mock_proxy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c118fdb5559a6e6906597476ffe927e417339419
-  data.tar.gz: 909cf35aad9069f92cce0f21f17de03fe6489356
+  metadata.gz: f8c93f0ddff097c44b0ba16b2887f9b904655de2
+  data.tar.gz: 23738c6f5c1a902962ebef15fed5d97f0ed4e4b4
 SHA512:
-  metadata.gz: de97377cfc310783879d568738f0fc7acf57bb5455190f8b6846132da1e83fd415ab8bb70a22f7c2f0b4bd09eff66320482c5930a835e503e01bfcf0ef64f326
-  data.tar.gz: 58f8f9033e815d3ccda25ea216b3c3335c7090fc4aa509dfecdcf772521c5f19b2cb9629dc2a98edc6e3b73fa8fc1a0798a17edc223687fb3f1fca051ff33534
+  metadata.gz: f529ec870c4388f683991a8c5b9da8fe370ad9d6a45a593bc59b488ee92d12001bc9f5f911120678b82597fe1891f537937cc91cd83f9d43ae7829a94116d6a4
+  data.tar.gz: 8f329cb371bf6edff177ea6e0466e9241411dcc93fd34be87688b53eea96e3a7c6eba1d84241857a01f631bd963a41b98fea7c0cf4a02ccd1af2a226bde11958

data/lib/mock_proxy.rb

@@ -194,23 +194,35 @@ class MockProxy
   # @return [MockProxy] if proc existed at key path
   # @raise [ArgumentError] if proc not found or hash found at key path
   def self.set_callback(proxy, key_path, proc, validate = true)
+    fail ArgumentError, 'proc must be provided' unless proc
+    fail ArgumentError, 'proc must be a proc' unless proc.is_a?(Proc)
     # Validate by checking if proc exists at key path
     get_and_validate_callback(proxy, key_path) if validate
     # Set callback at key path, validating if set
     key_paths = key_path.is_a?(Array) ? key_path.map(&:to_s) : key_path.to_s.split('.')
     copied_callback_hash = Hash[proxy.instance_variable_get('@callback_hash')]
+    # NOTE: Using reduce for accumulator but don't need the return value
     key_paths.reduce(copied_callback_hash) do |callback_hash, key|
-      if !callback_hash || !callback_hash[key]
-        if validate
+      # Last key
+      if key_paths.last == key
+        # Type check value, if validate
+        if validate && !callback_hash[key].is_a?(Proc)
+          fail ArgumentError, "The existing callback tree contains the full key path you provided but continues going (i.e. no proc at exact key path). If you want to shorten the callback tree, use MockProxy.set_at. The callback tree looks like this: #{copied_callback_hash}"
+        else
+          # Assign new proc if pass validations
+          callback_hash[key] = proc
+        end
+      else
+        # In-between keys
+        # Check presence, if validate
+        if validate && !callback_hash[key]
           fail ArgumentError, "The existing callback tree does not contain the full key path you provided. We stopped at #{key} and the callback tree looks like this: #{copied_callback_hash}"
         else
-          callback_hash[key] = {}
+          # Assign new hash (i.e. create new key path) if there is none (validate won't
+          # create new path because it would have failed above)
+          callback_hash[key] ||= {}
         end
       end
-      if callback_hash[key].is_a?(Proc)
-        callback_hash[key] = proc
-      else
-        callback_hash[key]
       end
     end
     proxy.instance_variable_set('@callback_hash', copied_callback_hash)

data/lib/mock_proxy/version.rb

@@ -1,4 +1,4 @@
 class MockProxy
   # The version number
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - matrinox