jaspion-kilza 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a005f85f95e01c815452123d02f78882c2e6963e
-  data.tar.gz: d948698396da25947d4df8ce25d5f3a19fd90765
+  metadata.gz: f4bd19ba66c3c9b74c745750c4cb82ae424d9de9
+  data.tar.gz: e25b99e560d34b8abdba7777c89a576c4ab24e95
 SHA512:
-  metadata.gz: 62e6310c809fc212626296a14e2dacc8b58e185e2049e2777642bfa4abe50faf5ff726fbf8089ce6dde4e9ae3b5019f09f1d662e3b715bc1e61d4f604f00dcbd
-  data.tar.gz: 237145797b973ce882e5b7fa2699133c266ecb57f0ac3f878cf3beceb9862dc4b28b8f21e327fda0f46f64019184403c551fdc71217ccf4b4576e749c2ea14d4
+  metadata.gz: 6b4e6b21fd2eb25ef7e5f618a997a785a96155d5f7b662f89c2192276fcb5845e4df0f6687b5253a1096d9868836f00575ea843e8f3419d414ab09eeb228282e
+  data.tar.gz: 2f9497d13dce60eeb46b740c007257b31bae8d7e4f50c65c590a7875d469171c0f2a6d2fce5057f19db5b3b0a6d3349a1c7901914653eab1899f4691fcaa2fdb

data/lib/jaspion/kilza.rb

@@ -7,6 +7,8 @@ require 'jaspion/kilza/language'
 require 'jaspion/kilza/language/objc'
 require 'jaspion/kilza/language/java'
 require 'jaspion/kilza/language/swift'
+require 'jaspion/kilza/language/swift/class'
+require 'jaspion/kilza/language/swift/property'
 
 # Ruby class
 class String

data/lib/jaspion/kilza/class.rb

@@ -16,7 +16,8 @@ module Jaspion
       #
       # @param name [String] Class Name
       def initialize(name)
-        @name = Kilza.normalize(name).capitalize
+        @name = Kilza.clean(name)
+        @name[0] = @name[0].capitalize
         @properties = []
         @imports = []
       end
@@ -53,7 +54,7 @@ module Jaspion
 
         s = Kilza::Source.new
         s.source = eruby.result(binding)
-        s.file_name = @name.capitalize + '.' + file_name
+        s.file_name = @name + '.' + file_name
         s
       end
 

data/lib/jaspion/kilza/language.rb

@@ -14,8 +14,11 @@ module Jaspion
       # JSON that will be used to generate objects
       attr_accessor :json_string
 
-      # String that will be used to prefix reserved words
-      attr_accessor :reserved_delimiter
+      # String that will be used to posfix reserved words for classes
+      attr_accessor :reserved_class_posfix
+
+      # String that will be used to prefix reserved words for properties
+      attr_accessor :reserved_property_prefix
 
       # Words that will receive an undescore before property name
       attr_accessor :reserved_words
@@ -37,7 +40,8 @@ module Jaspion
         @classes = []
         @types = {}
         @reserved_words = []
-        @reserved_delimiter = '_'
+        @reserved_class_posfix = 'Class'
+        @reserved_property_prefix = '_'
         @equal_keys = []
       end
 
@@ -63,7 +67,7 @@ module Jaspion
       #
       # @return [Kilza::Class] new class
       def clazz(name)
-        name = @reserved_delimiter + name unless @reserved_words.index(name).nil?
+        name = name + @reserved_class_posfix unless @reserved_words.index(name.downcase).nil?
         Class.new(name)
       end
 
@@ -78,7 +82,7 @@ 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?
+        name = @reserved_property_prefix + name unless @reserved_words.index(name.downcase).nil?
         prop = Property.new(name , type, array, key)
         prop.original_name = original_name
         prop
@@ -91,7 +95,10 @@ module Jaspion
       #
       # @return [Kilza::Class] class with the specified name
       def find(name)
-        name = Kilza.normalize(name).capitalize
+        name = name + @reserved_class_posfix unless @reserved_words.index(name.downcase).nil?
+        name = Kilza.clean(name)
+        name[0] = name[0].capitalize
+
         @classes.each { |cl| return cl if cl.name == name }
         @classes.push(clazz(name))
         @classes.last

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

@@ -11,6 +11,7 @@ module Jaspion
 
         def initialize(name, package = nil)
           super(name)
+          @name = @name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
           @package = package
         end
 
@@ -27,7 +28,7 @@ module Jaspion
     class Java
       class Property < Jaspion::Kilza::Property
 
-        def json_key
+        def constants
           return '    private static final String FIELD_' +
           @name.upcase + ' = "' + @original_name + '";'
         end
@@ -81,6 +82,32 @@ module Jaspion
             parse_element
           end
         end
+
+        def setter
+          newname = @name.gsub(/_*(.+)/) { $1 }.capitalize
+          r = StringIO.new
+          if array?
+            r << "public void set#{newname}(ArrayList<#{@type}> value) {"
+          else
+            r << "public void set#{newname}(#{@type} value) {"
+          end
+          r << "\n        this.#{@name} = value;\n    }"
+          r.string
+        end
+
+        def getter
+          newname = @name.gsub(/_*(.+)/) { $1 }.capitalize
+          r = StringIO.new
+          if array?
+            r << "public ArrayList<#{@type}> get#{@name.capitalize}() {"
+          elsif boolean?
+            r << "public #{@type} is#{newname}() {"
+          else
+            r << "public #{@type} get#{newname}() {"
+          end
+          r << "\n        return this.#{@name};\n    }"
+          r.string
+        end
       end
     end
   end
@@ -92,17 +119,19 @@ module Jaspion
     class Java
       include Jaspion::Kilza::Language
 
+      RESERVED_PROPERTY_PREFIX = '_'
+      RESERVED_CLASS_POSFIX = 'Class'
+      RESERVED_WORDS = %w(
+        abstract continue for new switch assert default goto,
+        package synchronized boolean do if private this break double implements,
+        protected throw byte else import public throws case enum instanceof,
+        null return transient catch extends int short try char final interface static,
+        void class finally long strictfp volatile const float native super while
+      )
+
       def initialize(json_string)
         super(json_string)
 
-        @reserved_words = %w(
-          abstract continue for new switch assert default goto,
-          package synchronized boolean do if private this break double implements,
-          protected throw byte else import public throws case enum instanceof,
-          null return transient catch extends int short try char final interface static,
-          void class finally long strictfp volatile const float native super while
-        )
-
         @types = {
           'nilclass' => 'Object',
           'string' => 'String',
@@ -122,7 +151,7 @@ module Jaspion
 
       def property(name, type, array, key)
         original_name = name
-        name = @reserved_delimiter + name unless @reserved_words.index(name).nil?
+        name = RESERVED_PROPERTY_PREFIX + name unless RESERVED_WORDS.index(name).nil?
         prop = Jaspion::Kilza::Java::Property.new(name , type, array, key)
         prop.original_name = original_name
         prop
@@ -133,7 +162,10 @@ module Jaspion
 
         @classes.each do |cl|
           cl.properties.each do |pr|
-            pr.type = pr.name.capitalize if pr.object? || (pr.array? && pr.null?)
+            name = Kilza.clean(pr.original_name)
+            name[0] = name[0].capitalize
+            name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+            pr.type = name if pr.object? || (pr.array? && pr.null?)
 
             cl.imports.push('import java.util.ArrayList;') if pr.array? &&
               cl.imports.index('import java.util.ArrayList;').nil?

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

@@ -1,3 +1,7 @@
+/**
+* Created on <%= Time.now.strftime("%Y-%m-%d") %>
+* Generated by Kilza https://github.com/Jaspion/Kilza
+*/
 package <%= @package %>;
 
 import org.json.*;
@@ -14,13 +18,13 @@ import com.google.gson.annotations.Expose;
 public class <%= @name %> implements Serializable
 {
 <% for @property in @properties %>
-<%= @property.json_key %>
+<%= @property.constants %>
 <% end %>
 
 <% for @property in @properties %>
 <%= @property.declaration %>
-<% end %>
 
+<% end %>
     public <%= @name %>() {
 
     }
@@ -54,29 +58,20 @@ public class <%= @name %> implements Serializable
     }
 
 <% for @property in @properties %>
-    public void set<%= @property.name.capitalize %>(<%= @property.array? ? "ArrayList<" + @property.type + ">" : @property.type %> value) {
-        this.<%= @property.name %> = value;
-    }
+    <%= @property.setter %>
 
-    <% if @property.array? %>
-    public ArrayList<<%= @property.type %>> get<%= @property.name.capitalize %>() {
-    <% elsif @property.boolean? %>
-    public <%= @property.type %> is<%= @property.name.capitalize %>() {
-    <% else %>
-    public <%= @property.type %> get<%= @property.name.capitalize %>() {
-    <% end %>
-        return this.<%= @property.name %>;
-    }
+    <%= @property.getter %>
 
 <% end %>
 <%
 @eq = []
 @hs = []
 for @property in @properties
+  newname = @property.name.gsub(/_*(.+)/) { $1 }.capitalize
   if @property.boolean?
-    @eq.push("((#{@name}) obj).is#{@property.name.capitalize}().equals(#{@property.name})") if @property.key?
+    @eq.push("((#{@name}) obj).is#{newname}().equals(#{@property.name})") if @property.key?
   else
-    @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if @property.key?
+    @eq.push("((#{@name}) obj).get#{newname}().equals(#{@property.name})") if @property.key?
   end
   @hs.push("#{@property.name}.hashCode()") if @property.key?
 end

data/lib/jaspion/kilza/language/objc.rb

@@ -6,6 +6,26 @@ module Jaspion
       class Class
         include Jaspion::Kilza::Class
 
+        def initialize(name)
+          super(name)
+          @name = @name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+        end
+
+        def equals
+          r = StringIO.new
+          r << '- (BOOL)isEqual:(id)anObject {'
+          fields = []
+          for pr in @properties
+              fields.push("[((#{@name}) anObject).#{pr.name} isEqual:#{pr.name}]") if pr.key?
+          end
+          r << "\n    if (anObject instanceof #{@name}) {"
+          r << "        return (" + fields.join(" &&\n            ") + "});"
+          r << "\n    }"
+          r << "\n    return false;"
+          r << "\n}"
+          r.string
+        end
+
         def sources
           [code('objc', 'h'), code('objc', 'm')]
         end
@@ -14,29 +34,56 @@ module Jaspion
   end
 end
 
+module Jaspion
+  module Kilza
+    class Objc
+      class Property < Jaspion::Kilza::Property
+
+        def class_name
+          return if !object?
+          Jaspion::Kilza::Objc::Class.new(@original_name).name
+        end
+
+        def class_reference
+          return "@class #{class_name};" unless class_name.nil? || array?
+        end
+
+        def declaration
+          "@property (nonatomic, strong) #{@type} #{@name};"
+        end
+
+        def constants(cl_name)
+          "NSString *const k#{cl_name}#{@name.capitalize} = @\"#{@original_name}\";"
+        end
+
+      end
+    end
+  end
+end
+
 module Jaspion
   module Kilza
     # Objective-C Language parser
     class Objc
       include Jaspion::Kilza::Language
 
+      RESERVED_PROPERTY_PREFIX = '_'
+      RESERVED_CLASS_POSFIX = 'Class'
+      RESERVED_WORDS = %w(
+        auto break case char const continue,
+        class default do double else enum extern float for,
+        goto if id implementation inline int interface long,
+        new nonatomic property protocol readonly readwrite register,
+        restrict retain return short signed sizeof static strong,
+        struct switch typedef union unsafe_unretained unsigned void,
+        volatile weak while _bool _complex _imaginary sel imp,
+        bool nil yes no self super __strong __weak oneway,
+        in out inout bycopy byref
+      )
+
       def initialize(json_string)
         super(json_string)
 
-        @reserved_delimiter = '_my'
-
-        @reserved_words = %w(
-          auto break case char const continue,
-          class default do double else enum extern float for,
-          goto if id implementation inline int interface long,
-          new nonatomic property protocol readonly readwrite register,
-          restrict retain return short signed sizeof static strong,
-          struct switch typedef union unsafe_unretained unsigned void,
-          volatile weak while _bool _complex _imaginary sel imp,
-          bool nil yes no self super __strong __weak oneway,
-          in out inout bycopy byref
-        )
-
         @types = {
           'nilclass' => 'id',
           'string'  => 'NSString *',
@@ -51,17 +98,29 @@ module Jaspion
       end
 
       def clazz(name)
+        name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
         Jaspion::Kilza::Objc::Class.new(name)
       end
 
+      def property(name, type, array, key)
+        original_name = name
+        name = RESERVED_PROPERTY_PREFIX + name unless RESERVED_WORDS.index(name.downcase).nil?
+        prop = Jaspion::Kilza::Objc::Property.new(name , type, array, key)
+        prop.original_name = original_name
+        prop
+      end
+
       def classes(class_name)
         super(class_name)
 
         @classes.each do |cl|
           cl.properties.each do |pr|
             if pr.object? || (pr.array? && pr.null?)
-              pr.type = pr.name.capitalize + ' *'
-              cl.imports.push("#import \"#{pr.name.capitalize}.h\"")
+              name = Kilza.clean(pr.original_name)
+              name[0] = name[0].capitalize
+              name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+              pr.type = name + ' *'
+              cl.imports.push("#import \"#{name}.h\"")
             end
 
             pr.type = 'NSMutableArray *' if pr.array?

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

@@ -9,15 +9,15 @@
 #import <Foundation/Foundation.h>
 
 <% for @property in @properties %>
-<% if @property.object? && !@property.array? %>
-@class <%= @property.name.capitalize %>;
+<% unless @property.class_reference.nil? %>
+<%= @property.class_reference %>
 <% end %>
 <% end %>
 
 @interface <%= @name %> : NSObject <NSCoding, NSCopying>
 
 <% for @property in @properties %>
-@property (nonatomic, strong) <%= @property.type %> <%= @property.name %>;
+<%= @property.declaration %>
 <% end %>
 
 + (<%= @name %> *)modelWithDictionary:(NSDictionary *)dict;

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

@@ -13,7 +13,7 @@
 
 // Original names
 <% for @property in @properties %>
-NSString * const k<%= @name %><%= @property.name.capitalize %> = @"<%= @property.original_name %>";
+<%= @property.constants(name) %>
 <% end %>
 
 @interface <%= @name %> ()
@@ -24,145 +24,132 @@ NSString * const k<%= @name %><%= @property.name.capitalize %> = @"<%= @property
 
 @implementation <%= @name %>
 
-+ (<%= @name %> *)modelWithDictionary:(NSDictionary *)dict
-{
-  <%= @name %> *instance = [[<%= @name %> alloc] initWithDictionary:dict];
-  return instance;
++ (<%= @name %> *)modelWithDictionary:(NSDictionary *)dict {
+    <%= @name %> *instance = [[<%= @name %> alloc] initWithDictionary:dict];
+    return instance;
 }
 
-+ (<%= @name %> *)modelWithString:(NSString *)json
-{
-  <%= @name %> *instance = [[<%= @name %> alloc] initWithString:json];
-  return instance;
++ (<%= @name %> *)modelWithString:(NSString *)json {
+    <%= @name %> *instance = [[<%= @name %> alloc] initWithString:json];
+    return instance;
 }
 
-- (instancetype)initWithString:(NSString *)json
-{
-  self = [super init];
+- (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];
+    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
-                                      options:NSJSONReadingMutableContainers
-                                        error:&jsonError];
-  if (!jsonError)
-    self = [self initWithDictionary:dict];
-
-  return self;
+    NSError *jsonError = nil;
+    NSData *objectData = [json dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:objectData
+                                                         options:NSJSONReadingMutableContainers
+                                                           error:&jsonError];
+    if (!jsonError)
+        self = [self initWithDictionary:dict];
+
+    return self;
 }
 
-- (instancetype)initWithDictionary:(NSDictionary *)dict
-{
-  self = [super init];
+- (instancetype)initWithDictionary:(NSDictionary *)dict {
+    self = [super init];
 
-  if (self && [dict isKindOfClass:[NSDictionary class]])
-  {
+    if (self && [dict isKindOfClass:[NSDictionary class]]) {
 <% for @property in @properties %>
 <% if @property.object? || (@property.null? && @property.array?) %>
-    NSObject *obj<%= @property.name.capitalize %> = [dict objectForKey:k<%= @name %><%= @property.name.capitalize %>];
+        NSObject *obj<%= @property.class_name %> = [self objectOrNilForKey:k<%= @name %><%= @property.name.capitalize %> fromDictionary:dict];
 <% if @property.array? %>
-    if ([obj<%= @property.name.capitalize %> isKindOfClass:[NSArray class]])
-    {
-      NSMutableArray *list<%= @property.name.capitalize %> = [NSMutableArray array];
-      for (NSDictionary *item in (NSArray *)obj<%= @property.name.capitalize %>) {
-        if ([item isKindOfClass:[NSDictionary class]]) {
-          [list<%= @property.name.capitalize %> addObject:[<%= @property.name.capitalize %> modelWithDictionary:(NSDictionary *)item]];
+        if ([obj<%= @property.class_name %> isKindOfClass:[NSArray class]]) {
+            NSMutableArray *list<%= @property.class_name %> = [NSMutableArray array];
+            for (NSDictionary *item in (NSArray *)obj<%= @property.name.capitalize %>) {
+                if ([item isKindOfClass:[NSDictionary class]]) {
+                    [list<%= @property.class_name %> addObject:[<%= @property.class_name %> modelWithDictionary:(NSDictionary *)item]];
+                }
+            }
+            self.<%= @property.name %> = list<%= @property.name.capitalize %>;
         }
-      }
-      self.<%= @property.name %> = list<%= @property.name.capitalize %>;
-    }
 <% else %>
-    {
-      self.<%= @property.name %> = [<%= @property.name.capitalize %> modelWithDictionary:(NSDictionary *)obj<%= @property.name.capitalize %>];
-    }
+        if (obj<%= @property.class_name %>) {
+            self.<%= @property.name %> = [<%= @property.class_name %> modelWithDictionary:(NSDictionary *)obj<%= @property.class_name %>];
+        }
 <% end %>
 <% else %>
-    self.<%= @property.name %> = [self objectOrNilForKey:k<%= @name %><%= @property.name.capitalize %> fromDictionary:dict];
+        self.<%= @property.name %> = [self objectOrNilForKey:k<%= @name %><%= @property.name.capitalize %> fromDictionary:dict];
 <% end %>
 <% end %>
-  }
-  return self;
+    }
+    return self;
 }
 
-- (NSDictionary *)dictionaryRepresentation
-{
-  NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
+- (NSDictionary *)dictionaryRepresentation {
+    NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
 
 <% for @property in @properties %>
 <% if @property.object? || (@property.null? && @property.array?) %>
 <% if @property.array? %>
-  NSMutableArray *tempArray<%= @property.name.capitalize %> = [NSMutableArray array];
-  for (NSObject *subArray in self.<%= @property.name %>) {
-    if ([subArray respondsToSelector:@selector(dictionaryRepresentation)]) {
-       [tempArray<%= @property.name.capitalize %> addObject:[subArray performSelector:@selector(dictionaryRepresentation)]];
-    } else {
-       [tempArray<%= @property.name.capitalize %> addObject:subArray];
+    NSMutableArray *tempArray<%= @property.name.capitalize %> = [NSMutableArray array];
+    for (NSObject *subArray in self.<%= @property.name %>) {
+        if ([subArray respondsToSelector:@selector(dictionaryRepresentation)]) {
+            [tempArray<%= @property.name.capitalize %> addObject:[subArray performSelector:@selector(dictionaryRepresentation)]];
+        } else {
+            [tempArray<%= @property.name.capitalize %> addObject:subArray];
+        }
     }
-  }
-  [mutableDict setValue:[NSArray arrayWithArray:tempArray<%= @property.name.capitalize %>] forKey:k<%= @name %><%= @property.name.capitalize %>];
+    [mutableDict setValue:[NSArray arrayWithArray:tempArray<%= @property.name.capitalize %>] forKey:k<%= @name %><%= @property.name.capitalize %>];
 <% else %>
-  if ([self.<%= @property.name %> respondsToSelector:@selector(dictionaryRepresentation)]) {
-    [mutableDict setValue:[self.<%= @property.name %> performSelector:@selector(dictionaryRepresentation)] forKey:k<%= @name %><%= @property.name.capitalize %>];
-  } else {
-    [mutableDict setValue:self.<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
-  }
+    if ([self.<%= @property.name %> respondsToSelector:@selector(dictionaryRepresentation)]) {
+        [mutableDict setValue:[self.<%= @property.name %> performSelector:@selector(dictionaryRepresentation)] forKey:k<%= @name %><%= @property.name.capitalize %>];
+    } else {
+        [mutableDict setValue:self.<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
+    }
 <% end %>
 <% else %>
-  [mutableDict setValue:self.<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
+    [mutableDict setValue:self.<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
 <% end %>
 <% end %>
 
-  return [NSDictionary dictionaryWithDictionary:mutableDict];
+    return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
-- (NSString *)description
-{
-  return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
+- (NSString *)description {
+    return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
 }
 
 #pragma mark - Helper Method
-- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
-{
-  id object = [dict objectForKey:aKey];
-  return [object isEqual:[NSNull null]] ? nil : object;
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict {
+    id object = [dict objectForKey:aKey];
+    return [object isEqual:[NSNull null]] ? nil : object;
 }
 
 #pragma mark - NSCoding Methods
 
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-  self = [super init];
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super init];
 
 <% for @property in @properties %>
-  self.<%= @property.name %> = [aDecoder decodeObjectForKey:k<%= @name %><%= @property.name.capitalize %>];
+    self.<%= @property.name %> = [aDecoder decodeObjectForKey:k<%= @name %><%= @property.name.capitalize %>];
 <% end %>
 
-  return self;
+    return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (void)encodeWithCoder:(NSCoder *)aCoder {
 <% for @property in @properties %>
-  [aCoder encodeObject:_<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
+    [aCoder encodeObject:_<%= @property.name %> forKey:k<%= @name %><%= @property.name.capitalize %>];
 <% end %>
 }
 
-- (id)copyWithZone:(NSZone *)zone
-{
-  <%= @name %> *copy = [[<%= @name %> alloc] init];
-  if (copy)
-  {
+- (id)copyWithZone:(NSZone *)zone {
+    <%= @name %> *copy = [[<%= @name %> alloc] init];
+    if (copy) {
 <% for @property in @properties %>
-    copy.<%= @property.name %> = [self.<%= @property.name %> copyWithZone:zone];
+        copy.<%= @property.name %> = [self.<%= @property.name %> copyWithZone:zone];
 <% end %>
-  }
+    }
 
-  return copy;
+    return copy;
 }
 
 @end

data/lib/jaspion/kilza/language/swift.rb

@@ -1,42 +1,28 @@
 require 'date'
 
-module Jaspion
-  module Kilza
-    class Swift
-      class Class
-        include Jaspion::Kilza::Class
-
-        def sources
-          [code('swift', 'swift')]
-        end
-      end
-    end
-  end
-end
-
 module Jaspion
   module Kilza
     # Swift Language parser
     class Swift
       include Jaspion::Kilza::Language
 
+      RESERVED_PROPERTY_PREFIX = '_'
+      RESERVED_CLASS_POSFIX = 'Class'
+      RESERVED_WORDS = %w(
+        class break as associativity deinit case dynamicType
+        convenience enum continue false dynamic extension default
+        is didSet func do nil final import else self get init
+        fallthrough Self infix internal for super inout let
+        if true lazy operator in left private return mutating
+        protocol switch none public where nonmutating static
+        while optional struct override subscript postfix
+        typealias precedence var prefix required right set
+        type unowned weak id description
+      )
+
       def initialize(json_string)
         super(json_string)
 
-        @reserved_delimiter = '_my'
-
-        @reserved_words = %w(
-          class break as associativity deinit case dynamicType
-          convenience enum continue false dynamic extension default
-          is didSet func do nil final import else self get init
-          fallthrough Self infix internal for super inout let
-          if true lazy operator in left private return mutating
-          protocol switch none public where nonmutating static
-          while optional struct override subscript postfix
-          typealias precedence var prefix required right set
-          type unowned weak id
-        )
-
         @types = {
           'nilclass' => 'AnyObject',
           'string'  => 'String',
@@ -51,16 +37,29 @@ module Jaspion
       end
 
       def clazz(name)
+        name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
         Jaspion::Kilza::Swift::Class.new(name)
       end
 
+      def property(name, type, array, key)
+        original_name = name
+        name = RESERVED_PROPERTY_PREFIX + name unless RESERVED_WORDS.index(name.downcase).nil?
+        prop = Jaspion::Kilza::Swift::Property.new(name , type, array, key)
+        prop.original_name = original_name
+        prop
+      end
+
       def classes(class_name)
         super(class_name)
 
         @classes.each do |cl|
           cl.properties.each do |pr|
             if pr.object? || (pr.array? && pr.null?)
-              pr.type = pr.name.capitalize
+              name = Kilza.clean(pr.original_name)
+              name[0] = name[0].capitalize
+              name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+
+              pr.type = name
               cl.imports.push("import #{pr.name.capitalize}")
             end
 

data/lib/jaspion/kilza/language/swift/class.rb

@@ -0,0 +1,18 @@
+module Jaspion
+  module Kilza
+    class Swift
+      class Class
+        include Jaspion::Kilza::Class
+
+        def initialize(name)
+          super(name)
+          @name = @name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+        end
+
+        def sources
+          [code('swift', 'swift')]
+        end
+      end
+    end
+  end
+end

data/lib/jaspion/kilza/language/swift/property.rb

@@ -0,0 +1,23 @@
+require 'jaspion/kilza/language/swift/class'
+
+module Jaspion
+  module Kilza
+    class Swift
+      class Property < Jaspion::Kilza::Property
+        def class_name
+          return if !object? || array?
+          Jaspion::Kilza::Swift::Class.new(@original_name).name
+        end
+
+        def constants(cl_name)
+          "    static let k#{cl_name}#{@name.capitalize}: String = \"#{@original_name.gsub('"', '\"')}\""
+        end
+
+        def declaration
+          "    public var #{@name}: #{@type}?"
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 //
-//  <%= @name %>.m
+//  <%= @name %>.swift
 //
 //  Created on <%= Time.now.strftime("%Y-%m-%d") %>
 //  Copyright (c) <%= Time.now.strftime("%Y") %>. All rights reserved.
@@ -11,62 +11,66 @@ import Foundation
 public class <%= @name %>: NSObject, NSCoding {
     // Original names
 <% for @property in @properties %>
-    static let k<%= @name %><%= @property.name.capitalize %>: String = "<%= @property.original_name.gsub('"', '\"') %>"
+<%= @property.constants(@name) %>
 <% end %>
 
 <% for @property in @properties %>
     public var <%= @property.name %>: <%= @property.type %>?
 <% end %>
 
-    public class func model(obj: AnyObject) -> <%= @name %> {
+    public class func model(obj: AnyObject) -> <%= @name %>? {
         var instance: <%= @name %>?
         if (obj is String) {
             instance = <%= @name %>.init(str: obj as! String)
         } else if (obj is Dictionary<String, AnyObject>) {
             instance = <%= @name %>.init(dict: obj as! Dictionary)
         }
-        return instance!
+        return instance
     }
 
-    public convenience init(str: String) {
+    public convenience init?(str: String) {
 <% if @properties.length == 1 %>
         var nStr: String = str
         if let trimmed: String = str.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()) {
-          if !trimmed.hasPrefix("{") {
-            nStr = "{ \"\(<%= @name %>.k<%= @name %><%= @properties.first.name.capitalize %>)\" : \(str) }"
-          }
+            if !trimmed.hasPrefix("{") {
+                nStr = "{ \"\(<%= @name %>.k<%= @name %><%= @properties.first.name.capitalize %>)\" : \(str) }"
+            }
         }
 
         if let data = nStr.dataUsingEncoding(NSUTF8StringEncoding) {
 <% else %>
         if let data = str.dataUsingEncoding(NSUTF8StringEncoding) {
 <% end %>
-          do {
-              let object: AnyObject = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments)
-              self.init(dict: object as! Dictionary)
-          } catch _ as NSError {
-              self.init(dict: Dictionary())
-          }
+            do {
+                let object: AnyObject = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments)
+                self.init(dict: object as! Dictionary)
+            } catch _ as NSError {
+                self.init(dict: Dictionary())
+            }
         } else {
-          self.init(dict: Dictionary())
+            self.init(dict: Dictionary())
         }
     }
 
-    public init(dict: Dictionary<String, AnyObject>) {
-      super.init()
+    public init?(dict: Dictionary<String, AnyObject>) {
+        super.init()
 <% for @property in @properties %>
 <% if @property.object? || @property.null? %>
 <% if @property.array? %>
-        let obj<%= @property.name.capitalize %>: [AnyObject] = dict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>]! as! [AnyObject]
-        var list<%= @property.name.capitalize %> = <%= @property.type %>()
-        for item in obj<%= @property.name.capitalize %> {
-            if item is Dictionary<String, AnyObject> {
-                list<%= @property.name.capitalize %>.append(<%= @property.name.capitalize %>.model(item))
+        if let obj<%= @property.name.capitalize %>: [AnyObject] = dict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] as? [AnyObject] {
+
+            var list<%= @property.name.capitalize %> = <%= @property.type %>()
+                for item in obj<%= @property.name.capitalize %> {
+                if item is Dictionary<String, AnyObject> {
+                    list<%= @property.name.capitalize %>.append(<%= @property.name.capitalize %>.model(item))
+                }
             }
+            self.<%= @property.name %> = list<%= @property.name.capitalize %>
+        } else {
+            return nil
         }
-        self.<%= @property.name %> = list<%= @property.name.capitalize %>
 <% else %>
-        self.<%= @property.name %> = <%= @property.name.capitalize %>.model(dict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>]!)
+        self.<%= @property.name %> = <%= @property.class_name %>.model(dict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>]!)
 <% end %>
 <% else %>
         self.<%= @property.name %> = objectOrNil(forKey: <%= @name %>.k<%= @name %><%= @property.name.capitalize %>, fromDictionary:dict)<% if @property.type != 'AnyObject' %> as? <%= @property.type %><% end %>
@@ -91,7 +95,7 @@ public class <%= @name %>: NSObject, NSCoding {
         }
         mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = Array.init(tempArray<%= @property.name.capitalize %>)
 <% else %>
-        if let dic = <%= @property.name %>?.dictionaryRepresentation() {
+        if let dic = self.<%= @property.name %>?.dictionaryRepresentation() {
             mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = dic
         } else {
             mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = self.<%= @property.name %>
@@ -106,12 +110,12 @@ public class <%= @name %>: NSObject, NSCoding {
 
     public func objectOrNil(forKey key: String, fromDictionary dict: Dictionary<String, AnyObject>) -> AnyObject?
     {
-      if let object: AnyObject = dict[key] {
-        if !(object is NSNull) {
-          return object
+        if let object: AnyObject = dict[key] {
+            if !(object is NSNull) {
+                return object
+            }
         }
-      }
-      return nil
+        return nil
     }
 
     required public init(coder aDecoder: NSCoder) {

data/lib/jaspion/kilza/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaspion-kilza
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Toshiro Sugii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,8 @@ files:
 - lib/jaspion/kilza/language/objc/h.erb
 - lib/jaspion/kilza/language/objc/m.erb
 - lib/jaspion/kilza/language/swift.rb
+- lib/jaspion/kilza/language/swift/class.rb
+- lib/jaspion/kilza/language/swift/property.rb
 - lib/jaspion/kilza/language/swift/swift.erb
 - lib/jaspion/kilza/property.rb
 - lib/jaspion/kilza/source.rb