collapsium 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac48359cda7fa845f6ee9bf88db8da16b190899d
-  data.tar.gz: c7c5c3c9c28978e1c85d397ea6a731bdaf911042
+  metadata.gz: 99a1088fec0a9bbcf2a9d47fb75e7447076e2c62
+  data.tar.gz: c0c3e428c35090a49f249beadff437fa6bda5bd4
 SHA512:
-  metadata.gz: eebf8ce4bcbab3920f3809ccb793e33da5b4343ec14c8e2c5b8edb7309f80a06e8b3c6c21dcad144484148c2adf56d19af21fbf9e3987ff3346ae95ec6d95891
-  data.tar.gz: da064743e896e5fe6505d2fc9dd5213adec4964dc93871b97a74592da0e0569df87590e3d75bde56ae532b1b7c7a1c5c7aeb309039998bd706deea7ff3f1730b
+  metadata.gz: c3336fb842483ffce622e2db745345cb2c3647fc17ba66d8b09ac7c082f88e4b538fcd72ced6b5c4614746a8a4c8c37b26fa363d07de3f425f9206b9b9434194
+  data.tar.gz: d548be9a8b9a4cf527024ae41e6e8563decebcbd08929137fbb4998bcee40b59c970c2454d18a84474a3de44f5d883d3a8010de5470e049258033fda4e2dbb26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    collapsium (0.8.0)
+    collapsium (0.8.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/collapsium/indifferent_access.rb

@@ -71,12 +71,12 @@ module Collapsium
         return sorted
       end
 
-      READ_METHODS = (
+      METHODS = (
           ::Collapsium::Support::HashMethods::KEYED_READ_METHODS \
           + ::Collapsium::Support::HashMethods::KEYED_WRITE_METHODS
       ).freeze
 
-      INDIFFERENT_ACCESS_READER = proc do |wrapped_method, *args, &block|
+      INDIFFERENT_ACCESS = proc do |wrapped_method, *args, &block|
         # Bail out early if the receiver is not a Hash. Do the same if we have
         # no key.
         receiver = wrapped_method.receiver
@@ -89,8 +89,11 @@ module Collapsium
         key = args.shift
         tries = IndifferentAccess.key_permutations(key)
 
-        # With the variations to try assembled, go through them one by one
-        result = nil
+        # With the variations to try assembled, go through them one by one. We
+        # define an inner class here for undefined results because 'nil' can be
+        # a legitimate result from the wrapped method.
+        class Undefined; end
+        result = Undefined
         tries.each do |try|
           if receiver.keys.include?(try)
             result = wrapped_method.call(try, *args, &block)
@@ -100,7 +103,7 @@ module Collapsium
 
         # If any of the above yielded a result, great, return that. Otherwise
         # yield to the default implementation (i.e. wrapped_method).
-        if not result.nil?
+        if result != Undefined
           next result
         end
         next wrapped_method.call(key, *args, &block)
@@ -123,9 +126,9 @@ module Collapsium
         base.extend(ViralCapabilities)
 
         # Wrap all accessor functions to deal with paths
-        READ_METHODS.each do |method|
+        METHODS.each do |method|
           wrap_method(base, method, raise_on_missing: false,
-                      &INDIFFERENT_ACCESS_READER)
+                      &INDIFFERENT_ACCESS)
         end
       end
     end # class << self

data/lib/collapsium/uber_hash.rb

@@ -22,13 +22,21 @@ module Collapsium
 
   # A Hash that includes all the different Hash extensions in collapsium
   class UberHash < Hash
+    # ViralCapabilities first, just to ensure everything will get inherited.
     include ViralCapabilities
+
+    # Access methods next.
+    include IndifferentAccess
+    include PathedAccess
+
+    # Recursive functionality should be able to use access methods, so they
+    # come next.
     include RecursiveMerge
     include RecursiveDup
     include RecursiveSort
     include RecursiveFetch
-    include PathedAccess
-    include IndifferentAccess
+
+    # Lastly, miscellaneous extensions
     include PrototypeMatch
 
     include Support::HashMethods

data/lib/collapsium/version.rb

@@ -8,5 +8,5 @@
 #
 module Collapsium
   # The current release version
-  VERSION = "0.8.0".freeze
+  VERSION = "0.8.1".freeze
 end

data/spec/pathed_access_spec.rb

@@ -273,7 +273,7 @@ describe ::Collapsium::PathedAccess do
       expect(res['bar']).to eql 42
     end
 
-    it "can write without overwriting" do
+    it "can write without duplication" do
       tester = {
         foo: {
           bar: 42,
@@ -284,11 +284,24 @@ describe ::Collapsium::PathedAccess do
       tester.extend(::Collapsium::IndifferentAccess)
 
       expect(tester['foo.bar']).to eql 42
+      expect(tester[:foo][:bar]).to eql 42
       expect(tester['foo.baz']).to eql 'quux'
+      expect(tester[:foo][:baz]).to eql 'quux'
+      expect(tester['foo'].length).to eql 2
 
       tester['foo.bar'] = 123
       expect(tester['foo.bar']).to eql 123
+      expect(tester[:foo][:bar]).to eql 123
       expect(tester['foo.baz']).to eql 'quux'
+      expect(tester[:foo][:baz]).to eql 'quux'
+      expect(tester['foo'].length).to eql 2
+
+      tester['foo.bar'] = nil
+      expect(tester['foo.bar']).to be_nil
+      expect(tester[:foo][:bar]).to be_nil
+      expect(tester['foo.baz']).to eql 'quux'
+      expect(tester[:foo][:baz]).to eql 'quux'
+      expect(tester['foo'].length).to eql 2
     end
 
     it "doesn't break #path_prefix" do

data/spec/uber_hash_spec.rb

@@ -37,6 +37,35 @@ describe Collapsium::UberHash do
     expect(x[:foo]).to eql 42
   end
 
+  it "mixes pathed and indifferent access well" do
+    x = ::Collapsium::UberHash.new(
+        foo: {
+          bar: 42,
+          baz: 'quux',
+        }
+    )
+
+    expect(x['foo.bar']).to eql 42
+    expect(x[:foo][:bar]).to eql 42
+    expect(x['foo.baz']).to eql 'quux'
+    expect(x[:foo][:baz]).to eql 'quux'
+    expect(x['foo'].length).to eql 2
+
+    x['foo.bar'] = 123
+    expect(x['foo.bar']).to eql 123
+    expect(x[:foo][:bar]).to eql 123
+    expect(x['foo.baz']).to eql 'quux'
+    expect(x[:foo][:baz]).to eql 'quux'
+    expect(x['foo'].length).to eql 2
+
+    x['foo.bar'] = nil
+    expect(x['foo.bar']).to be_nil
+    expect(x[:foo][:bar]).to be_nil
+    expect(x['foo.baz']).to eql 'quux'
+    expect(x[:foo][:baz]).to eql 'quux'
+    expect(x['foo'].length).to eql 2
+  end
+
   it "can be initialized without arguments" do
     x = ::Collapsium::UberHash.new
     expect(x.empty?).to be_truthy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collapsium
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler