rusty_json 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49a5182155d7545c422ea591c173797cc9f53ab
-  data.tar.gz: bda3805e8dd9dd57af0c4e78dad6219b459fa620
+  metadata.gz: 586d28acc06307f6920e376bcae55b025ce42021
+  data.tar.gz: 6851dd830392776b050b8c14730267a5518e1066
 SHA512:
-  metadata.gz: bffdf0b482c56c02e3a0a577042a5382b95f438013f55f75b3ecea20dc3d4e9bdf848957c324d650caf123a9707db104dee06c379af5544c08da3d4673b90070
-  data.tar.gz: 5ec2b7f4d32dd95dc5e542572c783bc259d3b2a276705872f2c5098fc709f0bf8090b38d8afddc861cf90b532336cdc061315d3f95c46b0c1f712ea884a589a2
+  metadata.gz: 40753f7dd3e28fec338b956250501a9bced6d0b60cced4ae1130328087725fd8ed6620e51a8b7298492a1c9b76a6cc1a587b8b67febb53e39ed675f3e1285338
+  data.tar.gz: a3810f86f425c2b341527a5f061bbe513ba846f28c22494f1d29b383332dcb1ee5849a03ece019f7edf7a42c76bb88fe842388c4fddb90165ea827f26730a412

data/lib/rusty_json/parser.rb

@@ -18,9 +18,8 @@ module RustyJson
 
     def parse
       @parsed = JSON.parse(@json)
-      struct = RustStruct.new(@name, true)
       if @parsed.is_a? Hash
-        struct = parse_hash(@parsed, struct)
+        struct = parse_hash(@name, @parsed)
       end
       struct.to_s
     end
@@ -39,20 +38,22 @@ module RustyJson
       end
     end
 
+    def possible_new_struct(s)
+      match = @structs.find{|st| s == st}
+      s = match || s
+      if match.nil?
+        @structs << s
+      end
+      s
+    end
+
     def parse_parts(name, values, struct)
       if values.is_a? Array
         struct = parse_array(name, values, struct)
       elsif values.is_a? Hash
         n = parse_name(name.split('_').collect(&:capitalize).join)
         @struct_names << n
-        s = RustStruct.new(n)
-        s = parse_hash(values, s)
-        match = @structs.find{|st| s == st}
-        s = match || s
-        if match.nil?
-          @struct_names << n
-          @structs << s
-        end
+        s = possible_new_struct( parse_hash(n, values) )
         struct.add_value(name, s)
       else
         struct = parse_value(name, values, struct)
@@ -60,7 +61,9 @@ module RustyJson
       struct
     end
 
-    def parse_hash(hash, struct)
+    def parse_hash(n, hash)
+      struct = RustStruct.new(n)
+      @struct_names << n
       hash.each do |name, values|
         struct = parse_parts(name, values, struct)
       end

data/lib/rusty_json/version.rb

@@ -1,3 +1,3 @@
 module RustyJson
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rusty_json
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris MacNaughton