jsontemplate 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184dd952362087d7b1090ff44ff04fa83cfebcf5
-  data.tar.gz: fee87b08802c49dba1a4b2a9be137c20763d9948
+  metadata.gz: 650217220c4a794fb5a58dfcbc27271efbe3672c
+  data.tar.gz: 80c01ac97ce7a7a3a06cf526ce9ffb5929d58955
 SHA512:
-  metadata.gz: 848fbf234a1524357e0d351b00ccc27d77b24797d71c915ac19c04ce2f00a4d4fdfbe5d35d3c6d5d123dc1c06872128e6fdb88ae40debd027775d8697364cd7f
-  data.tar.gz: 312c74709b2560086f3cc4aec2629db0831277ebe627df852dfbb498f1010e7fee1166a86022246997213881d70a49202f4fa6a5154fc927f8a0996a4e5c8a73
+  metadata.gz: 64274d0bb43ab4b8c98bd7f396b70bfe389e2bc7c53ffe0f12c2326ca58d30611f36b5330a47d91431467dbaca4388c2f4fe90e1683eeed65d16a1802ded76bb
+  data.tar.gz: 71524208b91d2b387b928c6e728ca2104d35ab8c63f470d14965d2d780f565f94e6c1ba431766a26882cb5e173687381be63887049304ff00d8ee125be10987a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsontemplate (0.4.0)
+    jsontemplate (0.4.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/jsontemplate/version.rb

@@ -1,3 +1,3 @@
 class JsonTemplate
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/jsontemplate.rb

@@ -31,17 +31,26 @@ class JsonTemplate
         map[v]
     end
 
+    def process_array(root)
+        root.collect do |v|
+           process(v)
+        end
+    end
+
+    def process(root=nil)
+        root ||= @json
+        return process_dict(root) if root.is_a?(Hash)
+        return process_array(root) if root.is_a?(Array)
+        return root
+    end
+
     def process_dict(root=nil)
         root ||= @json
 
-        return root if !root.is_a?(Hash) && !root.is_a?(Array)
+        return process(root) if !root.is_a?(Hash) # Backwards compat hack
 
         pairs = root.collect do |k,v|
-            if v.is_a?(Hash)
-                v = process_dict(v)
-            elsif v.is_a?(Array)
-                v = v.collect {|v_| process_dict(v_)}
-            end
+            v = process(v)
 
             if k == "$DirMerge"
                 process_dirmerge(v)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsontemplate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Vidar Hokstad