bridgetown-core 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd231215591b9251d63525c740620bf4cd6da0beb5e48abd420ce745355ac0bb
-  data.tar.gz: 82dff2c41efbac2e9ea4f60cc441f8665044c3c8e6576695a50db376951c5866
+  metadata.gz: 7878e020dc228c491934a986395227f17fa2ca93398ae0f3961a77c4df6e1761
+  data.tar.gz: 73dd2ad473c8525974708393f97f0ce464241fedcc78951186b726ea3435c444
 SHA512:
-  metadata.gz: 4606e45f6a843e7de6e9e81c873cb5082ca958277631d83dd260b0eef64289e8c93259d771fee5501dd5c7ec92747d278faffbaf3802ee72457e300aee96714e
-  data.tar.gz: 82cd06e0dd5a11061d2c37d3defb8d57e381f4129abed12bd47fa4af8c2bbaee3372c3aac09fcf3b9b6fd92a8152dd458b79da710fc575c8e91096946e5ced87
+  metadata.gz: 38624e9ea2b7e604b773f2224eec18fdce5e44fc9c9e388c7cefa1ebee6fcee62aa96406ff783a7458a5b3d7a24f45c486a2cc2e925867609a26cb8e30336bb1
+  data.tar.gz: eb46348e312153b95b46b1b5e7fbfca154c4d39c87af62e9b77ccdfacdd43cca640b8adf216c223aeb9f47f92977df48d3550dab1a7a173dac256c92cf89f77f

data/bridgetown-core.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("erubi",                 "~> 1.9")
   s.add_runtime_dependency("faraday",               "~> 1.0")
   s.add_runtime_dependency("faraday_middleware",    "~> 1.0")
+  s.add_runtime_dependency("hash_with_dot_access",  "~> 1.0")
   s.add_runtime_dependency("i18n",                  "~> 1.0")
   s.add_runtime_dependency("kramdown",              "~> 2.1")
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")

data/lib/bridgetown-core.rb

@@ -29,8 +29,8 @@ require "csv"
 require "json"
 
 # 3rd party
-require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/string/inflections"
+require "hash_with_dot_access"
 require "pathutil"
 require "addressable/uri"
 require "safe_yaml/load"

data/lib/bridgetown-core/concerns/site/content.rb

@@ -61,10 +61,10 @@ module Bridgetown
     end
 
     # Returns the value of +data+["site_metadata"] or creates a new instance of
-    # +ActiveSupport::HashWithIndifferentAccess+
+    # +HashWithDotAccess::Hash+
     # @return [Hash] Returns a hash of site metadata
     def metadata
-      data["site_metadata"] ||= ActiveSupport::HashWithIndifferentAccess.new
+      data["site_metadata"] ||= HashWithDotAccess::Hash.new
     end
 
     # The Hash payload containing site-wide data.
@@ -116,7 +116,7 @@ module Bridgetown
     # @see Collection
     def collections
       @collections ||= collection_names.each_with_object(
-        ActiveSupport::HashWithIndifferentAccess.new
+        HashWithDotAccess::Hash.new
       ) do |name, hsh|
         hsh[name] = Bridgetown::Collection.new(self, name)
       end

data/lib/bridgetown-core/concerns/site/processable.rb

@@ -30,10 +30,10 @@ module Bridgetown
                   else
                     Time.now
                   end
-      self.layouts = ActiveSupport::HashWithIndifferentAccess.new
+      self.layouts = HashWithDotAccess::Hash.new
       self.pages = []
       self.static_files = []
-      self.data = ActiveSupport::HashWithIndifferentAccess.new
+      self.data = HashWithDotAccess::Hash.new
       @post_attr_hash = {}
       @collections = nil
       @documents = nil

data/lib/bridgetown-core/concerns/validatable.rb

@@ -22,7 +22,7 @@ module Bridgetown
                                  **Utils.merged_file_read_opts(site, opts))
         if content =~ Document::YAML_FRONT_MATTER_REGEXP
           self.content = $POSTMATCH
-          self.data = SafeYAML.load(Regexp.last_match(1))&.with_indifferent_access
+          self.data = SafeYAML.load(Regexp.last_match(1))&.with_dot_access
         end
       rescue Psych::SyntaxError => e
         Bridgetown.logger.warn "YAML Exception reading #{filename}: #{e.message}"
@@ -32,7 +32,7 @@ module Bridgetown
         raise e if site.config["strict_front_matter"]
       end
 
-      self.data ||= ActiveSupport::HashWithIndifferentAccess.new
+      self.data ||= HashWithDotAccess::Hash.new
 
       validate_data! filename
       validate_permalink! filename

data/lib/bridgetown-core/configuration.rb

@@ -4,7 +4,7 @@ module Bridgetown
   # TODO: refactor this whole object! Already had to fix obscure
   # bugs just making minor changes, and all the indirection is
   # quite hard to decipher. -JW
-  class Configuration < ActiveSupport::HashWithIndifferentAccess
+  class Configuration < HashWithDotAccess::Hash
     # Default options. Overridden by values in bridgetown.config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = {
@@ -311,6 +311,10 @@ module Bridgetown
         raise Bridgetown::Errors::InvalidConfigurationError,
               "'#{option}' should be set as an array, but was: #{self[option].inspect}."
       end
+
+      # add _pages to includes set
+      self[:include] << "_pages"
+
       self
     end
   end

data/lib/bridgetown-core/document.rb

@@ -63,7 +63,7 @@ module Bridgetown
     # Returns a Hash containing the data. An empty hash is returned if
     #   no data was read.
     def data
-      @data ||= ActiveSupport::HashWithIndifferentAccess.new
+      @data ||= HashWithDotAccess::Hash.new
     end
 
     # Merge some data in with this document's data.
@@ -170,7 +170,7 @@ module Bridgetown
     #
     # Returns the permalink or nil if no permalink was set in the data.
     def permalink
-      data && data.is_a?(Hash) && data["permalink"]
+      data&.permalink
     end
 
     # The computed URL for the document. See `Bridgetown::URL#to_s` for more details.
@@ -295,7 +295,7 @@ module Bridgetown
 
     def previous_doc
       pos = collection.docs.index { |post| post.equal?(self) }
-      collection.docs[pos - 1] if pos && pos.positive?
+      collection.docs[pos - 1] if pos&.positive?
     end
 
     def trigger_hooks(hook_name, *args)

data/lib/bridgetown-core/filters.rb

@@ -138,6 +138,14 @@ module Bridgetown
       input.split.length
     end
 
+    # Calculates the average reading time of the supplied content.
+    # @param input [String] the String of content to analyze.
+    # @return [Float] the number of minutes required to read the content.
+    def reading_time(input, round_to = 0)
+      wpm = @context.registers[:site].config[:reading_time_wpm] || 250
+      (number_of_words(input).to_f / wpm).ceil(round_to)
+    end
+
     # Join an array of things into a string by separating with commas and the
     # word "and" for the last one.
     #

data/lib/bridgetown-core/page.rb

@@ -9,7 +9,7 @@ module Bridgetown
     include Validatable
 
     attr_writer :dir
-    attr_accessor :site, :pager
+    attr_accessor :site, :paginator, :pager
     attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
@@ -121,12 +121,18 @@ module Bridgetown
     # desired placeholder replacements. For details see "url.rb"
     def url_placeholders
       {
-        path: @dir,
+        path: qualified_pages_path_for_url,
         basename: basename,
         output_ext: output_ext,
       }
     end
 
+    # Strips _pages prefix off if needed for the url/destination generation
+    # @return [String]
+    def qualified_pages_path_for_url
+      @dir.sub(%r!^/_pages!, "")
+    end
+
     # Extract information from the page filename.
     #
     # name - The String filename of the page file.

data/lib/bridgetown-core/readers/data_reader.rb

@@ -6,7 +6,7 @@ module Bridgetown
 
     def initialize(site)
       @site = site
-      @content = ActiveSupport::HashWithIndifferentAccess.new
+      @content = {}
       @entry_filter = EntryFilter.new(site)
     end
 
@@ -20,7 +20,7 @@ module Bridgetown
       base = site.in_source_dir(dir)
       read_data_to(base, @content)
       merge_environment_specific_metadata!
-      @content
+      @content = @content.with_dot_access
     end
 
     # Read and parse all .yaml, .yml, .json, .csv and .tsv
@@ -44,7 +44,7 @@ module Bridgetown
         if File.directory?(path)
           read_data_to(
             path,
-            data[sanitize_filename(entry)] = ActiveSupport::HashWithIndifferentAccess.new
+            data[sanitize_filename(entry)] = {}
           )
         else
           key = sanitize_filename(File.basename(entry, ".*"))

data/lib/bridgetown-core/readers/defaults_reader.rb

@@ -6,7 +6,7 @@ module Bridgetown
 
     def initialize(site)
       @site = site
-      @path_defaults = ActiveSupport::HashWithIndifferentAccess.new
+      @path_defaults = HashWithDotAccess::Hash.new
     end
 
     def read

data/lib/bridgetown-core/renderer.rb

@@ -249,12 +249,12 @@ module Bridgetown
       )
     end
 
-    # Set page content to payload and assign pager if document has one.
+    # Set page content to payload and assign paginator if document has one.
     #
     # Returns nothing
     def assign_pages!
       payload["page"] = document.to_liquid
-      payload["paginator"] = (document.pager.to_liquid if document.respond_to?(:pager))
+      payload["paginator"] = document.paginator.to_liquid if document.respond_to?(:paginator)
     end
 
     # Set related posts to payload if document is a post.

data/lib/bridgetown-core/ruby_template_view.rb

@@ -8,17 +8,27 @@ module Bridgetown
     class Helpers
       include Bridgetown::Filters
 
+      attr_reader :view, :site
+
       Context = Struct.new(:registers)
 
-      def initialize(site)
+      def initialize(view, site)
+        @view = view
         @site = site
 
         # duck typing for Liquid context
-        @context = Context.new({ site: @site })
+        @context = Context.new({ site: site })
       end
 
       def webpack_path(asset_type)
-        Bridgetown::Utils.parse_webpack_manifest_file(@site, asset_type.to_s)
+        Bridgetown::Utils.parse_webpack_manifest_file(site, asset_type.to_s)
+      end
+
+      # @param pairs [Hash] A hash of key/value pairs.
+      #
+      # @return [String] Space-separated keys where the values are truthy.
+      def class_map(pairs = {})
+        pairs.select { |_key, truthy| truthy }.keys.join(" ")
       end
 
       def t(*args)
@@ -26,7 +36,7 @@ module Bridgetown
       end
     end
 
-    attr_reader :layout, :page, :site, :content
+    attr_reader :layout, :page, :paginator, :site, :content
 
     def initialize(convertible)
       if convertible.is_a?(Layout)
@@ -36,6 +46,7 @@ module Bridgetown
       else
         @page = convertible
       end
+      @paginator = page.paginator if page.respond_to?(:paginator)
       @site = page.site
     end
 
@@ -61,7 +72,7 @@ module Bridgetown
     end
 
     def helpers
-      @helpers ||= Helpers.new(@site)
+      @helpers ||= Helpers.new(self, site)
     end
 
     def method_missing(method, *args, &block)

data/lib/bridgetown-core/utils/ruby_exec.rb

@@ -59,7 +59,7 @@ module Bridgetown
 
         # This is where the magic happens! DON'T BE EVIL!!! ;-)
         output = obj.instance_eval(ruby_code)
-        output.is_a?(Hash) ? output.with_indifferent_access : output
+        output.is_a?(Hash) ? output.with_dot_access : output
       end
     end
   end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
   CODE_NAME = "Mount Scott"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hash_with_dot_access
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement