jekyll 4.2.2 → 4.3.0

data/lib/jekyll/excerpt.rb

@@ -4,8 +4,7 @@ module Jekyll
   class Excerpt
     extend Forwardable
 
-    attr_accessor :doc
-    attr_accessor :content, :ext
+    attr_accessor :content, :doc, :ext
     attr_writer   :output
 
     def_delegators :@doc,
@@ -139,7 +138,7 @@ module Jekyll
       return head if tail.empty?
 
       head = sanctify_liquid_tags(head) if head.include?("{%")
-      definitions = extract_markdown_link_reference_defintions(head, tail)
+      definitions = extract_markdown_link_reference_definitions(head, tail)
       return head if definitions.empty?
 
       head << "\n\n" << definitions.join("\n")
@@ -165,7 +164,7 @@ module Jekyll
       head
     end
 
-    def extract_markdown_link_reference_defintions(head, tail)
+    def extract_markdown_link_reference_definitions(head, tail)
       [].tap do |definitions|
         tail.scan(MKDWN_LINK_REF_REGEX).each do |segments|
           definitions << segments.join if head.include?(segments[0])
@@ -191,8 +190,8 @@ module Jekyll
 
     def print_build_warning
       Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!"
-      Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator" \
-                         " #{doc.excerpt_separator.inspect}. "
+      Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator " \
+                             "#{doc.excerpt_separator.inspect}."
       Jekyll.logger.warn "", "The block has been modified with the appropriate closing tag."
       Jekyll.logger.warn "", "Feel free to define a custom excerpt or excerpt_separator in the"
       Jekyll.logger.warn "", "document's Front Matter if the generated excerpt is unsatisfactory."

data/lib/jekyll/external.rb

@@ -22,13 +22,11 @@ module Jekyll
       #
       def require_if_present(names)
         Array(names).each do |name|
-          begin
-            require name
-          rescue LoadError
-            Jekyll.logger.debug "Couldn't load #{name}. Skipping."
-            yield(name, version_constraint(name)) if block_given?
-            false
-          end
+          require name
+        rescue LoadError
+          Jekyll.logger.debug "Couldn't load #{name}. Skipping."
+          yield(name, version_constraint(name)) if block_given?
+          false
         end
       end
 
@@ -55,23 +53,21 @@ module Jekyll
       #
       def require_with_graceful_fail(names)
         Array(names).each do |name|
-          begin
-            Jekyll.logger.debug "Requiring:", name.to_s
-            require name
-          rescue LoadError => e
-            Jekyll.logger.error "Dependency Error:", <<~MSG
-              Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-              In order to use Jekyll as currently configured, you'll need to install this gem.
+          Jekyll.logger.debug "Requiring:", name.to_s
+          require name
+        rescue LoadError => e
+          Jekyll.logger.error "Dependency Error:", <<~MSG
+            Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+            In order to use Jekyll as currently configured, you'll need to install this gem.
 
-              If you've run Jekyll with `bundle exec`, ensure that you have included the #{name}
-              gem in your Gemfile as well.
+            If you've run Jekyll with `bundle exec`, ensure that you have included the #{name}
+            gem in your Gemfile as well.
 
-              The full error message from Ruby is: '#{e.message}'
+            The full error message from Ruby is: '#{e.message}'
 
-              If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
-            MSG
-            raise Jekyll::Errors::MissingDependencyException, name
-          end
+            If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
+          MSG
+          raise Jekyll::Errors::MissingDependencyException, name
         end
       end
     end

data/lib/jekyll/filters.rb

@@ -193,12 +193,10 @@ module Jekyll
       @where_filter_cache[input_id] ||= {}
       @where_filter_cache[input_id][property] ||= {}
 
-      # stash or retrive results to return
-      @where_filter_cache[input_id][property][value] ||= begin
-        input.select do |object|
-          compare_property_vs_target(item_property(object, property), value)
-        end.to_a
-      end
+      # stash or retrieve results to return
+      @where_filter_cache[input_id][property][value] ||= input.select do |object|
+        compare_property_vs_target(item_property(object, property), value)
+      end.to_a
     end
 
     # Filters an array of objects against an expression
@@ -246,14 +244,13 @@ module Jekyll
       @find_filter_cache[input_id] ||= {}
       @find_filter_cache[input_id][property] ||= {}
 
-      # stash or retrive results to return
+      # stash or retrieve results to return
       # Since `enum.find` can return nil or false, we use a placeholder string "<__NO MATCH__>"
       #   to validate caching.
-      result = @find_filter_cache[input_id][property][value] ||= begin
-        input.find do |object|
-          compare_property_vs_target(item_property(object, property), value)
-        end || "<__NO MATCH__>"
-      end
+      result = @find_filter_cache[input_id][property][value] ||= input.find do |object|
+        compare_property_vs_target(item_property(object, property), value)
+      end || "<__NO MATCH__>"
+
       return nil if result == "<__NO MATCH__>"
 
       result
@@ -314,7 +311,7 @@ module Jekyll
           order = + 1
         else
           raise ArgumentError, "Invalid nils order: " \
-            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
+                               "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
         end
 
         sort_input(input, property, order)
@@ -481,7 +478,7 @@ module Jekyll
     end
 
     # -----------   The following set of code was *adapted* from Liquid::If
-    # -----------   ref: https://git.io/vp6K6
+    # -----------   ref: https://github.com/Shopify/liquid/blob/ffb0ace30315bbcf3548a0383fab531452060ae8/lib/liquid/tags/if.rb#L84-L107
 
     # Parse a string to a Liquid Condition
     def parse_condition(exp)

data/lib/jekyll/frontmatter_defaults.rb

@@ -198,10 +198,8 @@ module Jekyll
     def matching_sets(path, type)
       @matched_set_cache ||= {}
       @matched_set_cache[path] ||= {}
-      @matched_set_cache[path][type] ||= begin
-        valid_sets.select do |set|
-          !set.key?("scope") || applies?(set["scope"], path, type)
-        end
+      @matched_set_cache[path][type] ||= valid_sets.select do |set|
+        !set.key?("scope") || applies?(set["scope"], path, type)
       end
     end
 

data/lib/jekyll/hooks.rb

@@ -78,8 +78,8 @@ module Jekyll
       }
 
       unless @registry[owner][event]
-        raise NotAvailable, "Invalid hook. #{owner} supports only the " \
-          "following hooks #{@registry[owner].keys.inspect}"
+        raise NotAvailable, "Invalid hook. #{owner} supports only the following hooks " \
+                            "#{@registry[owner].keys.inspect}"
       end
 
       raise Uncallable, "Hooks must respond to :call" unless block.respond_to? :call

data/lib/jekyll/layout.rb

@@ -4,26 +4,14 @@ module Jekyll
   class Layout
     include Convertible
 
-    # Gets the Site object.
-    attr_reader :site
-
-    # Gets the name of this layout.
-    attr_reader :name
-
-    # Gets the path to this layout.
-    attr_reader :path
-
-    # Gets the path to this layout relative to its base
-    attr_reader :relative_path
-
-    # Gets/Sets the extension of this layout.
-    attr_accessor :ext
-
-    # Gets/Sets the Hash that holds the metadata for this layout.
-    attr_accessor :data
-
-    # Gets/Sets the content of this layout.
-    attr_accessor :content
+    attr_accessor :content, # content of layout
+                  :data,    # the Hash that holds the metadata for this layout
+                  :ext      # extension of layout
+
+    attr_reader :name, # name of layout
+                :path, # path to layout
+                :site, # the Site object
+                :relative_path # path to layout relative to its base
 
     # Initialize a new Layout.
     #