kilza 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb3186b37f9e9108276b4e7bb4c95217e32da34
-  data.tar.gz: 025ba6e2147e62e5e19dbf6ba8e58be9bbffa361
+  metadata.gz: 17f4a3986407598ff9c51551d15cb3dedc01c934
+  data.tar.gz: d18285c8fdf2e363b21ad71941d98d45ce9387e7
 SHA512:
-  metadata.gz: 8cde20c73473da2ff456a9ab14ddc5f2e32e60dcdf4218d91a6e62aa33127994c85046904d3318143a6b00a160b22a797c54812839bf42eadfcd24994ab02ba7
-  data.tar.gz: c5e2fcca3ba6505713607378e8b2905730c9a296a546984f7632599de692ce604de6a400ab9b519f0dbe67cbf353a0b40ecab2e5a1de0a8ad516f0e4ce9ca41d
+  metadata.gz: 0b85a49727c028294a2a9f716bf77f23ec22d1f028f023e534646fd8b6fc41edb84d9bc7497936966e9c6fa4adb42401f89522ff9df375ceadf51ed6f4dffecd
+  data.tar.gz: 716bcd6688ca12ac7490b54080800d967075a42e463f1c39dc41cdd22c0cfd5681ff1eff6d11eab2391120eed04d637a7356896a4c2a6dffe8f16606152f1d32

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -1,8 +1,10 @@
 # Kilza
 
+[![Gem Version](https://badge.fury.io/rb/kilza.svg)](https://badge.fury.io/rb/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)
+[![Coverage Status](https://coveralls.io/repos/github/Jaspion/Kilza/badge.svg?branch=master)](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)
 

data/bin/kilza

@@ -58,7 +58,7 @@ class KilzaApplication
 
     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.'))
@@ -105,8 +105,9 @@ class KilzaApplication
   end
 
   def run
+    @prompt.say(@pastel.bold('Kilza - v' + Kilza::VERSION))
     while (not @done)
-      action = @prompt.select(@pastel.bold('Choose your destiny?')) do |menu|
+      action = @prompt.select(@pastel.bold('Master, what can I do for you?')) do |menu|
         menu.default 1
         menu.enum '.'
 
@@ -127,11 +128,8 @@ class KilzaApplication
         if not class_package.nil?
           @prompt.say(@pastel.bold('Target package: ') + class_package)
         end
-        ok = @prompt.yes?('Is that correct?')
+        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'))
-
           generate(lang, json_string, class_basename, target_path, class_package)
 
           @prompt.say(@pastel.bold('Kikera!'))

data/lib/kilza/class.rb

@@ -11,34 +11,38 @@ module Kilza
     # Array with all class properties
     attr_accessor :properties
 
+    # Initializes a Class object
+    #
+    # @param name [String] Class Name
     def initialize(name)
       @name = Kilza.normalize(name).capitalize
       @properties = []
       @imports = []
     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 }
-      nil
-    end
-
     # Adds a new property
     #
     # @param property [Kilza::Property] Property to include
     def push(property)
-      p = find(property.name)
-      @properties.push(property) if p.nil?
+      index = @properties.index(property)
+      if !index.nil?
+        current = @properties[index]
+        @properties[index] = update(current, property)
+      else
+        @properties.push(property)
+      end
     end
 
     def sources
       fail 'It should be implemented'
     end
 
+    # Returns the #Source object of this Class.
+    #
+    # @param lang [String] Language name (java, objc, ...)
+    # @param file_name [String] Source file name
+    #
+    # @return [Kilza::Source] Source object of this Class
     def code(lang, file_name)
       cur_path = File.expand_path(__FILE__)
       erb_path = File.join(File.dirname(cur_path), 'language', lang)
@@ -61,5 +65,22 @@ module Kilza
         properties: properties
       }.to_s
     end
+
+    protected
+
+    # Compares two properties and fill the src property with relevant
+    # dst property values. If src.type is nilclass and dst.type not, replaces
+    # it with dst.type
+    #
+    # @param property [Kilza::Property] Property to include
+    #
+    # @return [Kilza::Property] src property with new values
+    def update(src, dst)
+      src.type = dst.type if src.null? && !dst.null?
+      src.original_type = dst.original_type if src.null? && !dst.null?
+      src.array = dst.array unless src.array?
+      src.key = dst.key unless src.key
+      src
+    end
   end
 end

data/lib/kilza/language.rb

@@ -43,6 +43,7 @@ module Kilza
       hash = JSON.parse(json_string)
       hash = { base_name + 'Object' => hash } if hash.is_a?(Array)
       parse_hash(base_name, hash)
+
       @classes
     end
 
@@ -69,7 +70,7 @@ module Kilza
     # @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?)
+      Property.new(name, type, array, key)
     end
 
     # Searches for a Kilza::Class inside @classes
@@ -85,7 +86,7 @@ module Kilza
       @classes.last
     end
 
-    # Parses an element value an verify if it should create a new Class
+    # Parses an element value an verify if it should create a new Classs
     # inside @classes
     #
     # @param class_name [String] Name of the class the element is inside
@@ -98,9 +99,12 @@ module Kilza
       return parse_array(class_name, name, value) if type == 'array'
 
       cur_class = find(class_name)
-      key = @equal_keys.index(name)
+      key = @equal_keys.index(name).nil? ? false : true
       cur_class.push(property(name, type, array, key))
 
+      # if value is nil, consider it as an Object
+      find(name) if type == 'nilclass'
+
       parse_hash(name, value) if type == 'hash'
     end
 

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

@@ -99,8 +99,12 @@ public class <%= @name %> implements Serializable
 @eq = []
 @hs = []
 for @property in @properties
-  @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if (@property.key)
-  @hs.push("#{@property.name}.hashCode()") if (@property.key)
+  if @property.boolean?
+    @eq.push("((#{@name}) obj).is#{@property.name.capitalize}().equals(#{@property.name})") if @property.key?
+  else
+    @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if @property.key?
+  end
+  @hs.push("#{@property.name}.hashCode()") if @property.key?
 end
 %>
 <% if @eq.length > 0 %>

data/lib/kilza/property.rb

@@ -11,6 +11,9 @@ module Kilza
 
     # Ruby string type
     # Can be object, fixnum, float, falseclass, trueclass and nilclass
+    attr_accessor :original_type
+
+    # Property type name
     attr_accessor :type
 
     # Indicates if the property represents an array of objects
@@ -20,6 +23,7 @@ module Kilza
     # Indicates if the property should be used for comparing purposes
     # Used to compare if one object is equal to another one
     attr_accessor :key
+    alias_method :key?, :key
 
     def initialize(name, type, array, key)
       @name = Kilza.normalize(name)
@@ -50,6 +54,10 @@ module Kilza
       @original_type == 'nilclass'
     end
 
+    def ==(pr)
+      @name == pr.name
+    end
+
     def to_s
       {
         name: @name,

data/lib/kilza/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kilza
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Toshiro Sugii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - CODE_OF_CONDUCT.md