json2pojo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8bb0a57399fc41a817393d8a2b527bd53f7155
-  data.tar.gz: ab2eee94d3fe62cfebbdbac9a1b92e17d04a103b
+  metadata.gz: a87241c0485afab7a960edc87811688b90f51ec6
+  data.tar.gz: b07c803d977f4f57b79e0e22d8cf00611af561ab
 SHA512:
-  metadata.gz: 057b59d341ded8eb3fa4838bc2a89a2534646b21c997c346b345fd31c4e589981e82d8f061af52f9d02f376179167afe8559c5afefa7dd6036740add71ee0d7e
-  data.tar.gz: d5e09427bfee05985c576d865a26aef359e876effeb3ff49a4bd897d1a85a0f97ad6483b8cdfcfa51aed00d67b3ae281bed8d962e92b4a6a332bc8af66990f65
+  metadata.gz: db1db607724683d993ae5592f4b2573aea407b6cd503337742734dfe4c48c7f1e03c9e3258e6f199297e45661ca42fff524448c5fc27b20c5bde9321557a0856
+  data.tar.gz: 4bd4bcf8f2706b392cf9b8501ca7e300f3015d3efb98be084ab15a522e8a9a46bf734ce8838db64e94c32637645f8e42647d787930d44eb898eea87498595919

data/lib/pojo_creator.rb

@@ -2,7 +2,7 @@ require "json"
 
 class PojoCreator
 
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
   def initialize(class_name)
     @class_name = get_class_name(class_name)
@@ -20,15 +20,15 @@ class PojoCreator
     prop_string = ""
 
     json.keys.each do |property|
-      if (json[property].class.to_s == "Hash")
+      prop_prefix = "\t@JsonProperty(\"#{property}\")\tprivate "
+      class_name = json[property].class.to_s
+      if (class_name == "Hash")
         @additional_classes << "class #{get_class_name(property)} {" + get_properties(json[property]) + "}"
-        prop_string += "\t@JsonProperty(\"#{property}\")\tprivate #{get_class_name(property)} #{get_field_name(property)};"
-      elsif(json[property].class.to_s == "Array")
+      elsif (class_name == "Array")
         @additional_classes << "class #{get_class_name(property)} {" + get_properties(json[property][0]) + "}"
-        prop_string += "\t@JsonProperty(\"#{property}\")\tprivate List<#{get_class_name(property)}> #{get_field_name(property)};"
-      else
-        prop_string += "\t@JsonProperty(\"#{property}\")\tprivate #{get_type(json[property])} #{get_field_name(property)};"
       end
+      prop_string += prop_prefix + get_type(json, property) + " " +  get_field_name(property) + ";"
+
     end
     prop_string
 
@@ -50,21 +50,26 @@ class PojoCreator
     snake_case_to_class_name(property)
   end
 
-  def get_type(value)
-
+  def get_type(json, key)
+    
     begin
-      Date.parse(value)
+      Date.parse(json[key])
       return "Date"
     rescue
 
     end
 
-    if value.class.to_s == "Fixnum"
+    class_name = json[key].class.to_s
+    if class_name == "Fixnum"
       return "Integer"
-    elsif value.class.to_s == "Float"
+    elsif class_name == "Float"
       return "Float"
-    elsif value.class.to_s == "FalseClass" or value.class.to_s == "TrueClass"
+    elsif class_name == "FalseClass" or class_name == "TrueClass"
       return "Boolean"
+    elsif class_name == "Hash"
+      return get_class_name(key)
+    elsif class_name == "Array"
+      return "List<" + get_class_name(key) + ">"
     else
       return "String"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json2pojo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Balazs Mester