rusty_json 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2144aa6c5054069d1f941651e994d43a5b464df5
-  data.tar.gz: 38e1c86e62c3483d5b1728ff7c6dd25e3cce4939
+  metadata.gz: c49a5182155d7545c422ea591c173797cc9f53ab
+  data.tar.gz: bda3805e8dd9dd57af0c4e78dad6219b459fa620
 SHA512:
-  metadata.gz: 1d2bef7ba8b83355d15061b97e9f93c0d0561dd325d5ba54963491f68295ef06bf91679bff9772f12f30070e5cd9bdc81db1386e232c4f472042af401a44f573
-  data.tar.gz: d11cf157e574365a92a01acb1fc3d723e4aeef9cab59b3f70510868e079ccab544c1d4364de096cb6ef22e903578ee5b45fc2151563f6a69acc5af52a9f5d62f
+  metadata.gz: bffdf0b482c56c02e3a0a577042a5382b95f438013f55f75b3ecea20dc3d4e9bdf848957c324d650caf123a9707db104dee06c379af5544c08da3d4673b90070
+  data.tar.gz: 5ec2b7f4d32dd95dc5e542572c783bc259d3b2a276705872f2c5098fc709f0bf8090b38d8afddc861cf90b532336cdc061315d3f95c46b0c1f712ea884a589a2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
 - 2.0.0
 - 2.1.7

data/lib/rusty_json/parser.rb

@@ -18,7 +18,7 @@ module RustyJson
 
     def parse
       @parsed = JSON.parse(@json)
-      struct = RustStruct.new(@name)
+      struct = RustStruct.new(@name, true)
       if @parsed.is_a? Hash
         struct = parse_hash(@parsed, struct)
       end
@@ -27,22 +27,23 @@ module RustyJson
 
     private
 
+    def parse_name(n)
+      if @struct_names.include? n
+        i = 2
+        while @struct_names.include? "#{n}_#{i}"
+          i += 1
+        end
+        "#{n}_#{i}"
+      else
+        n
+      end
+    end
+
     def parse_parts(name, values, struct)
       if values.is_a? Array
         struct = parse_array(name, values, struct)
       elsif values.is_a? Hash
-        n = name.split('_').collect(&:capitalize).join
-        # binding.pry if n.include? 'Key'
-        n = if @struct_names.include? n
-          parts = n.split('_')
-          if parts.count > 1
-            "#{parts[0]}_#{parts[1].to_i + 1}"
-          else
-            n + "_2"
-          end
-        else
-          n
-        end
+        n = parse_name(name.split('_').collect(&:capitalize).join)
         @struct_names << n
         s = RustStruct.new(n)
         s = parse_hash(values, s)

data/lib/rusty_json/rust_struct.rb

@@ -9,7 +9,8 @@ module RustyJson
       Array => 'Vec',
     }
 
-    def initialize(name)
+    def initialize(name, root = false)
+      @root = root
       @printed = false
       @name = name
       @values = {}
@@ -18,6 +19,9 @@ module RustyJson
 
     def reset
       @printed = false
+      @structs.each do |s|
+        s.reset
+      end
     end
 
     def add_value(name, type, subtype = nil)
@@ -71,6 +75,10 @@ struct #{@name} {
       struct << <<-RUST
 }
       RUST
+      if @root
+        reset
+      end
+      struct
     end
 
     private

data/lib/rusty_json/version.rb

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

metadata

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