jekyll 3.1.0.pre.rc2 → 3.1.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c49c2ade7b29eeb1b1928c794846db916363241
-  data.tar.gz: 5713d975ac97f85c1d5cda5a4377ef8d71765268
+  metadata.gz: 2865d808960f9a984948e2dd85a597a69f5c4a44
+  data.tar.gz: c2d0d0269e460efde60e26ae58950640740d4f7b
 SHA512:
-  metadata.gz: e4a476d032971178d64c3ab1087bedcaa16cfaf96c6b232d9a8461f8ed9f4db087e8af6b5691bdb2ece34e42facfdc083240fde62286c7d3fba06d0e08e8a8bd
-  data.tar.gz: d3b03199417ca5da4d536f30fd5d9fbd8f782acca115c613cacfdda6f74f9bb725fb7fe79658050c4c267ba2f72405f7e7d4ce24780495618c8ec8df1984a97c
+  metadata.gz: 52b008307fc6b72f72ab63690691ec39d521abd6505a6ef7e2d96745fc4876b4389daa9947850e04b1be4457d4701378240f13642aa6f80f24a67ef9a4482ba4
+  data.tar.gz: 537a7719b68d684c382e3a2b521518269bcfd14384bff5eb5da724e4b75278adce25cd0c620c922e8044bfd8bfc7be614813e5cea660cc6ad1a8dca3a47063d9

data/README.markdown

@@ -1,11 +1,18 @@
 # [Jekyll](http://jekyllrb.com/)
 
-[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll)
-[![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll)
-[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
-[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)](https://codeclimate.com/github/jekyll/jekyll/coverage)
-[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
-[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master)
+[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
+[![Build Status](https://travis-ci.org/jekyll/jekyll.svg?branch=master)][travis]
+[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)][coverage]
+[![Code Climate](https://codeclimate.com/github/jekyll/jekyll/badges/gpa.svg)][codeclimate]
+[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)][gemnasium]
+[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
+
+[ruby-gems]: https://rubygems.org/gems/jekyll
+[gemnasium]: https://gemnasium.com/jekyll/jekyll
+[codeclimate]: https://codeclimate.com/github/jekyll/jekyll
+[coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage
+[hakiri]: https://hakiri.io/github/jekyll/jekyll/master
+[travis]: https://travis-ci.org/jekyll/jekyll
 
 By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
 

data/lib/jekyll/commands/build.rb

@@ -33,7 +33,9 @@ module Jekyll
             build(site, options)
           end
 
-          if options.fetch('watch', false)
+          if options.fetch('detach', false)
+            Jekyll.logger.info "Auto-regeneration:", "disabled when running server detached."
+          elsif options.fetch('watch', false)
             watch(site, options)
           else
             Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."

data/lib/jekyll/document.rb

@@ -8,7 +8,7 @@ module Jekyll
     attr_accessor :content, :output
 
     YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-    DATELESS_FILENAME_MATCHER = /^(.*)(\.[^.]+)$/
+    DATELESS_FILENAME_MATCHER = /^(.+\/)*(.*)(\.[^.]+)$/
     DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
 
     # Create a new Document.
@@ -50,7 +50,7 @@ module Jekyll
     # Merge some data in with this document's data.
     #
     # Returns the merged data.
-    def merge_data!(other)
+    def merge_data!(other, source: "YAML front matter")
       if other.key?('categories') && !other['categories'].nil?
         if other['categories'].is_a?(String)
           other['categories'] = other['categories'].split(" ").map(&:strip)
@@ -61,7 +61,7 @@ module Jekyll
       if data.key?('date') && !data['date'].is_a?(Time)
         data['date'] = Utils.parse_date(
           data['date'].to_s,
-          "Document '#{relative_path}' does not have a valid date in the YAML front matter."
+          "Document '#{relative_path}' does not have a valid date in the #{source}."
         )
       end
       data
@@ -267,40 +267,46 @@ module Jekyll
       else
         begin
           defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
-          merge_data!(defaults) unless defaults.empty?
+          merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
 
           self.content = File.read(path, merged_file_read_opts(opts))
           if content =~ YAML_FRONT_MATTER_REGEXP
             self.content = $POSTMATCH
             data_file = SafeYAML.load(Regexp.last_match(1))
-            merge_data!(data_file) if data_file
+            merge_data!(data_file, source: "YAML front matter") if data_file
           end
 
           post_read
         rescue SyntaxError => e
-          puts "YAML Exception reading #{path}: #{e.message}"
+          Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}"
         rescue Exception => e
-          puts "Error reading file #{path}: #{e.message}"
+          if e.is_a? Jekyll::Errors::FatalException
+            raise e
+          end
+          Jekyll.logger.error "Error:", "could not read file #{path}: #{e.message}"
         end
       end
     end
 
     def post_read
-      if DATE_FILENAME_MATCHER =~ relative_path
-        _, _, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER)
-        merge_data!({
-          "slug" => slug,
-          "ext"  => ext
-        })
-        merge_data!({ "date" => date }) if data['date'].nil? || data['date'].to_i == site.time.to_i
-        data['title'] ||= slug.split('-').select(&:capitalize).join(' ')
+      if relative_path =~ DATE_FILENAME_MATCHER
+        date, slug, ext = $2, $3, $4
+        if !data['date'] || data['date'].to_i == site.time.to_i
+          merge_data!({"date" => date}, source: "filename")
+        end
+      elsif relative_path =~ DATELESS_FILENAME_MATCHER
+        slug, ext = $2, $3
       end
+
+      # Try to ensure the user gets a title.
+      data["title"] ||= Utils.titleize_slug(slug)
+      # Only overwrite slug & ext if they aren't specified.
+      data['slug'] ||= slug
+      data['ext']  ||= ext
+
       populate_categories
       populate_tags
-
-      if generate_excerpt?
-        data['excerpt'] ||= Jekyll::Excerpt.new(self)
-      end
+      generate_excerpt
     end
 
     # Add superdirectories of the special_dir to categories.
@@ -312,7 +318,7 @@ module Jekyll
       superdirs = relative_path.sub(/#{special_dir}(.*)/, '').split(File::SEPARATOR).reject do |c|
         c.empty? || c.eql?(special_dir) || c.eql?(basename)
       end
-      merge_data!({ 'categories' => superdirs })
+      merge_data!({ 'categories' => superdirs }, source: "file path")
     end
 
     def populate_categories
@@ -437,5 +443,12 @@ module Jekyll
         super
       end
     end
+
+    private # :nodoc:
+    def generate_excerpt
+      if generate_excerpt?
+        data["excerpt"] ||= Jekyll::Excerpt.new(self)
+      end
+    end
   end
 end

data/lib/jekyll/drops/drop.rb

@@ -46,7 +46,7 @@ module Jekyll
       def [](key)
         if self.class.mutable? && @mutations.key?(key)
           @mutations[key]
-        elsif respond_to? key
+        elsif self.class.invokable? key
           public_send key
         else
           fallback_data[key]

data/lib/jekyll/page.rb

@@ -63,8 +63,7 @@ module Jekyll
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      return nil if data.nil? || data['permalink'].nil?
-      data['permalink']
+      data.nil? ? nil : data['permalink']
     end
 
     # The template of the permalink.

data/lib/jekyll/site.rb

@@ -225,7 +225,7 @@ module Jekyll
       # Build a hash map based on the specified post attribute ( post attr =>
       # array of posts ) then sort each array in reverse order.
       hash = Hash.new { |h, key| h[key] = [] }
-      posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } }
+      posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr] }
       hash.values.each { |posts| posts.sort!.reverse! }
       hash
     end

data/lib/jekyll/utils.rb

@@ -10,10 +10,20 @@ module Jekyll
     SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
+    # Takes an indented string and removes the preceding spaces on each line
+
     def strip_heredoc(str)
       str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "")
     end
 
+    # Takes a slug and turns it into a simple title.
+
+    def titleize_slug(slug)
+      slug.split("-").map! do |val|
+        val.capitalize!
+      end.join(" ")
+    end
+
     # Non-destructive version of deep_merge_hashes! See that method.
     #
     # Returns the merged hashes.

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.0.pre.rc2'
+  VERSION = '3.1.0.pre.rc3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.rc2
+  version: 3.1.0.pre.rc3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.