jekyll 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd7e49f4d0c08e3a671d21444bc80a53ef6c4a0
-  data.tar.gz: 8eec4bc8581b8abd01c7bf077b79980af61537b7
+  metadata.gz: 45083d9a5aaf050f5b5dc16a09c7d4001db30856
+  data.tar.gz: 4bfa431a22f2d147963b49e6664584a43f9cdbc3
 SHA512:
-  metadata.gz: 6688a5be7d34576575ec1098fe5f80c2f625c6a4eefa5869bcb64a9ce41fe8d5c05424c9105fbcdc88f44512fa663aafd458da75e0672b1bd97b328c42af65a0
-  data.tar.gz: 0ce421c5435ad40f8cf231e38891a6949a827a75964b7c2c426654f2746507ed1f77a1cba06be22f709bc77cd7949a81cedf6510c629d3ee463fb41d957cefde
+  metadata.gz: 289e5fd56eccf356d07eca309241ac9ef9a11c020bd218c394d1499d2984d88c49e842697e07b0d576147ee3b1937d7046d290e31a3d49430f4373e168f0de49
+  data.tar.gz: 11c5a946bbb64cfbb560db1a28be0534131391b3353a1e55e5ae3aa05bccc2cf28386a879bb91b9ce9068173d63747409df80b1694e54ef8779ce12f0697c65f

data/lib/jekyll/collection.rb

@@ -41,7 +41,7 @@ module Jekyll
           doc.read
           docs << doc
         else
-          relative_dir = File.join(relative_directory, File.dirname(file_path)).chomp("/.")
+          relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
           files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
         end
       end

data/lib/jekyll/command.rb

@@ -51,7 +51,7 @@ module Jekyll
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-        c.option 'watch',   '-w', '--watch', 'Watch for changes and rebuild'
+        c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
         c.option 'force_polling', '--force_polling', 'Force watch to use polling'
         c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
         c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'

data/lib/jekyll/commands/new.rb

@@ -3,78 +3,80 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      def self.init_with_program(prog)
-        prog.command(:new) do |c|
-          c.syntax 'new PATH'
-          c.description 'Creates a new Jekyll site scaffold in PATH'
-
-          c.option 'force', '--force', 'Force creation even if PATH already exists'
-          c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
-
-          c.action do |args, options|
-            Jekyll::Commands::New.process(args, options)
+      class << self 
+        def init_with_program(prog)
+          prog.command(:new) do |c|
+            c.syntax 'new PATH'
+            c.description 'Creates a new Jekyll site scaffold in PATH'
+
+            c.option 'force', '--force', 'Force creation even if PATH already exists'
+            c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
+            
+            c.action do |args, options|
+              Jekyll::Commands::New.process(args, options)
+            end
           end
         end
-      end
 
-      def self.process(args, options = {})
-        raise ArgumentError.new('You must specify a path.') if args.empty?
+        def process(args, options = {})
+          raise ArgumentError.new('You must specify a path.') if args.empty?
 
-        new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
-        FileUtils.mkdir_p new_blog_path
-        if preserve_source_location?(new_blog_path, options)
-          Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
-        end
+          new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
+          FileUtils.mkdir_p new_blog_path
+          if preserve_source_location?(new_blog_path, options)
+            Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
+          end
 
-        if options["blank"]
-          create_blank_site new_blog_path
-        else
-          create_sample_files new_blog_path
+          if options["blank"]
+            create_blank_site new_blog_path
+          else
+            create_sample_files new_blog_path
 
-          File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
-            f.write(scaffold_post_content)
+            File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
+              f.write(scaffold_post_content)
+            end
           end
-        end
 
-        Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
-      end
+          Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
+        end
 
-      def self.create_blank_site(path)
-        Dir.chdir(path) do
-          FileUtils.mkdir(%w(_layouts _posts _drafts))
-          FileUtils.touch("index.html")
+        def create_blank_site(path)
+          Dir.chdir(path) do
+            FileUtils.mkdir(%w(_layouts _posts _drafts))
+            FileUtils.touch("index.html")
+          end
         end
-      end
 
-      def self.scaffold_post_content
-        ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
-      end
+        def scaffold_post_content
+          ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
+        end
 
-      # Internal: Gets the filename of the sample post to be created
-      #
-      # Returns the filename of the sample post, as a String
-      def self.initialized_post_name
-        "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
-      end
+        # Internal: Gets the filename of the sample post to be created
+        #
+        # Returns the filename of the sample post, as a String
+        def initialized_post_name
+          "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
+        end
 
-      private
+        private
 
-      def self.preserve_source_location?(path, options)
-        !options["force"] && !Dir["#{path}/**/*"].empty?
-      end
+        def preserve_source_location?(path, options)
+          !options["force"] && !Dir["#{path}/**/*"].empty?
+        end
 
-      def self.create_sample_files(path)
-        FileUtils.cp_r site_template + '/.', path
-        FileUtils.rm File.expand_path(scaffold_path, path)
-      end
+        def create_sample_files(path)
+          FileUtils.cp_r site_template + '/.', path
+          FileUtils.rm File.expand_path(scaffold_path, path)
+        end
 
-      def self.site_template
-        File.expand_path("../../site_template", File.dirname(__FILE__))
-      end
+        def site_template
+          File.expand_path("../../site_template", File.dirname(__FILE__))
+        end
 
-      def self.scaffold_path
-        "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
-      end
+        def scaffold_path
+          "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
+        end
+      end  
     end
   end
 end

data/lib/jekyll/commands/serve.rb

@@ -20,7 +20,8 @@ module Jekyll
             c.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.'
 
             c.action do |args, options|
-              options["serving"] ||= true
+              options["serving"] = true
+              options["watch"] = true unless options.key?("watch")
               Jekyll::Commands::Build.process(options)
               Jekyll::Commands::Serve.process(options)
             end

data/lib/jekyll/configuration.rb

@@ -211,7 +211,7 @@ module Jekyll
       if config.key?('auto') || config.key?('watch')
         Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
-                            " --watch/-w command-line option instead."
+                            " --[no-]watch/-w command-line option instead."
         config.delete('auto')
         config.delete('watch')
       end

data/lib/jekyll/convertible.rb

@@ -67,6 +67,7 @@ module Jekyll
           converter.convert output
         rescue => e
           Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{path}'."
+          Jekyll.logger.error("Conversion error:", e.to_s)
           raise e
         end
       end
@@ -162,16 +163,14 @@ module Jekyll
 
     # Determine whether the file should be rendered with Liquid.
     #
-    # Returns false if the document is either an asset file or a yaml file,
-    #   true otherwise.
+    # Always returns true.
     def render_with_liquid?
-      !coffeescript_file?
+      true
     end
 
     # Determine whether the file should be placed into layouts.
     #
-    # Returns false if the document is either an asset file or a yaml file,
-    #   true otherwise.
+    # Returns false if the document is an asset file.
     def place_in_layout?
       !asset_file?
     end

data/lib/jekyll/document.rb

@@ -128,7 +128,9 @@ module Jekyll
       {
         collection: collection.label,
         path:       cleaned_relative_path,
-        output_ext: Jekyll::Renderer.new(site, self).output_ext
+        output_ext: Jekyll::Renderer.new(site, self).output_ext,
+        name:       Utils.slugify(basename(".*")),
+        title:      Utils.slugify(data['title']) || Utils.slugify(basename(".*"))
       }
     end
 

data/lib/jekyll/filters.rb

@@ -47,6 +47,17 @@ module Jekyll
       converter.convert(input)
     end
 
+    # Slugify a filename or title.
+    #
+    # input - The filename or title to slugify.
+    #
+    # Returns the given filename or title as a lowercase String, with every
+    # sequence of spaces and non-alphanumeric characters replaced with a
+    # hyphen.
+    def slugify(input)
+      Utils.slugify(input)
+    end
+
     # Format a date in short format e.g. "27 Jan 2011".
     #
     # date - the Time to format.
@@ -203,7 +214,7 @@ module Jekyll
     # Filter an array of objects
     #
     # input - the object array
-    # key - key within each object to filter by
+    # property - property within each object to filter by
     # value - desired value
     #
     # Returns the filtered array of objects
@@ -248,6 +259,43 @@ module Jekyll
       end
     end
 
+    def pop(array, input = 1)
+      return array unless array.is_a?(Array)
+      new_ary = array.dup
+      new_ary.pop(input.to_i || 1)
+      new_ary
+    end
+
+    def push(array, input)
+      return array unless array.is_a?(Array)
+      new_ary = array.dup
+      new_ary.push(input)
+      new_ary
+    end
+
+    def shift(array, input = 1)
+      return array unless array.is_a?(Array)
+      new_ary = array.dup
+      new_ary.shift(input.to_i || 1)
+      new_ary
+    end
+
+    def unshift(array, input)
+      return array unless array.is_a?(Array)
+      new_ary = array.dup
+      new_ary.unshift(input)
+      new_ary
+    end
+
+    # Convert an object into its String representation for debugging
+    #
+    # input - The Object to be converted
+    #
+    # Returns a String representation of the object.
+    def inspect(input)
+      CGI.escapeHTML(input.inspect)
+    end
+
     private
     def time(input)
       case input

data/lib/jekyll/site.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'csv'
 
 module Jekyll
   class Site
@@ -212,7 +213,7 @@ module Jekyll
       return unless File.directory?(dir) && (!safe || !File.symlink?(dir))
 
       entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json}'] + Dir['*'].select { |fn| File.directory?(fn) }
+        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
       end
 
       entries.each do |entry|
@@ -223,7 +224,12 @@ module Jekyll
         if File.directory?(path)
           read_data_to(path, data[key] = {})
         else
-          data[key] = SafeYAML.load_file(path)
+          case File.extname(path).downcase
+          when '.csv'
+            data[key] = CSV.read(path, :headers => true).map(&:to_hash)
+          else
+            data[key] = SafeYAML.load_file(path)
+          end
         end
       end
     end

data/lib/jekyll/tags/include.rb

@@ -13,13 +13,9 @@ module Jekyll
 
     class IncludeTag < Liquid::Tag
 
-      SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
-
       VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
       VARIABLE_SYNTAX = /(?<variable>[^{]*\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?<params>.*)/
 
-      INCLUDES_DIR = '_includes'
-
       def initialize(tag_name, markup, tokens)
         super
         matched = markup.strip.match(VARIABLE_SYNTAX)
@@ -30,6 +26,11 @@ module Jekyll
           @file, @params = markup.strip.split(' ', 2);
         end
         validate_params if @params
+        @tag_name = tag_name
+      end
+
+      def syntax_example
+        "{% #{@tag_name} file.ext param='value' param2='value' %}"
       end
 
       def parse_params(context)
@@ -61,7 +62,7 @@ Invalid syntax for include tag. File contains invalid characters or sequences:
 
 Valid syntax:
 
-  #{SYNTAX_EXAMPLE}
+  #{syntax_example}
 
 eos
         end
@@ -77,7 +78,7 @@ Invalid syntax for include tag:
 
 Valid syntax:
 
-  #{SYNTAX_EXAMPLE}
+  #{syntax_example}
 
 eos
         end
@@ -96,8 +97,12 @@ eos
         end
       end
 
+      def includes_dir
+        '_includes'
+      end
+
       def render(context)
-        dir = File.join(File.realpath(context.registers[:site].source), INCLUDES_DIR)
+        dir = resolved_includes_dir(context)
 
         file = render_variable(context) || @file
         validate_file_name(file)
@@ -113,10 +118,14 @@ eos
             partial.render!(context)
           end
         rescue => e
-          raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
+          raise IncludeTagError.new e.message, File.join(includes_dir, @file)
         end
       end
 
+      def resolved_includes_dir(context)
+        File.join(File.realpath(context.registers[:site].source), includes_dir)
+      end
+
       def validate_path(path, dir, safe)
         if safe && !realpath_prefixed_with?(path, dir)
           raise IOError.new "The included file '#{path}' should exist and should not be a symlink"
@@ -126,7 +135,7 @@ eos
       end
 
       def path_relative_to_source(dir, path)
-        File.join(INCLUDES_DIR, path.sub(Regexp.new("^#{dir}"), ""))
+        File.join(includes_dir, path.sub(Regexp.new("^#{dir}"), ""))
       end
 
       def realpath_prefixed_with?(path, dir)
@@ -138,7 +147,19 @@ eos
         File.read(file, file_read_opts(context))
       end
     end
+
+    class IncludeRelativeTag < IncludeTag
+      def includes_dir
+        '.'
+      end
+
+      def resolved_includes_dir(context)
+        page_path = context.registers[:page].nil? ? includes_dir : File.dirname(context.registers[:page]["path"])
+        Jekyll.sanitized_path(context.registers[:site].source, page_path)
+      end
+    end
   end
 end
 
 Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag)
+Liquid::Template.register_tag('include_relative', Jekyll::Tags::IncludeRelativeTag)

data/lib/jekyll/utils.rb

@@ -102,5 +102,22 @@ module Jekyll
       !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
     end
 
+    # Slugify a filename or title.
+    #
+    # name - the filename or title to slugify
+    #
+    # Returns the given filename or title in lowercase, with every
+    # sequence of spaces and non-alphanumeric characters replaced with a
+    # hyphen.
+    def slugify(string)
+      unless string.nil?
+        # Replace each non-alphanumeric character sequence with a hyphen
+        slug = string.gsub(/[^a-z0-9]+/i, '-')
+        # Remove leading/trailing hyphen
+        slug.gsub!(/^\-|\-$/i, '')
+        slug.downcase
+      end
+    end
+
   end
 end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/lib/site_template/.gitignore

@@ -1 +1,2 @@
-_site
+_site
+.sass-cache

data/lib/site_template/_includes/head.html

@@ -1,6 +1,6 @@
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width initial-scale=1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>

data/lib/site_template/_sass/_base.scss

@@ -20,12 +20,13 @@ body {
     font-weight: 300;
     color: $text-color;
     background-color: $background-color;
+    -webkit-text-size-adjust: 100%;
 }
 
 
 
 /**
- * Set `margin-bottom` to maintain vertycal rhythm
+ * Set `margin-bottom` to maintain vertical rhythm
  */
 h1, h2, h3, h4, h5, h6,
 p, blockquote, pre,

data/lib/site_template/css/main.scss

@@ -1,49 +1,49 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-
-
-// Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
-$base-font-size:   16px;
-$small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
-
-$spacing-unit:     30px;
-
-$text-color:       #111;
-$background-color: #fdfdfd;
-$brand-color:      #2a7ae2;
-
-$grey-color:       #828282;
-$grey-color-light: lighten($grey-color, 40%);
-$grey-color-dark:  darken($grey-color, 25%);
-
-$on-palm:          600px;
-$on-laptop:        800px;
-
-
-
-// Using media queries with like this:
-// @include media-query($palm) {
-//     .wrapper {
-//         padding-right: $spacing-unit / 2;
-//         padding-left: $spacing-unit / 2;
-//     }
-// }
-@mixin media-query($device) {
-    @media screen and (max-width: $device) {
-        @content;
-    }
-}
-
-
-
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import
-        "base",
-        "layout",
-        "syntax-highlighting"
-;
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
+@charset "utf-8";
+
+
+
+// Our variables
+$base-font-family: Helvetica, Arial, sans-serif;
+$base-font-size:   16px;
+$small-font-size:  $base-font-size * 0.875;
+$base-line-height: 1.5;
+
+$spacing-unit:     30px;
+
+$text-color:       #111;
+$background-color: #fdfdfd;
+$brand-color:      #2a7ae2;
+
+$grey-color:       #828282;
+$grey-color-light: lighten($grey-color, 40%);
+$grey-color-dark:  darken($grey-color, 25%);
+
+$on-palm:          600px;
+$on-laptop:        800px;
+
+
+
+// Using media queries with like this:
+// @include media-query($palm) {
+//     .wrapper {
+//         padding-right: $spacing-unit / 2;
+//         padding-left: $spacing-unit / 2;
+//     }
+// }
+@mixin media-query($device) {
+    @media screen and (max-width: $device) {
+        @content;
+    }
+}
+
+
+
+// Import partials from `sass_dir` (defaults to `_sass`)
+@import
+        "base",
+        "layout",
+        "syntax-highlighting"
+;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement