jekyll 2.0.0.alpha.3 → 2.0.0.rc1

data/site/docs/templates.md

@@ -209,7 +209,7 @@ root of your source directory. This will embed the contents of
 
     The name of the file you wish to embed can be literal (as in the example above),
     or you can use a variable, using liquid-like variable syntax as in
-    <code>{% raw %}{% include {{ my_variable }} %}{% endraw %}</code>.
+    <code>{% raw %}{% include {{my_variable}} %}{% endraw %}</code>.
 
   </p>
 </div>

data/test/test_collections.rb

@@ -49,6 +49,35 @@ class TestCollections < Test::Unit::TestCase
     should "know the full path to itself on the filesystem" do
       assert_equal @collection.directory, source_dir("_methods")
     end
+
+    context "when turned into Liquid" do
+      should "have a label attribute" do
+        assert_equal @collection.to_liquid["label"], "methods"
+      end
+
+      should "have a docs attribute" do
+        assert_equal @collection.to_liquid["docs"], Array.new
+      end
+
+      should "have a directory attribute" do
+        assert_equal @collection.to_liquid["directory"], source_dir("_methods")
+      end
+
+      should "have a relative_directory attribute" do
+        assert_equal @collection.to_liquid["relative_directory"], "_methods"
+      end
+
+      should "have a written attribute" do
+        assert_equal @collection.to_liquid["written"], false
+      end
+    end
+
+    should "know whether it should be written or not" do
+      assert_equal @collection.write?, false
+      @collection.metadata['output'] = true
+      assert_equal @collection.write?, true
+      @collection.metadata.delete 'output'
+    end
   end
 
   context "with no collections specified" do
@@ -57,10 +86,8 @@ class TestCollections < Test::Unit::TestCase
       @site.process
     end
 
-    should "not contain any collections other than the default ones" do
-      collections = @site.collections.dup
-      assert collections.delete("data").is_a?(Jekyll::Collection)
-      assert_equal Hash.new, collections
+    should "not contain any collections" do
+      assert_equal Hash.new, @site.collections
     end
   end
 
@@ -107,6 +134,25 @@ class TestCollections < Test::Unit::TestCase
     end
   end
 
+  context "with a collection with metadata" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "methods" => {
+            "foo" => "bar",
+            "baz" => "whoo"
+          }
+        }
+      })
+      @site.process
+      @collection = @site.collections["methods"]
+    end
+
+    should "extract the configuration collection information as metadata" do
+      assert_equal @collection.metadata, {"foo" => "bar", "baz" => "whoo"}
+    end
+  end
+
   context "in safe mode" do
     setup do
       @site = fixture_site({

data/test/test_filters.rb

@@ -93,6 +93,10 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
     end
 
+    should "not error when xml escaping nil" do
+      assert_equal "", @filter.xml_escape(nil)
+    end
+
     should "escape space as plus" do
       assert_equal "my+things", @filter.cgi_escape("my things")
     end

data/test/test_liquid_extensions.rb

@@ -0,0 +1,31 @@
+require 'helper'
+
+class TestLiquidExtensions < Test::Unit::TestCase
+
+  context "looking up a variable in a Liquid context" do
+    class SayHi < Liquid::Tag
+      include Jekyll::LiquidExtensions
+
+      def initialize(tag_name, markup, tokens)
+        @markup = markup.strip
+      end
+
+      def render(context)
+        "hi #{lookup_variable(context, @markup)}"
+      end
+    end
+    Liquid::Template.register_tag('say_hi', SayHi)
+    setup do
+      @template = Liquid::Template.parse("{% say_hi page.name %}") # Parses and compiles the template
+    end
+
+    should "extract the var properly" do
+      assert_equal @template.render({'page' => {'name' => 'tobi'}}), 'hi tobi'
+    end
+
+    should "return the variable name if the value isn't there" do
+      assert_equal @template.render({'page' => {'title' => 'tobi'}}), 'hi page.name'
+    end
+  end
+
+end

data/test/test_utils.rb

@@ -63,4 +63,5 @@ class TestUtils < Test::Unit::TestCase
     end
 
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -456,6 +456,7 @@ files:
 - features/data.feature
 - features/drafts.feature
 - features/embed_filters.feature
+- features/frontmatter_defaults.feature
 - features/include_tag.feature
 - features/markdown.feature
 - features/pagination.feature
@@ -493,10 +494,12 @@ files:
 - lib/jekyll/errors.rb
 - lib/jekyll/excerpt.rb
 - lib/jekyll/filters.rb
+- lib/jekyll/frontmatter_defaults.rb
 - lib/jekyll/generator.rb
 - lib/jekyll/generators/pagination.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/layout_reader.rb
+- lib/jekyll/liquid_extensions.rb
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
@@ -534,6 +537,7 @@ files:
 - script/cibuild
 - script/console
 - script/rebund
+- script/test
 - site/.gitignore
 - site/CNAME
 - site/README
@@ -727,6 +731,7 @@ files:
 - test/test_generated_site.rb
 - test/test_kramdown.rb
 - test/test_layout_reader.rb
+- test/test_liquid_extensions.rb
 - test/test_new_command.rb
 - test/test_page.rb
 - test/test_pager.rb
@@ -772,6 +777,7 @@ test_files:
 - features/data.feature
 - features/drafts.feature
 - features/embed_filters.feature
+- features/frontmatter_defaults.feature
 - features/include_tag.feature
 - features/markdown.feature
 - features/pagination.feature
@@ -885,6 +891,7 @@ test_files:
 - test/test_generated_site.rb
 - test/test_kramdown.rb
 - test/test_layout_reader.rb
+- test/test_liquid_extensions.rb
 - test/test_new_command.rb
 - test/test_page.rb
 - test/test_pager.rb