kilza 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19afa4576243d4b81618c7a96e3fcfc171d1e40c
-  data.tar.gz: 5ebd96dd828845962476cd04e9d9b1c5f2c581e4
+  metadata.gz: 0bb3186b37f9e9108276b4e7bb4c95217e32da34
+  data.tar.gz: 025ba6e2147e62e5e19dbf6ba8e58be9bbffa361
 SHA512:
-  metadata.gz: 7359efe86778e41c19a07fbd9b2e7719d73db4626c4630f1944d9ba4ab4c4576efd9c4155f5d88cdb3f720012617b4bb3a8d0ad9b88f8db6178fc131a931a2e5
-  data.tar.gz: 08bbb522b1b72075a981a2accd3ea2d4db85629cf417d0c22eb4f871bbb5d14428322f99297e78b0941788ce467d2a8610b894ba42efd7c54bf4f8e67e54c09e
+  metadata.gz: 8cde20c73473da2ff456a9ab14ddc5f2e32e60dcdf4218d91a6e62aa33127994c85046904d3318143a6b00a160b22a797c54812839bf42eadfcd24994ab02ba7
+  data.tar.gz: c5e2fcca3ba6505713607378e8b2905730c9a296a546984f7632599de692ce604de6a400ab9b519f0dbe67cbf353a0b40ecab2e5a1de0a8ad516f0e4ce9ca41d

data/README.md

@@ -1,5 +1,11 @@
 # Kilza
 
+[![Build Status](https://travis-ci.org/Jaspion/Kilza.svg?branch=master)](https://travis-ci.org/Jaspion/Kilza)
+
+[![Coverage Status](https://coveralls.io/repos/Jaspion/Kilza/badge.svg?branch=master&service=github)](https://coveralls.io/github/Jaspion/Kilza?branch=master)
+
+[![Inline docs](http://inch-ci.org/github/jaspion/kilza.svg?branch=master)](http://inch-ci.org/github/jaspion/kilza)
+
 Ruby gem that can convert JSON strings in Objects.
 
 It supports Objective-C and Java classes. Contribuition would be appreciate.
@@ -150,8 +156,8 @@ public class Mybaseclass implements Serializable
     }
     @Override
     public int hashCode(){
-        return (((Long)code).hashCode() +
-        ((String)message).hashCode());
+        return (code.hashCode() +
+        message.hashCode());
     }
 
     @Override

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "kilza"
+require 'bundler/setup'
+require 'kilza'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/kilza

@@ -16,8 +16,8 @@ end
 module TTY
   class Prompt
     class List
-      def numpad(value)
-        @numpad = value
+      def enum(value)
+        @enum = value
       end
     end
   end
@@ -25,6 +25,9 @@ end
 
 class KilzaApplication
 
+  OBJC = 1
+  JAVA = 2
+
   def initialize
     @pastel = Pastel.new
     @prompt = TTY::Prompt.new
@@ -34,34 +37,34 @@ class KilzaApplication
   end
 
   def get_lang
-    action = @prompt.select(@pastel.bold("Target programming language?")) do |menu|
+    action = @prompt.select(@pastel.bold('Target programming language?')) do |menu|
       menu.default 1
-      menu.numpad true
+      menu.enum '.'
 
-      menu.choice "Objective-C", 1
-      menu.choice "Java", 2
+      menu.choice 'Objective-C', OBJC
+      menu.choice 'Java', JAVA
     end
     action
   end
 
   def get_json
-    action = @prompt.select(@pastel.bold("Where is your JSON string content?")) do |menu|
+    action = @prompt.select(@pastel.bold('Where is your JSON string content?')) do |menu|
       menu.default 1
-      menu.numpad true
+      menu.enum '.'
 
-      menu.choice "It's online. I have an URL.", 1
-      menu.choice "It's offline. I have the file path.", 2
+      menu.choice 'It\'s online. I have an URL.', 1
+      menu.choice 'It\'s offline. I have the file path.', 2
     end
 
     json_string = ''
     if (action == 1)
-      url = @prompt.ask(@pastel.bold("Please, what is the URL?")) do |q|
+      url = @prompt.ask(@pastel.bold('Please, what is the URL?')) do |q|
         q.required true
       end
-      @prompt.say(@pastel.bold("Ok. I'll try to get the content right now."))
+      @prompt.say(@pastel.bold('Ok. I\'ll try to get the content right now.'))
       json_string = read_url(url)
     else
-      file_path = File.expand_path(@prompt.ask(@pastel.bold("Please, what is the file path? "))) do |q|
+      file_path = File.expand_path(@prompt.ask(@pastel.bold('Please, what is the file path? '))) do |q|
         q.required true
       end
       json_string = File.read(file_path.chomp)
@@ -69,56 +72,69 @@ class KilzaApplication
     json_string
   end
 
+  def generate(lang, json_string, class_basename, target_path, class_package = '')
+    if (lang == OBJC)
+      objc = Kilza::Objc.new(json_string)
+      objc.classes(class_basename).each { |c|
+        c.sources.each{ |s|
+          File.write(File.join(target_path, s.file_name), s.source)
+        }
+      }
+    elsif (lang == JAVA)
+      java = Kilza::Java.new(json_string)
+      java.classes(class_basename).each { |c|
+        c.package = class_package
+        c.sources.each{ |s|
+          File.write(File.join(target_path, s.file_name), s.source)
+        }
+      }
+    end
+  end
+
+  def get_target_path
+    target_path = @prompt.ask(@pastel.bold('Master, where would you like to save? ')).chomp
+    File.expand_path(target_path)
+  end
+
+  def get_basename
+    @prompt.ask(@pastel.bold('Master, which name would like to call the first class? ')).chomp
+  end
+
+  def get_package
+    @prompt.ask(@pastel.bold('What is the target Java package? ')).chomp
+  end
+
   def run
     while (not @done)
-      action = @prompt.select(@pastel.bold("Choose your destiny?")) do |menu|
+      action = @prompt.select(@pastel.bold('Choose your destiny?')) do |menu|
         menu.default 1
-        menu.numpad true
+        menu.enum '.'
 
         menu.choice 'I want some JSON objects.', 1
         menu.choice 'Nothing.', 2
       end
       if action == 1
         json_string = get_json
-        target_path = @prompt.ask(@pastel.bold("Master, where would you like to save? ")).chomp
-        target_path = File.expand_path(target_path)
-        class_basename = @prompt.ask(@pastel.bold("Master, which name would like to call the first class? ")).chomp
+        target_path = get_target_path
+        class_basename = get_basename
         lang = get_lang
 
-        class_package = nil
-        if (lang == 2)
-          class_package = @prompt.ask(@pastel.bold("What is the target Java package? ")).chomp
-        end
+        class_package = get_package if (lang == JAVA)
 
-        @prompt.say(@pastel.bold("Target: ") + target_path)
-        @prompt.say(@pastel.bold("Base class name: ") + class_basename)
-        @prompt.say(@pastel.bold("Target language: ") + (lang == 1 ? 'Objective-C' : 'Java'))
-        if (not class_package.nil?)
-          @prompt.say(@pastel.bold("Target package: ") + class_package)
+        @prompt.say(@pastel.bold('Target: ') + target_path)
+        @prompt.say(@pastel.bold('Base class name: ') + class_basename)
+        @prompt.say(@pastel.bold('Target language: ') + (lang == OBJC ? 'Objective-C' : 'Java'))
+        if not class_package.nil?
+          @prompt.say(@pastel.bold('Target package: ') + class_package)
         end
         ok = @prompt.yes?('Is that correct?')
-        if (ok.nil? or ok)
-          @prompt.say(@pastel.bold("Yes master. Now I'm going to generate all files."))
-          @prompt.say(@pastel.bold("Berebekan Katabamba Berebekan Katabamba Berebekan Katabamba"))
-
-          if (lang == 1)
-            objc = Kilza::Objc.new(json_string)
-            objc.classes(class_basename).each { |c|
-              c.sources.each{ |s|
-                File.write(File.join(target_path, s.file_name), s.source)
-              }
-            }
-          else
-            java = Kilza::Java.new(json_string)
-            java.classes(class_basename).each { |c|
-              c.package = class_package
-              c.sources.each{ |s|
-                File.write(File.join(target_path, s.file_name), s.source)
-              }
-            }
-          end
-
-          @prompt.say(@pastel.bold("Kikera!"))
+        if ok.nil? or ok
+          @prompt.say(@pastel.bold('Yes master. Now I\'m going to generate all files.'))
+          @prompt.say(@pastel.bold('Berebekan Katabamba Berebekan Katabamba Berebekan Katabamba'))
+
+          generate(lang, json_string, class_basename, target_path, class_package)
+
+          @prompt.say(@pastel.bold('Kikera!'))
         end
       else
         @done = true

data/kilza.gemspec

@@ -4,35 +4,42 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kilza/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "kilza"
+  spec.name          = 'kilza'
   spec.version       = Kilza::VERSION
-  spec.authors       = ["Toshiro Sugii"]
-  spec.email         = ["rtoshiro@printwtf.com"]
+  spec.authors       = ['Toshiro Sugii']
+  spec.email         = ['rtoshiro@printwtf.com']
 
-  spec.summary       = %q{Parses JSON objects and generates objects into other languages}
-  spec.description   = %q{Parses JSON objects and generates objects into other languages}
-  spec.homepage      = "https://github.com/Jaspion/Kilza"
-  spec.license       = "MIT"
+  spec.summary       = 'Parses JSON and generates objects into other languages'
+  spec.description   = %q{
+    Ruby gem that can convert JSON strings in Objects.
+    It supports Objective-C and Java classes. Contribuition would be appreciate.
+  }
+  spec.homepage      = 'https://github.com/Jaspion/Kilza'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "rubygems.org"
+    spec.metadata['allowed_push_host'] = 'rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    fail 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = ["kilza"]
-  spec.require_paths = ["lib"]
+  spec.files= `git ls-files -z`.split("\x0").reject { |f|
+    f.match(%r{^(test|spec|features)/})
+  }
+  spec.bindir = 'bin'
+  spec.executables = ['kilza']
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'coveralls'
 
-  spec.add_dependency "json"
-  spec.add_dependency "erubis"
-  spec.add_dependency "tty"
-  spec.add_dependency "pastel"
+  spec.add_dependency 'json'
+  spec.add_dependency 'erubis'
+  spec.add_dependency 'tty'
+  spec.add_dependency 'pastel'
 end

data/lib/kilza.rb

@@ -1,4 +1,4 @@
-require "kilza/version"
+require 'kilza/version'
 
 require 'kilza/source'
 require 'kilza/class'
@@ -7,21 +7,36 @@ require 'kilza/language'
 require 'kilza/language/objc'
 require 'kilza/language/java'
 
+# Ruby class
 class String
-  def is_number?
+  # Test if the string can be a number
+  #
+  # @param str [String] string to be tested
+  #
+  # @return [Boolean] true in case of success
+  def number?
     true if Float(self) rescue false
   end
 end
 
+# Tranforms a JSON string into Objects
 module Kilza
+  # Removes everything except numbers and letters.
+  #
+  # @param str [String] string to be cleaned
+  #
+  # @return [String] cleaned string
   def self.clean(str)
-    if str[0].is_number?
-      str = '_' + str
-    end
-    str = str.gsub(/[^a-zA-Z0-9]/, '_')
+    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)
-    str = Kilza::clean(str).downcase
+    Kilza.clean(str).downcase
   end
 end

data/lib/kilza/class.rb

@@ -1,46 +1,65 @@
 module Kilza
+  # Represents one single object class
   module Class
+    # Class name
     attr_accessor :name
-    attr_accessor :params
+
+    # Array with all class dependecies
+    # Specific for each language
     attr_accessor :imports
+
+    # Array with all class properties
     attr_accessor :properties
 
     def initialize(name)
-      @name = Kilza::normalize(name).capitalize
+      @name = Kilza.normalize(name).capitalize
       @properties = []
       @imports = []
-      @params = []
     end
 
+    # Search for a property by name
+    #
+    # @param name [String] Property name
+    #
+    # @return [Kilza::Property] The property found or nil
     def find(name)
-      @properties.each { |p|
-        return p if (p.name == name)
-      }
+      @properties.each { |p| return p if p.name == name }
       nil
     end
 
+    # Adds a new property
+    #
+    # @param property [Kilza::Property] Property to include
     def push(property)
       p = find(property.name)
-      if p.nil?
-        @properties.push(property)
-      end
+      @properties.push(property) if p.nil?
     end
 
     def sources
+      fail 'It should be implemented'
+    end
+
+    def code(lang, file_name)
+      cur_path = File.expand_path(__FILE__)
+      erb_path = File.join(File.dirname(cur_path), 'language', lang)
+
+      path = File.join(erb_path, file_name + '.erb')
+      eruby = Erubis::Eruby.new(File.read(path))
+
+      s = Kilza::Source.new
+      s.source = eruby.result(binding)
+      s.file_name = @name.capitalize + '.' + file_name
+      s
     end
 
-    def to_hash
+    def to_s
       properties = []
-      @properties.each { |p|
-        properties.push(p.to_hash)
-      }
-      hash = {
-        :name => @name,
-        :imports => @imports,
-        :params => @params,
-        :properties => properties
-      }
-      hash
+      @properties.each { |p| properties.push(p.to_s) }
+      {
+        name: @name,
+        imports: @imports,
+        properties: properties
+      }.to_s
     end
   end
 end

data/lib/kilza/language.rb

@@ -2,79 +2,134 @@ require 'json'
 require 'erubis'
 
 module Kilza
+  # Represents an program language
   module Language
+    # Array with all Class classes
     attr_accessor :classes
+
+    # Name used to represent the first generated class
     attr_accessor :base_name
+
+    # JSON that will be used to generate objects
     attr_accessor :json_string
 
-    attr_accessor :reserved_words # words that will receive an undescore before property name
-    attr_accessor :equal_keys     # array with all properties that will be used to compare other objects
-    attr_accessor :types          # hash table with all language types mapped to target language
+    # String that will be used to prefix reserved words
+    attr_accessor :reserved_delimiter
+
+    # Words that will receive an undescore before property name
+    attr_accessor :reserved_words
+
+    # Array with all properties that will be used to compare other objects
+    attr_accessor :equal_keys
+
+    # Hash table with all language types mapped to target language
+    attr_accessor :types
 
     def initialize(json_string)
       @json_string = json_string
       @classes = []
       @types = {}
       @reserved_words = []
+      @reserved_delimiter = '_'
       @equal_keys = []
     end
 
-    def get_class(name)
-      name = "_" + name if not @reserved_words.index(name).nil?
+    # Returns all available classes
+    #
+    # @param base_name [String] First class name
+    #
+    # @return [Array] All available classes
+    def classes(base_name)
+      hash = JSON.parse(json_string)
+      hash = { base_name + 'Object' => hash } if hash.is_a?(Array)
+      parse_hash(base_name, hash)
+      @classes
+    end
+
+    protected
+
+    # Creates a new Class object and checks for valid name
+    #
+    # @param name [String] name of the class to be created
+    #
+    # @return [Kilza::Class] new class
+    def clazz(name)
+      name = @reserved_delimiter + name unless @reserved_words.index(name).nil?
       Class.new(name)
     end
 
-    def get_property(name, type, is_array, is_key)
-      name = "_" + name if not @reserved_words.index(name).nil?
-      Property.new(name, type, is_array, is_key.nil?)
+    # Creates a new Property object and checks for valid name
+    #
+    # @param name [String] name of the property to be created
+    # @param type [String] type of the property based on class name
+    # @param array [Boolean] indicates if this property represents an array
+    # @param key [Boolean] indicates if this property can be used to compare
+    # objects
+    #
+    # @return [Kilza::Property] new property
+    def property(name, type, array, key)
+      name = @reserved_delimiter + name unless @reserved_words.index(name).nil?
+      Property.new(name, type, array, key.nil?)
     end
 
+    # Searches for a Kilza::Class inside @classes
+    # and creates a new one if it could not be found
+    #
+    # @param name [String] class name to find
+    #
+    # @return [Kilza::Class] class with the specified name
     def find(name)
-      @classes.each { |cl|
-        return cl if (cl.name == name)
-      }
-      @classes.push(get_class(name))
-      return @classes.last
+      name = Kilza.normalize(name).capitalize
+      @classes.each { |cl| return cl if cl.name == name }
+      @classes.push(clazz(name))
+      @classes.last
     end
 
-    def parse(hash, class_name)
-      current_class = find(class_name)
-      hash.each { |property_name, value|
-        type = value.class.name.split('::').last.downcase
-
-        case type
-        when "array"
-          if (value.length == 0)
-            current_class.push(get_property(property_name, 'object', true, @equal_keys.index(property_name)))
-            parse(value, property_name)
-          else
-            value.each { |el|
-              if (el.is_a?(Array) or el.is_a?(Hash))
-                parse(el, property_name)
-                current_class.push(get_property(property_name, 'object', true, @equal_keys.index(property_name)))
-              else
-                type = el.class.name.split('::').last.downcase
-                current_class.push(get_property(property_name, type, true, @equal_keys.index(property_name)))
-              end
-            }
-          end
-        when "hash"
-          current_class.push(get_property(property_name, 'object', false, @equal_keys.index(property_name)))
-          parse(value, property_name)
-        else
-          current_class.push(get_property(property_name, type, false, @equal_keys.index(property_name)))
-        end
-      }
+    # Parses an element value an verify if it should create a new Class
+    # inside @classes
+    #
+    # @param class_name [String] Name of the class the element is inside
+    # @param name [String] The element name
+    # @param value [Any] The element value
+    # @param array [Boolean] Indicates the element is inside an Array
+    def parse_el(class_name, name, value, array = false)
+      type = value.class.name.split('::').last.downcase
+
+      return parse_array(class_name, name, value) if type == 'array'
+
+      cur_class = find(class_name)
+      key = @equal_keys.index(name)
+      cur_class.push(property(name, type, array, key))
+
+      parse_hash(name, value) if type == 'hash'
     end
 
-    def classes(base_name)
-      hash = JSON.parse(json_string)
-      if (hash.is_a?(Array))
-        hash = { base_name + "Object" => hash }
+    # Parses an hash calling parse_el for each element
+    #
+    # @param class_name [String] Name of the class the hash is inside
+    # @param hash [Hash] The hash value
+    def parse_hash(class_name, hash)
+      hash.each do |property_name, value|
+        parse_el(class_name, property_name, value)
       end
-      parse(hash, base_name)
-      return @classes
     end
 
+    # Parses an element that represents an array calling parse_el
+    # for each element.
+    # If the array is empty, it creates a new class to represent
+    # each array's element.
+    #
+    # @param class_name [String] Name of the class the array is inside
+    # @param name [String] The element name
+    # @param value [Any] The element value
+    def parse_array(class_name, name, value)
+      if value.length == 0
+        parse_el(class_name, name, nil, true)
+      else
+        value.each do |val|
+          parse_el(class_name, name, val, true)
+        end
+      end
+    end
   end
 end

data/lib/kilza/language/java.rb

@@ -2,10 +2,10 @@ require 'date'
 
 module Kilza
   class Java
-
     class Class
       include Kilza::Class
 
+      # Represents the Java class package
       attr_accessor :package
 
       def initialize(name, package = nil)
@@ -14,77 +14,58 @@ module Kilza
       end
 
       def sources
-        cur_path = File.expand_path(__FILE__)
-        java_path = File.join(File.dirname(cur_path), File.basename(cur_path, '.rb'), "java.erb")
-        eruby_java = Erubis::Eruby.new(File.read(java_path))
-
-        java = Kilza::Source.new
-        java.source = eruby_java.result(binding)
-        java.file_name = @name.capitalize + ".java"
-
-        result = [
-          java
-        ]
-        return result
+        [code('java', 'java')]
       end
     end
-
   end
 end
 
 module Kilza
+  # Objective-C Language parser
   class Java
     include Kilza::Language
 
     def initialize(json_string)
       super(json_string)
 
-      @reserved_words = [
-        "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"
-      ]
+      @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",
-        "fixnum" => "Long",
-        "float" => "Double",
-        "falseclass" => "Boolean",
-        "trueclass" => "Boolean",
-        "object" => "Object"
+        'nilclass' => 'Object',
+        'string' => 'String',
+        'fixnum' => 'Long',
+        'float' => 'Double',
+        'falseclass' => 'Boolean',
+        'trueclass' => 'Boolean',
+        'hash' => 'Object'
       }
 
-      @equal_keys = [
-        "id",
-        "identifier",
-        "uid"
-      ]
+      @equal_keys = %w(id identifier uid)
     end
 
-    def get_class(name)
+    def clazz(name)
       Kilza::Java::Class.new(name)
     end
 
-    def parse(hash, class_name)
-      super(hash, class_name)
+    def classes(class_name)
+      super(class_name)
 
-      @classes.each { |cl|
-        cl.properties.each { |pr|
-          if pr.is_object?
-            pr.type = pr.name.capitalize
-          end
+      @classes.each do |cl|
+        cl.properties.each do |pr|
+          pr.type = pr.name.capitalize if pr.object? || (pr.array? && pr.null?)
 
-          if pr.is_array?
-            cl.imports.push("import java.util.ArrayList;") if cl.imports.index("import java.util.ArrayList;").nil?
-          end
+          cl.imports.push('import java.util.ArrayList;') if pr.array? &&
+            cl.imports.index('import java.util.ArrayList;').nil?
 
-          pr.type = @types[pr.type] if not @types[pr.type].nil?
-        }
-      }
+          pr.type = @types[pr.type] unless @types[pr.type].nil?
+        end
+      end
     end
-
   end
 end

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

@@ -20,7 +20,7 @@ public class <%= @name %> implements Serializable
 <% for @property in @properties %>
     @Expose
     @SerializedName(FIELD_<%= @property.name.upcase %>)
-    <% if @property.is_array? %>
+    <% if @property.array? %>
     private ArrayList<<%= @property.type %>> <%= @property.name %>;
     <% else %>
     private <%= @property.type %> <%= @property.name %>;
@@ -51,13 +51,13 @@ public class <%= @name %> implements Serializable
     protected void parseObject(JSONObject object)
     {
 <% for @property in @properties %>
-  <% if @property.is_array? %>
+  <% if @property.array? %>
         if (object.optJSONArray(FIELD_<%= @property.name.upcase %>) != null)
         {
             this.<%= @property.name %> = new ArrayList<>();
             JSONArray <%= @property.name %>JsonArray = object.optJSONArray(FIELD_<%= @property.name.upcase %>);
             for (int i = 0; i < <%= @property.name %>JsonArray.length(); i++) {
-    <% if @property.is_object? %>
+    <% if @property.object? || @property.null? %>
                 JSONObject <%= @property.name %> = <%= @property.name %>JsonArray.optJSONObject(i);
     <% else %>
                 <%= @property.type %> <%= @property.name %> = <%= @property.name %>JsonArray.optJSON<%= @property.type %>(i);
@@ -66,10 +66,10 @@ public class <%= @name %> implements Serializable
             }
         }
   <% else %>
-    <% if @property.is_object? %>
+    <% if @property.object? %>
         this.<%= @property.name %> = new <%= @property.type %>(object.optJSONObject(FIELD_<%= @property.name.upcase %>));
     <% else %>
-      <% if @property.is_nil? %>
+      <% if @property.null? %>
         this.<%= @property.name %> = object.opt(FIELD_<%= @property.name.upcase %>);
       <% else %>
         this.<%= @property.name %> = object.opt<%= @property.type %>(FIELD_<%= @property.name.upcase %>);
@@ -80,14 +80,16 @@ public class <%= @name %> implements Serializable
     }
 
 <% for @property in @properties %>
-    public void set<%= @property.name.capitalize %>(<%= @property.is_array? ? "ArrayList<" + @property.type + ">" : @property.type %> value) {
+    public void set<%= @property.name.capitalize %>(<%= @property.array? ? "ArrayList<" + @property.type + ">" : @property.type %> value) {
         this.<%= @property.name %> = value;
     }
 
-    <% if @property.is_boolean? %>
+    <% if @property.array? %>
+    public ArrayList<<%= @property.type %>> get<%= @property.name.capitalize %>() {
+    <% elsif @property.boolean? %>
     public <%= @property.type %> is<%= @property.name.capitalize %>() {
     <% else %>
-    public <%= @property.is_array? ? "ArrayList<" + @property.type + ">" : @property.type %> get<%= @property.name.capitalize %>() {
+    public <%= @property.type %> get<%= @property.name.capitalize %>() {
     <% end %>
         return this.<%= @property.name %>;
     }
@@ -97,8 +99,8 @@ public class <%= @name %> implements Serializable
 @eq = []
 @hs = []
 for @property in @properties
-  @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if (@property.is_key)
-  @hs.push("(#{@property.name}).hashCode()") if (@property.is_key)
+  @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if (@property.key)
+  @hs.push("#{@property.name}.hashCode()") if (@property.key)
 end
 %>
 <% if @eq.length > 0 %>

data/lib/kilza/language/objc.rb

@@ -2,93 +2,69 @@ require 'date'
 
 module Kilza
   class Objc
-
     class Class
       include Kilza::Class
 
       def sources
-        cur_path = File.expand_path(__FILE__)
-        m_path = File.join(File.dirname(cur_path), File.basename(cur_path, '.rb'), "m.erb")
-        h_path = File.join(File.dirname(cur_path), File.basename(cur_path, '.rb'), "h.erb")
-
-        eruby_m = Erubis::Eruby.new(File.read(m_path))
-        eruby_h = Erubis::Eruby.new(File.read(h_path))
-
-        m = Kilza::Source.new
-        m.source = eruby_m.result(binding)
-        m.file_name = @name.capitalize + ".m"
-
-        h = Kilza::Source.new
-        h.source = eruby_h.result(binding)
-        h.file_name = @name.capitalize + ".h"
-
-        result = [
-          h,m
-        ]
-        return result
+        [code('objc', 'h'), code('objc', 'm')]
       end
     end
-
   end
 end
 
 module Kilza
+  # Objective-C Language parser
   class Objc
     include Kilza::Language
 
     def initialize(json_string)
       super(json_string)
 
-      @reserved_words = [
-        "auto", "break", "case", "char", "const", "continue",
-        "class", "default", "do", "double", "else", "enum", "extern", "float", "for",
-        "goto", "if", "id", "implementation", "inline", "int", "interface", "long",
-        "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"
-      ]
+      @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 *",
-        "fixnum" => "NSNumber *",
-        "float" => "NSNumber *",
-        "falseclass" => "NSNumber *",
-        "trueclass" => "NSNumber *",
-        "object" => "NSObject *"
+        'nilclass' => 'id',
+        'string'  => 'NSString *',
+        'fixnum' => 'NSNumber *',
+        'float' => 'NSNumber *',
+        'falseclass' => 'NSNumber *',
+        'trueclass' => 'NSNumber *',
+        'hash' => 'NSObject *'
       }
 
-      @equal_keys = [
-        "id",
-        "identifier",
-        "uid"
-      ]
+      @equal_keys = %w(id identifier uid)
     end
 
-    def get_class(name)
+    def clazz(name)
       Kilza::Objc::Class.new(name)
     end
 
-    def parse(hash, class_name)
-      super(hash, class_name)
-
-      @classes.each { |cl|
-        cl.properties.each { |pr|
-          if pr.is_object?
-            cl.imports.push("#import \"" + pr.name.capitalize + ".h\"")
-          end
+    def classes(class_name)
+      super(class_name)
 
-          if pr.is_array?
-            pr.type = "NSMutableArray *"
+      @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\"")
           end
 
-          pr.type = @types[pr.type] if not @types[pr.type].nil?
-        }
-      }
+          pr.type = 'NSMutableArray *' if pr.array?
+          pr.type = @types[pr.type] unless @types[pr.type].nil?
+        end
+      end
     end
-
   end
 end

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

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 
 <% for @property in @properties %>
-<% if @property.is_object? %>
+<% if @property.object? && !@property.array? %>
 @class <%= @property.name.capitalize %>;
 <% end %>
 <% end %>

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

@@ -57,9 +57,9 @@ NSString * const k<%= @name %><%= @property.name.capitalize %> = @"<%= @property
   if (self && [dict isKindOfClass:[NSDictionary class]])
   {
 <% for @property in @properties %>
-<% if @property.is_object? %>
+<% if @property.object? || (@property.null? && @property.array?) %>
     NSObject *obj<%= @property.name.capitalize %> = [dict objectForKey:k<%= @name %><%= @property.name.capitalize %>];
-<% if @property.is_array? %>
+<% if @property.array? %>
     if ([obj<%= @property.name.capitalize %> isKindOfClass:[NSArray class]])
     {
       NSMutableArray *list<%= @property.name.capitalize %> = [NSMutableArray array];
@@ -88,8 +88,8 @@ NSString * const k<%= @name %><%= @property.name.capitalize %> = @"<%= @property
   NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
 
 <% for @property in @properties %>
-<% if @property.is_object? %>
-<% if @property.is_array? %>
+<% 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)]) {

data/lib/kilza/property.rb

@@ -1,58 +1,62 @@
 module Kilza
+  # Represents a single Class property
   class Property
+    # Normalized property name
+    # Starts with _ or alphanumeric character
+    # and doesn't contain any special character
     attr_accessor :name
+
+    # Original JSON property name
     attr_accessor :original_name
+
+    # Ruby string type
+    # Can be object, fixnum, float, falseclass, trueclass and nilclass
     attr_accessor :type
-    attr_accessor :params
-    attr_accessor :is_array
-    attr_accessor :is_key
 
-    def initialize(name, type, is_array, is_key)
-      @name = Kilza::normalize(name)
+    # Indicates if the property represents an array of objects
+    attr_accessor :array
+    alias_method :array?, :array
+
+    # Indicates if the property should be used for comparing purposes
+    # Used to compare if one object is equal to another one
+    attr_accessor :key
+
+    def initialize(name, type, array, key)
+      @name = Kilza.normalize(name)
       @original_name = name
       @type = type
-      @is_array = is_array
-      @is_key = is_key
-    end
-
-    def is_array?
-      @is_array
+      @array = array
+      @key = key
+      @original_type = type
     end
 
-    def is_object?
-      @type == 'object' or @type == @name.capitalize
+    def object?
+      @original_type == 'hash'
     end
 
-    def is_fixnum?
-      @type == 'fixnum'
+    def fixnum?
+      @original_type == 'fixnum'
     end
 
-    def is_boolean?
-      @type == 'trueclass' or @type == 'falseclass'
+    def boolean?
+      @original_type == 'trueclass' || @original_type == 'falseclass'
     end
 
-    def is_float?
-      @type == 'float'
+    def float?
+      @original_type == 'float'
     end
 
-    def is_nil?
-      @type == 'nilclass'
+    def null?
+      @original_type == 'nilclass'
     end
 
-    def to_hash
-      hash = {
-        :name => @name,
-        :original_name => @original_name,
-        :type => @type,
-        :params => @params,
-        :is_array? => @is_array,
-        :is_object? => is_object?,
-        :is_fixnum? => is_fixnum?,
-        :is_boolean? => is_boolean?,
-        :is_float? => is_float?,
-        :is_nil? => is_nil?
-      }
-      hash
+    def to_s
+      {
+        name: @name,
+        original_name: @original_name,
+        type: @type,
+        array?: @array
+      }.to_s
     end
   end
 end

data/lib/kilza/source.rb

@@ -1,6 +1,10 @@
 module Kilza
+  # Represents one single source file
   class Source
+    # The file name
     attr_accessor :file_name
+
+    # The source code of the file
     attr_accessor :source
   end
 end

data/lib/kilza/version.rb

@@ -1,3 +1,4 @@
+# Tranforms a JSON string into Objects
 module Kilza
-  VERSION = "1.0.2"
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kilza
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Toshiro Sugii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +136,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Parses JSON objects and generates objects into other languages
+description: "\n    Ruby gem that can convert JSON strings in Objects.\n    It supports
+  Objective-C and Java classes. Contribuition would be appreciate.\n  "
 email:
 - rtoshiro@printwtf.com
 executables:
@@ -162,5 +191,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Parses JSON objects and generates objects into other languages
+summary: Parses JSON and generates objects into other languages
 test_files: []