jekyll 4.2.2 → 4.3.0

data/lib/jekyll/utils.rb

@@ -47,7 +47,14 @@ module Jekyll
     end
 
     def mergable?(value)
-      value.is_a?(Hash) || value.is_a?(Drops::Drop)
+      case value
+      when Hash, Drops::Drop, DataHash
+        true
+      when DataEntry
+        mergable?(value.data)
+      else
+        false
+      end
     end
 
     def duplicable?(obj)
@@ -128,7 +135,8 @@ module Jekyll
     # Returns the parsed date if successful, throws a FatalException
     # if not
     def parse_date(input, msg = "Input could not be parsed.")
-      Time.parse(input).localtime
+      @parse_date_cache ||= {}
+      @parse_date_cache[input] ||= Time.parse(input).localtime
     rescue ArgumentError
       raise Errors::InvalidDateError, "Invalid date '#{input}': #{msg}"
     end
@@ -143,7 +151,7 @@ module Jekyll
       false
     end
 
-    # Determine whether the given content string contains Liquid Tags or Vaiables
+    # Determine whether the given content string contains Liquid Tags or Variables
     #
     # Returns true is the string contains sequences of `{%` or `{{`
     def has_liquid_construct?(content)
@@ -265,7 +273,7 @@ module Jekyll
       template
     end
 
-    # Work the same way as Dir.glob but seperating the input into two parts
+    # Work the same way as Dir.glob but separating the input into two parts
     # ('dir' + '/' + 'pattern') to make sure the first part('dir') does not act
     # as a pattern.
     #
@@ -287,7 +295,7 @@ module Jekyll
     # patterns - the patterns (or the pattern) which will be applied under the dir
     # flags    - the flags which will be applied to the pattern
     #
-    # Returns matched pathes
+    # Returns matched paths
     def safe_glob(dir, patterns, flags = 0)
       return [] unless Dir.exist?(dir)
 
@@ -303,12 +311,15 @@ module Jekyll
     # and a given param
     def merged_file_read_opts(site, opts)
       merged = (site ? site.file_read_opts : {}).merge(opts)
-      if merged[:encoding] && !merged[:encoding].start_with?("bom|")
+
+      # always use BOM when reading UTF-encoded files
+      if merged[:encoding]&.downcase&.start_with?("utf-")
         merged[:encoding] = "bom|#{merged[:encoding]}"
       end
-      if merged["encoding"] && !merged["encoding"].start_with?("bom|")
+      if merged["encoding"]&.downcase&.start_with?("utf-")
         merged["encoding"] = "bom|#{merged["encoding"]}"
       end
+
       merged
     end
 

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.2.2"
+  VERSION = "4.3.0"
 end

data/lib/jekyll.rb

@@ -45,6 +45,8 @@ module Jekyll
   autoload :Collection,          "jekyll/collection"
   autoload :Configuration,       "jekyll/configuration"
   autoload :Convertible,         "jekyll/convertible"
+  autoload :DataEntry,           "jekyll/data_entry"
+  autoload :DataHash,            "jekyll/data_hash"
   autoload :Deprecator,          "jekyll/deprecator"
   autoload :Document,            "jekyll/document"
   autoload :EntryFilter,         "jekyll/entry_filter"
@@ -148,7 +150,7 @@ module Jekyll
 
     # Public: Set the log writer.
     #         New log writer must respond to the same methods
-    #         as Ruby's interal Logger.
+    #         as Ruby's internal Logger.
     #
     # writer - the new Logger-compatible log transport
     #

data/lib/site_template/_config.yml

@@ -8,7 +8,7 @@
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # 'bundle exec jekyll serve'. If you change this file, please restart the server process.
 #
-# If you need help with YAML syntax, here are some quick references for you: 
+# If you need help with YAML syntax, here are some quick references for you:
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
 # https://learnxinyminutes.com/docs/yaml/
 #

data/lib/theme_template/README.md.erb

@@ -6,7 +6,6 @@ To experiment with this code, add some sample content and run `bundle exec jekyl
 
 TODO: Delete this and the text above, and describe your gem
 
-
 ## Installation
 
 Add this line to your Jekyll site's `Gemfile`:
@@ -35,7 +34,7 @@ TODO: Write usage instructions here. Describe your available layouts, includes,
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hello. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/<%= theme_name %>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](https://www.contributor-covenant.org/) code of conduct.
 
 ## Development
 
@@ -49,4 +48,3 @@ To add a custom directory to your theme-gem, please edit the regexp in `<%= them
 ## License
 
 The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,16 +72,22 @@ dependencies:
   name: jekyll-sass-converter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jekyll-watch
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +109,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,6 +119,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -142,16 +154,22 @@ dependencies:
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.3.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pathutil
   requirement: !ruby/object:Gem::Requirement
@@ -170,16 +188,22 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -196,18 +220,38 @@ dependencies:
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 description: Jekyll is a simple, blog aware, static site generator.
 email:
 - maintainers@jekyllrb.com
@@ -241,6 +285,7 @@ files:
 - lib/jekyll/commands/serve.rb
 - lib/jekyll/commands/serve/live_reload_reactor.rb
 - lib/jekyll/commands/serve/livereload_assets/livereload.js
+- lib/jekyll/commands/serve/mime_types_charset.json
 - lib/jekyll/commands/serve/servlet.rb
 - lib/jekyll/commands/serve/websockets.rb
 - lib/jekyll/configuration.rb
@@ -250,6 +295,8 @@ files:
 - lib/jekyll/converters/markdown/kramdown_parser.rb
 - lib/jekyll/converters/smartypants.rb
 - lib/jekyll/convertible.rb
+- lib/jekyll/data_entry.rb
+- lib/jekyll/data_hash.rb
 - lib/jekyll/deprecator.rb
 - lib/jekyll/document.rb
 - lib/jekyll/drops/collection_drop.rb
@@ -259,6 +306,7 @@ files:
 - lib/jekyll/drops/jekyll_drop.rb
 - lib/jekyll/drops/site_drop.rb
 - lib/jekyll/drops/static_file_drop.rb
+- lib/jekyll/drops/theme_drop.rb
 - lib/jekyll/drops/unified_payload_drop.rb
 - lib/jekyll/drops/url_drop.rb
 - lib/jekyll/entry_filter.rb
@@ -357,7 +405,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="