jekyll 4.0.0.pre.beta1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557bf944b97df515f8ac16b41b21317a4361fa27e45c44d63ea8579e14a8188e
-  data.tar.gz: 436685ee32413cf98111372ca82f1f39d38f549cc2cf482c86a1aba53e627b93
+  metadata.gz: 3d628ad7c78b42c6430f0fa42153b0039881f581d1151678cb2d99a5256f0628
+  data.tar.gz: 22a33c4249c92f5ce5e75d60420c11df71852a58b64a254ddb53c6ffec4f3ce9
 SHA512:
-  metadata.gz: 76c7cfa113e1a0741584a34be45ed4380e57250d1829d905d4aa1bba33ec06d6e1debf02a474ab36aca8f65ff1f4fca9cb97ce06c52e74715327267bb2bb5345
-  data.tar.gz: 4f25d89074b8aae2dfdcad4a56246b7541137e5a226040898e13b0f610acce79e8d8aaee0c63ea7aae185d09156b85643269440d6a02bc59dac8e2d26033e4af
+  metadata.gz: 68b602c0af4b2e2540584f3bf6210f07363d51b50a484d5134f8c69d38a7f5893fe130f6e63218e36e2f3a6e05a54eb8a46c220540a852cdc2417d8e0b24fb1d
+  data.tar.gz: ab9c8776960d49245f22c6b5b759e2928cd77338a592374c14357e561c1525f1f6720e10c8bdecf0d3bb5c1231bb823ad9cd40fb6038a9c7198572f9879a1ba8

data/lib/jekyll.rb

@@ -190,7 +190,7 @@ module Jekyll
     end
 
     # Conditional optimizations
-    Jekyll::External.require_if_present("liquid-c")
+    Jekyll::External.require_if_present("liquid/c")
   end
 end
 

data/lib/jekyll/commands/new.rb

@@ -80,13 +80,13 @@ module Jekyll
             # Happy Jekylling!
             gem "jekyll", "~> #{Jekyll::VERSION}"
             # This is the default theme for new Jekyll sites. You may change this to anything you like.
-            gem "minima", "~> 2.0"
+            gem "minima", "~> 2.5"
             # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
             # uncomment the line below. To upgrade, run `bundle update github-pages`.
             # gem "github-pages", group: :jekyll_plugins
             # If you have any plugins, put them here!
             group :jekyll_plugins do
-              gem "jekyll-feed", "~> 0.6"
+              gem "jekyll-feed", "~> 0.12"
             end
 
             # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

data/lib/jekyll/configuration.rb

@@ -4,7 +4,7 @@ module Jekyll
   class Configuration < Hash
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = Configuration[{
+    DEFAULTS = {
       # Where things are
       "source"              => Dir.pwd,
       "destination"         => File.join(Dir.pwd, "_site"),
@@ -75,7 +75,7 @@ module Jekyll
         "footnote_nr"   => 1,
         "show_warnings" => false,
       },
-    }.map { |k, v| [k, v.freeze] }].freeze
+    }.each_with_object(Configuration.new) { |(k, v), hsh| hsh[k] = v.freeze }.freeze
 
     class << self
       # Static: Produce a Configuration ready for use in a Site.
@@ -94,7 +94,7 @@ module Jekyll
     #
     # Return a copy of the hash where all its keys are strings
     def stringify_keys
-      reduce({}) { |hsh, (k, v)| hsh.merge(k.to_s => v) }
+      each_with_object({}) { |(k, v), hsh| hsh[k.to_s] = v }
     end
 
     def get_config_value_with_override(config_key, override)
@@ -235,7 +235,9 @@ module Jekyll
 
       # Ensure we have a hash.
       if config["collections"].is_a?(Array)
-        config["collections"] = Hash[config["collections"].map { |c| [c, {}] }]
+        config["collections"] = config["collections"].each_with_object({}) do |collection, hash|
+          hash[collection] = {}
+        end
       end
 
       config["collections"] = Utils.deep_merge_hashes(

data/lib/jekyll/convertible.rb

@@ -112,9 +112,10 @@ module Jekyll
     #
     # Returns the Hash representation of this Convertible.
     def to_liquid(attrs = nil)
-      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map do |attribute|
-        [attribute, send(attribute)]
-      end]
+      further_data = \
+        (attrs || self.class::ATTRIBUTES_FOR_LIQUID).each_with_object({}) do |attribute, hsh|
+          hsh[attribute] = send(attribute)
+        end
 
       defaults = site.frontmatter_defaults.all(relative_path, type)
       Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)

data/lib/jekyll/drops/url_drop.rb

@@ -125,7 +125,7 @@ module Jekyll
       private
 
       def fallback_data
-        {}
+        @fallback_data ||= {}
       end
     end
   end

data/lib/jekyll/entry_filter.rb

@@ -53,7 +53,7 @@ module Jekyll
     end
 
     def backup?(entry)
-      entry[-1..-1] == "~"
+      entry.end_with?("~")
     end
 
     def excluded?(entry)

data/lib/jekyll/filters.rb

@@ -372,7 +372,7 @@ module Jekyll
     # return numeric values as numbers for proper sorting
     def parse_sort_input(property)
       number_like = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!
-      return property.to_f if property =~ number_like
+      return property.to_f if property.to_s =~ number_like
 
       property
     end

data/lib/jekyll/liquid_renderer/table.rb

@@ -10,72 +10,29 @@ module Jekyll
       end
 
       def to_s(num_of_rows = 50)
-        data = data_for_table(num_of_rows)
-        widths = table_widths(data)
-        generate_table(data, widths)
+        tabulate(data_for_table(num_of_rows))
       end
 
       private
 
-      def generate_table(data, widths)
-        str = +"\n"
-
-        table_head = data.shift
-        table_foot = data.pop
-
-        str << generate_row(table_head, widths)
-        str << generate_table_head_border(table_head, widths)
-
-        data.each do |row_data|
-          str << generate_row(row_data, widths)
-        end
-
-        str << generate_table_head_border(table_foot, widths)
-        str << generate_row(table_foot, widths).rstrip
-
-        str << "\n"
-        str
-      end
-
-      def generate_table_head_border(row_data, widths)
-        str = +""
-
-        row_data.each_index do |cell_index|
-          str << "-" * widths[cell_index]
-          str << "-+-" unless cell_index == row_data.length - 1
-        end
-
-        str << "\n"
-        str
-      end
-
-      def generate_row(row_data, widths)
-        str = +""
-
-        row_data.each_with_index do |cell_data, cell_index|
-          str << if cell_index.zero?
-                   cell_data.ljust(widths[cell_index], " ")
-                 else
-                   cell_data.rjust(widths[cell_index], " ")
-                 end
-
-          str << " | " unless cell_index == row_data.length - 1
-        end
-
-        str << "\n"
-        str
-      end
-
-      def table_widths(data)
-        widths = []
-
-        data.each do |row|
-          row.each_with_index do |cell, index|
-            widths[index] = [cell.length, widths[index]].compact.max
-          end
+      def tabulate(data)
+        require "terminal-table"
+
+        header = data.shift
+        footer = data.pop
+        output = +"\n"
+
+        table = Terminal::Table.new do |t|
+          t << header
+          t << :separator
+          data.each { |row| t << row }
+          t << :separator
+          t << footer
+          t.style = { :alignment => :right, :border_top => false, :border_bottom => false }
+          t.align_column(0, :left)
         end
 
-        widths
+        output << table.to_s << "\n"
       end
 
       # rubocop:disable Metrics/AbcSize

data/lib/jekyll/site.rb

@@ -145,9 +145,9 @@ module Jekyll
     #
     # Returns a Hash containing collection name-to-instance pairs.
     def collections
-      @collections ||= Hash[collection_names.map do |coll|
-        [coll, Jekyll::Collection.new(self, coll)]
-      end]
+      @collections ||= collection_names.each_with_object({}) do |name, hsh|
+        hsh[name] = Jekyll::Collection.new(self, name)
+      end
     end
 
     # The list of collection names.

data/lib/jekyll/theme.rb

@@ -10,7 +10,6 @@ module Jekyll
       @name = name.downcase.strip
       Jekyll.logger.debug "Theme:", name
       Jekyll.logger.debug "Theme source:", root
-      configure_sass
     end
 
     def root
@@ -38,13 +37,6 @@ module Jekyll
       @assets_path ||= path_for "assets"
     end
 
-    def configure_sass
-      return unless sass_path
-
-      External.require_with_graceful_fail("sass") unless defined?(Sass)
-      Sass.load_paths << sass_path
-    end
-
     def runtime_dependencies
       gemspec.runtime_dependencies
     end

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.0.0.pre.beta1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.beta1
+  version: 4.0.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jekyll-watch
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Jekyll is a simple, blog aware, static site generator.
 email:
 - maintainers@jekyllrb.com
@@ -339,9 +353,8 @@ metadata:
   source_code_uri: https://github.com/jekyll/jekyll
 post_install_message: |
   -------------------------------------------------------------------------------------
-  This version of Jekyll comes with some major changes.
+  Jekyll 4.0 comes with some major changes, notably:
 
-  Most notably:
     * Our `link` tag now comes with the `relative_url` filter incorporated into it.
       You should no longer prepend `{{ site.baseurl }}` to `{% link foo.md %}`
       For further details: https://github.com/jekyll/jekyll/pull/6727