jekyll 1.0.0.beta4 → 1.0.0.rc1

data/test/test_generated_site.rb

@@ -5,7 +5,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     setup do
       clear_dest
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
       end
 
       @site = Site.new(Jekyll.configuration)
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 31, @site.posts.size
+      assert_equal 32, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -46,7 +46,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     setup do
       clear_dest
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
       end
 
       @site = Site.new(Jekyll.configuration)
@@ -62,7 +62,7 @@ class TestGeneratedSite < Test::Unit::TestCase
       assert_raise ArgumentError do
         clear_dest
         stub(Jekyll).configuration do
-          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
         end
 
         @site = Site.new(Jekyll.configuration)

data/test/test_page.rb

@@ -15,7 +15,7 @@ class TestPage < Test::Unit::TestCase
   context "A Page" do
     setup do
       clear_dest
-      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
 
@@ -102,16 +102,6 @@ class TestPage < Test::Unit::TestCase
         assert_equal "/about/", @page.dir
       end
     end
-    
-    context "with unspecified layout" do
-      setup do
-        @page = setup_page('contacts.html')
-      end
-
-      should "default to 'post' layout" do
-        assert_equal "page", @page.data["layout"]
-      end
-    end
         
     context "with specified layout of nil" do
       setup do

data/test/test_pager.rb

@@ -14,7 +14,7 @@ class TestPager < Test::Unit::TestCase
   context "pagination disabled" do
     setup do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({
+        Jekyll::Configuration::DEFAULTS.merge({
           'source'      => source_dir,
           'destination' => dest_dir
         })
@@ -31,7 +31,7 @@ class TestPager < Test::Unit::TestCase
   context "pagination enabled for 2" do
     setup do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({
+        Jekyll::Configuration::DEFAULTS.merge({
           'source'      => source_dir,
           'destination' => dest_dir,
           'paginate'    => 2

data/test/test_post.rb

@@ -13,7 +13,7 @@ class TestPost < Test::Unit::TestCase
   context "A Post" do
     setup do
       clear_dest
-      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
 
@@ -95,7 +95,7 @@ class TestPost < Test::Unit::TestCase
         should "consume the embedded dashes" do
           @post.read_yaml(@source, @real_file)
 
-          assert_equal({"title" => "Foo --- Bar", "layout" => "post"}, @post.data)
+          assert_equal({"title" => "Foo --- Bar"}, @post.data)
           assert_equal "Triple the fun!", @post.content
         end
       end
@@ -139,18 +139,6 @@ class TestPost < Test::Unit::TestCase
             assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
           end
         end
-
-        context "with unspecified layout" do
-          setup do
-            file = '2013-01-12-no-layout.textile'
-            @post = setup_post(file)
-            @post.process(file)
-          end
-
-          should "default to 'post' layout" do
-            assert_equal "post", @post.data["layout"]
-          end
-        end
         
         context "with specified layout of nil" do
           setup do
@@ -320,13 +308,31 @@ class TestPost < Test::Unit::TestCase
             assert !@post.excerpt.include?("---"), "does not contains separator"
           end
         end
+
+        context "with custom excerpt" do
+          setup do
+            file = "2013-04-11-custom-excerpt.markdown"
+            @post = setup_post(file)
+            do_render(@post)
+          end
+
+          should "use custom excerpt" do
+            assert_equal("I can set a custom excerpt", @post.excerpt)
+          end
+
+          should "expose custom excerpt to liquid" do
+            assert @post.content.include?("I can use the excerpt: <quote>I can set a custom excerpt</quote>"), "Exposes incorrect excerpt to liquid."
+          end
+
+        end
+
       end
     end
 
     context "when in a site" do
       setup do
         clear_dest
-        stub(Jekyll).configuration { Jekyll::DEFAULTS }
+        stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
         @site = Site.new(Jekyll.configuration)
         @site.posts = [setup_post('2008-02-02-published.textile'),
                        setup_post('2009-01-27-categories.textile')]
@@ -519,7 +525,7 @@ class TestPost < Test::Unit::TestCase
   
   context "converter file extension settings" do
     setup do
-      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
     

data/test/test_site.rb

@@ -3,49 +3,49 @@ require 'helper'
 class TestSite < Test::Unit::TestCase
   context "configuring sites" do
     should "have an array for plugins by default" do
-      site = Site.new(Jekyll::DEFAULTS)
+      site = Site.new(Jekyll::Configuration::DEFAULTS)
       assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
     end
 
     should "look for plugins under the site directory by default" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'source' => File.expand_path(source_dir)}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'source' => File.expand_path(source_dir)}))
       assert_equal [File.join(source_dir, '_plugins')], site.plugins
     end
 
     should "have an array for plugins if passed as a string" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
       assert_equal ['/tmp/plugins'], site.plugins
     end
 
     should "have an array for plugins if passed as an array" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => ['/tmp/plugins', '/tmp/otherplugins']}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => ['/tmp/plugins', '/tmp/otherplugins']}))
       assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins
     end
 
     should "have an empty array for plugins if nothing is passed" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => []}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => []}))
       assert_equal [], site.plugins
     end
 
     should "have an empty array for plugins if nil is passed" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => nil}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => nil}))
       assert_equal [], site.plugins
     end
 
     should "expose default baseurl" do
-      site = Site.new(Jekyll::DEFAULTS)
-      assert_equal Jekyll::DEFAULTS['baseurl'], site.baseurl
+      site = Site.new(Jekyll::Configuration::DEFAULTS)
+      assert_equal Jekyll::Configuration::DEFAULTS['baseurl'], site.baseurl
     end
 
     should "expose baseurl passed in from config" do
-      site = Site.new(Jekyll::DEFAULTS.merge({'baseurl' => '/blog'}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'baseurl' => '/blog'}))
       assert_equal '/blog', site.baseurl
     end
   end
   context "creating sites" do
     setup do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
       end
       @site = Site.new(Jekyll.configuration)
     end
@@ -205,7 +205,7 @@ class TestSite < Test::Unit::TestCase
 
     should "filter symlink entries when safe mode enabled" do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
       end
       site = Site.new(Jekyll.configuration)
       stub(File).symlink?('symlink.js') {true}
@@ -221,7 +221,7 @@ class TestSite < Test::Unit::TestCase
 
     should "not include symlinks in safe mode" do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
       end
       site = Site.new(Jekyll.configuration)
 
@@ -232,7 +232,7 @@ class TestSite < Test::Unit::TestCase
 
     should "include symlinks in unsafe mode" do
       stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
       end
       site = Site.new(Jekyll.configuration)
 
@@ -244,7 +244,7 @@ class TestSite < Test::Unit::TestCase
     context 'error handling' do
       should "raise if destination is included in source" do
         stub(Jekyll).configuration do
-          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => source_dir})
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => source_dir})
         end
 
         assert_raise Jekyll::FatalException do
@@ -254,7 +254,7 @@ class TestSite < Test::Unit::TestCase
 
       should "raise if destination is source" do
         stub(Jekyll).configuration do
-          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => File.join(source_dir, "..")})
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => File.join(source_dir, "..")})
         end
 
         assert_raise Jekyll::FatalException do
@@ -303,7 +303,7 @@ class TestSite < Test::Unit::TestCase
       end
 
       should 'remove orphaned files in destination - keep_files .svn' do
-        config = Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
+        config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
         @site = Site.new(config)
         @site.process
         assert !File.exist?(dest_dir('.htpasswd'))

data/test/test_tags.rb

@@ -6,7 +6,7 @@ class TestTags < Test::Unit::TestCase
 
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
-      Jekyll::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
+      Jekyll::Configuration::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
     end
     site = Site.new(Jekyll.configuration)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -139,6 +139,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: colorator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -371,18 +387,25 @@ files:
 - lib/jekyll/commands/build.rb
 - lib/jekyll/commands/new.rb
 - lib/jekyll/commands/serve.rb
+- lib/jekyll/configuration.rb
 - lib/jekyll/converter.rb
 - lib/jekyll/converters/identity.rb
 - lib/jekyll/converters/markdown.rb
+- lib/jekyll/converters/markdown/kramdown_parser.rb
+- lib/jekyll/converters/markdown/maruku_parser.rb
+- lib/jekyll/converters/markdown/rdiscount_parser.rb
+- lib/jekyll/converters/markdown/redcarpet_parser.rb
 - lib/jekyll/converters/textile.rb
 - lib/jekyll/convertible.rb
 - lib/jekyll/core_ext.rb
+- lib/jekyll/deprecator.rb
 - lib/jekyll/draft.rb
 - lib/jekyll/errors.rb
 - lib/jekyll/filters.rb
 - lib/jekyll/generator.rb
 - lib/jekyll/generators/pagination.rb
 - lib/jekyll/layout.rb
+- lib/jekyll/logger.rb
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
@@ -492,6 +515,7 @@ files:
 - test/source/_posts/2013-01-12-nil-layout.textile
 - test/source/_posts/2013-01-12-no-layout.textile
 - test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
+- test/source/_posts/2013-04-11-custom-excerpt.markdown
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -536,6 +560,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -61414058465599084
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: