ObjCGenerator 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bda9cfd347531a805f73ddab559605a3d8cdc11
-  data.tar.gz: cb6bc9885cc2016f8a75266ff18406b207e8bf4b
+  metadata.gz: 99a5a896777c606d06a79dfaaed6c290d62b4cf8
+  data.tar.gz: 2c4dbfacda9f5e823bebaadd0b8ba4864e7cf450
 SHA512:
-  metadata.gz: 1b6c58d00ac110f5bf98e411f6b51b0ca42c6727e84be93371e02d23f4675c5b4c87b905cf84d95ce2d05a28c75476c8bdcb525c67320b0fb6b20b0ce540cdce
-  data.tar.gz: 57626ddd58af53a87bf6ac7cd95264ab4102fe9135bf7319cb7d7914f36ecd029ce3da3aef3d445620a8458f0c648c305a569297e555e1b53101bfd8dae95aaf
+  metadata.gz: 2aebc58d88362c096cd5a70f8ed0e82fe4444d019557a80fcadf00bd43e3e9fe5658ccb89fbae7fbaf7130b1c1d3a99a2267d4d9bac6184b6c144b9dfe210a5b
+  data.tar.gz: 9278bae480f767287746a6b79b8700b97029fdc434a450c377dbd592eab5ea2fd7559a1cc3a520a8b99772afb142b92b58f0490ab7a747744e63db744c79614c

data/bin/objcgenerator

@@ -13,23 +13,22 @@ command :generate do |c|
   c.syntax = 'objgenerator generate [options]'
   c.summary = 'Generate the Objective-C code'
   c.description = 'Generate the Objective-C code. Provide a valid json description with the --input <string> parameter.'
-  c.example 'Use the "api.json" definition file and generate the classes in the current directory', 'objcgenerator generate --input "api.json" --output .'
+  c.example 'Use the "api.json" definition file and generate the classes in the current directory', 'objcgenerator generate --input "api.json" --output . --generate-categories'
   c.option '--input STRING', String, 'The path oth the JSON desctription'
   c.option '--output STRING', String, 'The output path where the obj-c code will be generated'
+  c.option '--generate-categories', 'For each class, a category is also created'
 
   c.action do |args, options|
     options.default :output => '.'
 
-    if (options.input.nil? or options.output.nil?)
-      puts "Inavalid format:"
-      puts "objgenerator generate --input <file> --output <path>"
-    else
-      input=File.new(options.input,"r");
-      json = input.read
-      command = ObjCGenerator::Command.new
+    raise ArgumentError.new("Input parameter is required!") unless options.input
 
-      command.run json, options.output
-    end
+    input=File.new(options.input,"r");
+    json = input.read
+    command = ObjCGenerator::Command.new
+    command.run json, options.output
+
+    command.generate_categories(json, options.output) if options.generate_categories
   end
 end
 

data/lib/ObjCGenerator/category_generator.rb

@@ -0,0 +1,31 @@
+module ObjCGenerator
+  class CategoryGenerator
+    def template_path filename
+      File.join(File.expand_path("../..", File.dirname(__FILE__)), "templates/#{filename}.erb")
+    end
+
+    def generate_incipit()
+      author = "Ignazioc"
+
+      incipit_template = File.read(template_path('incipit'))
+      ERB.new(incipit_template).result(binding)
+    end
+
+    def generate_category_header(class_name)
+      incipit = generate_incipit()
+
+      header_template      = File.read(template_path('category_header'))
+      category_header =  ERB.new(header_template).result(binding)
+      return incipit  + category_header
+    end
+
+    def generate_category_implementation(class_name)
+      incipit = generate_incipit()
+
+      template = File.read(template_path('category_implementation'))
+      category_implementation =  ERB.new(template).result(binding)
+      return incipit  + category_implementation
+    end
+
+  end
+end

data/lib/ObjCGenerator/class_interface_generator.rb

@@ -14,7 +14,6 @@ module ObjCGenerator
 
     def generate_class_header (class_name, variables)
       incipit = generate_incipit()
-
       @class_predefinitions = generate_import_classes(variables)
       @class_name           = "@interface #{class_name} : NSObject <NSCopying>"
       @class_properties     = generate_class_properties(variables)

data/lib/ObjCGenerator/command.rb

@@ -2,42 +2,36 @@ module ObjCGenerator
   class Command
 
     def run input_file, output_dir
+      parser = JSONParser.new()
 
-      parsed = JSON.parse(input_file)
-
-      parsed.each do |var|
-        if var["type"] == "Class"
-
-          vars = var["vars"].map { |hash|
-            case hash["type"]
-            when "Bool"
-              TypeBool.new(hash["name"])
-            when "Int"
-              TypeInt.new(hash["name"])
-            when "Float"
-              TypeFloat.new(hash["name"])
-            when "String"
-              TypeString.new(hash["name"])
-            when "Date"
-              TypeDate.new(hash["name"])
-            when "Array"
-              TypeArray.new(hash["name"], hash["subType"])
-            else
-              TypeCustomObject.new(hash["name"], hash["type"])
-
-            end
-          }
-
-          g = ClassInterfaceGenerator.new()
-          gc = ClassInterfaceGenerator.new()
-
-          header = g.generate_class_header var["name"], vars
-          File.open( output_dir + "/#{var["name"]}.h", 'w') { |file| file.write(header) }
-
-          implementation = gc.class_implementation var["name"], vars
-          File.open( output_dir + "/#{var["name"]}.m", 'w') { |file| file.write(implementation) }
-
-        end
+      result = parser.parse(input_file)
+      result.each do |klass|
+
+        g = ClassInterfaceGenerator.new()
+        gc = ClassInterfaceGenerator.new()
+
+        header = g.generate_class_header klass[:name], klass[:var_list]
+        File.open( output_dir + "/#{klass[:name]}.h", 'w') { |file| file.write(header) }
+
+        implementation = gc.class_implementation klass[:name], klass[:var_list]
+        File.open( output_dir + "/#{klass[:name]}.m", 'w') { |file| file.write(implementation) }
+      end
+    end
+
+    def generate_categories(input_file, output_dir)
+      parser = JSONParser.new()
+      result = parser.parse(input_file)
+
+      categoryGenerator = CategoryGenerator.new()
+
+      result.each do |klass|
+        class_name = klass[:name]
+
+        header = categoryGenerator.generate_category_header(class_name)
+        File.open( output_dir + "/#{klass[:name]}+CustomCode.h", 'w') { |file| file.write(header) }
+
+        implementation = categoryGenerator.generate_category_implementation(class_name)
+        File.open( output_dir + "/#{klass[:name]}+CustomCode.m", 'w') { |file| file.write(implementation) }
       end
     end
   end

data/lib/ObjCGenerator/json_parser.rb

@@ -0,0 +1,36 @@
+module ObjCGenerator
+  class JSONParser
+
+
+    #return an array of maps
+    #in this format {:name => 'SampleClass', :var_list => [....]}
+    def parse(input_file)
+      parsed = JSON.parse(input_file)
+      result = []
+      parsed.each do |klass|
+        if klass["type"] == "Class"
+          var_list = klass["vars"].map { |hash|
+            case hash["type"]
+            when "Bool"
+              TypeBool.new(hash["name"])
+            when "Int"
+              TypeInt.new(hash["name"])
+            when "Float"
+              TypeFloat.new(hash["name"])
+            when "String"
+              TypeString.new(hash["name"])
+            when "Date"
+              TypeDate.new(hash["name"])
+            when "Array"
+              TypeArray.new(hash["name"], hash["subType"])
+            else
+              TypeCustomObject.new(hash["name"], hash["type"])
+            end
+          }
+        end #end if
+        result << {name: klass["name"], var_list: var_list }
+      end #end each
+      result
+    end #end parse
+  end
+end

data/lib/ObjCGenerator/types.rb

@@ -242,4 +242,7 @@ class TypeArray  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copyWithZone:nil];"
   end
+  def hash_row
+    "[self.#{self.varname} hash];"
+  end
 end

data/lib/ObjCGenerator/version.rb

@@ -1,3 +1,3 @@
 module ObjCGenerator
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/ObjCGenerator.rb

@@ -4,6 +4,8 @@ require 'erb'
 require "ObjCGenerator/version"
 require "ObjCGenerator/class_interface_generator"
 require "ObjCGenerator/class_implementation_generator"
+require "ObjCGenerator/category_generator"
+require "ObjCGenerator/json_parser"
 require "ObjCGenerator/command"
 require "ObjCGenerator/types"
 

data/templates/category_header.erb

@@ -0,0 +1,5 @@
+#import "<%= class_name %>.h"
+
+@interface <%= class_name %> (CustomCode)
+
+@end

data/templates/category_implementation.erb

@@ -0,0 +1,5 @@
+#import "<%= class_name %>+CustomCode.h"
+
+@implementation <%= class_name %> (CustomCode)
+
+@end

data/templates/class_header.erb

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+<%= @class_predefinitions %>
+<%= @class_name %>
+
+<%= @class_properties %>
+
+<%= @class_methods %>
+
+@end

data/templates/class_implementation.erb

@@ -0,0 +1,23 @@
+#import "<%= class_name %>.h"
+<%= @import_other_classes %>
+@implementation <%= class_name %>
+
+<%= @init_method %>
+
+<%= @init_with_dict_method %>
+
+<%= @class_init_with_dict %>
+
+<%= @to_dict_method  %>
+
+<%= @is_equals_method%>
+
+<%= @is_equals_to_Object_method %>
+
+<%= @description_method %>
+
+<%= @copy_method %>
+
+<%= @hash_method %>
+
+@end

data/templates/incipit.erb

@@ -0,0 +1,5 @@
+//
+// This code is autogenerated using ObjCGenerator by <%= author %>
+// https://github.com/ignazioc/ObjCGenerator
+//
+

data/templates/method_class_init_with_dict.erb

@@ -0,0 +1,3 @@
++ (instancetype)<%= @lowercaseClassName %>WithDict:(NSDictionary *)dict {
+    return [[self alloc] initWithDict:dict];
+}

data/templates/method_copy.erb

@@ -0,0 +1,5 @@
+- (instancetype)copyWithZone:(NSZone *)zone {
+    <%= @class_name %> *<%= @varname %> = [[[self class] allocWithZone:zone] init];<% for item in @copy_rows %>
+    <%= item %><% end %>
+    return <%= @varname %>;
+}

data/templates/method_description.erb

@@ -0,0 +1,7 @@
+- (NSString *)description {
+    NSString *params = [@[<% for item in @description_rows %>
+                          <%= item %><% end %>
+                         ] componentsJoinedByString:@", "
+                       ];
+    return [NSString stringWithFormat:@"%@ { %@ }", NSStringFromClass([self class]), params];
+}

data/templates/method_hash.erb

@@ -0,0 +1,6 @@
+- (NSUInteger)hash {
+    NSUInteger result = 1;
+    NSUInteger prime = 31;<% for item in @hash_rows %>
+    result += prime * result + <%= item %><% end %>
+    return result;
+}

data/templates/method_init.erb

@@ -0,0 +1,7 @@
+- (instancetype)init {
+    if ((self = [super init])) {
+<% for item in @init_rows %>
+        <%= item %><% end %>
+    }
+    return self;
+}

data/templates/method_init_with_dictionary.erb

@@ -0,0 +1,8 @@
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    if ((self = [self init])) {
+
+        id val = nil;<% for item in @initWithDictRows %>
+        <%= item %><% end %>
+    }
+    return self;
+}

data/templates/method_is_equal.erb

@@ -0,0 +1,7 @@
+- (BOOL)isEqual:(id)object {
+    if (self == object) { return true; }
+    else if ([object isKindOfClass:[self class]]) {
+        return [self isEqualTo<%= @class_name %>:object];
+    }
+    else { return NO; }
+}

data/templates/method_is_equal_to.erb

@@ -0,0 +1,5 @@
+- (BOOL)isEqualTo<%= @class_name %>:(<%= @class_name %> *)other {
+    if (self == other) return YES;<% for item in @is_equal_rows %>
+    <%= item %><% end %>
+    return YES;
+}

data/templates/method_to_dict.erb

@@ -0,0 +1,5 @@
+- (NSDictionary *)toDict {
+    return @{<% for item in @to_ditc_rows %>
+            <%= item %><% end %>
+            };
+}

data/templates/methods_definition.erb

@@ -0,0 +1,10 @@
+- (instancetype)init;
+- (instancetype)initWithDict:(NSDictionary *)dict;
++ (instancetype)<%= lowercase_class_name %>WithDict:(NSDictionary *)dict;
+- (NSDictionary *)toDict;
+
+- (BOOL)isEqual:(id)object;
+- (BOOL)isEqualTo<%= class_name %>:(<%= class_name %> *)other;
+- (NSUInteger)hash;
+- (NSString *)description;
+- (instancetype)copyWithZone:(NSZone *)zone;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ObjCGenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ignazio Calò
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,11 +62,28 @@ extra_rdoc_files: []
 files:
 - bin/objcgenerator
 - lib/ObjCGenerator.rb
+- lib/ObjCGenerator/category_generator.rb
 - lib/ObjCGenerator/class_implementation_generator.rb
 - lib/ObjCGenerator/class_interface_generator.rb
 - lib/ObjCGenerator/command.rb
+- lib/ObjCGenerator/json_parser.rb
 - lib/ObjCGenerator/types.rb
 - lib/ObjCGenerator/version.rb
+- templates/category_header.erb
+- templates/category_implementation.erb
+- templates/class_header.erb
+- templates/class_implementation.erb
+- templates/incipit.erb
+- templates/method_class_init_with_dict.erb
+- templates/method_copy.erb
+- templates/method_description.erb
+- templates/method_hash.erb
+- templates/method_init.erb
+- templates/method_init_with_dictionary.erb
+- templates/method_is_equal.erb
+- templates/method_is_equal_to.erb
+- templates/method_to_dict.erb
+- templates/methods_definition.erb
 homepage: ''
 licenses:
 - MIT