Load in HashWithDotAccess 2.0, remove AS dependency of indifferent ac…

…cess

Gemfile.lock

@@ -18,7 +18,7 @@ PATH
       erubi (~> 1.9)
       faraday (~> 2.0)
       faraday-follow_redirects (~> 0.3)
-      hash_with_dot_access (~> 1.2)
+      hash_with_dot_access (~> 2.0)
       i18n (~> 1.0)
       kramdown (~> 2.1)
       kramdown-parser-gfm (~> 1.0)
@@ -97,8 +97,7 @@ GEM
     faraday-net_http (3.1.0)
       net-http
     ffi (1.16.3)
-    hash_with_dot_access (1.2.0)
-      activesupport (>= 5.0.0, < 8.0)
+    hash_with_dot_access (2.0.0)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)

bridgetown-core/benchmark/dot-access.rb

@@ -0,0 +1,108 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler"
+Bundler.setup
+require "benchmark/ips"
+require "active_support/core_ext/hash/indifferent_access"
+require "hash_with_dot_access"
+
+class User < HashWithDotAccess::Hash
+end
+
+user = User.new({ address: { category: { desc: "Urban" } } })
+
+using HashWithDotAccess::Refinements
+
+# Enable and start GC before each job run. Disable GC afterwards.
+#
+# Inspired by https://www.omniref.com/ruby/2.2.1/symbols/Benchmark/bm?#annotation=4095926&line=182
+class GCSuite
+  def warming(*)
+    run_gc
+  end
+
+  def running(*)
+    run_gc
+  end
+
+  def warmup_stats(*); end
+
+  def add_report(*); end
+
+  private
+
+  def run_gc
+    GC.enable
+    GC.start
+    GC.disable
+  end
+end
+
+suite = GCSuite.new
+
+Benchmark.ips do |x|
+  x.config(suite:, time: 1, warmup: 1)
+
+  x.report("standard hash") do
+    h = { "foo" => "bar" }
+    h["foo"]
+  end
+  x.report("standard hash with fetch") do
+    h = { "foo" => "bar" }
+    h.fetch("foo", nil)
+  end
+  x.report("standard hash - symbol keys") do
+    h = { foo: "bar" }
+    h[:foo]
+  end
+  x.report("standard hash with fetch - symbol keys") do
+    h = { foo: "bar" }
+    h.fetch(:foo, nil)
+  end
+  x.report("hash with indifferent access string") do
+    h = { "foo" => "bar" }.with_indifferent_access
+    h["foo"]
+  end
+  x.report("hash with indifferent access symbol") do
+    h = { "foo" => "bar" }.with_indifferent_access
+    h[:foo]
+  end
+  x.report("hash with indifferent access via new method") do
+    h = ActiveSupport::HashWithIndifferentAccess.new({ "foo" => "bar" })
+    h[:foo]
+  end
+  # x.report("hash with indifferent access via []") do
+  #   h = ActiveSupport::HashWithIndifferentAccess[{ "foo" => "bar" }]
+  #   h[:foo]
+  # end
+  x.report("hash as_dots and symbol access") do
+    h = { foo: "bar" }.as_dots
+    h[:foo]
+  end
+  x.report("hash as_dots and method access") do
+    h = { foo: "bar" }.as_dots
+    h.foo
+  end
+  x.report("hash with dot access new method, string init, and symbol access") do
+    h = HashWithDotAccess::Hash.new({ "foo" => "bar" })
+    h[:foo]
+  end
+  x.report("hash with dot access new method, symbol init, and method access") do
+    h = HashWithDotAccess::Hash.new(foo: "bar")
+    h.foo
+  end
+  x.report("hash with dot access new method, string access") do
+    h = HashWithDotAccess::Hash.new({ "foo" => "bar" })
+    h["foo"]
+  end
+    user = { address: { category: { desc: "Urban" } } }
+  x.report("nested symbols") do
+    user[:address][:category][:desc]
+  end
+    userd = User.new({ address: { category: { desc: "Urban" } } })
+  x.report("nested dots") do
+    userd.address.category.desc
+  end
+  x.compare!
+end

bridgetown-core/bridgetown-core.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("erubi",                     "~> 1.9")
   s.add_runtime_dependency("faraday",                   "~> 2.0")
   s.add_runtime_dependency("faraday-follow_redirects",  "~> 0.3")
-  s.add_runtime_dependency("hash_with_dot_access",      "~> 1.2")
+  s.add_runtime_dependency("hash_with_dot_access",      "~> 2.0")
   s.add_runtime_dependency("i18n",                      "~> 1.0")
   s.add_runtime_dependency("kramdown",                  "~> 2.1")
   s.add_runtime_dependency("kramdown-parser-gfm",       "~> 1.0")

bridgetown-core/lib/bridgetown-core/collection.rb

@@ -3,6 +3,7 @@
 module Bridgetown
   class Collection
     using Bridgetown::Refinements
+    using HashWithDotAccess::Refinements
     include Enumerable
 
     # @return [Bridgetown::Site]
@@ -250,7 +251,7 @@ def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticCompl
         end
       end
 
-      merge_environment_specific_metadata(data_contents).with_dot_access
+      merge_environment_specific_metadata(data_contents).as_dots
     end
 
     def merge_environment_specific_metadata(data_contents)

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

@@ -3,6 +3,7 @@
 class Bridgetown::Site
   # Content is king!
   module Content
+    using HashWithDotAccess::Refinements
     def resources_grouped_by_taxonomy(taxonomy)
       data.site_taxonomies_hash ||= {}
       data.site_taxonomies_hash[taxonomy.label] ||= taxonomy.terms.transform_values do |terms|
@@ -45,10 +46,10 @@ def site_payload
     #
     #  If `config["collections"]` is not specified, a blank hash is returned.
     #
-    # @return [Hash{String, Symbol => Collection}] A Hash
+    # @return [HashWithDotAccess::Hash{String, Symbol => Collection}] A Hash
     #   containing a collection name-to-instance pairs.
     #
-    # @return [Hash] Returns a blank hash if no items found
+    # @return [HashWithDotAccess::Hash] Returns a blank hash if no items found
     def collections
       @collections ||= collection_names.each_with_object(
         HashWithDotAccess::Hash.new
@@ -78,7 +79,7 @@ def taxonomy_types
         [label, Bridgetown::Resource::TaxonomyType.new(
           site: self, label:, key:, metadata: tax_metadata
         ),]
-      end.with_dot_access
+      end.as_dots
     end
 
     # Get all loaded resources.

bridgetown-core/lib/bridgetown-core/layout.rb

@@ -2,6 +2,7 @@
 
 module Bridgetown
   class Layout
+    using HashWithDotAccess::Refinements
     include FrontMatter::Importer
     include LiquidRenderable
 
@@ -67,7 +68,7 @@ def initialize(site, base, name, from_plugin: false)
       @relative_path = @path.sub(@base_dir, "")
       @ext = File.extname(name)
 
-      @data = read_front_matter(@path)&.with_dot_access
+      @data = read_front_matter(@path)&.as_dots
     rescue SyntaxError => e
       Bridgetown.logger.error "Error:",
                               "Ruby Exception in #{e.message}"

bridgetown-core/lib/bridgetown-core/resource/base.rb

@@ -3,6 +3,7 @@
 module Bridgetown
   module Resource
     class Base # rubocop:todo Metrics/ClassLength
+      using HashWithDotAccess::Refinements
       include Comparable
       include Bridgetown::Publishable
       include Bridgetown::LayoutPlaceable
@@ -93,10 +94,7 @@ def relations
       #
       # @return [HashWithDotAccess::Hash]
       def front_matter_defaults
-        site.frontmatter_defaults.all(
-          relative_path.to_s,
-          collection.label.to_sym
-        ).with_dot_access
+        site.frontmatter_defaults.all(relative_path.to_s, collection.label.to_sym).as_dots
       end
 
       # @return [HashWithDotAccess::Hash]

bridgetown-core/lib/bridgetown-core/resource/taxonomy_type.rb

@@ -3,6 +3,8 @@
 module Bridgetown
   module Resource
     class TaxonomyType
+      using HashWithDotAccess::Refinements
+
       # @return [Bridgetown::Site]
       attr_reader :site
 
@@ -28,7 +30,7 @@ def initialize(site:, label:, key:, metadata:)
       def terms
         site.resources.map do |resource|
           resource.taxonomies[label].terms
-        end.flatten.group_by(&:label).with_dot_access
+        end.flatten.group_by(&:label).as_dots
       end
 
       def inspect

bridgetown-core/lib/bridgetown-core/site.rb

@@ -61,7 +61,7 @@ def initialize(config, label: :main, loaders_manager: nil)
       @reader          = Reader.new(self)
       @liquid_renderer = LiquidRenderer.new(self)
 
-      Bridgetown::Cache.base_cache["site_tmp"] = {}.with_dot_access
+      Bridgetown::Cache.base_cache["site_tmp"] = HashWithDotAccess::Hash.new
       ensure_not_in_dest
 
       Bridgetown::Current.sites[@label] = self

bridgetown-core/lib/bridgetown-core/static_file.rb

@@ -2,6 +2,7 @@
 
 module Bridgetown
   class StaticFile
+    using HashWithDotAccess::Refinements
     extend Forwardable
 
     attr_reader :relative_path, :extname, :name, :data, :site, :collection
@@ -34,7 +35,7 @@ def initialize(site, base, dir, name, collection = nil) # rubocop:disable Metric
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
-      @data = @site.frontmatter_defaults.all(relative_path, type).with_dot_access
+      @data = @site.frontmatter_defaults.all(relative_path, type).as_dots
       data.permalink ||= if collection && !collection.builtin?
                            "#{collection.default_permalink.chomp("/").chomp(".*")}.*"
                          else