jekyll 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c167aa9b02ffadc0482aa73eca44b948a1fbc5
-  data.tar.gz: 009cc8ae7b98a986ffd1792c382ab04a7e3ecfa9
+  metadata.gz: 754fc17db71e2e921e0af04aa539ce4ed79bc11d
+  data.tar.gz: af228ee2a490fdc51c039cbfdd57ed6877396fe0
 SHA512:
-  metadata.gz: 5f12355c33e46191613bed314fcca4d4124e5957cd1ffe394e61c99f2e99536c8c445b9dee2182f52b59d48350c7d3a785b3c49a8e86fb7665477bdcc047b8e4
-  data.tar.gz: 42e90646fb9484f3dfe61c2268074f7ed97656a0cc4674a07d21c12d985c5be8de08d58afa4a9d3f9414cd097cda30f9405f99c85157718ef8e7377c1d939f85
+  metadata.gz: ea0b25be9b51836e6b8909704cbc1473cd35daf97985376e4ce397b98a54c64511c841155a21c2276b813993a8e42683a998df245d776c1395e3c8f7a8f749e2
+  data.tar.gz: 1d69242ac627e23898a9f179302477ab9d79f86372f6f318c811c3c009e1fd526eaac7ee6c62316eb89cf4bed5d24ac80ed0012ec9897af7df0896f521339839

data/.rubocop.yml

@@ -0,0 +1,80 @@
+Metrics/MethodLength: { Max:  24 }
+Metrics/ClassLength:  { Max: 240 }
+Metrics/ModuleLength: { Max: 240 }
+Metrics/LineLength:   { Max: 112 }
+Metrics/CyclomaticComplexity: { Max: 8 }
+Metrics/PerceivedComplexity: { Max: 8 }
+Metrics/ParameterLists: { Max: 4 }
+Metrics/MethodLength: { Max: 24 }
+Metrics/AbcSize: { Max: 20 }
+
+Style/IndentHash: { EnforcedStyle: consistent }
+Style/HashSyntax: { EnforcedStyle: hash_rockets }
+Style/SignalException: { EnforcedStyle: only_raise }
+Style/AlignParameters: { EnforcedStyle: with_fixed_indentation }
+Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes }
+Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
+Style/MultilineOperationIndentation: { EnforcedStyle: indented }
+Style/FirstParameterIndentation: { EnforcedStyle: consistent }
+Style/StringLiterals: { EnforcedStyle: double_quotes }
+Style/RegexpLiteral: { EnforcedStyle: slashes }
+Style/IndentArray: { EnforcedStyle: consistent }
+Style/ExtraSpacing: { AllowForAlignment: true }
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%q': '{}'
+    '%Q': '{}'
+    '%r': '!!'
+    '%s': '()'
+    '%w': '()'
+    '%W': '()'
+    '%x': '()'
+
+Style/AlignArray:                     { Enabled: false }
+Style/StringLiterals:                 { Enabled: false }
+Style/Documentation:                  { Enabled: false }
+Style/DoubleNegation:                 { Enabled: false }
+Style/UnneededCapitalW:               { Enabled: false }
+Style/EmptyLinesAroundModuleBody:     { Enabled: false }
+Style/EmptyLinesAroundAccessModifier: { Enabled: false }
+Style/BracesAroundHashParameters:     { Enabled: false }
+Style/SpaceInsideBrackets:            { Enabled: false }
+Style/IfUnlessModifier:               { Enabled: false }
+Style/ModuleFunction:                 { Enabled: false }
+Style/RescueModifier:                 { Enabled: false }
+Style/GuardClause:                    { Enabled: false }
+Style/FileName:                       { Enabled: false }
+Lint/UselessAccessModifier:           { Enabled: false }
+Style/SpaceAroundOperators:           { Enabled: false }
+Style/RedundantReturn:                { Enabled: false }
+Style/SingleLineMethods:              { Enabled: false }
+
+AllCops:
+  TargetRubyVersion: 2.0
+  Include:
+  - lib/**/*.rb
+
+  Exclude:
+  - .rubocop.yml
+  - .codeclimate.yml
+  - .travis.yml
+  - .gitignore
+  - .rspec
+
+  - Gemfile.lock
+  - CHANGELOG.{md,markdown,txt,textile}
+  - CONTRIBUTING.{md,markdown,txt,textile}
+  - readme.{md,markdown,txt,textile}
+  - README.{md,markdown,txt,textile}
+  - Readme.{md,markdown,txt,textile}
+  - ReadMe.{md,markdown,txt,textile}
+  - COPYING
+  - LICENSE
+
+  - site/**/*
+  - test/**/*
+  - vendor/**/*
+  - features/**/*
+  - script/**/*
+  - spec/**/*

data/README.markdown

@@ -14,8 +14,6 @@
 [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)!
-
 Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
 
 ## Philosophy
@@ -37,7 +35,7 @@ See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
 ## Code of Conduct
 
 In order to have a more open and welcoming community, Jekyll adheres to a
-[code of conduct](CONDUCT.md) adapted from the Ruby on Rails code of
+[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
 conduct.
 
 Please adhere to this code of conduct in any interactions you have in the

data/lib/jekyll.rb

@@ -153,8 +153,9 @@ module Jekyll
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
+      questionable_path.insert(0, '/') if questionable_path.start_with?('~')
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path = clean_path.sub(/\A\w\:\//, '/')
+      clean_path.sub!(/\A\w\:\//, '/')
 
       if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         clean_path

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

@@ -12,11 +12,11 @@ module Jekyll
           "line_number_start" => 1,
           "tab_width"         => 4,
           "wrap"              => "div"
-        }
+        }.freeze
 
         def initialize(config)
           Jekyll::External.require_with_graceful_fail "kramdown"
-          @main_fallback_highlighter = config["highlighter"] || "rogue"
+          @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
           setup
         end
@@ -32,22 +32,44 @@ module Jekyll
           @config["syntax_highlighter_opts"] ||= {}
           @config["coderay"] ||= {} # XXX: Legacy.
           modernize_coderay_config
+          make_accessible
         end
 
         def convert(content)
           Kramdown::Document.new(content, @config).to_html
         end
 
+        private
+        def make_accessible(hash = @config)
+          proc_ = proc { |hash_, key| hash_[key.to_s] if key.is_a?(Symbol) }
+          hash.default_proc = proc_
+
+          hash.each do |_, val|
+            make_accessible val if val.is_a?(
+              Hash
+            )
+          end
+        end
+
         # config[kramdown][syntax_higlighter] > config[kramdown][enable_coderay] > config[highlighter]
         # Where `enable_coderay` is now deprecated because Kramdown
         # supports Rouge now too.
 
         private
         def highlighter
-          @highlighter ||= begin
-            if highlighter = @config["syntax_highlighter"] then highlighter
-            elsif @config.key?("enable_coderay") && @config["enable_coderay"]
-              Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', use syntax_highlighter: coderay in your configuration file."
+          return @highlighter if @highlighter
+
+          if @config["syntax_highlighter"]
+            return @highlighter = @config[
+              "syntax_highlighter"
+            ]
+          end
+
+          @highlighter = begin
+            if @config.key?("enable_coderay") && @config["enable_coderay"]
+              Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', " \
+                "use syntax_highlighter: coderay in your configuration file."
+
               "coderay"
             else
               @main_fallback_highlighter
@@ -59,7 +81,13 @@ module Jekyll
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
             cleaned_key = key.gsub(/\Acoderay_/, "")
-            Jekyll::Deprecator.deprecation_message "You are using '#{key}'. Normalizing to #{cleaned_key}." if key != cleaned_key
+
+            if key != cleaned_key
+              Jekyll::Deprecator.deprecation_message(
+                "You are using '#{key}'. Normalizing to #{cleaned_key}."
+              )
+            end
+
             hsh[cleaned_key] = val
           end
         end
@@ -71,7 +99,9 @@ module Jekyll
         private
         def modernize_coderay_config
           if highlighter == "coderay"
-            Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, please use 'syntax_highlighter_opts' instead."
+            Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, " \
+              "please use 'syntax_highlighter_opts' instead."
+
             @config["syntax_highlighter_opts"] = begin
               strip_coderay_prefix(
                 @config["syntax_highlighter_opts"] \

data/lib/jekyll/deprecator.rb

@@ -22,7 +22,7 @@ module Jekyll
 
     def no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first)
-        deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll --help` to find out more."
+        deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll help` to find out more."
         abort
       end
     end

data/lib/jekyll/document.rb

@@ -217,8 +217,11 @@ module Jekyll
     def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url.end_with?("/")
-      path << output_ext unless path.end_with? output_ext
+      if url.end_with? "/"
+        path = File.join(path, "index.html")
+      else
+        path << output_ext unless path.end_with? output_ext
+      end
       path
     end
 

data/lib/jekyll/liquid_renderer/file.rb

@@ -8,7 +8,7 @@ module Jekyll
 
       def parse(content)
         measure_time do
-          @template = Liquid::Template.parse(content)
+          @template = Liquid::Template.parse(content, line_numbers: true)
         end
 
         self

data/lib/jekyll/utils.rb

@@ -20,7 +20,7 @@ module Jekyll
 
     def titleize_slug(slug)
       slug.split("-").map! do |val|
-        val.capitalize!
+        val.capitalize
       end.join(" ")
     end
 

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -131,6 +131,7 @@ extra_rdoc_files:
 - README.markdown
 - LICENSE
 files:
+- ".rubocop.yml"
 - LICENSE
 - README.markdown
 - bin/jekyll