simple-immutable 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573eb118f7b46e8ecf7b89a0932cc1eba443a06d43572b2364c86a4d9ea1138d
-  data.tar.gz: 535879ee9c6697d0d106c809c56f92b84adb0e431bd5329acaf6fb33669cdb49
+  metadata.gz: 8b64e7bb0ef88ead17af2b5d1bca5ea4dc3a19c566a441ee8fe519afe7ac47c3
+  data.tar.gz: 4dedaf9317e816780dc86427b99a2b070a1ec46da22ca56446e8ceb120ba615a
 SHA512:
-  metadata.gz: '0475929a5809411bb352e8d1e7e87edbdf9301b6a6da44267a06993b60eed5939a46dacddf27d2eb5391e5bb707cba160bb9096116e4232bea584c7f2f373453'
-  data.tar.gz: b920bc63f731e455d53c4ff93fdcf8f9ca8dd6254505bd42340749bbdfda6b77a2bc61cd7a51aa351b2c0a8907064e17e954eb07cbecf65424946ac3f737249d
+  metadata.gz: '0029d88bfa9788f39948eacc0707af394d2702b31800ec86ef83e76f9e1b4dbeb672ce619877a5f0e9f09da93b9b1edcdf3a0dc471c84b73fd1fd8415f168a6e'
+  data.tar.gz: abd71b228155f72f7953868cd445722c013b3ce9067d9ecc2075cd5c518a12905a0cd3ed768d7adec505291b53f6f383ce0fc6b63e2b1181ff0887f2fdf7c09c

data/.rubocop.yml

@@ -30,3 +30,6 @@ Style/NumericPredicate:
 
 Metrics/MethodLength:
   Max: 20
+
+Lint/IneffectiveAccessModifier:
+  Enabled: false

data/Makefile

@@ -4,6 +4,7 @@ default: test
 
 test:
 	ruby test/immutable_test.rb
+	ruby test/immutable_w_null_record_test.rb
 	bin/rubocop
 
 release:

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/simple/immutable.rb

@@ -6,14 +6,14 @@ class Simple::Immutable
 
   # turns an object, which can be a hash or array of hashes, arrays, and scalars
   # into an object which you can use to access with dot methods.
-  def self.create(object, max_depth = 8)
+  def self.create(object, max_depth: 8, null_record: nil)
     case object
     when Array
       raise ArgumentError, "Object nested too deep (or inner loop?)" if max_depth < 0
 
-      object.map { |obj| create obj, max_depth - 1 }
+      object.map { |obj| create obj, null_record: null_record, max_depth: max_depth - 1 }
     when Hash
-      new(object)
+      new(object, null_record)
     else
       object
     end
@@ -22,7 +22,14 @@ class Simple::Immutable
   def self.raw_data(immutable)
     case immutable
     when SELF
-      immutable.instance_variable_get :@hsh
+      hsh = immutable.instance_variable_get :@hsh
+      null_record = immutable.instance_variable_get :@null_record
+
+      if null_record
+        null_record.merge(hsh)
+      else
+        hsh
+      end
     when Array
       immutable.map { |e| raw_data(e) }
     else
@@ -37,19 +44,35 @@ class Simple::Immutable
 
   private
 
-  def initialize(hsh)
+  def initialize(hsh, null_record = nil)
     @hsh = hsh
+    @null_record = null_record
+  end
+
+  # rubycop:disable Lint/IneffectiveAccessModifier
+
+  # fetches key from a hsh, regardless of it being a Symbol or a String.
+  # Yields the block if the key cannot be found.
+  def self.fetch_symbol_or_string_from_hash(hsh, key, &block)
+    if hsh
+      hsh.fetch(key.to_sym) do
+        hsh.fetch(key.to_s, &block)
+      end
+    else
+      yield
+    end
   end
 
   def method_missing(sym, *args, &block)
     if args.empty? && !block
-      begin
-        value = @hsh.fetch(sym.to_sym) { @hsh.fetch(sym.to_s) }
-        return SELF.create(value)
-      rescue KeyError
-        # STDERR.puts "Missing attribute #{sym} for Immutable w/#{@hsh.inspect}"
-        nil
+      value = SELF.fetch_symbol_or_string_from_hash(@hsh, sym) do
+        SELF.fetch_symbol_or_string_from_hash(@null_record, sym) do
+          # STDERR.puts "Missing attribute #{sym} for Immutable w/#{@hsh.inspect}"
+          super
+        end
       end
+
+      return SELF.create(value)
     end
 
     super

data/test/immutable_test.rb

@@ -85,7 +85,6 @@ class Simple::Immutable::TestCase < Test::Unit::TestCase
   end
 
   def test_raw_data
-    immutable = Immutable.create(hsh)
     expected  = hsh
 
     assert_equal(expected, Immutable.raw_data(immutable))

data/test/immutable_w_null_record_test.rb

@@ -0,0 +1,63 @@
+# rubocop:disable Metrics/AbcSize
+
+require "test-unit"
+require_relative "../lib/simple-immutable"
+
+class Simple::Immutable::WithNullRecordTestCase < Test::Unit::TestCase
+  Immutable = ::Simple::Immutable
+
+  def hsh
+    {
+      a: "a-value",
+      "b": "b-value",
+      "child": {
+        name: "childname",
+        grandchild: {
+          name: "grandchildname"
+        }
+      },
+      "children": [
+        "anna",
+        "arthur",
+        {
+          action: {
+            keep_your_mouth_shut: true
+          }
+        }
+      ]
+    }
+  end
+
+  def null_record
+    {
+      foo: "foo-value",
+      "bar" => "bar-value"
+    }
+  end
+
+  def immutable
+    Immutable.create hsh, null_record: null_record
+  end
+
+  def test_hash_access
+    assert_equal "a-value", immutable.a
+    assert_equal "b-value", immutable.b
+  end
+
+  def test_null_record_access
+    assert_equal "foo-value", immutable.foo
+    assert_equal "bar-value", immutable.bar
+  end
+
+  def test_missing_keys
+    assert_raise(NoMethodError) do
+      immutable.unknown
+    end
+  end
+
+  def test_raw_data
+    # raw data does contain null_record
+    expected = hsh.merge(null_record)
+    assert_equal(expected, Immutable.raw_data(immutable))
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple-immutable
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - radiospiel
 - mediapeers GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies: []
 description: Immutable ruby objects implementing dot and [] accessors.
 email: eno@radiospiel.org
@@ -33,10 +33,11 @@ files:
 - scripts/release.rb
 - simple-immutable.gemspec
 - test/immutable_test.rb
+- test/immutable_w_null_record_test.rb
 homepage: http://github.com/radiospiel/simple-immutable
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -51,9 +52,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Immutable ruby objects
 test_files:
 - test/immutable_test.rb
+- test/immutable_w_null_record_test.rb