ObjCGenerator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1dc238605c220a535ee63afe585c956dbbbc1cd
-  data.tar.gz: 3e19101c22da3256f160b700daab9dee88c3145c
+  metadata.gz: d768d15ac8526021090cfaad4832799fde7da34c
+  data.tar.gz: b63d02360bee09e90fb97955b2b9fb10153c560f
 SHA512:
-  metadata.gz: af189b52e97e4145c16cfa71402e3edbd4a3abd43685f247333708e0b4e095fc8efba04754940853abf4ed31a8bd80ad743b7d6dab6e117e5162ac541d16d8eb
-  data.tar.gz: a785bf33caefa66e04ef46ab2505e2bc8e32196710bfbaa5d9ca56ee14193c37b42342bb02f9923faa52827eefea7ca92119953e3c56ad2d2c90eb03cc707844
+  metadata.gz: 1a114f4e0130ab281d8fa14cd8516bbf6c4f75bc7ea6d3351a6dca99bc4457e9041f2dcafed0f0d080bd5c4a16a64742aebfaad25c7c3f13c9468f28a9af151c
+  data.tar.gz: edbca3206860cd97ad9c040f8454536780506be26491b60acbfe8c92fb7819080256536eb5e174923047a48bb87b41150a421dc5fdac10920c9755b4456eab7e

data/bin/api_desc.json

@@ -1,4 +1,14 @@
 [
+    {
+        "name": "SampleClass2",
+        "type": "Class",
+        "vars": [
+            {
+                "name": "someStr",
+                "type": "String"
+            }
+        ]
+    },
     {
         "name": "SampleClass",
         "type": "Class",
@@ -18,6 +28,10 @@
             {
                 "name": "someStr",
                 "type": "String"
+            },
+            {
+                "name": "someClass2",
+                "type": "SampleClass2"
             }
         ]
     }

data/bin/objcgenerator

@@ -4,9 +4,18 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'ObjCGenerator'
 
+if (ARGV[0].nil?) then
+  if (STDIN.tty?)
+    puts "Usage: objcgenerator <finame>"
+    puts "Usage: cat <filename> | objcgenerator"
+    exit
+  end
+  input=$<
+else
+    input=File.new(ARGV[0],"r");
+end
+str = (STDIN.tty?) ? 'not reading from stdin' : $stdin.read
 
-filename = "api_desc.json"
-file = open(filename)
-json = file.read
+json = input.read
 
 ObjCGenerator::Command.run json, Dir.pwd

data/lib/ObjCGenerator/class_implementation.rb

@@ -14,8 +14,8 @@ module ObjCGenerator
   end
 
   def self.class_implementation (class_name, vars)
-    text = "#import \"#{class_name}.h\""                           + "\n" +
-      ""                                                      + "\n" +
+    text = "#import \"#{class_name}.h\""                      + "\n" +
+      "#{import_other_classes vars}"                          + "\n" +
       "@implementation #{class_name}"                         + "\n" +
       ""                                                      + "\n" +
       "#{init_method vars}"                                   + "\n" +
@@ -40,6 +40,11 @@ module ObjCGenerator
       ""
   end
 
+  def self.import_other_classes vars
+      custom_objects = vars.select { | var | var.is_a? TypeCustomObject }
+      custom_objects.inject("") { |mem, var| mem << "#import \"#{var.var_type}.h\""  + "\n"}
+    end
+
   def self.copy_method(class_name, vars)
     t = class_name.dup
     t[0] = t[0].chr.downcase
@@ -194,7 +199,7 @@ module ObjCGenerator
     vars.each do |var|
       result << "        _#{var.varname} = #{var.default_value};"
     end
-    result = vertical_align_vars result, /( = )/, 0
+    result = vertical_align_vars result, /(=)/, 0
     result = result.intersperse("\n")
 
     result.inject("") { |mem, var| mem << var  }

data/lib/ObjCGenerator/command.rb

@@ -1,21 +1,10 @@
 module ObjCGenerator
   class Command
 
-    def self.vertical_align strings
-      max_lengt = strings.map { | str|
-        c = str.rpartition(" ").first.length
-      }.max
-
-      result = strings.map { |str|
-        l = str.rpartition(" ").last.start_with?("*") ? max_lengt : max_lengt+1
-        str.rpartition(" ").first.ljust(l , ' ')  + str.rpartition(" ").last
-      }
-      result
-    end
-
     def self.class_header (class_name, vars)
       @text = "#import <Foundation/Foundation.h>"               + "\n" +
         ""                                                      + "\n" +
+        "#{import_classes vars}"                                + "\n" +
         "@interface #{class_name} : NSObject <NSCopying>"       + "\n" +
         ""                                                      + "\n" +
         "#{class_properties vars}"                              + "\n" +
@@ -33,7 +22,7 @@ module ObjCGenerator
         result << var.property_definition
       end
 
-      result = vertical_align result
+      result = ObjCGenerator::vertical_align_vars result, /( )/, 4
       result = result.intersperse("\n")
 
       result.inject("") { |mem, var| mem << var }
@@ -54,12 +43,18 @@ module ObjCGenerator
         "- (instancetype)copyWithZone:(NSZone *)zone;"
     end
 
+    def self.import_classes vars
+      custom_objects = vars.select { | var | var.is_a? TypeCustomObject }
+      custom_objects.inject("") { |mem, var| mem << "@class #{var.var_type};"  + "\n"}
+    end
+
     def self.run input_file, output_dir
 
       parsed = JSON.parse(input_file)
 
       parsed.each do |var|
         if var["type"] == "Class"
+
           vars = var["vars"].map { |hash|
             case hash["type"]
             when "Bool"
@@ -72,6 +67,9 @@ module ObjCGenerator
               TypeString.new(hash["name"])
             when "Date"
               TypeDate.new(hash["name"])
+            else
+              TypeCustomObject.new(hash["name"], hash["type"])
+
             end
           }
 
@@ -81,7 +79,6 @@ module ObjCGenerator
           implementation = ObjCGenerator::class_implementation var["name"], vars
           File.open( output_dir + "/#{var["name"]}.m", 'w') { |file| file.write(implementation) }
 
-          # ObjCGenerator::testa(var["name"])
         end
       end
 

data/lib/ObjCGenerator/types.rb

@@ -151,3 +151,36 @@ class TypeDate  < ObjCType
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copy];"
   end
 end
+
+
+
+class TypeCustomObject  < ObjCType
+  attr_accessor :varname
+  attr_accessor :var_type
+  def initialize( name , type)
+    super(name)
+    @var_type = type
+  end
+  def property_definition
+    "@property (nonatomic) #{@var_type} *#{@varname};"
+  end
+  def default_value
+    "[#{@var_type} new]"
+  end
+  def conversion_value origin
+    # "[#{origin} description]"
+    "[[SampleClass2 alloc] initWithDict:#{origin}]"
+  end
+  def to_dictionary_item
+    "@\"#{@varname}\" : [self.#{@varname} toDict]  ?: @{}"
+  end
+  def inEquality_test other
+    "![self.#{self.varname}  isEqual:#{other}.#{self.varname}]"
+  end
+  def description_row
+    "@\"self.#{self.varname} = %@\" , self.#{self.varname}"
+  end
+  def copyrow newVarName
+    "#{newVarName}.#{self.varname}  = [self.#{self.varname} copyWithZone:nil];"
+  end
+end

data/lib/ObjCGenerator/version.rb

@@ -1,3 +1,3 @@
 module ObjCGenerator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ObjCGenerator.rb

@@ -1,4 +1,5 @@
 require "json"
+require "thor"
 require "ObjCGenerator/version"
 require "ObjCGenerator/command"
 require "ObjCGenerator/types"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ObjCGenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ignazio Calò
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler