ObjCGenerator 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8e1464215c49253200d99f93ac52b332aa580e
-  data.tar.gz: ce29a585676bc6e3ef8a9d3f529b1324f6c91e5a
+  metadata.gz: c359c27e87442b2ffc7da956fce1be4f153016d2
+  data.tar.gz: 6578fafc4cbd591a7222e6f5afefb863142eaf9e
 SHA512:
-  metadata.gz: 989e408170733ec058d339340534df1287c4d144fe48ded4aa3787459055f4d9813ef0e792cbd657eb4df0699c70b6a065fc55cf0a1679ad6acf3ca23bcf5f6c
-  data.tar.gz: b156ddb9e3378287a67bcbca25261865a13839e0d26e913c4428c2e395248f2207cdae52c231a61983f1953bf846f04fec32aaa973c02e6c2b75f400140b4387
+  metadata.gz: 4881b3b395116a29d08f411a3616cb849d4c7bea04d83c0f496b09966b697b6fca5105960d45068b7937f3683f041799318a0686ea79f7621aa58e92974169e0
+  data.tar.gz: 53f181dfc16d4783a2a4b4ccc5ed5fa93f0c5cc38dc181f9ee38200ba6f082eb256279dfefa4ea511ceaeda64543bad56860773bd4bbee11611eb59eea35a990

data/bin/objcgenerator

@@ -3,19 +3,32 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'ObjCGenerator'
+require 'rubygems'
+require 'commander/import'
 
-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
+program :version, ObjCGenerator::VERSION
+program :description, 'Generate Objective-C code from a JSON description of classes.'
+
+command :generate do |c|
+  c.syntax = 'objgenerator generate [options]'
+  c.summary = ''
+  c.description = ''
+  c.example 'description', 'command example'
+  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'
 
-json = input.read
+  c.action do |args, options|
+    options.default :output => '.'
 
-ObjCGenerator::Command.run json, Dir.pwd
+    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
+
+      command.run json, options.output
+    end
+  end
+end

data/lib/ObjCGenerator/class_implementation_generator.rb

@@ -0,0 +1,140 @@
+
+module ObjCGenerator
+
+  class ClassInterfaceGenerator
+    def generate_incipit()
+      author = "Ignazioc"
+
+      incipit_template = File.read(template_path('incipit'))
+      ERB.new(incipit_template).result(binding)
+    end
+
+    def class_implementation (class_name, vars)
+
+      incipit = generate_incipit()
+
+      @import_other_classes       =  generate_import_other_classes(vars)
+      @init_method                = generate_init_method(vars)
+      @init_with_dict_method      =  generate_init_with_dict_method(vars)
+      @class_init_with_dict       = generate_class_init_with_dict(class_name)
+      @to_dict_method             = generate_to_dict_method(vars)
+      @is_equals_method           = generate_is_equals_method(class_name)
+      @is_equals_to_Object_method = generate_is_equals_to_Object_method(class_name, vars)
+      @description_method         = generate_description_method( vars)
+      @copy_method                = generate_copy_method( class_name, vars)
+      @hash_method                = generate_hash_method( class_name, vars)
+
+      class_implementation = File.read(template_path('class_implementation'))
+      return incipit + ERB.new(class_implementation).result(binding)
+    end
+
+    def generate_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 generate_init_method vars
+      @init_rows = vars.map { |var | "_#{var.varname} = #{var.default_value};" }
+      @init_rows = ObjCGenerator::vertical_align_vars @init_rows, /(=)/, 0
+
+      init_method = File.read(template_path('method_init'))
+      return ERB.new(init_method).result(binding)
+    end
+
+    def generate_init_with_dict_method vars
+      @initWithDictRows = vars.map { |var|
+        conversion_type = var.conversion_value("val")
+        "if ((val = dict[@\"#{var.varname}\"]))  { _#{var.varname} = #{conversion_type}; } else { NSLog(@\"Error initWithDict: Unable to find: #{var.varname}\"); }"
+      }
+      @initWithDictRows = ObjCGenerator::vertical_align_vars @initWithDictRows,  /(\)\))/, 1
+      @initWithDictRows = ObjCGenerator::vertical_align_vars @initWithDictRows,  /( = )/, 2
+      @initWithDictRows = ObjCGenerator::vertical_align_vars @initWithDictRows,  /( } )/, 0
+
+      init_with_dict_method = File.read(template_path('method_init_with_dictionary'))
+      return ERB.new(init_with_dict_method).result(binding)
+
+    end
+
+    def generate_class_init_with_dict class_name
+      @lowercaseClassName = class_name.dup
+      @lowercaseClassName[0] = @lowercaseClassName[0].chr.downcase
+
+      template = File.read(template_path('method_class_init_with_dict'))
+      return ERB.new(template).result(binding)
+    end
+
+    def generate_to_dict_method vars
+      @to_ditc_rows = vars.map { |var|  var.to_dictionary_item + ","}
+      @to_ditc_rows[-1] = @to_ditc_rows[-1][0...-1]
+      @to_ditc_rows = ObjCGenerator::vertical_align_vars @to_ditc_rows, /( : )/, 0
+      @to_ditc_rows = ObjCGenerator::vertical_align_vars @to_ditc_rows, /( \?: )/, 0
+
+      template = File.read(template_path('method_to_dict'))
+      return ERB.new(template).result(binding)
+    end
+
+    def generate_is_equals_method class_name
+      @class_name = class_name
+      template = File.read(template_path('method_is_equal'))
+      return ERB.new(template).result(binding)
+    end
+
+    def generate_is_equals_to_Object_method (class_name, vars)
+      @class_name = class_name
+
+      @is_equal_rows = vars.map { |var|  "if (#{var.inEquality_test("other")}) return NO;" }
+      @is_equal_rows = ObjCGenerator::vertical_align_vars @is_equal_rows, /(  )/, 0
+      @is_equal_rows = ObjCGenerator::vertical_align_vars @is_equal_rows, /(\) )/, 0
+
+      template = File.read(template_path('method_is_equal_to'))
+      return ERB.new(template).result(binding)
+    end
+
+    def generate_description_method vars
+      @description_rows = vars.map { |var| "[NSString stringWithFormat:#{var.description_row}]," }
+      @description_rows[-1] = @description_rows[-1][0...-1]
+      @description_rows = ObjCGenerator::vertical_align_vars @description_rows, /( = )/, 0
+      @description_rows = ObjCGenerator::vertical_align_vars @description_rows, /( , )/, 0
+
+      template = File.read(template_path('method_description'))
+      return ERB.new(template).result(binding)
+    end
+
+
+    def generate_copy_method(class_name, vars)
+      @lowercaseClassName = class_name.dup
+      @lowercaseClassName[0] = @lowercaseClassName[0].chr.downcase
+      newName = "#{@lowercaseClassName}Copy"
+      @copy_rows = vars.map { |var| var.copyrow(newName) }
+      @copy_rows = ObjCGenerator::vertical_align_vars @copy_rows, /( = )/, 0
+
+      @class_name = class_name
+      @varname = newName
+
+      template = File.read(template_path('method_copy'))
+      return ERB.new(template).result(binding)
+    end
+
+
+    def generate_hash_method(class_name, vars)
+      @hash_rows = vars.map { |var| "#{var.hash_row};" }
+      template = File.read(template_path('method_hash'))
+
+      return ERB.new(template).result(binding)
+    end
+
+  end
+
+  def self.vertical_align_vars (strings , regexp, index)
+    max_lengt = strings.map { | str|
+      str.split(regexp)[0..index].join.length
+    }.max
+
+    result = strings.map { |str|
+      arr =  str.split(regexp)
+      arr[0..index].join.ljust(max_lengt , ' ') + arr[index+1..arr.length].join
+    }
+    result
+  end
+
+end

data/lib/ObjCGenerator/class_interface_generator.rb

@@ -0,0 +1,53 @@
+module ObjCGenerator
+  class ClassInterfaceGenerator
+
+    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_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)
+      @class_methods        = generate_class_methods(class_name)
+
+      header_template      = File.read(template_path('class_header'))
+      class_header =  ERB.new(header_template).result(binding)
+
+      return incipit  + class_header
+
+    end
+    def generate_class_properties(variables)
+      result = []
+      result = variables.map { |var| var.property_definition() }
+
+      result = ObjCGenerator::vertical_align_vars( result, /( )/, 4)
+      result = result.intersperse("\n")
+
+      result.inject("") { |mem, var| mem << var }
+    end
+
+    def generate_class_methods class_name
+      lowercase_class_name = class_name.dup
+      lowercase_class_name[0] = lowercase_class_name[0].chr.downcase
+
+      methods_definition_template      = File.read(template_path('methods_definition'))
+      methods_definition =  ERB.new(methods_definition_template).result(binding)
+
+    end
+
+    def generate_import_classes variables
+      custom_objects = variables.select { | var | var.is_a? TypeCustomObject }
+      custom_objects.inject("") { |mem, var| mem << "@class #{var.var_type};"  + "\n"}
+    end
+  end
+end

data/lib/ObjCGenerator/command.rb

@@ -1,54 +1,7 @@
 module ObjCGenerator
   class Command
 
-    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" +
-        ""                                                      + "\n" +
-        "#{class_methods class_name}"                           + "\n" +
-        ""                                                      + "\n" +
-        "@end"                                                  + "\n" +
-        ""                                                      + "\n" +
-        ""
-    end
-    def self.class_properties vars
-      result = []
-
-      vars.each do |var|
-        result << var.property_definition
-      end
-
-      result = ObjCGenerator::vertical_align_vars result, /( )/, 4
-      result = result.intersperse("\n")
-
-      result.inject("") { |mem, var| mem << var }
-    end
-
-    def self.class_methods class_name
-      t = class_name.dup
-      t[0] = t[0].chr.downcase
-      @text = "- (instancetype)init;"                               + "\n" +
-        "- (instancetype)initWithDict:(NSDictionary *)dict;"        + "\n" +
-        "+ (instancetype)#{t}WithDict:(NSDictionary *)dict;"        + "\n" +
-        "- (NSDictionary *)toDict;"                                 + "\n" +
-        ""                                                          + "\n" +
-        "- (BOOL)isEqual:(id)object;"                               + "\n" +
-        "- (BOOL)isEqualTo#{class_name}:(#{class_name} *)other;"    + "\n" +
-        "- (NSUInteger)hash;"                                       + "\n" +
-        "- (NSString *)description;"                                + "\n" +
-        "- (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
+    def run input_file, output_dir
 
       parsed = JSON.parse(input_file)
 
@@ -67,23 +20,25 @@ module ObjCGenerator
               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
           }
 
-          header = class_header var["name"], vars
+          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 = ObjCGenerator::class_implementation var["name"], vars
+          implementation = gc.class_implementation var["name"], vars
           File.open( output_dir + "/#{var["name"]}.m", 'w') { |file| file.write(implementation) }
 
         end
       end
-
-
-
     end
   end
 end

data/lib/ObjCGenerator/types.rb

@@ -24,6 +24,9 @@ class ObjCType
   def copyrow newVarName
     "-subcalss-"
   end
+  def hash_row
+    "-subcalss-"
+  end
 end
 
 class TypeBool  < ObjCType
@@ -50,6 +53,10 @@ class TypeBool  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = self.#{self.varname};"
   end
+  def hash_row
+    "(self.#{self.varname}?1231:1237);"
+  end
+
 end
 
 class TypeInt  < ObjCType
@@ -75,6 +82,9 @@ class TypeInt  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = self.#{self.varname};"
   end
+  def hash_row
+    "self.#{self.varname};"
+  end
 end
 
 class TypeFloat  < ObjCType
@@ -100,6 +110,9 @@ class TypeFloat  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = self.#{self.varname};"
   end
+  def hash_row
+    "self.#{self.varname};" #is rounded
+  end
 end
 
 class TypeString  < ObjCType
@@ -125,6 +138,9 @@ class TypeString  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copy];"
   end
+  def hash_row
+    "[self.#{self.varname} hash];"
+  end
 end
 
 class TypeDate  < ObjCType
@@ -150,6 +166,9 @@ class TypeDate  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copy];"
   end
+  def hash_row
+    "[self.#{self.varname} hash];"
+  end
 end
 
 
@@ -169,7 +188,7 @@ class TypeCustomObject  < ObjCType
   end
   def conversion_value origin
     # "[#{origin} description]"
-    "[[SampleClass2 alloc] initWithDict:#{origin}]"
+    "[[#{var_type} alloc] initWithDict:#{origin}]"
   end
   def to_dictionary_item
     "@\"#{@varname}\" : [self.#{@varname} toDict]  ?: @{}"
@@ -183,4 +202,44 @@ class TypeCustomObject  < ObjCType
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copyWithZone:nil];"
   end
+  def hash_row
+    "[self.#{self.varname} hash];"
+  end
+end
+
+
+###############################################################################
+##                           A R R A Y                                       ##
+###############################################################################
+
+class TypeArray  < ObjCType
+  attr_accessor :varname
+  attr_accessor :var_sub_type
+  def initialize( name , sub_type)
+    super(name)
+
+    @var_sub_type = sub_type
+  end
+
+  def property_definition
+    "@property (nonatomic) NSArray *#{@varname}; //@[#{var_sub_type}]"
+  end
+  def default_value
+    "@[]"
+  end
+  def conversion_value origin
+    "[NSArray arrayWithArray:#{origin}]"
+  end
+  def to_dictionary_item
+    "@\"#{@varname}\" : self.#{@varname}  ?: @[]"
+  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.3"
+  VERSION = "0.0.4"
 end

data/lib/ObjCGenerator.rb

@@ -1,9 +1,13 @@
 require "json"
 require "thor"
+require 'erb'
+
 require "ObjCGenerator/version"
+require "ObjCGenerator/class_interface_generator"
+require "ObjCGenerator/class_implementation_generator"
 require "ObjCGenerator/command"
 require "ObjCGenerator/types"
-require "ObjCGenerator/class_implementation"
+
 
 module Enumerable
   def intersperse(obj=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ObjCGenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ignazio Calò
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ignazioc@gmail.com
@@ -46,10 +60,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/api_desc.json
 - bin/objcgenerator
 - lib/ObjCGenerator.rb
-- lib/ObjCGenerator/class_implementation.rb
+- lib/ObjCGenerator/class_implementation_generator.rb
+- lib/ObjCGenerator/class_interface_generator.rb
 - lib/ObjCGenerator/command.rb
 - lib/ObjCGenerator/types.rb
 - lib/ObjCGenerator/version.rb

data/bin/api_desc.json

@@ -1,38 +0,0 @@
-[
-    {
-        "name": "SampleClass2",
-        "type": "Class",
-        "vars": [
-            {
-                "name": "someStr",
-                "type": "String"
-            }
-        ]
-    },
-    {
-        "name": "SampleClass",
-        "type": "Class",
-        "vars": [
-            {
-                "name": "someBool",
-                "type": "Bool"
-            },
-            {
-                "name": "someInt",
-                "type": "Int"
-            },
-            {
-                "name": "someFloat",
-                "type": "Float"
-            },
-            {
-                "name": "someStr",
-                "type": "String"
-            },
-            {
-                "name": "someClass2",
-                "type": "SampleClass2"
-            }
-        ]
-    }
-]

data/lib/ObjCGenerator/class_implementation.rb

@@ -1,208 +0,0 @@
-
-module ObjCGenerator
-
-  def self.vertical_align_vars (strings , regexp, index)
-    max_lengt = strings.map { | str|
-      str.split(regexp)[0..index].join.length
-    }.max
-
-    result = strings.map { |str|
-      arr =  str.split(regexp)
-      arr[0..index].join.ljust(max_lengt , ' ') + arr[index+1..arr.length].join
-    }
-    result
-  end
-
-  def self.class_implementation (class_name, vars)
-    text = "#import \"#{class_name}.h\""                      + "\n" +
-      "#{import_other_classes vars}"                          + "\n" +
-      "@implementation #{class_name}"                         + "\n" +
-      ""                                                      + "\n" +
-      "#{init_method vars}"                                   + "\n" +
-      ""                                                      + "\n" +
-      "#{init_with_dict_method vars}"                         + "\n" +
-      ""                                                      + "\n" +
-      "#{class_init_with_dict class_name}"                    + "\n" +
-      ""                                                      + "\n" +
-      "#{to_dict_method vars}"                                + "\n" +
-      ""                                                      + "\n" +
-      "#{is_equals_method class_name}"                        + "\n" +
-      ""                                                      + "\n" +
-      "#{is_equals_to_Object_method class_name, vars}"        + "\n" +
-      ""                                                      + "\n" +
-      "#{hash_method}"                                        + "\n" +
-      ""                                                      + "\n" +
-      "#{description_method vars}"                            + "\n" +
-      ""                                                      + "\n" +
-      "#{copy_method class_name, vars}"                       + "\n" +
-      ""                                                      + "\n" +
-      "@end"                                                  + "\n" +
-      ""
-  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
-    newName = "#{t}Copy"
-    text = "- (instancetype)copyWithZone:(NSZone *)zone {"                               + "\n" +
-      "    #{class_name} *#{newName} = [[[self class] allocWithZone:zone] init];"   + "\n" +
-      "    #{copy_rows vars, newName}"                                              + "\n" +
-      "    return #{newName};"                                                       + "\n" +
-      "}"
-  end
-
-  def self.copy_rows vars, newVarName
-    result = []
-    vars.each do |var|
-      r = var.copyrow newVarName
-      result << r
-    end
-
-    result = vertical_align_vars result, /( = )/, 0
-    # result = vertical_align_vars result, /( , )/, 0
-    result = result.intersperse("\n    ")
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-  def self.description_method vars
-    text = "- (NSString *)description {"                                  + "\n" +
-      "    NSString *params = [@["                                   + "\n" +
-      "                         #{description_rows vars}"          + "\n" +
-      "                         ] componentsJoinedByString:@\", \"" + "\n" +
-      "                       ];"                                    + "\n" +
-      "    return [NSString stringWithFormat:@\"%@ { %@ }\", NSStringFromClass([self class]), params];"     + "\n" +
-      "}"
-  end
-
-  def self.description_rows vars
-    result = []
-    vars.each do |var|
-      r = "[NSString stringWithFormat:#{var.description_row}]"
-      result << r
-    end
-
-    result = vertical_align_vars result, /( = )/, 0
-    result = vertical_align_vars result, /( , )/, 0
-    result = result.intersperse("\n                       , ")
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-  def self.hash_method
-    text = "- (NSUInteger)hash {"                                       + "\n" +
-      "    return [[self description] hash];"                           + "\n" +
-      "}"
-  end
-
-  def self.is_equals_method class_name
-    text = "- (BOOL)isEqual:(id)object {"                               + "\n" +
-      "    if (self == object) { return true; }"                        + "\n" +
-      "    else if ([object isKindOfClass:[self class]]) {"             + "\n" +
-      "        return [self isEqualTo#{class_name}:object];"            + "\n" +
-      "    }"                                                           + "\n" +
-      "    else { return NO; }"                                         + "\n" +
-      "}"
-  end
-
-  def self.is_equals_to_Object_method (class_name, vars)
-    text = "- (BOOL)isEqualTo#{class_name}:(#{class_name} *)other {"    + "\n" +
-      "    if (self == other) return YES;"                              + "\n" +
-      "    #{equality_rows vars}"                                       + "\n" +
-      "    return YES;"                                                 + "\n" +
-      "}"
-  end
-
-  def self.equality_rows vars
-    result = []
-    vars.each do |var|
-      r = "if (#{var.inEquality_test("other")}) return NO;"
-      result << r
-    end
-
-    result = vertical_align_vars result, /(  )/, 0
-    result = vertical_align_vars result, /(\) )/, 0
-    result = result.intersperse("\n    ")
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-  def self.to_dict_method vars
-    text = "- (NSDictionary *)toDict {"                                 + "\n" +
-      "    return @{"                                                   + "\n" +
-      "            #{value_to_dict vars}"                               + "\n" +
-      "            };"                                                  + "\n" +
-      "}"
-  end
-
-  def self.value_to_dict vars
-    result = []
-    vars.each do |var|
-      r = var.to_dictionary_item
-      result << r
-    end
-    result = vertical_align_vars result, /( : )/, 0
-    result = vertical_align_vars result, /( \?: )/, 0
-    result = result.intersperse("\n          , ")
-
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-  def self.class_init_with_dict class_name
-    t = class_name.dup
-    t[0] = t[0].chr.downcase
-    text = "+ (instancetype)#{t}WithDict:(NSDictionary *)dict {"        + "\n" +
-      "    return [[self alloc] initWithDict:dict];"                    + "\n" +
-      "}"
-  end
-
-  def self.init_with_dict_method vars
-    text = "- (instancetype)initWithDict:(NSDictionary *)dict {"        + "\n" +
-      "    if ((self = [self init])) {"                                 + "\n" +
-      "        id val = nil;"                                           + "\n" +
-      "        #{init_values vars}"                                     + "\n" +
-      "    }"                                                           + "\n" +
-      "    return self;"                                                + "\n" +
-      "}"
-  end
-
-  def self.init_values vars
-    result = []
-    vars.each do |var|
-      conversion_type = var.conversion_value("val")
-      result << "if ((val = dict[@\"#{var.varname}\"]))  { _#{var.varname} = #{conversion_type}; } else { NSLog(@\"Error initWithDict: Unable to find: #{var.varname}\"); }"
-    end
-    result = vertical_align_vars result,  /(\)\))/, 1
-    result = vertical_align_vars result,  /( = )/, 2
-    result = vertical_align_vars result,  /( } )/, 0
-    result = result.intersperse("\n        ")
-
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-
-  def self.init_method vars
-    text = "- (instancetype)init {"           + "\n" +
-      "    if ((self = [super init])) {"       + "\n" +
-      "#{default_values vars}"                 + "\n" +
-      "    }"                                  + "\n" +
-      "    return self;"                       + "\n" +
-      "}"
-
-  end
-
-
-  def self.default_values vars
-    result = []
-    vars.each do |var|
-      result << "        _#{var.varname} = #{var.default_value};"
-    end
-    result = vertical_align_vars result, /(=)/, 0
-    result = result.intersperse("\n")
-
-    result.inject("") { |mem, var| mem << var  }
-  end
-
-end