diff --git a/Rakefile b/Rakefile index 5d86012f..f46e8f6a 100644 --- a/Rakefile +++ b/Rakefile @@ -81,7 +81,7 @@ begin require 'cucumber/rake/task' Cucumber::Rake::Task.new(:features) do |t| - t.cucumber_opts = "--format pretty" + t.cucumber_opts = "--format progress" end rescue LoadError desc 'Cucumber rake task not available' diff --git a/features/post_data.feature b/features/post_data.feature index fcba1507..93ec0a94 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -105,19 +105,6 @@ Feature: Post data Then the _site directory should exist And I should see "Post categories: movies and scifi" in "_site/movies/scifi/2009/03/27/star-wars.html" - Scenario: Use post.topics variable - Given I have a _posts directory - And I have a _posts/movies directory - And I have a _posts/movies/scifi directory - And I have a _layouts directory - And I have the following post under "movies/scifi": - | title | date | layout | content | - | Star Wars | 3/27/2009 | simple | Luke, I am your father. | - And I have a simple layout that contains "Post topics: {{ site.posts.first.topics | array_to_sentence_string }}" - When I run jekyll - Then the _site directory should exist - And I should see "Post topics: movies and scifi" in "_site/2009/03/27/star-wars.html" - Scenario: Disable a post from being published Given I have a _posts directory And I have an "index.html" file that contains "Published!" diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb index aa2c91b0..61bfc8e2 100644 --- a/lib/jekyll/post.rb +++ b/lib/jekyll/post.rb @@ -18,7 +18,7 @@ module Jekyll name =~ MATCHER end - attr_accessor :site, :date, :slug, :ext, :topics, :published, :data, :content, :output + attr_accessor :site, :date, :slug, :ext, :published, :data, :content, :output attr_writer :categories def categories @@ -38,10 +38,6 @@ module Jekyll @name = name self.categories = dir.split('/').reject { |x| x.empty? } - - parts = name.split('/') - self.topics = parts.size > 1 ? parts[0..-2] : [] - self.process(name) self.read_yaml(@base, name) @@ -209,7 +205,6 @@ module Jekyll "url" => self.url, "date" => self.date, "id" => self.id, - "topics" => self.topics, "categories" => self.categories, "next" => self.next, "previous" => self.previous, diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 176e5ef7..9964cc69 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -214,15 +214,12 @@ module Jekyll # # Returns {"site" => {"time" =>