jekyll 1.2.1 → 1.3.0.rc

data/test/test_site.rb

@@ -156,7 +156,7 @@ class TestSite < Test::Unit::TestCase
 
     should "read layouts" do
       @site.read_layouts
-      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
+      assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort
     end
 
     should "read posts" do
@@ -335,5 +335,62 @@ class TestSite < Test::Unit::TestCase
       end
     end
 
+    context 'data directory' do
+      should 'auto load yaml files' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'members.yaml'))
+
+        assert_equal site.data['members'], file_content
+        assert_equal site.site_payload['site']['data']['members'], file_content
+      end
+
+      should 'auto load yml files' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'languages.yml'))
+
+        assert_equal site.data['languages'], file_content
+        assert_equal site.site_payload['site']['data']['languages'], file_content
+      end
+
+      should "load symlink files in unsafe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => false}))
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'products.yml'))
+
+        assert_equal site.data['products'], file_content
+        assert_equal site.site_payload['site']['data']['products'], file_content
+      end
+
+      should "not load symlink files in safe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => true}))
+        site.process
+
+        assert_nil site.data['products']
+        assert_nil site.site_payload['site']['data']['products']
+      end
+
+      should "load symlink directory in unsafe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => false, 'data_source' => File.join('symlink-test', '_data')}))
+        site.process
+
+        assert_not_nil site.data['products']
+        assert_not_nil site.data['languages']
+        assert_not_nil site.data['members']
+      end
+
+      should "not load symlink directory in safe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => true, 'data_source' => File.join('symlink-test', '_data')}))
+        site.process
+
+        assert_nil site.data['products']
+        assert_nil site.data['languages']
+        assert_nil site.data['members']
+      end
+    end
   end
 end

data/test/test_tags.rb

@@ -19,7 +19,7 @@ class TestTags < Test::Unit::TestCase
     payload = { "pygments_prefix" => @converter.pygments_prefix,
                 "pygments_suffix" => @converter.pygments_suffix }
 
-    @result = Liquid::Template.parse(content).render(payload, info)
+    @result = Liquid::Template.parse(content).render!(payload, info)
     @result = @converter.convert(@result)
   end
 
@@ -69,6 +69,9 @@ CONTENT
 
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ 'cssclass' => 'hl', 'linenos' => 'table' }, tag.instance_variable_get(:@options))
+
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
     end
   end
 
@@ -273,22 +276,19 @@ CONTENT
         end
       end
 
-      context "when invalid" do
-        setup do
-          @gist = "mattr-24081a1d93d2898ecf0f"
-          @filename = "myfile.ext"
-          content = <<CONTENT
+      should "raise ArgumentError when invalid" do
+        @gist = "mattr-24081a1d93d2898ecf0f"
+        @filename = "myfile.ext"
+        content = <<CONTENT
   ---
   title: My Cool Gist
   ---
 
   {% gist #{@gist} #{@filename} %}
 CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
 
-        should "write script tag with specific file in gist" do
-          assert_match "Error parsing gist id", @result
+        assert_raise ArgumentError do
+          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
       end
     end
@@ -313,7 +313,7 @@ CONTENT
     end
 
     context "with blank gist id" do
-      setup do
+      should "raise ArgumentError" do
         content = <<CONTENT
 ---
 title: My Cool Gist
@@ -321,16 +321,15 @@ title: My Cool Gist
 
 {% gist %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-      end
 
-      should "output error message" do
-        assert_match "Error parsing gist id", @result
+        assert_raise ArgumentError do
+          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        end
       end
     end
 
     context "with invalid gist id" do
-      setup do
+      should "raise ArgumentError" do
         invalid_gist = 'invalid'
         content = <<CONTENT
 ---
@@ -339,11 +338,10 @@ title: My Cool Gist
 
 {% gist #{invalid_gist} %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-      end
 
-      should "output error message" do
-        assert_match "Error parsing gist id", @result
+        assert_raise ArgumentError do
+          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        end
       end
     end
   end
@@ -373,7 +371,7 @@ CONTENT
     end
 
     context "with invalid parameter syntax" do
-      should "throw a SyntaxError" do
+      should "throw a ArgumentError" do
         content = <<CONTENT
 ---
 title: Invalid parameter syntax
@@ -381,7 +379,7 @@ title: Invalid parameter syntax
 
 {% include params.html param s="value" %}
 CONTENT
-        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
 
@@ -392,7 +390,7 @@ title: Invalid parameter syntax
 
 {% include params.html params="value %}
 CONTENT
-        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0.rc
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: directory_watcher
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -198,34 +198,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
-    - - '!='
-      - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
-    - - '!='
-      - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -246,14 +240,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -274,14 +268,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +304,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +346,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: jekyll_test_plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables:
@@ -342,6 +378,7 @@ files:
 - bin/jekyll
 - cucumber.yml
 - features/create_sites.feature
+- features/data.feature
 - features/drafts.feature
 - features/embed_filters.feature
 - features/include_tag.feature
@@ -434,12 +471,14 @@ files:
 - site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
 - site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
 - site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
+- site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
 - site/css/style.css
 - site/docs/configuration.md
 - site/docs/contributing.md
+- site/docs/datafiles.md
 - site/docs/deployment-methods.md
 - site/docs/drafts.md
 - site/docs/extras.md
@@ -486,9 +525,13 @@ files:
 - test/helper.rb
 - test/source/+/foo.md
 - test/source/.htaccess
+- test/source/_data/languages.yml
+- test/source/_data/members.yaml
+- test/source/_data/products.yml
 - test/source/_includes/params.html
 - test/source/_includes/sig.markdown
 - test/source/_layouts/default.html
+- test/source/_layouts/post/simple.html
 - test/source/_layouts/simple.html
 - test/source/_plugins/dummy.rb
 - test/source/_posts/2008-02-02-not-published.textile
@@ -534,6 +577,7 @@ files:
 - test/source/deal.with.dots.html
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
+- test/source/products.yml
 - test/source/sitemap.xml
 - test/source/symlink-test/symlinked-file
 - test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
@@ -574,9 +618,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: jekyll
 rubygems_version: 2.0.3