jekyll 1.0.0.rc1 → 1.0.0

data/CONTRIBUTING.md

@@ -41,7 +41,7 @@ Workflow
 Here's the most direct way to get your work merged into the project:
 
 * Fork the project.
-* Clone down your fork ( `git clone git://github.com/<username>/jekyll.git` ).
+* Clone down your fork ( `git clone git@github.com:<username>/jekyll.git` ).
 * Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ).
 * Hack away, add tests. Not necessarily in that order.
 * Make sure everything still passes by running `rake`.

data/History.txt

@@ -6,6 +6,12 @@
     * Added ability to render drafts in _drafts folder via command line (#833)
     * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928)
   * Minor Enhancements
+    * Site template HTML5-ified (#964)
+    * Use post's directory path when matching for the post_url tag (#998)
+    * Loosen dependency on Pygments so it's only required when it's needed (#1015)
+    * Parse strings into Time objects for date-related Liquid filters (#1014)
+    * Tell the user if there is no subcommand specified (#1008)
+    * Freak out if the destination of `jekyll new` exists and is non-empty (#981)
     * Add `timezone` configuration option for compilation (#957)
     * Add deprecation messages for pre-1.0 CLI options (#959)
     * Refactor and colorize logging (#959)
@@ -46,6 +52,12 @@
     * Add source and destination directory protection (#535)
     * Better YAML error message (#718)
   * Bug Fixes
+    * Paginate in subdirectories properly (#1016)
+    * Ensure post and page URLs have a leading slash (#992)
+    * Catch all exceptions, not just StandardError descendents (#1007)
+    * Bullet-proof limit_posts option (#1004)
+    * Read in YAML as UTF-8 to accept non-ASCII chars (#836)
+    * Fix the CLI option --plugins to actually accept dirs and files (#993)
     * Allow 'excerpt' in YAML Front-Matter to override the extracted excerpt (#946)
     * Fix cascade problem with site.baseurl, site.port and site.host. (#935)
     * Filter out directories with valid post names (#875)
@@ -67,13 +79,15 @@
     * Add SVG support to Jekyll/WEBrick. (#407, #406)
     * Prevent custom destination from causing continuous regen on watch (#528, #820, #862)
   * Site Enhancements
+    * Responsify (#860)
+    * Fix spelling, punctuation and phrasal errors (#989)
     * Update quickstart instructions with `new` command (#966)
     * Add docs for page.excerpt (#956)
     * Add docs for page.path (#951)
     * Clean up site docs to prepare for 1.0 release (#918)
     * Bring site into master branch with better preview/deploy (#709)
     * Redesigned site (#583)
-  * Development fixes
+  * Development Fixes
     * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938)
     * Added "features:html" rake task for debugging purposes, cleaned up
       cucumber profiles (#832)

data/Rakefile

@@ -111,10 +111,6 @@ namespace :site do
 
   desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
   task :publish do
-    # Failsafe. Remove this once it has been done.
-    puts "Make sure to merge #583 into gh-pages before deploying."
-    exit(1)
-
     # Ensure the gh-pages dir exists so we can generate into it.
     puts "Checking for gh-pages dir..."
     unless File.exist?("./gh-pages")

data/bin/jekyll

@@ -17,7 +17,7 @@ default_command :help
 global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
 global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
 global_option '--safe', 'Safe mode (defaults to false)'
-global_option '--plugins', 'Plugins directory (defaults to ./_plugins)'
+global_option '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
 global_option '--layouts', 'Layouts directory (defaults to ./_layouts)'
 
 # Option names don't always directly match the configuration value we'd like.
@@ -48,7 +48,7 @@ command :build do |c|
 
   c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
   c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', 'Limits the number of posts to parse and publish'
+  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
   c.option '-w', '--watch', 'Watch for changes and rebuild'
   c.option '--lsi', 'Use LSI for improved related posts'
   c.option '--drafts', 'Render posts in the _drafts folder'
@@ -66,7 +66,7 @@ command :serve do |c|
 
   c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
   c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', 'Limits the number of posts to parse and publish'
+  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
   c.option '-w', '--watch', 'Watch for changes and rebuild'
   c.option '--lsi', 'Use LSI for improved related posts'
   c.option '--drafts', 'Render posts in the _drafts folder'

data/features/pagination.feature

@@ -2,13 +2,13 @@ Feature: Site pagination
   In order to paginate my blog
   As a blog's user
   I want divide the posts in several pages
-  
+
   Scenario Outline: Paginate with N posts per page
     Given I have a configuration file with "paginate" set to "<num>"
     And I have a _layouts directory
     And I have an "index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
-    And I have the following post:
+    And I have the following posts:
       | title     | date      | layout  | content                                |
       | Wargames  | 3/27/2009 | default | The only winning move is not to play.  |
       | Wargames2 | 4/27/2009 | default | The only winning move is not to play2. |
@@ -32,10 +32,10 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page-:num                |
       | permalink     | /blog/:year/:month/:day/:title |
-      And I have a _layouts directory
-      And I have an "index.html" page that contains "{{ paginator.posts.size }}"
+    And I have a blog directory
+    And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
-    And I have the following post:
+    And I have the following posts:
       | title     | date      | layout  | content                                |
       | Wargames  | 3/27/2009 | default | The only winning move is not to play.  |
       | Wargames2 | 4/27/2009 | default | The only winning move is not to play2. |

data/features/step_definitions/jekyll_steps.rb

@@ -5,7 +5,7 @@ Before do
 end
 
 After do
-  Dir.chdir(TEST_DIR)
+  Dir.chdir(File.expand_path("..", TEST_DIR))
   FileUtils.rm_rf(TEST_DIR)
 end
 

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.0.0.rc1'
+  s.version           = '1.0.0'
   s.license           = 'MIT'
-  s.date              = '2013-04-16'
+  s.date              = '2013-05-06'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -102,14 +102,13 @@ Gem::Specification.new do |s|
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
     lib/jekyll/tags/post_url.rb
+    lib/site_template/.gitignore
     lib/site_template/_config.yml
     lib/site_template/_layouts/default.html
     lib/site_template/_layouts/post.html
     lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
-    lib/site_template/css/screen.css
+    lib/site_template/css/main.css
     lib/site_template/css/syntax.css
-    lib/site_template/images/.gitkeep
-    lib/site_template/images/rss.png
     lib/site_template/index.html
     script/bootstrap
     site/.gitignore
@@ -118,8 +117,10 @@ Gem::Specification.new do |s|
     site/_config.yml
     site/_includes/analytics.html
     site/_includes/docs_contents.html
+    site/_includes/docs_contents_mobile.html
     site/_includes/footer.html
     site/_includes/header.html
+    site/_includes/primary-nav-items.html
     site/_includes/section_nav.html
     site/_includes/top.html
     site/_layouts/default.html
@@ -144,9 +145,10 @@ Gem::Specification.new do |s|
     site/_posts/2012-07-01-structure.md
     site/_posts/2012-07-01-templates.md
     site/_posts/2012-07-01-troubleshooting.md
+    site/_posts/2012-07-01-upgrading.md
     site/_posts/2012-07-01-usage.md
     site/_posts/2012-07-01-variables.md
-    site/css/grid.css
+    site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
     site/css/style.css
@@ -202,6 +204,7 @@ Gem::Specification.new do |s|
     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/_posts/es/2008-11-21-nested.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
     test/source/contacts.html

data/lib/jekyll.rb

@@ -24,7 +24,6 @@ require 'English'
 # 3rd party
 require 'liquid'
 require 'maruku'
-require 'pygments'
 require 'colorator'
 
 # internal requires
@@ -57,7 +56,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.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/commands/new.rb

@@ -8,6 +8,10 @@ module Jekyll
 
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
+        unless Dir["#{new_blog_path}/**/*"].empty?
+          Jekyll::Logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+          exit(1)
+        end
 
         create_sample_files new_blog_path
 

data/lib/jekyll/configuration.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Jekyll
   class Configuration < Hash
 
@@ -14,7 +16,7 @@ module Jekyll
 
       'safe'          => false,
       'show_drafts'   => nil,
-      'limit_posts'   => nil,
+      'limit_posts'   => 0,
       'lsi'           => false,
       'future'        => true,           # remove and make true just default
       'pygments'      => true,           # remove and make true just default

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

@@ -4,6 +4,7 @@ module Jekyll
       class RedcarpetParser
         def initialize(config)
           require 'redcarpet'
+          require 'pygments'
           @config = config
           @redcarpet_extensions = {}
           @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }

data/lib/jekyll/convertible.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'set'
 
 # Convertible provides methods for converting a pagelike item
@@ -32,10 +34,10 @@ module Jekyll
           self.content = $POSTMATCH
           self.data = YAML.safe_load($1)
         end
-      rescue => e
-        puts "Error reading file #{File.join(base, name)}: #{e.message}"
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
+        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"        
+      rescue Exception => e
+        puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
 
       self.data ||= {}
@@ -64,34 +66,31 @@ module Jekyll
       @converter ||= self.site.converters.find { |c| c.matches(self.ext) }
     end
 
-    # Add any necessary layouts to this convertible document.
+    # Render Liquid in the content
     #
-    # payload - The site payload Hash.
-    # layouts - A Hash of {"name" => "layout"}.
+    # content - the raw Liquid content to render
+    # payload - the payload for Liquid
+    # info    - the info for Liquid
     #
-    # Returns nothing.
-    def do_layout(payload, layouts)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
-
-      # render and transform content (this becomes the final content of the object)
-      payload["pygments_prefix"] = converter.pygments_prefix
-      payload["pygments_suffix"] = converter.pygments_suffix
-
-      begin
-        self.content = Liquid::Template.parse(self.content).render!(payload, info)
-      rescue => e
-        puts "Liquid Exception: #{e.message} in #{self.name}"
-        e.backtrace.each do |backtrace|
-          puts backtrace
-        end
-        abort("Build Failed")
+    # Returns the converted content
+    def render_liquid(content, payload, info)
+      Liquid::Template.parse(content).render!(payload, info)
+    rescue Exception => e
+      Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
+      e.backtrace.each do |backtrace|
+        puts backtrace
       end
+      abort("Build Failed")
+    end
 
-      self.transform
-
-      # output keeps track of what will finally be written
-      self.output = self.content
-
+    # Recursively render layouts
+    #
+    # layouts - a list of the layouts
+    # payload - the payload for Liquid
+    # info    - the info for Liquid
+    #
+    # Returns nothing
+    def render_all_layouts(layouts, payload, info)
       # recursively render layouts
       layout = layouts[self.data["layout"]]
       used = Set.new([layout])
@@ -99,15 +98,9 @@ module Jekyll
       while layout
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
-        begin
-          self.output = Liquid::Template.parse(layout.content).render!(payload, info)
-        rescue => e
-          puts "Liquid Exception: #{e.message} in #{self.data["layout"]}"
-          e.backtrace.each do |backtrace|
-            puts backtrace
-          end
-          abort("Build Failed")
-        end
+        self.output = self.render_liquid(layout.content,
+                                         payload.merge({:file => self.data["layout"]}),
+                                         info)
 
         if layout = layouts[layout.data["layout"]]
           if used.include?(layout)
@@ -118,5 +111,42 @@ module Jekyll
         end
       end
     end
+
+    # Add any necessary layouts to this convertible document.
+    #
+    # payload - The site payload Hash.
+    # layouts - A Hash of {"name" => "layout"}.
+    #
+    # Returns nothing.
+    def do_layout(payload, layouts)
+      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
+
+      # render and transform content (this becomes the final content of the object)
+      payload["pygments_prefix"] = converter.pygments_prefix
+      payload["pygments_suffix"] = converter.pygments_suffix
+
+      self.content = self.render_liquid(self.content,
+                                        payload.merge({:file => self.name}),
+                                        info)
+      self.transform
+
+      # output keeps track of what will finally be written
+      self.output = self.content
+
+      self.render_all_layouts(layouts, payload, info)
+    end
+
+    # Write the generated page file to the destination directory.
+    #
+    # dest - The String path to the destination dir.
+    #
+    # Returns nothing.
+    def write(dest)
+      path = destination(dest)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, 'w') do |f|
+        f.write(self.output)
+      end
+    end
   end
 end

data/lib/jekyll/deprecator.rb

@@ -1,6 +1,7 @@
 module Jekyll
   class Deprecator
     def self.process(args)
+      no_subcommand(args)
       deprecation_message args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
       deprecation_message args, "--no-server", "To build Jekyll without launching a server, \
@@ -15,6 +16,14 @@ module Jekyll
       deprecation_message args, "--url", "The 'url' setting can only be set in your config files."
     end
 
+    def self.no_subcommand(args)
+      if args.size == 0 || args.first =~ /^--/
+        Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
+                            switches. Run `jekyll help' to find out more."
+        exit(1)
+      end
+    end
+
     def self.deprecation_message(args, deprecated_argument, message)
       if args.include?(deprecated_argument)
         Jekyll::Logger.error "Deprecation:", message

data/lib/jekyll/filters.rb

@@ -30,7 +30,7 @@ module Jekyll
     #
     # Returns the formatting String.
     def date_to_string(date)
-      date.strftime("%d %b %Y")
+      time(date).strftime("%d %b %Y")
     end
 
     # Format a date in long format e.g. "27 January 2011".
@@ -39,7 +39,7 @@ module Jekyll
     #
     # Returns the formatted String.
     def date_to_long_string(date)
-      date.strftime("%d %B %Y")
+      time(date).strftime("%d %B %Y")
     end
 
     # Format a date for use in XML.
@@ -53,7 +53,7 @@ module Jekyll
     #
     # Returns the formatted String.
     def date_to_xmlschema(date)
-      date.xmlschema
+      time(date).xmlschema
     end
 
     # Format a date according to RFC-822
@@ -67,7 +67,7 @@ module Jekyll
     #
     # Returns the formatted String.
     def date_to_rfc822(date)
-      date.rfc822
+      time(date).rfc822
     end
 
     # XML escape a string for use. Replaces any special characters with
@@ -137,5 +137,18 @@ module Jekyll
         "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
       end
     end
+
+    private
+    def time(input)
+      case input
+      when Time
+        input
+      when String
+        Time.parse(input)
+      else
+        Jekyll::Logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
+        exit(1)
+      end
+    end
   end
 end