jekyll 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d1ccf027b6fb0da7805b442449aa63d0a22ef0
-  data.tar.gz: ac1b81c708fd150ddf115d8d967d20e245460645
+  metadata.gz: 68bb27761f573ec04ae1397a773f64e1d8f4545e
+  data.tar.gz: bd8993ae63044fd48be9ff85bcb0ee5ff7c3dc4c
 SHA512:
-  metadata.gz: e336dc8f9e8dd733ab4fb788434c48eecede987f412c8f8ba07a050ce2cb9daedd6bb8625bf1c57149011981fcda9b2c5ff8ba8aaa86f4cc351f1d925709f470
-  data.tar.gz: d1b9196688c17be6cb1e89c573d22180972e44b1e4e519515d1f722df37c56313bb28ac6e6003a216bafa224a26532970315d9a09f7afdce13dce63b01c8d649
+  metadata.gz: bcd138cfb2d0629a83d4b2c16c4fd9d4635cb053ba14302611820be25acef3a475e0956f65933eb4641133769d7e62abdecd60f11636a53f2b70aa945bb2d74d
+  data.tar.gz: 2addd77ace5a02fae654c07fcc2d2db6d993ac8036771333cbb023d68a09c622d6433a8aefc42d9ab69b57f0972d9f75c0118924a89b0b9bbbec2384827ab907

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
   Exclude:
     - lib/jekyll/renderer.rb
     - bin/**/*
+    - exe/**/*
     - benchmark/**/*
     - script/**/*
     - vendor/**/*
@@ -17,6 +18,10 @@ Lint/UselessAccessModifier:
   Enabled: false
 Metrics/AbcSize:
   Max: 21
+Metrics/BlockLength:
+  Exclude:
+    - test/**/*.rb
+    - lib/jekyll/configuration.rb
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/

data/lib/jekyll/commands/build.rb

@@ -71,23 +71,27 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          if Utils::Platforms.windows?
-            Jekyll.logger.warn "", "--watch arg is unsupported on Windows. "
-            Jekyll.logger.warn "", "If you are on Windows Bash, please see: " \
-              "https://github.com/Microsoft/BashOnWindows/issues/216"
+          # Warn Windows users that they might need to upgrade.
+          if Utils::Platforms.bash_on_windows?
+            Jekyll.logger.warn "",
+              "Auto-regeneration may not work on some Windows versions."
+            Jekyll.logger.warn "",
+              "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
+            Jekyll.logger.warn "",
+              "If it does not work, please upgrade Bash on Windows or "\
+                "run Jekyll with --no-watch."
+          end
 
+          External.require_with_graceful_fail "jekyll-watch"
+          watch_method = Jekyll::Watcher.method(:watch)
+          if watch_method.parameters.size == 1
+            watch_method.call(
+              options
+            )
           else
-            External.require_with_graceful_fail "jekyll-watch"
-            watch_method = Jekyll::Watcher.method(:watch)
-            if watch_method.parameters.size == 1
-              watch_method.call(
-                options
-              )
-            else
-              watch_method.call(
-                options, site
-              )
-            end
+            watch_method.call(
+              options, site
+            )
           end
         end
       end # end of class << self

data/lib/jekyll/configuration.rb

@@ -17,7 +17,9 @@ module Jekyll
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => %w(node_modules vendor),
+      "exclude"           => %w(
+        node_modules vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+      ),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",

data/lib/jekyll/drops/url_drop.rb

@@ -78,6 +78,11 @@ module Jekyll
       def y_day
         @obj.date.strftime("%j")
       end
+
+      private
+      def fallback_data
+        {}
+      end
     end
   end
 end

data/lib/jekyll/entry_filter.rb

@@ -36,8 +36,7 @@ module Jekyll
     end
 
     def included?(entry)
-      glob_include?(site.include,
-        entry)
+      glob_include?(site.include, entry)
     end
 
     def special?(entry)
@@ -50,14 +49,14 @@ module Jekyll
     end
 
     def excluded?(entry)
-      excluded = glob_include?(site.exclude, relative_to_source(entry))
-      if excluded
-        Jekyll.logger.debug(
-          "EntryFilter:",
-          "excluded #{relative_to_source(entry)}"
-        )
+      glob_include?(site.exclude, relative_to_source(entry)).tap do |excluded|
+        if excluded
+          Jekyll.logger.debug(
+            "EntryFilter:",
+            "excluded #{relative_to_source(entry)}"
+          )
+        end
       end
-      excluded
     end
 
     # --

data/lib/jekyll/frontmatter_defaults.rb

@@ -188,7 +188,7 @@ module Jekyll
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
+        path.gsub(%r!\A/|(?<=[^/])\z!, "".freeze)
       end
     end
   end

data/lib/jekyll/readers/data_reader.rb

@@ -62,8 +62,7 @@ module Jekyll
     end
 
     def sanitize_filename(name)
-      name.gsub!(%r![^\w\s-]+!, "")
-      name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
+      name.gsub!(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "".freeze)
       name.gsub(%r!\s+!, "_")
     end
   end

data/lib/jekyll/site.rb

@@ -191,11 +191,7 @@ module Jekyll
       render_pages(payload)
 
       Jekyll::Hooks.trigger :site, :post_render, self, payload
-    # rubocop: disable HandleExceptions
-    rescue Errno::ENOENT
-      # ignore missing layout dir
     end
-    # rubocop: enable HandleExceptions
 
     # Remove orphaned files and empty directories in destination.
     #

data/lib/jekyll/url.rb

@@ -84,14 +84,36 @@ module Jekyll
       end
     end
 
+    # We include underscores in keys to allow for 'i_month' and so forth.
+    # This poses a problem for keys which are followed by an underscore
+    # but the underscore is not part of the key, e.g. '/:month_:day'.
+    # That should be :month and :day, but our key extraction regexp isn't
+    # smart enough to know that so we have to make it an explicit
+    # possibility.
+    def possible_keys(key)
+      if key.end_with?("_")
+        [key, key.chomp("_")]
+      else
+        [key]
+      end
+    end
+
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
-        if replacement.nil?
-          "".freeze
-        else
-          self.class.escape_path(replacement)
+        pool = possible_keys(match.sub(":".freeze, "".freeze))
+
+        winner = pool.find { |key| @placeholders.key?(key) }
+        if winner.nil?
+          raise NoMethodError,
+            "The URL template doesn't have #{pool.join(" or ")} keys. "\
+              "Check your permalink template!"
         end
+
+        value = @placeholders[winner]
+        value = "" if value.nil?
+        replacement = self.class.escape_path(value)
+
+        match.sub(":#{winner}", replacement)
       end.gsub(%r!//!, "/".freeze)
     end
 

data/lib/jekyll/utils/platforms.rb

@@ -19,20 +19,33 @@ module Jekyll
       # /proc/version returns nothing to us.
       # --
 
-      def really_windows?
+      def vanilla_windows?
         RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i && \
           !proc_version
       end
 
+      # --
+      # XXX: Remove in 4.0
+      # --
+
+      alias_method :really_windows?, \
+        :vanilla_windows?
+
       #
 
-      def windows?
-        RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i || \
+      def bash_on_windows?
+        RbConfig::CONFIG["host_os"] =~ %r!linux! && \
           proc_version =~ %r!microsoft!i
       end
 
       #
 
+      def windows?
+        vanilla_windows? || bash_on_windows?
+      end
+
+      #
+
       def linux?
         RbConfig::CONFIG["host_os"] =~ %r!linux! && \
           proc_version !~ %r!microsoft!i

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.0".freeze
+  VERSION = "3.3.1".freeze
 end

data/lib/site_template/_config.yml

@@ -2,7 +2,7 @@
 #
 # This config file is meant for settings that affect your whole blog, values
 # which you are expected to set up once and rarely edit after that. If you find
-# yourself editing these this file very often, consider using Jekyll's data files
+# yourself editing this file very often, consider using Jekyll's data files
 # feature for the data you need to update frequently.
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use

data/lib/theme_template/README.md.erb

@@ -38,7 +38,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 To set up your environment to develop this theme, run `bundle install`.
 
-You theme is setup just like a normal Jelyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
 When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
 

data/lib/theme_template/theme.gemspec.erb

@@ -12,7 +12,8 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)}i) }
 
-  spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
+  spec.add_runtime_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid