jaspion-kilza 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7abc9dfe396f9eef474cf11b374b791d3750b1
-  data.tar.gz: 60814db03aaf45197f5f36c70bba4b54882883fc
+  metadata.gz: eb863f539668936bbfcc38b09be56efe00fc9c58
+  data.tar.gz: 4cdea48ae8354c0b4d1dcb48238a0c21848c51c7
 SHA512:
-  metadata.gz: 0da939967226bd29ee3b9ab272f596ee07faf252a8c6b1dd1cd199b34ddb4d966452b7bc4817a65599aaef40f6e75a6dd8eb2917db9edefbe463e717f3089397
-  data.tar.gz: f9e4469139c16cea2fc524709f36c304b2d4534cb56e982fe4ab7a52961c0e0d9d645905bd93514049b81bc253e34af985d2c24ed0da10955b0702acd27be105
+  metadata.gz: 54acf2e90227058d1a6dc5c31d683bf42834f5a02ffe77bc695de8939d840be17b0426da5d476db5b86bdc73d9963f89a062af668a98583d2076ad48ca7f013b
+  data.tar.gz: 2895c608667a76fff1a22820532aad55faa9265154e953d68c9bdaa2dac36c478c6f7a2adc74eaecbcdb32bdc7e5b7b25522660fe3a64e47fa56ce7f441a0632

data/lib/jaspion/kilza.rb

@@ -28,6 +28,7 @@ module Jaspion
     #
     # @return [String] cleaned string
     def self.clean(str)
+      return if str.nil?
       str = '_' + str if str[0].number?
       str.gsub(/[^a-zA-Z0-9]/, '_')
     end
@@ -38,6 +39,7 @@ module Jaspion
     #
     # @return [String] cleaned string
     def self.normalize(str)
+      return if str.nil?
       Jaspion::Kilza.clean(str).downcase
     end
   end

data/lib/jaspion/kilza/language.rb

@@ -26,6 +26,12 @@ module Jaspion
       # Hash table with all language types mapped to target language
       attr_accessor :types
 
+      # Initializes the language
+      # If json_string is not a Hash {}, it will surroud the json with
+      # { "base_name"} = json_string
+      #
+      # @param json_string [String] JSON String
+      #
       def initialize(json_string)
         @json_string = json_string
         @classes = []
@@ -70,8 +76,11 @@ module Jaspion
       #
       # @return [Kilza::Property] new property
       def property(name, type, array, key)
+        original_name = name
         name = @reserved_delimiter + name unless @reserved_words.index(name).nil?
-        Property.new(name, type, array, key)
+        prop = Property.new(name , type, array, key)
+        prop.original_name = original_name
+        prop
       end
 
       # Searches for a Kilza::Class inside @classes

data/lib/jaspion/kilza/language/java/java.erb

@@ -44,6 +44,10 @@ public class <%= @name %> implements Serializable
     }
 
     protected void parseString(String jsonString) throws JSONException {
+<% if @properties.length == 1 %>
+        if (!jsonString.trim().startsWith("{"))
+            jsonString = "{\"" + FIELD_<%= @properties.first.name.upcase %> + "\" : " + jsonString + "}";
+<% end %>
         JSONObject jsonObject = new JSONObject(jsonString);
         parseObject(jsonObject);
     }

data/lib/jaspion/kilza/language/objc/m.erb

@@ -38,7 +38,12 @@ NSString * const k<%= @name %><%= @property.name.capitalize %> = @"<%= @property
 - (instancetype)initWithString:(NSString *)json
 {
   self = [super init];
+<% if @properties.length == 1 %>
 
+  if (![[json stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] hasPrefix:@"{"])
+    json = [NSString stringWithFormat:@"{ \"%@\" : %@ }", k<%= @name %><%= @properties.first.name.capitalize %>, json];
+
+<% end %>
   NSError *jsonError = nil;
   NSData *objectData = [json dataUsingEncoding:NSUTF8StringEncoding];
   NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:objectData

data/lib/jaspion/kilza/version.rb

@@ -1,6 +1,6 @@
 # Tranforms a JSON string into Objects
 module Jaspion
   module Kilza
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jaspion-kilza
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Toshiro Sugii