jekyll 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a712d90247fd73b3da0ce3c6755d73902432ca
-  data.tar.gz: c26a2cbe898e1e13a7dec7ccc5e7404c010e7ef7
+  metadata.gz: a6bb5f77c26304b1534b5f360dcbbd3e12188bcd
+  data.tar.gz: 1120d5f07030ca80d947b105ac97f9930671335d
 SHA512:
-  metadata.gz: 8e072aa16ae430ece25c590b01672b37bed0f57fddf5ba7184b0b05d15887b788ebc841b4d3790df702568d62d770c3de7650c99947363b16fcbd60953ad4ac4
-  data.tar.gz: 5b2be2069d66a2445ea6e8aff70e4e9ede7096912729e5374ee8ab0d054378322a97a215a79246ef3f97ce7016b014ef5d83c659a162d429101dc34c39545424
+  metadata.gz: a5bc63775da2b18f8e14519012360a16863cee75f1da7cbeb95fc682d5239b1c46ac301feebb24bce7a396ba978b89fbd6be997df2a040fecd9b290257cc3c5b
+  data.tar.gz: 2c56872f244a6623296f7387fdccd7c93829b160562f6c126918863311c347068e5503207cfff7c551d2328cd7dfb295caef9f3bd906dede493584c92767e1bf

data/lib/jekyll.rb

@@ -144,9 +144,9 @@ module Jekyll
       return base_directory if base_directory.eql?(questionable_path)
 
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path = clean_path.sub(/^\A\w\:\//, '/')
+      clean_path = clean_path.sub(/\A\w\:\//, '/')
 
-      unless clean_path.start_with?(base_directory.sub(/^\A\w\:\//, '/'))
+      unless clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         File.join(base_directory, clean_path)
       else
         clean_path

data/lib/jekyll/convertible.rb

@@ -66,8 +66,8 @@ module Jekyll
         begin
           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)
+          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{path}':"
+          Jekyll.logger.error("", e.to_s)
           raise e
         end
       end

data/lib/jekyll/plugin_manager.rb

@@ -17,7 +17,6 @@ module Jekyll
     def conscientious_require
       require_plugin_files
       require_gems
-      self.class.require_from_bundler
     end
 
     # Require each of the gem plugins specified.
@@ -33,14 +32,15 @@ module Jekyll
     end
 
     def self.require_from_bundler
-      if ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
-        false
-      else
+      if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
         require "bundler"
-        required_gems = Bundler.require(:jekyll_plugins)
+        Bundler.setup # puts all groups on the load path
+        required_gems = Bundler.require(:jekyll_plugins) # requires the gems in this group only
         Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
         ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
         true
+      else
+        false
       end
     rescue LoadError, Bundler::GemfileNotFound
       false

data/lib/jekyll/renderer.rb

@@ -73,7 +73,8 @@ module Jekyll
         begin
           converter.convert output
         rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{document.relative_path}'."
+          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{document.relative_path}':"
+          Jekyll.logger.error("", e.to_s)
           raise e
         end
       end

data/lib/jekyll/tags/highlight.rb

@@ -46,14 +46,15 @@ eos
 
         is_safe = !!context.registers[:site].safe
 
-        output = case context.registers[:site].highlighter
-        when 'pygments'
-          render_pygments(code, is_safe)
-        when 'rouge'
-          render_rouge(code)
-        else
-          render_codehighlighter(code)
-        end
+        output =
+          case context.registers[:site].highlighter
+            when 'pygments'
+              render_pygments(code, is_safe)
+            when 'rouge'
+              render_rouge(code)
+            else
+              render_codehighlighter(code)
+            end
 
         rendered_output = add_code_tag(output)
         prefix + rendered_output + suffix

data/lib/jekyll/tags/post_url.rb

@@ -3,16 +3,22 @@ module Jekyll
     class PostComparer
       MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
 
-      attr_accessor :date, :slug
+      attr_reader :path, :date, :slug, :name
 
       def initialize(name)
-        all, path, date, slug = *name.sub(/^\//, "").match(MATCHER)
+        @name = name
+        all, @path, @date, @slug = *name.sub(/^\//, "").match(MATCHER)
         raise ArgumentError.new("'#{name}' does not contain valid date and/or title.") unless all
-        @slug = path ? path + slug : slug
-        @date = Utils.parse_date(date, "'#{name}' does not contain valid date.")
+
+        @name_regex = /^#{path}#{date}-#{slug}\.[^.]+/
       end
 
       def ==(other)
+        other.name.match(@name_regex)
+      end
+
+      def deprecated_equality(other)
+        date = Utils.parse_date(name, "'#{name}' does not contain valid date and/or title.")
         slug == post_slug(other) &&
           date.year  == other.date.year &&
           date.month == other.date.month &&
@@ -59,6 +65,19 @@ eos
           end
         end
 
+        # New matching method did not match, fall back to old method
+        # with deprecation warning if this matches
+
+        site.posts.each do |p|
+          if @post.deprecated_equality p
+            Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{name} }}' did not match " +
+              "a post using the new matching method of checking name " +
+              "(path-date-slug) equality. Please make sure that you " +
+              "change this tag to match the post's name exactly."
+            return p.url
+          end
+        end
+
         raise ArgumentError.new <<-eos
 Could not find post "#{@orig_post}" in tag 'post_url'.
 

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid