ObjCGenerator 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a5a896777c606d06a79dfaaed6c290d62b4cf8
-  data.tar.gz: 2c4dbfacda9f5e823bebaadd0b8ba4864e7cf450
+  metadata.gz: 0de33303f0dcc956d5aaad2645e753f41d1e1ebb
+  data.tar.gz: 0dbb21818bbabb6308f5fa68576a3e389dc2dd04
 SHA512:
-  metadata.gz: 2aebc58d88362c096cd5a70f8ed0e82fe4444d019557a80fcadf00bd43e3e9fe5658ccb89fbae7fbaf7130b1c1d3a99a2267d4d9bac6184b6c144b9dfe210a5b
-  data.tar.gz: 9278bae480f767287746a6b79b8700b97029fdc434a450c377dbd592eab5ea2fd7559a1cc3a520a8b99772afb142b92b58f0490ab7a747744e63db744c79614c
+  metadata.gz: 1c6a242af67c90e503d2825a4309921a65fc8af1526f25b97ad0a1693c39d3c537ea53bf1221b55ab4b4a665babc6ca6424a8f48c52b5e859b5d8303d6b89caa
+  data.tar.gz: d735658dc682ce63682cc4e4eeb53ee65eb0a174e9d02c52c580800f2930a1241ed557714a3efb32aac3e91ca168e04bbaba212c5861ffc113ed6698a552ee9c

data/lib/ObjCGenerator.rb

@@ -5,6 +5,7 @@ require "ObjCGenerator/version"
 require "ObjCGenerator/class_interface_generator"
 require "ObjCGenerator/class_implementation_generator"
 require "ObjCGenerator/category_generator"
+require "ObjCGenerator/file_copier.rb"
 require "ObjCGenerator/json_parser"
 require "ObjCGenerator/command"
 require "ObjCGenerator/types"

data/lib/ObjCGenerator/category_generator.rb

@@ -1,5 +1,6 @@
 module ObjCGenerator
   class CategoryGenerator
+
     def template_path filename
       File.join(File.expand_path("../..", File.dirname(__FILE__)), "templates/#{filename}.erb")
     end

data/lib/ObjCGenerator/class_implementation_generator.rb

@@ -1,7 +1,12 @@
 
 module ObjCGenerator
 
-  class ClassInterfaceGenerator
+  class ClassImplementationGenerator
+
+    def template_path filename
+      File.join(File.expand_path("../..", File.dirname(__FILE__)), "templates/#{filename}.erb")
+    end
+
     def generate_incipit()
       author = "Ignazioc"
 
@@ -13,9 +18,9 @@ module ObjCGenerator
 
       incipit = generate_incipit()
 
-      @import_other_classes       =  generate_import_other_classes(vars)
+      @import_other_classes       = generate_import_other_classes(vars)
       @init_method                = generate_init_method(vars)
-      @init_with_dict_method      =  generate_init_with_dict_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)
@@ -122,7 +127,6 @@ module ObjCGenerator
 
       return ERB.new(template).result(binding)
     end
-
   end
 
   def self.vertical_align_vars (strings , regexp, index)

data/lib/ObjCGenerator/command.rb

@@ -8,13 +8,17 @@ module ObjCGenerator
       result.each do |klass|
 
         g = ClassInterfaceGenerator.new()
-        gc = ClassInterfaceGenerator.new()
+        gc = ClassImplementationGenerator.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) }
+
+        fc = FileCopier.new()
+        fc.copy_categories(output_dir)
+
       end
     end
 

data/lib/ObjCGenerator/file_copier.rb

@@ -0,0 +1,13 @@
+module ObjCGenerator
+  class FileCopier
+
+    def template_path
+      File.join(File.expand_path("../..", File.dirname(__FILE__)), "templates")
+    end
+
+
+    def copy_categories(dest)
+      FileUtils.cp_r( Dir.glob(template_path + '/**/*.{h,m}'), dest)
+    end
+  end
+end

data/lib/ObjCGenerator/types.rb

@@ -152,16 +152,16 @@ class TypeDate  < ObjCType
     "[NSDate dateWithTimeIntervalSince1970:0.]"
   end
   def conversion_value origin
-    "[NSDate dateWithTimeIntervalSince1970:[#{origin} doubleValue]]"
+    "[NSDate ic_dateFromIso8601String:#{origin}]"
   end
   def to_dictionary_item
-    "@\"#{@varname}\" : @(self.#{@varname}.timeIntervalSince1970) ?: @(0.)"
+    "@\"#{@varname}\" : [self.#{@varname} ic_iso8601String]  ?: @\"\""
   end
   def inEquality_test other
     "![self.#{self.varname}  isEqualToDate:#{other}.#{self.varname}]"
   end
   def description_row
-    "@\"self.#{self.varname} = %@\" , self.#{self.varname}"
+    "@\"self.#{self.varname} = %@\" , [self.#{self.varname} ic_iso8601String]"
   end
   def copyrow newVarName
     "#{newVarName}.#{self.varname}  = [self.#{self.varname} copy];"

data/lib/ObjCGenerator/version.rb

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

data/templates/NSDate+CustomCode.h

@@ -0,0 +1,15 @@
+//
+// This code is autogenerated using ObjCGenerator by IgnazioC
+// https://github.com/ignazioc/ObjCGenerator
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDate (CustomCode)
+
+- (NSString *)ic_iso8601String;
++ (NSDate *)ic_dateFromIso8601String:(NSString *)date;
+
++ (NSDateFormatter *)ic_iso8601DateFormatter;
+
+@end

data/templates/NSDate+CustomCode.m

@@ -0,0 +1,28 @@
+//
+// This code is autogenerated using ObjCGenerator by IgnazioC
+// https://github.com/ignazioc/ObjCGenerator
+//
+
+#import "NSDate+CustomCode.h"
+
+@implementation NSDate (CustomCode)
+
++ (NSDateFormatter *)ic_iso8601DateFormatter {
+  NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+  NSLocale *enUSPOSIXLocale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+  [dateFormatter setLocale:enUSPOSIXLocale];
+  [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZZZ"];
+  return dateFormatter;
+}
+
+- (NSString *)ic_iso8601String {
+  NSString *iso8601String = [[NSDate ic_iso8601DateFormatter] stringFromDate:self];
+  return iso8601String;
+}
+
++ (NSDate *)ic_dateFromIso8601String:(NSString *)date {
+  NSDate *iso8601Date = [[NSDate ic_iso8601DateFormatter] dateFromString:date];
+  return iso8601Date;
+}
+
+@end

data/templates/method_description.erb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ObjCGenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ignazio Calò
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,9 +66,12 @@ files:
 - lib/ObjCGenerator/class_implementation_generator.rb
 - lib/ObjCGenerator/class_interface_generator.rb
 - lib/ObjCGenerator/command.rb
+- lib/ObjCGenerator/file_copier.rb
 - lib/ObjCGenerator/json_parser.rb
 - lib/ObjCGenerator/types.rb
 - lib/ObjCGenerator/version.rb
+- templates/NSDate+CustomCode.h
+- templates/NSDate+CustomCode.m
 - templates/category_header.erb
 - templates/category_implementation.erb
 - templates/class_header.erb