jaspion-kilza 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4bd19ba66c3c9b74c745750c4cb82ae424d9de9
-  data.tar.gz: e25b99e560d34b8abdba7777c89a576c4ab24e95
+  metadata.gz: 2ba6bd6fcbaf07090a7b8fbb96f2a42770b83184
+  data.tar.gz: 4f3c0d86a9a346327f9f67f0d6ba5a3ab1127519
 SHA512:
-  metadata.gz: 6b4e6b21fd2eb25ef7e5f618a997a785a96155d5f7b662f89c2192276fcb5845e4df0f6687b5253a1096d9868836f00575ea843e8f3419d414ab09eeb228282e
-  data.tar.gz: 2f9497d13dce60eeb46b740c007257b31bae8d7e4f50c65c590a7875d469171c0f2a6d2fce5057f19db5b3b0a6d3349a1c7901914653eab1899f4691fcaa2fdb
+  metadata.gz: 4d53ded510827a5b16fcde8569c4434d50a95d62707555dcaa73005c5fb7e2f3f8bbd62c9317d6b07d1197b37b5b4bbaf5e00cb626e31c9e7c8c67d59c13d843
+  data.tar.gz: f60a8b7ec1b71629310aaa9df292fea03efb36204f61b20139f7c629746fd1563a3a549b41221870bbd39567e8e8e58fb6fea40cc212f5b9bb41e437d888a329

data/README.md

@@ -1,6 +1,6 @@
 # Jaspion Kilza
 
-[![Gem Version](https://badge.fury.io/rb/kilza.svg)](https://badge.fury.io/rb/kilza)
+[![Gem Version](https://badge.fury.io/rb/jaspion-kilza.svg)](https://badge.fury.io/rb/jaspion-kilza)
 
 [![Build Status](https://travis-ci.org/Jaspion/Kilza.svg?branch=master)](https://travis-ci.org/Jaspion/Kilza)
 

data/lib/jaspion/kilza.rb

@@ -5,7 +5,11 @@ require 'jaspion/kilza/class'
 require 'jaspion/kilza/property'
 require 'jaspion/kilza/language'
 require 'jaspion/kilza/language/objc'
+require 'jaspion/kilza/language/objc/class'
+require 'jaspion/kilza/language/objc/property'
 require 'jaspion/kilza/language/java'
+require 'jaspion/kilza/language/java/class'
+require 'jaspion/kilza/language/java/property'
 require 'jaspion/kilza/language/swift'
 require 'jaspion/kilza/language/swift/class'
 require 'jaspion/kilza/language/swift/property'
@@ -22,28 +26,32 @@ class String
   end
 end
 
+# Ruby class
+class Array
+  # Inserts an separator between each element
+  #
+  # @param sep [String] string to be used as separator
+  #
+  # @return [Array] the new array
+  def separate(sep = '')
+    a = self
+    l = a.length - 2
+    (0..l).each { |i| a.insert(((2 * i) + 1), sep) }
+    a
+  end
+
+  # Inserts an separator between each element
+  #
+  # @param sep [String] string to be used as separator
+  def separate!(sep = '')
+    l = length - 2
+    (0..l).each { |i| insert(((2 * i) + 1), sep) }
+  end
+end
+
 # Tranforms a JSON string into Objects
 module Jaspion
   module Kilza
-    # Removes everything except numbers and letters.
-    #
-    # @param str [String] string to be cleaned
-    #
-    # @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
 
-    # Cleans the string and make it lowercase.
-    #
-    # @param str [String] string to be cleaned
-    #
-    # @return [String] cleaned string
-    def self.normalize(str)
-      return if str.nil?
-      Jaspion::Kilza.clean(str).downcase
-    end
   end
 end

data/lib/jaspion/kilza/class.rb

@@ -5,10 +5,6 @@ module Jaspion
       # Class name
       attr_accessor :name
 
-      # Array with all class dependecies
-      # Specific for each language
-      attr_accessor :imports
-
       # Array with all class properties
       attr_accessor :properties
 
@@ -16,18 +12,22 @@ module Jaspion
       #
       # @param name [String] Class Name
       def initialize(name)
-        @name = Kilza.clean(name)
-        @name[0] = @name[0].capitalize
+        @name = Jaspion::Kilza::Class.normalize(name)
+        # @name[0] = @name[0].capitalize
         @properties = []
         @imports = []
       end
 
+      def imports
+        @imports.sort.separate.flatten
+      end
+
       # Adds a new property
       #
       # @param property [Kilza::Property] Property to include
       def push(property)
         index = @properties.index(property)
-        if !index.nil?
+        unless index.nil?
           current = @properties[index]
           @properties[index] = update(current, property)
         else
@@ -68,6 +68,25 @@ module Jaspion
         }.to_s
       end
 
+      # Adds an new import statement
+      #
+      # @param import [String|Array] The whole statement that has to be printted
+      #                              It can be an Array
+      def push_import(import)
+        import = [import] if import.is_a? String
+        index = @imports.index(import)
+        @imports.push(import) if index.nil?
+      end
+
+      # Removes an new import statement
+      #
+      # @param import [String|Array] The statement to be removed
+      def delete_import(import)
+        import = [import] if import.is_a? String
+        i = @imports.index(import)
+        @imports.delete_at(i) unless i.nil?
+      end
+
       protected
 
       # Compares two properties and fill the src property with relevant
@@ -84,6 +103,21 @@ module Jaspion
         src.key = dst.key unless src.key
         src
       end
+
+      # Removes everything except numbers and letters
+      # and removes all _ at the beginning and capitalizes the first character
+      #
+      # @param str [String] string to be cleaned
+      #
+      # @return [String] cleaned string
+      def self.normalize(str)
+        return if str.nil?
+        str = '_' + str if str[0].number?
+        str = str.gsub(/[^a-zA-Z0-9]/, '')
+        str = str.gsub(/_*(.+)/) { $1 }
+        str[0] = str[0].capitalize
+        str
+      end
     end
   end
 end

data/lib/jaspion/kilza/language.rb

@@ -14,12 +14,6 @@ module Jaspion
       # JSON that will be used to generate objects
       attr_accessor :json_string
 
-      # 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
 
@@ -40,8 +34,6 @@ module Jaspion
         @classes = []
         @types = {}
         @reserved_words = []
-        @reserved_class_posfix = 'Class'
-        @reserved_property_prefix = '_'
         @equal_keys = []
       end
 
@@ -67,7 +59,10 @@ module Jaspion
       #
       # @return [Kilza::Class] new class
       def clazz(name)
-        name = name + @reserved_class_posfix unless @reserved_words.index(name.downcase).nil?
+        # cl_name = self.class.name.split('::').last
+        # cl = Jaspion::Kilza.const_get("#{cl_name}::Class")
+        # return cl.new(name) unless cl.nil?
+        #
         Class.new(name)
       end
 
@@ -82,7 +77,6 @@ module Jaspion
       # @return [Kilza::Property] new property
       def property(name, type, array, key)
         original_name = name
-        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
@@ -95,9 +89,7 @@ module Jaspion
       #
       # @return [Kilza::Class] class with the specified name
       def find(name)
-        name = name + @reserved_class_posfix unless @reserved_words.index(name.downcase).nil?
-        name = Kilza.clean(name)
-        name[0] = name[0].capitalize
+        name = Jaspion::Kilza::Class::normalize(name)
 
         @classes.each { |cl| return cl if cl.name == name }
         @classes.push(clazz(name))

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

@@ -1,118 +1,5 @@
 require 'date'
 
-module Jaspion
-  module Kilza
-    class Java
-      class Class
-        include Jaspion::Kilza::Class
-
-        # Represents the Java class package
-        attr_accessor :package
-
-        def initialize(name, package = nil)
-          super(name)
-          @name = @name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
-          @package = package
-        end
-
-        def sources
-          [code('java', 'java')]
-        end
-      end
-    end
-  end
-end
-
-module Jaspion
-  module Kilza
-    class Java
-      class Property < Jaspion::Kilza::Property
-
-        def constants
-          return '    private static final String FIELD_' +
-          @name.upcase + ' = "' + @original_name + '";'
-        end
-
-        def declaration
-          r = %(    @Expose
-    @SerializedName(FIELD_#{@name.upcase})
-)
-
-          if array?
-            r + "    private ArrayList<#{@type}> #{@name};"
-          else
-            r + "    private #{@type} #{@name};"
-          end
-        end
-
-        def parse_element
-          if object?
-            "        this.#{@name} = new #{@type}(object.optJSONObject(FIELD_#{@name.upcase}));"
-          elsif null?
-            "        this.#{@name} = object.opt(FIELD_#{@name.upcase});"
-          else
-            "        this.#{@name} = object.opt#{@type}(FIELD_#{@name.upcase});"
-          end
-        end
-
-        def parse_array
-          r = %(        if (object.optJSONArray(FIELD_#{@name.upcase}) != null)
-        {
-            this.#{@name} = new ArrayList<>();
-            JSONArray #{@name}JsonArray = object.optJSONArray(FIELD_#{@name.upcase});
-            for (int i = 0; i < #{@name}JsonArray.length(); i++) {
-          )
-
-          if object? || null?
-            r = r + "      JSONObject #{@name} = #{@name}JsonArray.optJSONObject(i);"
-          else
-            r = r + "      #{@type} #{@name} = #{@name}JsonArray.optJSON#{@type}(i);"
-          end
-          r = r + %(
-                this.#{@name}.add(new #{@type}(#{@name}));
-            }
-        })
-          return r
-        end
-
-        def parse_json
-          if array?
-            parse_array
-          else
-            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
-end
-
 module Jaspion
   module Kilza
     # Objective-C Language parser
@@ -128,20 +15,19 @@ module Jaspion
         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',
+        'fixnum'      => 'Long',
+        'float'       => 'Double',
+        'falseclass'  => 'Boolean',
+        'trueclass'   => 'Boolean',
+        'hash'        => 'Object'
+      }
 
       def initialize(json_string)
         super(json_string)
 
-        @types = {
-          'nilclass' => 'Object',
-          'string' => 'String',
-          'fixnum' => 'Long',
-          'float' => 'Double',
-          'falseclass' => 'Boolean',
-          'trueclass' => 'Boolean',
-          'hash' => 'Object'
-        }
-
         @equal_keys = %w(id identifier uid)
       end
 
@@ -150,29 +36,7 @@ module Jaspion
       end
 
       def property(name, type, array, key)
-        original_name = name
-        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
-      end
-
-      def classes(class_name)
-        super(class_name)
-
-        @classes.each do |cl|
-          cl.properties.each do |pr|
-            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?
-
-            pr.type = @types[pr.type] unless @types[pr.type].nil?
-          end
-        end
+        Jaspion::Kilza::Java::Property.new(name , type, array, key)
       end
     end
   end

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

@@ -0,0 +1,99 @@
+module Jaspion
+  module Kilza
+    class Java
+      class Class
+        include Jaspion::Kilza::Class
+
+        # Represents the Java class package
+        attr_accessor :package
+
+        attr_reader :gson
+        attr_reader :serializable
+        attr_reader :parcelable
+
+        alias :gson? :gson
+        alias_method :serializable?, :serializable
+        alias_method :parcelable?, :parcelable
+
+        def initialize(name, package = nil)
+          name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+          super(name)
+
+          @package = package
+          @implements = []
+
+          push_import('import org.json.*;')
+
+          self.serializable = true
+          self.parcelable = false
+          self.gson = true
+        end
+
+        def push(pr)
+          pr.gson = gson?
+
+          pr.type = pr.class_name if pr.object? || (pr.array? && pr.null?)
+          push_import('import java.util.ArrayList;') if pr.array?
+          pr.type = Jaspion::Kilza::Java::TYPES[pr.type] unless Jaspion::Kilza::Java::TYPES[pr.type].nil?
+
+          super(pr)
+        end
+
+        def push_implements(implement)
+          @implements.push(implement)
+        end
+
+        def implements
+          @implements.sort
+        end
+
+        def gson=(g)
+          @gson = g
+
+          v = %w(
+            import\ com.google.gson.Gson;
+            import\ com.google.gson.GsonBuilder;
+            import\ com.google.gson.annotations.SerializedName;
+            import\ com.google.gson.annotations.Expose;
+          )
+
+          if (g)
+            push_import(v)
+          else
+            delete_import(v)
+          end
+        end
+
+        def parcelable=(p)
+          @parcelable = p
+
+          v = 'import android.os.Parcelable;'
+          if (p)
+            push_implements('Parcelable')
+            push_import(v)
+          else
+            implements.delete('Parcelable')
+            delete_import(v)
+          end
+        end
+
+        def serializable=(s)
+          @serializable = s
+
+          v = 'import java.io.Serializable;'
+          if (s)
+            push_implements('Serializable')
+            push_import(v)
+          else
+            implements.delete('Serializable')
+            delete_import(v)
+          end
+        end
+
+        def sources
+          [code('java', 'java')]
+        end
+      end
+    end
+  end
+end

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

@@ -4,18 +4,11 @@
 */
 package <%= @package %>;
 
-import org.json.*;
-import java.io.Serializable;
-<% for @import in @imports %>
+<% for @import in imports %>
 <%= @import %>
 <% end %>
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.annotations.Expose;
-
-public class <%= @name %> implements Serializable
+public class <%= @name %><% if @implements.length > 0 %> implements <%= implements.join(', ') %><% end %>
 {
 <% for @property in @properties %>
 <%= @property.constants %>
@@ -94,7 +87,35 @@ end
 
     @Override
     public String toString() {
-      Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-      return gson.toJson(this);
+        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+        return gson.toJson(this);
+    }
+<% if parcelable %>
+
+    private <%= @name %>(Parcel in) {
+<% for @property in @properties %>
+        <%= @property.read_parcel %>
+<% end %>
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel out, int flags) {
+<% for @property in @properties %>
+        <%= @property.write_parcel %>
+<% end %>
     }
+
+    public static final Parcelable.Creator<<%= @name %>> CREATOR = new Parcelable.Creator<<%= @name %>>() {
+        public <%= @name %> createFromParcel(Parcel in) {
+            return new <%= @name %>(in);
+        }
+
+        public <%= @name %>[] newArray(int size) {
+            return new <%= @name %>[size];
+        }
+    };
+<% end %>
 }

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

@@ -0,0 +1,142 @@
+module Jaspion
+  module Kilza
+    class Java
+      class Property < Jaspion::Kilza::Property
+
+        attr_accessor :gson
+        alias :gson? :gson
+
+        def initialize(name, type, array, key)
+          original_name = name
+          name = RESERVED_PROPERTY_PREFIX + name unless RESERVED_WORDS.index(name).nil?
+          super(name, type, array, key)
+
+          @original_name = original_name
+          @serializable = true
+        end
+
+        def class_name
+          class_name = super
+          class_name = class_name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(class_name.downcase).nil?
+          class_name
+        end
+
+        def constants
+          return '    private static final String FIELD_' +
+          @name.upcase + ' = "' + @original_name + '";'
+        end
+
+        def read_parcel
+          r = ''
+          if array?
+            if object?
+              r = "in.readTypedList(#{@name}, #{class_name}.CREATOR);"
+            else
+              r = "#{@name} = in.readArrayList(null);"
+            end
+          elsif object?
+            r = "#{@name} = (#{class_name}) in.readParcelable(#{class_name}.class.getClassLoader());"
+          elsif boolean?
+            r = "#{@name} = in.readByte() != 0;"
+          else
+            r = "#{@name} = in.read#{type}();"
+          end
+          r
+        end
+
+        def write_parcel
+          r = ''
+          if array?
+            if object?
+              r = "out.writeTypedList(#{@name});"
+            else
+              r = "out.writeList(#{@name});"
+            end
+          elsif object?
+            r = "out.writeParcelable(#{@name}, flags);"
+          elsif boolean?
+            r = "out.writeByte((byte) (#{name} ? 1 : 0));"
+          else
+            r = "out.write#{type}(#{name});"
+          end
+          r
+        end
+
+        def declaration
+          r = ''
+          r << "    @Expose\n" if gson?
+          r << "    @SerializedName(FIELD_#{@name.upcase})\n" if gson?
+          if array?
+            r + "    private ArrayList<#{@type}> #{@name};"
+          else
+            r + "    private #{@type} #{@name};"
+          end
+        end
+
+        def parse_element
+          if object?
+            "        this.#{@name} = new #{@type}(object.optJSONObject(FIELD_#{@name.upcase}));"
+          elsif null?
+            "        this.#{@name} = object.opt(FIELD_#{@name.upcase});"
+          else
+            "        this.#{@name} = object.opt#{@type}(FIELD_#{@name.upcase});"
+          end
+        end
+
+        def parse_array
+          r = %(        if (object.optJSONArray(FIELD_#{@name.upcase}) != null)
+        {
+            this.#{@name} = new ArrayList<>();
+            JSONArray #{@name}JsonArray = object.optJSONArray(FIELD_#{@name.upcase});
+            for (int i = 0; i < #{@name}JsonArray.length(); i++) {
+          )
+
+          if object? || null?
+            r = r + "      JSONObject #{@name} = #{@name}JsonArray.optJSONObject(i);"
+          else
+            r = r + "      #{@type} #{@name} = #{@name}JsonArray.optJSON#{@type}(i);"
+          end
+          r = r + %(
+                this.#{@name}.add(new #{@type}(#{@name}));
+            }
+        })
+          return r
+        end
+
+        def parse_json
+          if array?
+            parse_array
+          else
+            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
+end

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

@@ -1,66 +1,5 @@
 require 'date'
 
-module Jaspion
-  module Kilza
-    class Objc
-      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
-      end
-    end
-  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
@@ -78,55 +17,30 @@ module Jaspion
         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
+        in out inout bycopy byref description
       )
+      TYPES = {
+        'nilclass'    => 'id',
+        'string'      => 'NSString *',
+        'fixnum'      => 'NSNumber *',
+        'float'       => 'NSNumber *',
+        'falseclass'  => 'NSNumber *',
+        'trueclass'   => 'NSNumber *',
+        'hash'        => 'NSObject *'
+      }
 
       def initialize(json_string)
         super(json_string)
 
-        @types = {
-          'nilclass' => 'id',
-          'string'  => 'NSString *',
-          'fixnum' => 'NSNumber *',
-          'float' => 'NSNumber *',
-          'falseclass' => 'NSNumber *',
-          'trueclass' => 'NSNumber *',
-          'hash' => 'NSObject *'
-        }
-
         @equal_keys = %w(id identifier uid)
       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?)
-              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?
-            pr.type = @types[pr.type] unless @types[pr.type].nil?
-          end
-        end
+        Jaspion::Kilza::Objc::Property.new(name , type, array, key)
       end
     end
   end

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

@@ -0,0 +1,51 @@
+module Jaspion
+  module Kilza
+    class Objc
+      class Class
+        include Jaspion::Kilza::Class
+
+        def initialize(name)
+          name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+          super(name)
+        end
+
+        def push(pr)
+          if pr.object? || (pr.array? && pr.null?)
+            pr.type = pr.class_name + ' *'
+            push_import("#import \"#{pr.class_name}.h\"")
+          end
+
+          pr.type = 'NSMutableArray *' if pr.array?
+          unless Jaspion::Kilza::Objc::TYPES[pr.type].nil?
+            pr.type = Jaspion::Kilza::Objc::TYPES[pr.type]
+          end
+
+          super(pr)
+        end
+
+        def imports
+          @imports.sort.flatten
+        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
+      end
+    end
+  end
+end

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

@@ -20,11 +20,11 @@
 <%= @property.declaration %>
 <% end %>
 
-+ (<%= @name %> *)modelWithDictionary:(NSDictionary *)dict;
-+ (<%= @name %> *)modelWithString:(NSString *)json;
++ (<%= @name %> * _Nonnull)modelWithDictionary:(NSDictionary * _Nonnull)dict;
++ (<%= @name %> * _Nonnull)modelWithString:(NSString * _Nonnull)json;
 
-- (instancetype)initWithString:(NSString *)json;
-- (instancetype)initWithDictionary:(NSDictionary *)dict;
-- (NSDictionary *)dictionaryRepresentation;
+- (instancetype _Nonnull)initWithString:(NSString * _Nonnull)json;
+- (instancetype _Nonnull)initWithDictionary:(NSDictionary * _Nonnull)dict;
+- (NSDictionary * _Nonnull)dictionaryRepresentation;
 
 @end

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

@@ -7,7 +7,7 @@
 //
 
 #import "<%= @name %>.h"
-<% for @import in @imports %>
+<% for @import in imports %>
 <%= @import %>
 <% end %>
 

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

@@ -0,0 +1,38 @@
+module Jaspion
+  module Kilza
+    class Objc
+      class Property < Jaspion::Kilza::Property
+
+        def initialize(name, type, array, key = '')
+          original_name = name
+          unless RESERVED_WORDS.index(name.downcase).nil?
+            name = RESERVED_PROPERTY_PREFIX + name
+          end
+          super(name, type, array, key)
+          @original_name = original_name
+        end
+
+        def class_name
+          return if !(object? || (array? && null?))
+
+          class_name = super
+          class_name = class_name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(class_name.downcase).nil?
+          class_name
+        end
+
+        def class_reference
+          return "@class #{class_name};" unless class_name.nil? || array?
+        end
+
+        def declaration
+          "@property (nonatomic, strong, nullable) #{@type} #{@name};"
+        end
+
+        def constants(cl_name)
+          "NSString *const k#{cl_name}#{@name.capitalize} = @\"#{@original_name}\";"
+        end
+
+      end
+    end
+  end
+end

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

@@ -19,54 +19,28 @@ module Jaspion
         typealias precedence var prefix required right set
         type unowned weak id description
       )
+      TYPES = {
+        'nilclass'    => 'AnyObject',
+        'string'      => 'String',
+        'fixnum'      => 'Int',
+        'float'       => 'Double',
+        'falseclass'  => 'Bool',
+        'trueclass'   => 'Bool',
+        'hash'        => 'Dictionary'
+      }
 
       def initialize(json_string)
         super(json_string)
 
-        @types = {
-          'nilclass' => 'AnyObject',
-          'string'  => 'String',
-          'fixnum' => 'Int',
-          'float' => 'Double',
-          'falseclass' => 'Bool',
-          'trueclass' => 'Bool',
-          'hash' => 'Dictionary'
-        }
-
         @equal_keys = 'id identifier uid'
       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?)
-              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
-
-            pr.type = @types[pr.type] unless @types[pr.type].nil?
-            pr.type = "[#{pr.type}]" if pr.array?
-          end
-        end
+        Jaspion::Kilza::Swift::Property.new(name , type, array, key)
       end
     end
   end

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

@@ -5,8 +5,20 @@ module Jaspion
         include Jaspion::Kilza::Class
 
         def initialize(name)
+          name = name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
           super(name)
-          @name = @name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(name.downcase).nil?
+        end
+
+        def push(pr)
+          if pr.object? || (pr.array? && pr.null?)
+            pr.type = pr.class_name
+            push_import("import #{pr.class_name}")
+          end
+
+          pr.type = Jaspion::Kilza::Swift::TYPES[pr.type] unless Jaspion::Kilza::Swift::TYPES[pr.type].nil?
+          pr.type = "[#{pr.type}]" if pr.array?
+
+          super(pr)
         end
 
         def sources

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

@@ -4,9 +4,22 @@ module Jaspion
   module Kilza
     class Swift
       class Property < Jaspion::Kilza::Property
+
+        def initialize(name, type, array, key = '')
+          original_name = name
+          unless RESERVED_WORDS.index(name.downcase).nil?
+            name = RESERVED_PROPERTY_PREFIX + name
+          end
+          super(name, type, array, key)
+          @original_name = original_name
+        end
+
         def class_name
-          return if !object? || array?
-          Jaspion::Kilza::Swift::Class.new(@original_name).name
+          return if !(object? || null? || (array? && null?))
+
+          class_name = super
+          class_name = class_name + RESERVED_CLASS_POSFIX unless RESERVED_WORDS.index(class_name.downcase).nil?
+          class_name
         end
 
         def constants(cl_name)

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

@@ -58,16 +58,15 @@ public class <%= @name %>: NSObject, NSCoding {
 <% if @property.object? || @property.null? %>
 <% if @property.array? %>
         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 %> {
+            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.class_name %>.model(item) {
+                        list<%= @property.name.capitalize %>.append(obj)
+                    }
                 }
             }
             self.<%= @property.name %> = list<%= @property.name.capitalize %>
-        } else {
-            return nil
         }
 <% else %>
         self.<%= @property.name %> = <%= @property.class_name %>.model(dict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>]!)

data/lib/jaspion/kilza/property.rb

@@ -26,8 +26,8 @@ module Jaspion
       attr_accessor :key
       alias_method :key?, :key
 
-      def initialize(name, type, array, key)
-        @name = Kilza.normalize(name)
+      def initialize(name, type, array, key = '')
+        @name = Jaspion::Kilza::Property.normalize(name)
         @original_name = name
         @type = type
         @array = array
@@ -59,6 +59,12 @@ module Jaspion
         @name == pr.name
       end
 
+      # If this Property represents a new Class,
+      # it returns the formatted class name
+      def class_name
+        Jaspion::Kilza::Class.normalize(@original_name)
+      end
+
       def to_s
         {
           name: @name,
@@ -67,6 +73,29 @@ module Jaspion
           array?: @array
         }.to_s
       end
+
+      # Removes everything except numbers and letters.
+      #
+      # @param str [String] string to be cleaned
+      #
+      # @return [String] cleaned string
+      def self.clean(str)
+        return if str.nil?
+        str.gsub(/[^a-zA-Z0-9]/, '')
+      end
+
+      # Cleans the string and make it lowercase.
+      #
+      # @param str [String] string to be cleaned
+      #
+      # @return [String] cleaned string
+      def self.normalize(str)
+        return if str.nil?
+        str = str.gsub(/[^a-zA-Z0-9]/, '_')
+        str = '_' if str.length == 0
+        str = '_' + str if str[0].number?
+        str.downcase
+      end
     end
   end
 end

data/lib/jaspion/kilza/version.rb

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

metadata

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