jekyll 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bc4a3e8b5ff2166ff4085233990a3e812f939c
-  data.tar.gz: 15c66ce3e4d6382e030edbaf94de50fb7f8f25f4
+  metadata.gz: f15afc62570e5e20a6a27553ca201e08ec8c9d69
+  data.tar.gz: 1a967f8aca5003083a4b9da5ba6a92d25dbf1ea7
 SHA512:
-  metadata.gz: 17f3e2ca1a1eff87d94a83b200110abc916bad8cd7e0547d1adece084baf5427fdfefe275261f22a91c8107c286a7c4c28178175af1dfc95cbad29e0bf4c6529
-  data.tar.gz: 6628f451773ee299076c5ca366c253357f78f7292e9bc06a96f9d547b20da89f1afca053da7ad590d8c320d81728eb154868d5a3e3ffbcfcb550f5623448f8a1
+  metadata.gz: f1479bd3d893c58838172496863d3fdb58d48d9195270aa00445ad5d7895bd7622e9bf9ae4f42a35492be996c8f24de9f8bfe9f64148c10c055636992c210c8a
+  data.tar.gz: e3c5582546fcb711a2c9b5ee9c3c0a8611385fb96f4fad06199e52312bab2e124105782503243a4a744cd4dffca31ccc06a413336f892e95fbc345aafbd64979

data/.travis.yml

@@ -4,7 +4,7 @@ install:
 - script/rebund download
 - travis_retry bundle install --path vendor/bundle
 rvm:
-- 2.1.0
+- 2.1.1
 - 2.0.0
 - 1.9.3
 script: script/cibuild

data/History.markdown

@@ -1,5 +1,17 @@
 ## HEAD
 
+### Major Enhancements
+
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.0.0 / 2014-05-06
+
 ### Major Enhancements
   * Add "Collections" feature (#2199)
   * Add gem-based plugin whitelist to safe mode (#1657)
@@ -18,6 +30,8 @@
   * Complete redesign of the template site generated by `jekyll new` (#2050)
   * Update Listen from 1.x to 2.x (#2097)
   * Front-matter defaults (#2205)
+  * Deprecate `relative_permalinks` configuration option (default to `false`) (#2307)
+  * Exclude files based on prefix as well as `fnmatch?` (#2303)
 
 ### Minor Enhancements
   * Move the EntryFilter class into the Jekyll module to avoid polluting the
@@ -64,6 +78,12 @@
   * Add the ability for pages to be marked as `published: false` (#1492)
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. (#2253)
+  * Remove literal lang name from class (#2292)
+  * Return `utf-8` encoding in header for  webrick error page response (#2289)
+  * Make template site easier to customize (#2268)
+  * Add two-digit year to permalink template option (#2301)
+  * Add `site.documents` to Liquid payload (list of all docs) (#2295)
+  * Take into account missing values in the Liquid sort filter (#2299)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)
@@ -95,6 +115,10 @@
   * Load in `rouge` only when it's been requested as the highlighter (#2189)
   * Convert input to string before XML escaping (`xml_escape` liquid filter) (#2244)
   * Modify configuration key for Collections and reset properly. (#2238)
+  * Avoid duplicated output using `highlight` tag (#2264)
+  * Only use Jekyll.logger for output (#2307)
+  * Close the file descriptor in `has_yaml_header?` (#2310)
+  * Add `output` to `Document` liquid output hash (#2309)
 
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)
@@ -126,6 +150,10 @@
   * Add missing tests for `Command` (#2216)
   * Update `rr` link in CONTRIBUTING doc (#2247)
   * Streamline cucumber execution of `jekyll` subcommands (#2258)
+  * Refactor `Commands::Serve`. (#2269)
+  * Refactor `highlight` tag (#2154)
+  * Update `Util` hash functions with latest from Rails (#2273)
+  * Workaround for Travis bug (#2290) 
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)
@@ -196,6 +224,18 @@
   * Add a cross-reference about `post_url` (#2243)
   * Add `jekyll-live-tiles` to list of third-party plugins (#2250)
   * Fixed broken link to GitHub training material site source (#2257)
+  * Update link to help repo, now called `jekyll-help` (#2277)
+  * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
+  * Include plugins by sonnym in list of third-party plugins (#2297)
+  * Add deprecated articles keeper filter to list of third-party plugins (#2300)
+  * Simplify and improve our CSS. (#2127)
+  * Use black text color for the mobile navbar (#2306)
+  * Use the built in date filter and `site.time` for the copyright year. (#2305)
+  * Update html5shiv to v3.7.2 (#2304)
+  * Add 2.0.0 release post (#2298)
+  * Add docs for custom markdown processors (#2298)
+  * Add docs for `where` and `group_by` Liquid filters (#2298)
+  * Remove notes in docs for unreleased features (#2309)
 
 ## 1.5.1 / 2014-03-27
 

data/README.markdown

@@ -1,10 +1,10 @@
 # [Jekyll](http://jekyllrb.com/)
 
-[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
+[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](http://badge.fury.io/rb/jekyll)
 
-[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.png?branch=master)](https://travis-ci.org/jekyll/jekyll)
+[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll)
 [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
-[![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll)
+[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
 [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
 
 By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!

data/features/collections.feature

@@ -70,3 +70,27 @@ Feature: Collections
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: All the documents
+    Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: Documents have an output attribute, which is the converted HTML
+    Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "First document's output: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"

data/features/embed_filters.feature

@@ -73,3 +73,35 @@ Feature: Embed filters
     Then the _site directory should exist
     And I should see exactly "Page-2, Page-1" in "_site/page-1.html"
     And I should see exactly "Page-2, Page-1" in "_site/page-2.html"
+
+  Scenario: Sort pages by the title
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html"
+
+  Scenario: Sort pages by the title ordering pages without title last
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', 'last' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"

data/features/site_configuration.feature

@@ -105,6 +105,15 @@ Feature: Site configuration
     And I should see "Hello world!" in "_site/index.html"
     And I should see "class=\"highlight\"" in "_site/index.html"
 
+  Scenario: Rouge renders code block once
+    Given I have a configuration file with "highlighter" set to "rouge"
+    And I have a _posts directory
+    And I have the following post:
+      | title | date             | layout  | content                                      |
+      | foo   | 2014-04-27 11:34 | default | {% highlight text %} test {% endhighlight %} |
+    When I run jekyll build
+    Then I should not see "highlight(.*)highlight" in "_site/2014/04/27/foo.html"
+
   Scenario: Set time and no future dated posts
     Given I have a _layouts directory
     And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"

data/features/step_definitions/jekyll_steps.rb

@@ -165,7 +165,7 @@ Then /^the (.*) directory should not exist$/ do |dir|
 end
 
 Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(text), file_contents(file)
+  assert_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
 end
 
 Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
@@ -173,7 +173,7 @@ Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
 end
 
 Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
-  assert_no_match Regexp.new(text), file_contents(file)
+  assert_no_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
 end
 
 Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|

data/features/support/env.rb

@@ -28,7 +28,11 @@ def run_jekyll(args)
 end
 
 def slug(title)
-  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  if title
+    title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  else
+    Time.now.strftime("%s%9N") # nanoseconds since the Epoch
+  end
 end
 
 def location(folder, direction)

data/jekyll.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('liquid', "~> 2.5.5")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('listen', "~> 2.5")
-  s.add_runtime_dependency('maruku', "0.7.0")
+  s.add_runtime_dependency('kramdown', "~> 1.3")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.1")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('redcarpet', "~> 3.1")
   s.add_runtime_dependency('toml', '~> 0.1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
-  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0.0.rc3')
+  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rr', "~> 1.1")
   s.add_development_dependency('cucumber', "1.3.11")
   s.add_development_dependency('RedCloth', "~> 4.2")
-  s.add_development_dependency('kramdown', "~> 1.3")
+  s.add_development_dependency('maruku', "0.7.0")
   s.add_development_dependency('rdiscount', "~> 1.6")
   s.add_development_dependency('launchy', "~> 2.3")
   s.add_development_dependency('simplecov', "~> 0.7")

data/lib/jekyll/commands/build.rb

@@ -25,7 +25,7 @@ module Jekyll
           options = configuration_from_options(options)
           site = Jekyll::Site.new(options)
 
-          Jekyll.logger.log_level = Jekyll::Stevenson::ERROR if options['quiet']
+          Jekyll.logger.log_level = :error if options['quiet']
 
           build(site, options)
           watch(site, options) if options['watch']
@@ -70,8 +70,8 @@ module Jekyll
           Jekyll.logger.info "Auto-regeneration:", "enabled"
 
           listener = Listen.to(
-            source, 
-            :ignore => ignored, 
+            source,
+            :ignore => ignored,
             :force_polling => options['force_polling']
           ) do |modified, added, removed|
             t = Time.now.strftime("%Y-%m-%d %H:%M:%S")

data/lib/jekyll/commands/doctor.rb

@@ -41,7 +41,7 @@ module Jekyll
             if page.uses_relative_permalinks
               Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
                                   " permalinks which will be deprecated in" +
-                                  " Jekyll v1.2 and beyond."
+                                  " Jekyll v2.0.0 and beyond."
               contains_deprecated_pages = true
             end
           end

data/lib/jekyll/commands/new.rb

@@ -36,7 +36,7 @@ module Jekyll
           end
         end
 
-        puts "New jekyll site installed in #{new_blog_path}."
+        Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
       end
 
       def self.create_blank_site(path)

data/lib/jekyll/commands/serve.rb

@@ -29,33 +29,20 @@ module Jekyll
         # Boot up a WEBrick server which points to the compiled site's root.
         def process(options)
           options = configuration_from_options(options)
-
-          require 'webrick'
-
           destination = options['destination']
-
-          FileUtils.mkdir_p(destination)
-
-          # monkey patch WEBrick using custom 404 page (/404.html)
-          if File.exist?(File.join(destination, '404.html'))
-            WEBrick::HTTPResponse.class_eval do
-              def create_error_page
-                @body = IO.read(File.join(@config[:DocumentRoot], '404.html'))
-              end
-            end
-          end
-
-          # recreate NondisclosureName under utf-8 circumstance
-          fh_option = WEBrick::Config::FileHandler
-          fh_option[:NondisclosureName] = ['.ht*','~*']
+          setup(destination)
 
           s = WEBrick::HTTPServer.new(webrick_options(options))
+          s.unmount("")
 
-          s.config.store(:DirectoryIndex, s.config[:DirectoryIndex] << "index.xml")
+          s.mount(
+            options['baseurl'],
+            WEBrick::HTTPServlet::FileHandler,
+            destination,
+            file_handler_options
+          )
 
-          s.mount(options['baseurl'], WEBrick::HTTPServlet::FileHandler, destination, fh_option)
-
-          Jekyll.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
+          Jekyll.logger.info "Server address:", server_address(s, options)
 
           if options['detach'] # detach the server
             pid = Process.fork { s.start }
@@ -68,6 +55,22 @@ module Jekyll
           end
         end
 
+        def setup(destination)
+          require 'webrick'
+
+          FileUtils.mkdir_p(destination)
+
+          # monkey patch WEBrick using custom 404 page (/404.html)
+          if File.exist?(File.join(destination, '404.html'))
+            WEBrick::HTTPResponse.class_eval do
+              def create_error_page
+                @header['content-type'] = "text/html; charset=UTF-8"
+                @body = IO.read(File.join(@config[:DocumentRoot], '404.html'))
+              end
+            end
+          end
+        end
+
         def webrick_options(config)
           opts = {
             :DocumentRoot       => config['destination'],
@@ -75,7 +78,8 @@ module Jekyll
             :BindAddress        => config['host'],
             :MimeTypes          => mime_types,
             :DoNotReverseLookup => true,
-            :StartCallback      => start_callback(config['detach'])
+            :StartCallback      => start_callback(config['detach']),
+            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml)
           }
 
           if !config['verbose']
@@ -99,6 +103,24 @@ module Jekyll
           WEBrick::HTTPUtils::load_mime_types(mime_types_file)
         end
 
+        def server_address(server, options)
+          baseurl = "#{options['baseurl']}/" if options['baseurl']
+          [
+            "http://",
+            server.config[:BindAddress],
+            ":",
+            server.config[:Port],
+            baseurl || ""
+          ].map(&:to_s).join("")
+        end
+
+        # recreate NondisclosureName under utf-8 circumstance
+        def file_handler_options
+          fh_option = WEBrick::Config::FileHandler
+          fh_option[:NondisclosureName] = ['.ht*','~*']
+          fh_option
+        end
+
       end
 
     end

data/lib/jekyll/configuration.rb

@@ -27,8 +27,7 @@ module Jekyll
       'future'        => true,           # remove and make true just default
       'unpublished'   => false,
 
-      'relative_permalinks' => true,     # backwards-compatibility with < 1.0
-                                         # will be set to false once 2.0 hits
+      'relative_permalinks' => false,
 
       'markdown'      => 'kramdown',
       'highlighter'   => 'pygments',

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

@@ -6,7 +6,7 @@ module Jekyll
         module CommonMethods
           def add_code_tags(code, lang)
             code = code.to_s
-            code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
+            code = code.sub(/<pre>/, "<pre><code class=\"language-#{lang}\" data-lang=\"#{lang}\">")
             code = code.sub(/<\/pre>/,"</code></pre>")
           end
         end

data/lib/jekyll/convertible.rb

@@ -50,9 +50,9 @@ module Jekyll
           self.data = SafeYAML.load($1)
         end
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
       rescue Exception => e
-        puts "Error reading file #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
       end
 
       self.data ||= {}

data/lib/jekyll/document.rb

@@ -194,6 +194,7 @@ module Jekyll
     def to_liquid
       if data.is_a?(Hash)
         Utils.deep_merge_hashes data, {
+          "output"        => output,
           "content"       => content,
           "path"          => path,
           "relative_path" => relative_path,
@@ -228,5 +229,14 @@ module Jekyll
       path <=> anotherDocument.path
     end
 
+    # Determine whether this document should be written.
+    # Based on the Collection to which it belongs.
+    #
+    # True if the document has a collection and if that collection's #write?
+    #   method returns true, otherwise false.
+    def write?
+      collection && collection.write?
+    end
+
   end
 end