imperium 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b5342210c6ee5d4e7876d0899b224b36092bbb
-  data.tar.gz: 660c0bba85f85516ead3f5c8b00fe3ad7bb437fd
+  metadata.gz: 2dda117c132b075ad9351a9940055f2f53d29d36
+  data.tar.gz: a8ef9b691469f852dd0bbd67bbd0f3f654351565
 SHA512:
-  metadata.gz: 699233998e7e26e9036f2362b4a5ca6eff394e258935966609dde0215b6283dada530510c4ca537ca1a3d474c3739234e69133b7117095b3eb5722edbb8eef7a
-  data.tar.gz: f52e244277ad058e270ab111ebd287a6959ff9c2a65168d4bf399ebfee05c0ef0d93df5f26950400ac85acd985431b544a845d8a8b5cbd4af076097e3c2e0178
+  metadata.gz: fbb5a5c2fcd8b83edfa988b6b76d8e242bb95a056633a528685e6e00762ee376d42373196741fdd731210953e9a39f0d86729847093e9b27ff8bcbe3c934d66a
+  data.tar.gz: 8ca0ecaa2c8afbb24d02589d9667a0a97066a07a825a56816d3668d71bc2c88e9a17c854ec1a0b7ba21eebbcca1312039329d00aa05ac033ff3fc269dd23ce1d

data/lib/imperium/kv_get_response.rb

@@ -38,10 +38,14 @@ module Imperium
     end
 
     MERGING_FUNC = -> (_, old, new) {
-      if old.is_a?(Hash) && new.is_a?(Hash)
+      old_is_hash = old.is_a?(Hash)
+      new_is_hash = new.is_a?(Hash)
+      if old_is_hash && new_is_hash
         old.merge(new, &MERGING_FUNC)
+      elsif new_is_hash
+        new.merge(nil => old)
       else
-        new
+        old.merge(nil => new)
       end
     }
     private_constant :MERGING_FUNC
@@ -49,6 +53,10 @@ module Imperium
     # Extracts the values from the response and smashes them into a simple
     # object depending on options provided on the request.
     #
+    # If a value exists exactly at the prefix or exactly at a nested prefix
+    # with additional nested values the hash representing the nested values
+    # will have a `nil` key added to contain the un-nested value.
+    #
     # @example A nested hash constructed from recursively found values
     #   # Given a response including the following values (metadata ommitted for clarity):
     #   # [
@@ -58,6 +66,18 @@ module Imperium
     #   response = Imperium::KV.get('foo/bar/baz', :recurse)
     #   response.values # => {'first' => 'qux', 'second' => {'deep' => 'purple'}}
     #
+    # @example A nested hash constructed from recusively found values and repeated keys
+    #   # Given a response including the following values (metadata ommitted for clarity):
+    #   # [
+    #   #   {"Key" => "foo/bar", "Value" => "b25l\n"},
+    #   #   {"Key" => "foo/bar/baz", "Value" => "dHdv\n"}
+    #   #   {"Key" => "foo/bar/baz/qux", "Value" => "dGhyZWU=\n"}
+    #   # ]
+    #   response = Imperium::KV.get('foo/bar', :recurse)
+    #   response.values # => {
+    #     nil => 'one',
+    #     'baz' => {nil => 'two', qux' => 'three'},
+    #   }
     # @return [String] When the matching key is found without the `recurse`
     #   option as well as when a single value is found with the recurse option
     #   and the key exactly matches the prefix.
@@ -74,12 +94,7 @@ module Imperium
           found_objects.first.value
         else
           found_objects.inject({}) do |hash, obj|
-            if prefix.empty?
-              unprefixed_key = obj.key
-            else
-              unprefixed_key = obj.key[prefix.length + 1..-1]
-            end
-            key_parts = unprefixed_key.split('/')
+            key_parts = extract_key_parts(obj.key)
             hash.merge(construct_nested_hash(key_parts, obj.value), &MERGING_FUNC)
           end
         end
@@ -98,5 +113,19 @@ module Imperium
         {key => construct_nested_hash(key_parts, value)}
       end
     end
+
+    def extract_key_parts(key)
+      unprefixed_key = remove_prefix(key)
+      (unprefixed_key.nil? ? [nil] : unprefixed_key.split('/'))
+    end
+
+    def remove_prefix(key)
+      prefix.empty? ? key : key[(prefix.length + 1)..-1]
+      if prefix.empty?
+        unprefixed_key = key
+      else
+        unprefixed_key = key[prefix.length + 1..-1]
+      end
+    end
   end
 end

data/lib/imperium/version.rb

@@ -1,3 +1,3 @@
 module Imperium
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperium
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tyler Pickett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable