Replace Hamster hash for user-accessible data with Hashie Indifferent access

middleman-core/lib/middleman-core/contracts.rb

@@ -18,16 +18,6 @@ if ENV['TEST'] || ENV['CONTRACTS'] == 'true'
       end
     end
 
-    class Frozen < CallableClass
-      def initialize(contract)
-        @contract = contract
-      end
-
-      def valid?(val)
-        (val.frozen? || val.nil? || [::TrueClass, ::FalseClass, ::Fixnum].include?(val.class)) && Contract.valid?(val, @contract)
-      end
-    end
-
     VectorOf = Contracts::CollectionOf::Factory.new(::Hamster::Vector)
     ResourceList = Contracts::ArrayOf[IsA['Middleman::Sitemap::Resource']]
   end

middleman-core/lib/middleman-core/sitemap/resource.rb

@@ -87,8 +87,8 @@ module Middleman
       end
 
       # Data about this resource, populated from frontmatter or extensions.
-      # @return [IndifferentHash]
+      # @return [Hash]
-      Contract IsA['Middleman::Util::IndifferentHash']
+      Contract RespondTo[:indifferent_access?]
       def data
         ::Middleman::Util.recursively_enhance(metadata[:page])
       end

middleman-core/lib/middleman-core/util.rb

@@ -11,8 +11,8 @@ require 'rack/mime'
 # DbC
 require 'middleman-core/contracts'
 
-# Immutable Data
+# Indifferent Access
-require 'hamster'
+require 'hashie'
 
 # For URI templating
 require 'addressable/uri'
@@ -76,56 +76,25 @@ module Middleman
       end
     end
 
-    class IndifferentHash < ::Hamster::Hash
+    class EnhancedHash < ::Hash
-      def [](key)
+      include ::Hashie::Extensions::MergeInitializer
-        if key?(key.to_sym)
+      include ::Hashie::Extensions::MethodReader
-          super(key.to_sym)
+      include ::Hashie::Extensions::IndifferentAccess
-        elsif key?(key.to_s)
-          super(key.to_s)
-        else
-          super
-        end
     end
 
-      def method_missing(key, *_args)
+    # Recursively convert a normal Hash into a EnhancedHash
-        if key?(key.to_sym)
-          self[key.to_sym]
-        elsif key?(key.to_s)
-          self[key.to_s]
-        end
-      end
-    end
-
-    # Recursively convert a normal Hash into a IndifferentHash
     #
     # @private
     # @param [Hash] data Normal hash
-    # @return [Middleman::Util::IndifferentHash]
+    # @return [Hash]
-    FrozenDataStructure = Frozen[Or[IndifferentHash, Array, String, TrueClass, FalseClass, Fixnum, NilClass]]
+    Contract Maybe[Hash] => Maybe[Or[Array, EnhancedHash]]
-    Contract Maybe[Or[String, Array, Hash, IndifferentHash]] => Maybe[FrozenDataStructure]
     def recursively_enhance(obj)
-      case obj
+      if obj.is_a? ::Array
-      when ::Hash
+        obj.map { |e| recursively_enhance(e) }.freeze
-        res = obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] }
+      elsif obj.is_a? ::Hash
-        IndifferentHash.new(res)
+        EnhancedHash.new(obj).freeze
-      when IndifferentHash
-        obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] }
-      when ::Array
-        res = obj.map { |element| recursively_enhance(element) }
-        Hamster::Vector.new(res)
-      when ::SortedSet
-        # This clause must go before ::Set clause, since ::SortedSet is a ::Set.
-        res = obj.map { |element| recursively_enhance(element) }
-        Hamster::SortedSet.new(res)
-      when ::Set
-        res = obj.map { |element| recursively_enhance(element) }
-        Hamster::Set.new(res)
-      when Hamster::Vector, Hamster::Set, Hamster::SortedSet
-        obj.map { |element| recursively_enhance(element) }
-      when ::TrueClass, ::FalseClass, ::Fixnum, ::Symbol, ::NilClass, ::Float
-        obj
       else
-        obj.dup.freeze
+        obj
       end
     end
 

middleman-core/lib/middleman-core/util/data.rb

@@ -29,7 +29,7 @@ module Middleman
 
       # Get the frontmatter and plain content from a file
       # @param [String] path
-      # @return [Array<Middleman::Util::IndifferentHash, String>]
+      # @return [Array<Hash, String>]
       Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]]
       def parse(full_path, known_type=nil)
         data = {}

middleman-core/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.0.0.beta.2' unless const_defined?(:VERSION)
+  VERSION = '4.0.0.beta.3' unless const_defined?(:VERSION)
 end

middleman-core/middleman-core.gemspec

@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   # Testing
   s.add_dependency('contracts', ['~> 0.9.0'])
 
-  # Immutability
+  # Hash stuff
+  s.add_dependency('hashie', ['~> 3.4'])
   s.add_dependency('hamster', ['~> 1.0'])
 end

middleman-core/spec/middleman-core/util_spec.rb

@@ -54,43 +54,23 @@ describe Middleman::Util do
   end
 
   describe "::recursively_enhance" do
-    it "returns IndifferentHash if given one" do
+    it "returns Hashie extended Hash if given a hash" do
-      input   = Middleman::Util::IndifferentHash.new({test: "subject"})
-      subject = Middleman::Util.recursively_enhance input
-
-      expect( subject ).to be_a Middleman::Util::IndifferentHash
-      expect( subject.test ).to eq "subject"
-    end
-
-    it "returns IndifferentHash if given a hash" do
       input   = {test: "subject"}
       subject = Middleman::Util.recursively_enhance input
       
-      expect( subject ).to be_a Middleman::Util::IndifferentHash
       expect( subject.test ).to eq "subject"
     end
 
     it "returns Array with strings, or IndifferentHash, true, false" do
-      indifferent_hash = Middleman::Util::IndifferentHash.new({test: "subject"})
+      indifferent_hash = {test: "subject"}
       regular_hash     = {regular: "hash"}
       input   = [ indifferent_hash, regular_hash, true, false ]
       subject = Middleman::Util.recursively_enhance input
 
-      expect( subject[0] ).to be_a Middleman::Util::IndifferentHash
-      expect( subject[1] ).to be_a Middleman::Util::IndifferentHash
       expect( subject[1].regular ).to eq "hash"
       expect( subject[2] ).to eq true
       expect( subject[3] ).to eq false
     end
-
-    it "returns duplicated & frozen original object if not special cased" do
-      input   = "foo"
-      subject = Middleman::Util.recursively_enhance input
-
-      expect( subject ).to eq input
-      expect( subject.object_id ).not_to eq input.object_id
-      expect( subject ).to be_frozen
-    end
   end
 
 end