jaspion-kilza 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb863f539668936bbfcc38b09be56efe00fc9c58
-  data.tar.gz: 4cdea48ae8354c0b4d1dcb48238a0c21848c51c7
+  metadata.gz: a005f85f95e01c815452123d02f78882c2e6963e
+  data.tar.gz: d948698396da25947d4df8ce25d5f3a19fd90765
 SHA512:
-  metadata.gz: 54acf2e90227058d1a6dc5c31d683bf42834f5a02ffe77bc695de8939d840be17b0426da5d476db5b86bdc73d9963f89a062af668a98583d2076ad48ca7f013b
-  data.tar.gz: 2895c608667a76fff1a22820532aad55faa9265154e953d68c9bdaa2dac36c478c6f7a2adc74eaecbcdb32bdc7e5b7b25522660fe3a64e47fa56ce7f441a0632
+  metadata.gz: 62e6310c809fc212626296a14e2dacc8b58e185e2049e2777642bfa4abe50faf5ff726fbf8089ce6dde4e9ae3b5019f09f1d662e3b715bc1e61d4f604f00dcbd
+  data.tar.gz: 237145797b973ce882e5b7fa2699133c266ecb57f0ac3f878cf3beceb9862dc4b28b8f21e327fda0f46f64019184403c551fdc71217ccf4b4576e749c2ea14d4

data/bin/kilza

@@ -5,7 +5,6 @@ require 'jaspion/kilza'
 require 'pastel'
 require 'tty'
 require 'tty-prompt'
-require 'tty-spinner'
 require 'net/http'
 require 'uri'
 
@@ -27,11 +26,11 @@ class KilzaApplication
 
   OBJC = 1
   JAVA = 2
+  SWIFT = 3
 
   def initialize
     @pastel = Pastel.new
     @prompt = TTY::Prompt.new
-    @spinner = TTY::Spinner.new
 
     @done = false
   end
@@ -42,6 +41,7 @@ class KilzaApplication
       menu.enum '.'
 
       menu.choice 'Objective-C', OBJC
+      menu.choice 'Swift', SWIFT
       menu.choice 'Java', JAVA
     end
     action
@@ -88,6 +88,13 @@ class KilzaApplication
           File.write(File.join(target_path, s.file_name), s.source)
         }
       }
+    elsif (lang == SWIFT)
+      swift = Jaspion::Kilza::Swift.new(json_string)
+      swift.classes(class_basename).each { |c|
+        c.sources.each{ |s|
+          File.write(File.join(target_path, s.file_name), s.source)
+        }
+      }
     end
   end
 
@@ -125,8 +132,8 @@ class KilzaApplication
         @prompt.say("\n")
         @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 language: ') + (lang == OBJC ? 'Objective-C' : (lang == SWIFT ? 'Swift' : 'Java')))
+        unless class_package.nil?
           @prompt.say(@pastel.bold('Target package: ') + class_package)
         end
         ok = @prompt.yes?(@pastel.bold('Is that correct? '))

data/lib/jaspion/kilza.rb

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

data/lib/jaspion/kilza/language.rb

@@ -47,6 +47,7 @@ module Jaspion
       #
       # @return [Array] All available classes
       def classes(base_name)
+        @classes = []
         hash = JSON.parse(json_string)
         hash = { base_name + 'Object' => hash } if hash.is_a?(Array)
         parse_hash(base_name, hash)

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

@@ -22,6 +22,70 @@ module Jaspion
   end
 end
 
+module Jaspion
+  module Kilza
+    class Java
+      class Property < Jaspion::Kilza::Property
+
+        def json_key
+          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
+      end
+    end
+  end
+end
+
 module Jaspion
   module Kilza
     # Objective-C Language parser
@@ -56,6 +120,14 @@ module Jaspion
         Jaspion::Kilza::Java::Class.new(name)
       end
 
+      def property(name, type, array, key)
+        original_name = name
+        name = @reserved_delimiter + 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)
 

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

@@ -14,17 +14,11 @@ import com.google.gson.annotations.Expose;
 public class <%= @name %> implements Serializable
 {
 <% for @property in @properties %>
-    private static final String FIELD_<%= @property.name.upcase %> = "<%= @property.original_name %>";
+<%= @property.json_key %>
 <% end %>
 
 <% for @property in @properties %>
-    @Expose
-    @SerializedName(FIELD_<%= @property.name.upcase %>)
-    <% if @property.array? %>
-    private ArrayList<<%= @property.type %>> <%= @property.name %>;
-    <% else %>
-    private <%= @property.type %> <%= @property.name %>;
-    <% end %>
+<%= @property.declaration %>
 <% end %>
 
     public <%= @name %>() {
@@ -55,31 +49,7 @@ public class <%= @name %> implements Serializable
     protected void parseObject(JSONObject object)
     {
 <% for @property in @properties %>
-  <% 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.object? || @property.null? %>
-                JSONObject <%= @property.name %> = <%= @property.name %>JsonArray.optJSONObject(i);
-    <% else %>
-                <%= @property.type %> <%= @property.name %> = <%= @property.name %>JsonArray.optJSON<%= @property.type %>(i);
-    <% end %>
-                this.<%= @property.name %>.add(new <%= @property.type %>(<%= @property.name %>));
-            }
-        }
-  <% else %>
-    <% if @property.object? %>
-        this.<%= @property.name %> = new <%= @property.type %>(object.optJSONObject(FIELD_<%= @property.name.upcase %>));
-    <% else %>
-      <% if @property.null? %>
-        this.<%= @property.name %> = object.opt(FIELD_<%= @property.name.upcase %>);
-      <% else %>
-        this.<%= @property.name %> = object.opt<%= @property.type %>(FIELD_<%= @property.name.upcase %>);
-      <% end %>
-    <% end %>
-  <% end %>
+<%= @property.parse_json %>
 <% end %>
     }
 

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

@@ -3,6 +3,7 @@
 //
 //  Created on <%= Time.now.strftime("%Y-%m-%d") %>
 //  Copyright (c) <%= Time.now.strftime("%Y") %>. All rights reserved.
+//  Generated by Kilza https://github.com/Jaspion/Kilza
 //
 
 #import <Foundation/Foundation.h>

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

@@ -3,6 +3,7 @@
 //
 //  Created on <%= Time.now.strftime("%Y-%m-%d") %>
 //  Copyright (c) <%= Time.now.strftime("%Y") %>. All rights reserved.
+//  Generated by Kilza https://github.com/Jaspion/Kilza
 //
 
 #import "<%= @name %>.h"

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

@@ -0,0 +1,74 @@
+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
+
+      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',
+          'fixnum' => 'Int',
+          'float' => 'Double',
+          'falseclass' => 'Bool',
+          'trueclass' => 'Bool',
+          'hash' => 'Dictionary'
+        }
+
+        @equal_keys = 'id identifier uid'
+      end
+
+      def clazz(name)
+        Jaspion::Kilza::Swift::Class.new(name)
+      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}")
+            end
+
+            pr.type = @types[pr.type] unless @types[pr.type].nil?
+            pr.type = "[#{pr.type}]" if pr.array?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,134 @@
+//
+//  <%= @name %>.m
+//
+//  Created on <%= Time.now.strftime("%Y-%m-%d") %>
+//  Copyright (c) <%= Time.now.strftime("%Y") %>. All rights reserved.
+//  Generated by Kilza https://github.com/Jaspion/Kilza
+//
+
+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('"', '\"') %>"
+<% end %>
+
+<% for @property in @properties %>
+    public var <%= @property.name %>: <%= @property.type %>?
+<% end %>
+
+    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!
+    }
+
+    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 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())
+          }
+        } else {
+          self.init(dict: Dictionary())
+        }
+    }
+
+    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))
+            }
+        }
+        self.<%= @property.name %> = list<%= @property.name.capitalize %>
+<% else %>
+        self.<%= @property.name %> = <%= @property.name.capitalize %>.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 %>
+<% end %>
+<% end %>
+    }
+
+    public func dictionaryRepresentation() -> Dictionary<String, AnyObject> {
+      <% if @properties.length == 0 %>
+        let mutableDict: Dictionary = [String: AnyObject]()
+      <% else %>
+        var mutableDict: Dictionary = [String: AnyObject]()
+      <% end %>
+<% for @property in @properties %>
+<% if @property.object? || (@property.null? && @property.array?) %>
+<% if @property.array? %>
+        var tempArray<%= @property.name.capitalize %> = [Dictionary<String, AnyObject>]()
+        for subArray in self.<%= @property.name %>! {
+            if let dicRepresentation: Dictionary<String, AnyObject> = subArray.dictionaryRepresentation() {
+                 tempArray<%= @property.name.capitalize %>.append(dicRepresentation)
+            }
+        }
+        mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = Array.init(tempArray<%= @property.name.capitalize %>)
+<% else %>
+        if let dic = <%= @property.name %>?.dictionaryRepresentation() {
+            mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = dic
+        } else {
+            mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = self.<%= @property.name %>
+        }
+<% end %>
+<% else %>
+        mutableDict[<%= @name %>.k<%= @name %><%= @property.name.capitalize %>] = self.<%= @property.name %>
+<% end %>
+<% end %>
+        return NSDictionary.init(dictionary: mutableDict) as! Dictionary<String, AnyObject>
+    }
+
+    public func objectOrNil(forKey key: String, fromDictionary dict: Dictionary<String, AnyObject>) -> AnyObject?
+    {
+      if let object: AnyObject = dict[key] {
+        if !(object is NSNull) {
+          return object
+        }
+      }
+      return nil
+    }
+
+    required public init(coder aDecoder: NSCoder) {
+<% for @property in @properties %>
+        self.<%= @property.name %> = aDecoder.decodeObjectForKey(<%= @name %>.k<%= @name %><%= @property.name.capitalize %>)!<% if @property.type != 'AnyObject' %> as? <%= @property.type %><% end %>
+<% end %>
+    }
+
+    public func encodeWithCoder(aCoder: NSCoder) {
+<% for @property in @properties %>
+        aCoder.encodeObject(<%= @property.name %>, forKey:<%= @name %>.k<%= @name %><%= @property.name.capitalize %>)
+<% end %>
+    }
+
+    override public var description: String {
+        get {
+            return "\(dictionaryRepresentation())"
+        }
+    }
+}

data/lib/jaspion/kilza/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaspion-kilza
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Toshiro Sugii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,8 @@ files:
 - lib/jaspion/kilza/language/objc.rb
 - 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/swift.erb
 - lib/jaspion/kilza/property.rb
 - lib/jaspion/kilza/source.rb
 - lib/jaspion/kilza/version.rb
@@ -190,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Parses JSON and generates objects into other languages