jekyll 3.8.0.pre.rc2 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fddf298655ecad13b88d1e7a5fdd6ee54a8379c8724ad17a5d07dcb895a304
-  data.tar.gz: 2aa7a239d6bb42e3975e495ee074c999b85d7f6e0e652b349bbd3bc213df973b
+  metadata.gz: fd590fa00abc66e1aeafd4bdff3020bb88eff683f76f454cb3fdd95c5a07e2d4
+  data.tar.gz: 41bed706beaf0e5ceed8aa6706233ab7e183b5d1409954a1c05e8cd09aeade93
 SHA512:
-  metadata.gz: 676bce947226ac467d5d036b181b3f652d4867098a0f3b62ee1405fa737c727c0fc9038dcce3c894ff805a7ca115374a1b1545f662a889cf64c35eda93d3cac2
-  data.tar.gz: 3322935bfadd96623322592f1c4aeefcdf56dcb4932f02278c90a822370726364fd80e0262f13d4b5e09e49853eca30d61a777e332a32bd612a2e496ff6ea6c9
+  metadata.gz: 43f920daab74a63b7ed8cd4cfb9d8c39b786863c815f36e8ac891e3568b063dd4c186eeb2267d79122ff63f04b9da5a8d6ad429915e7bd49d6079f96f6a6cdab
+  data.tar.gz: 81e8e732a58e5accf834f343ec846dcf4333e3706ea669844324f1eacdda283a97b019c10d410a3447c76498bf19159d23ac153e3ac49d8e8130be609a8062d1

data/.rubocop.yml

@@ -49,11 +49,9 @@ Layout/MultilineOperationIndentation:
 Lint/NestedPercentLiteral:
   Exclude:
     - test/test_site.rb
-Layout/SpaceInsideBrackets:
-  Enabled: false
 Layout/EmptyComment:
   Enabled: false
-Lint/EndAlignment:
+Layout/EndAlignment:
   Severity: error
 Lint/UnreachableCode:
   Severity: error

data/README.markdown

@@ -3,8 +3,8 @@
 [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
 [![Linux Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg?label=Linux%20build)][travis]
 [![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor]
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/jekyll/jekyll.svg)][coverage]
-[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)][codeclimate]
+[![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)](codeclimate)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)](coverage)
 [![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)][gemnasium]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 

data/lib/jekyll/frontmatter_defaults.rb

@@ -108,13 +108,14 @@ module Jekyll
 
       if scope["path"].to_s.include?("*")
         Dir.glob(abs_scope_path).each do |scope_path|
-          scope_path = Pathname.new(scope_path).relative_path_from site_path
+          scope_path = Pathname.new(scope_path).relative_path_from(site_path)
+          scope_path = strip_collections_dir(scope_path)
           Jekyll.logger.debug "Globbed Scope Path:", scope_path
           return true if path_is_subpath?(sanitized_path, scope_path)
         end
         false
       else
-        path_is_subpath?(sanitized_path, rel_scope_path)
+        path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
       end
     end
     # rubocop:enable Metrics/AbcSize
@@ -129,6 +130,13 @@ module Jekyll
       false
     end
 
+    def strip_collections_dir(path)
+      collections_dir  = @site.config["collections_dir"]
+      slashed_coll_dir = "#{collections_dir}/"
+      return path if collections_dir.empty? || !path.to_s.start_with?(slashed_coll_dir)
+      path.sub(slashed_coll_dir, "")
+    end
+
     # Determines whether the scope applies to type.
     # The scope applies to the type if:
     #   1. no 'type' is specified

data/lib/jekyll/tags/highlight.rb

@@ -65,23 +65,24 @@ MSG
 
       private
 
+      OPTIONS_REGEX = %r!(?:\w="[^"]*"|\w=\w|\w)+!
+
       def parse_options(input)
         options = {}
-        unless input.empty?
-          # Split along 3 possible forms -- key="<quoted list>", key=value, or key
-          input.scan(%r!(?:\w="[^"]*"|\w=\w|\w)+!) do |opt|
-            key, value = opt.split("=")
-            # If a quoted list, convert to array
-            if value && value.include?("\"")
-              value.delete!('"')
-              value = value.split
-            end
-            options[key.to_sym] = value || true
+        return options if input.empty?
+
+        # Split along 3 possible forms -- key="<quoted list>", key=value, or key
+        input.scan(OPTIONS_REGEX) do |opt|
+          key, value = opt.split("=")
+          # If a quoted list, convert to array
+          if value && value.include?('"')
+            value.delete!('"')
+            value = value.split
           end
+          options[key.to_sym] = value || true
         end
-        if options.key?(:linenos) && options[:linenos] == true
-          options[:linenos] = "inline"
-        end
+
+        options[:linenos] = "inline" if options[:linenos] == true
         options
       end
 

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.0.pre.rc2".freeze
+  VERSION = "3.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.8.0.pre.rc2
+  version: 3.8.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -323,9 +323,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3