jekyll 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54f2c04f2decc2f06508c9205753f6c65a62dcde
-  data.tar.gz: 9a5c07d788561b8a9ebdffb395961610e1f0bb84
+  metadata.gz: 5466e36bab3cde8d7f3be1b61f7f8bf52b458750
+  data.tar.gz: 08fee26752318820f8ccaaa0158fea42a4764a70
 SHA512:
-  metadata.gz: 0e700a2800c20defbf5b1106a434a92445e43f959044ea232e5d90ae54914ab84c3ae8ec7985a9876343041b014e5a37cafdce87f0262acff5741a0e0dc52dd3
-  data.tar.gz: 93db0c83231d8a8476fd5a4bd58496d80ca204c5d13dcb714af00da9653ddb2c19708b3933104a60c64115d1fcd7aabb85890be003f7650e57293a93f909f21f
+  metadata.gz: fe10f7294a52a2def29b0a618f97805d834ebf779ca51bccc129829e9bd9c98ab53b1a34883c248a92b5ed7b8e9bbaf0fda0c30dd4907ff182c9c208c9ed1d3f
+  data.tar.gz: 4f4e15d14f2af09e0429e707665c85a3b80567a25474a980b80c833b102d7b713fe1c124b630036591507fb70899022474fadf9a27405afd7a2b0138fd197492

data/History.markdown

@@ -10,7 +10,28 @@
 
 ### Site Enhancements
 
-## 1.3.1 / 2013-11/26
+## 1.4.0 / 2013-12-07
+
+### Major Enhancements
+  * Add support for TOML config files (#1765)
+
+### Minor Enhancements
+  * Sort plugins as a way to establish a load order (#1682)
+  * Update Maruku to 0.7.0 (#1775)
+
+### Bug Fixes
+  * Add a space between two words in a Pagination warning message (#1769)
+  * Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 (#1778)
+
+### Development Fixes
+  * Remove some whitespace in the code (#1755)
+  * Remove some duplication in the reading of posts and drafts (#1779)
+
+### Site Enhancements
+  * Fixed case of a word in the Jekyll v1.3.0 release post (#1762)
+  * Fixed the mime type for the favicon (#1772)
+
+## 1.3.1 / 2013-11-26
 
 ### Minor Enhancements
   * Add a `--prefix` option to passthrough for the importers (#1669)

data/Rakefile

@@ -218,7 +218,7 @@ namespace :site do
       abort "You seem to have misplaced your History.markdown file. I can haz?"
     end
   end
-  
+
   namespace :releases do
     desc "Create new release post"
     task :new, :version do |t, args|

data/features/markdown.feature

@@ -13,8 +13,8 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/2009/03/27/hackers.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
 
   Scenario: Markdown in pagination on index
     Given I have a configuration file with "paginate" set to "5"
@@ -26,5 +26,5 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
-    
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
+    

data/features/site_configuration.feature

@@ -67,28 +67,28 @@ Feature: Site configuration
     And I have a configuration file with "markdown" set to "rdiscount"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Redcarpet for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "redcarpet"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Maruku for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "maruku"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Highlight code with pygments
     Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.3.1'
+  s.version           = '1.4.0'
   s.license           = 'MIT'
-  s.date              = '2013-11-26'
+  s.date              = '2013-12-07'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -26,12 +26,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('liquid', "~> 2.5.2")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('listen', "~> 1.3")
-  s.add_runtime_dependency('maruku', "~> 0.6.0")
+  s.add_runtime_dependency('maruku', "~> 0.7.0")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('commander', "~> 4.1.3")
   s.add_runtime_dependency('safe_yaml', "~> 0.9.7")
   s.add_runtime_dependency('colorator', "~> 0.1")
   s.add_runtime_dependency('redcarpet', "~> 2.3.0")
+  s.add_runtime_dependency('toml', '~> 0.1.0')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -158,6 +159,7 @@ Gem::Specification.new do |s|
     site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
     site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
     site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
+    site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
@@ -211,6 +213,7 @@ Gem::Specification.new do |s|
     test/helper.rb
     test/source/+/foo.md
     test/source/.htaccess
+    test/source/_config.dev.toml
     test/source/_data/languages.yml
     test/source/_data/members.yaml
     test/source/_data/products.yml

data/lib/jekyll.rb

@@ -26,6 +26,7 @@ require 'pathname'
 require 'liquid'
 require 'maruku'
 require 'colorator'
+require 'toml'
 
 # internal requires
 require 'jekyll/core_ext'
@@ -62,7 +63,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/jekyll/configuration.rb

@@ -99,6 +99,17 @@ module Jekyll
       override['source'] || self['source'] || DEFAULTS['source']
     end
 
+    def safe_load_file(filename)
+      case File.extname(filename)
+      when '.toml'
+        TOML.load_file(filename)
+      when /\.y(a)?ml/
+        YAML.safe_load_file(filename)
+      else
+        raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
+      end
+    end
+
     # Public: Generate list of configuration files from the override
     #
     # override - the command-line options hash
@@ -121,8 +132,8 @@ module Jekyll
     #
     # Returns this configuration, overridden by the values in the file
     def read_config_file(file)
-      next_config = YAML.safe_load_file(file)
-      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) if !next_config.is_a?(Hash)
+      next_config = safe_load_file(file)
+      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) unless next_config.is_a?(Hash)
       Jekyll.logger.info "Configuration file:", file
       next_config
     rescue SystemCallError
@@ -131,7 +142,7 @@ module Jekyll
         {}
       else
         Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
-        raise LoadError
+        raise LoadError, "The Configuration file '#{file}' could not be found."
       end
     end
 

data/lib/jekyll/converters/markdown/maruku_parser.rb

@@ -41,7 +41,7 @@ module Jekyll
         end
 
         def convert(content)
-          converted = Maruku.new(content, :error_stream => @errors).to_html
+          converted = Maruku.new(content, :error_stream => @errors).to_html.strip
           print_errors_and_fail unless @errors.empty?
           converted
         end

data/lib/jekyll/generators/pagination.rb

@@ -17,7 +17,7 @@ module Jekyll
           if template = template_page(site)
             paginate(site, template)
           else
-            Jekyll.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find" +
+            Jekyll.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find " +
             "an index.html page to use as the pagination template. Skipping pagination."
           end
         end

data/lib/jekyll/site.rb

@@ -73,7 +73,7 @@ module Jekyll
       # directory.
       unless self.safe
         self.plugins.each do |plugins|
-            Dir[File.join(plugins, "**/*.rb")].each do |f|
+            Dir[File.join(plugins, "**/*.rb")].sort.each do |f|
               require f
             end
         end
@@ -169,19 +169,14 @@ module Jekyll
     #
     # Returns nothing.
     def read_posts(dir)
-      entries = get_entries(dir, '_posts')
+      posts = read_things(dir, '_posts', Post)
 
-      # first pass processes, but does not yet render post content
-      entries.each do |f|
-        if Post.valid?(f)
-          post = Post.new(self, self.source, dir, f)
-
-          if post.published && (self.future || post.date <= self.time)
-            aggregate_post_info(post)
-          end
+      posts.each do |post|
+        if post.published && (self.future || post.date <= self.time)
+          aggregate_post_info(post)
         end
       end
-    end
+   end
 
     # Read all the files in <source>/<dir>/_drafts and create a new Post
     # object with each one.
@@ -190,15 +185,16 @@ module Jekyll
     #
     # Returns nothing.
     def read_drafts(dir)
-      entries = get_entries(dir, '_drafts')
+      drafts = read_things(dir, '_drafts', Draft)
 
-      # first pass processes, but does not yet render draft content
-      entries.each do |f|
-        if Draft.valid?(f)
-          draft = Draft.new(self, self.source, dir, f)
+      drafts.each do |draft|
+        aggregate_post_info(draft)
+      end
+    end
 
-          aggregate_post_info(draft)
-        end
+    def read_things(dir, magic_dir, klass)
+      things = get_entries(dir, magic_dir).map do |entry|
+        klass.new(self, self.source, dir, entry) if klass.valid?(entry)
       end
     end
 

data/lib/jekyll/tags/include.rb

@@ -13,7 +13,7 @@ module Jekyll
 
       SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
 
-      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/      
+      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
 
       INCLUDES_DIR = '_includes'
 

data/site/_includes/top.html

@@ -12,6 +12,6 @@
   <link rel="stylesheet" href="{{ site.url }}/css/gridism.css" />
   <link rel="stylesheet" href="{{ site.url }}/css/style.css" />
   <link rel="stylesheet" href="{{ site.url }}/css/pygments.css" />
-  <link rel="icon" type="image/x-icon" href="{{ site.url }}/favicon.png" />
+  <link rel="icon" type="image/png" href="{{ site.url }}/favicon.png" />
   <script src="{{ site.url }}/js/modernizr-2.5.3.min.js"></script>
 </head>

data/site/_posts/2013-11-04-jekyll-1-3-0-released.markdown

@@ -19,7 +19,7 @@ Here are a few things we think you'll want to know about this release:
   repetition in your templates and to set site specific options without
   changing `_config.yml`.
 
-* You can now Run `jekyll serve --detach` to boot up a WEBrick server in the
+* You can now run `jekyll serve --detach` to boot up a WEBrick server in the
   background. **Note:** you'll need to run `kill [server_pid]` to shut
   the server down. When ran, you'll get a process id that you can use in
   place of `[server_pid]`

data/site/_posts/2013-12-07-jekyll-1-4-0-released.markdown

@@ -0,0 +1,30 @@
+---
+layout: news_item
+title: 'Jekyll 1.4.0 Released'
+date: 2013-12-07 13:55:28 -0600
+author: mattr-
+version: 1.4.0
+categories: [release]
+---
+
+About a month after the release of Jekyll v1.3.0, we are releasing
+Jekyll v1.4.0. This release will be the last non-patch release to support Ruby
+1.8.7 and our next release will be Jekyll 2.0.0.
+
+Here are a few things we think you'll want to know about this release:
+
+* TOML is now a supported markup language for config files.
+
+* Maruku has been updated to 0.7.0 which provides some new features and
+  a ton of bugfixes over the previous 0.6.x releases.
+
+* Non-`gem` Plugins are now sorted alphabetically by filename before they're
+  processed, which can provide a rudimentary way to establish a load order for
+  plugins.
+
+For a full run-down, visit our [change log](/docs/history/)!
+
+As always, Jekyll wouldn't be possible without the contributions from
+others in the Jekyll community. We'd like to thank the following people
+for contributing to this release: Anatol Broder, David Sawyer, Greg
+Karékinian, Jordon Bedwell, Matthew Iversen, Persa Zula, and Yi Zeng.

data/site/docs/history.md

@@ -5,7 +5,28 @@ permalink: /docs/history/
 prev_section: contributing
 ---
 
-## 1.3.1 / 2013-11/26
+## 1.4.0 / 2013-12-07
+
+### Major Enhancements
+- Add support for TOML config files ([#1765]({{ site.repository }}/issues/1765))
+
+### Minor Enhancements
+- Sort plugins as a way to establish a load order ([#1682]({{ site.repository }}/issues/1682))
+- Update Maruku to 0.7.0 ([#1775]({{ site.repository }}/issues/1775))
+
+### Bug Fixes
+- Add a space between two words in a Pagination warning message ([#1769]({{ site.repository }}/issues/1769))
+- Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 ([#1778]({{ site.repository }}/issues/1778))
+
+### Development Fixes
+- Remove some whitespace in the code ([#1755]({{ site.repository }}/issues/1755))
+- Remove some duplication in the reading of posts and drafts ([#1779]({{ site.repository }}/issues/1779))
+
+### Site Enhancements
+- Fixed case of a word in the Jekyll v1.3.0 release post ([#1762]({{ site.repository }}/issues/1762))
+- Fixed the mime type for the favicon ([#1772]({{ site.repository }}/issues/1772))
+
+## 1.3.1 / 2013-11-26
 
 ### Minor Enhancements
 - Add a `--prefix` option to passthrough for the importers ([#1669]({{ site.repository }}/issues/1669))

data/test/source/_config.dev.toml

@@ -0,0 +1,2 @@
+baseurl = "/you-beautiful-blog-you"
+title = "My magnificent site, wut"

data/test/test_configuration.rb

@@ -30,7 +30,7 @@ class TestConfiguration < Test::Unit::TestCase
       @config = Configuration[{"source" => source_dir}]
       @no_override     = {}
       @one_config_file = {"config" => "config.yml"}
-      @multiple_files  = {"config" => %w[config/site.yml config/deploy.yml configuration.yml]}
+      @multiple_files  = {"config" => %w[config/site.yml config/deploy.toml configuration.yml]}
     end
 
     should "always return an array" do
@@ -45,7 +45,7 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal %w[config.yml], @config.config_files(@one_config_file)
     end
     should "return an array of the config files if given many config files" do
-      assert_equal %w[config/site.yml config/deploy.yml configuration.yml], @config.config_files(@multiple_files)
+      assert_equal %w[config/site.yml config/deploy.toml configuration.yml], @config.config_files(@multiple_files)
     end
   end
   context "#backwards_compatibilize" do
@@ -131,6 +131,7 @@ class TestConfiguration < Test::Unit::TestCase
       @paths = {
         :default => File.join(Dir.pwd, '_config.yml'),
         :other   => File.join(Dir.pwd, '_config.live.yml'),
+        :toml    => source_dir('_config.dev.toml'),
         :empty   => ""
       }
     end
@@ -153,12 +154,20 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
     end
 
+    should "successfully load a TOML file" do
+      Jekyll.logger.log_level = Jekyll::Stevenson::WARN
+      assert_equal Jekyll::Configuration::DEFAULTS.merge({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), Jekyll.configuration({ "config" => [@paths[:toml]] })
+      Jekyll.logger.log_level = Jekyll::Stevenson::INFO
+    end
+
     should "load multiple config files" do
       mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
       mock(YAML).safe_load_file(@paths[:other]) { Hash.new }
+      mock(TOML).load_file(@paths[:toml]) { Hash.new }
       mock($stdout).puts("Configuration file: #{@paths[:default]}")
       mock($stdout).puts("Configuration file: #{@paths[:other]}")
-      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] })
+      mock($stdout).puts("Configuration file: #{@paths[:toml]}")
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] })
     end
 
     should "load multiple config files and last config should win" do

data/test/test_excerpt.rb

@@ -66,7 +66,7 @@ class TestExcerpt < Test::Unit::TestCase
         end
 
         should "be the first paragraph of the page" do
-          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>", @extracted_excerpt.content
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>", @extracted_excerpt.content
         end
 
         should "link properly" do

data/test/test_post.rb

@@ -284,7 +284,7 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "return rendered HTML" do
-          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>",
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>",
                        @post.excerpt
         end
 

data/test/test_tags.rb

@@ -252,7 +252,7 @@ CONTENT
       end
 
       should "write script tag" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js'>\s</script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js'><![CDATA[\s]]></script>", @result
       end
     end
 
@@ -272,7 +272,7 @@ CONTENT
         end
 
         should "write script tag with specific file in gist" do
-          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
+          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
         end
       end
 
@@ -308,7 +308,7 @@ CONTENT
       end
 
       should "write script tag with specific file in gist" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: toml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -475,6 +489,7 @@ files:
 - site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
 - site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
 - site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
+- site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
@@ -528,6 +543,7 @@ files:
 - test/helper.rb
 - test/source/+/foo.md
 - test/source/.htaccess
+- test/source/_config.dev.toml
 - test/source/_data/languages.yml
 - test/source/_data/members.yaml
 - test/source/_data/products.yml