restkit-generate 0.1.3 → 0.2

data/bin/restkit-generate

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-lib = File.expand_path(File.dirname(THIS_FILE) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+$lib = File.expand_path(File.dirname(THIS_FILE) + '/../lib')
+$LOAD_PATH.unshift($lib) if File.directory?($lib) && !$LOAD_PATH.include?($lib)
 
 require 'optparse'
-require 'generator'
+require 'erb'
+require 'restkit-generate'
 
 options = {}
 
@@ -20,6 +21,10 @@ optparse = OptionParser.new do |opts|
     options[:prefix] = p
   end
 
+  opts.on("-c", "--core-data", "Use core data") do |c|
+    options[:core_data] = c
+  end
+
   opts.on( '-h', '--help', 'Display this screen' ) do
     puts opts
     exit
@@ -38,14 +43,14 @@ if ARGV.empty?
   exit
 end
 
-Generator.configure(options)
+RestKitGenerate.configure(options)
 
 begin
-  Generator.validate!
+  RestKitGenerate.validate!
 rescue ArgumentError => error
   puts error
   exit
 end
 
-Generator::Header.make
-Generator::MakeFile.make
+RestKitGenerate::H.new
+RestKitGenerate::M.new

data/lib/restkit-generate.rb

@@ -0,0 +1,5 @@
+module RestKitGenerate ; end
+
+require 'restkit-generate/common'
+require 'restkit-generate/h'
+require 'restkit-generate/m'

data/lib/{generator → restkit-generate}/common.rb

@@ -1,4 +1,4 @@
-module Generator
+module RestKitGenerate
   @@config = {}
   @@properties = {}
 
@@ -39,12 +39,15 @@ module Generator
 
     ARGV.each do |arg|
       original_name = arg.split(":")[0]
-      a = arg.gsub(/_([a-z])/) do |word|
+      a = arg.gsub(/\./, '_').gsub(/_([a-z])/) do |word|
         word.gsub(/_/, "").capitalize
       end
 
       name = a.split(":")[0]
-      name = @@config[:model_name].downcase+"Id" if name == "id"
+      if name == "id"
+        name = @@config[:model_name].downcase+"Id"
+        @@config[:primary_key] = name
+      end
       type = a.split(":")[1]
 
       @@properties[name] = {:type => type, :original_name => original_name}

data/lib/restkit-generate/h.rb

@@ -0,0 +1,19 @@
+module RestKitGenerate
+  class H
+    def initialize
+      props = []
+      model_name = RestKitGenerate.config[:model_name]
+      prefix = RestKitGenerate.config[:prefix]
+      core_data = RestKitGenerate.config[:core_data]
+      RestKitGenerate.properties.each{|key, value| props << "@property (nonatomic, #{value[:type] == "NSString" ? "copy" : "strong"}) #{value[:type]} *#{key};" }
+
+      erb = ERB.new(File.read(File.join($lib, 'restkit-generate', !core_data ? 'nsobject.h.erb' : 'nsmanagedobject.h.erb')))
+      result = erb.result(binding)
+
+      if RestKitGenerate.config[:verbose]
+        puts result
+      end
+      File.open("#{prefix}#{model_name}.h", 'w') {|f| f.write(result) }
+    end
+  end
+end

data/lib/restkit-generate/m.rb

@@ -0,0 +1,28 @@
+module RestKitGenerate
+  class M
+    def initialize
+      model_name = RestKitGenerate.config[:model_name]
+      prefix = RestKitGenerate.config[:prefix]
+      mapping = []
+      decoders = []
+      encoders = []
+      dynamic = []
+      tab = "    "
+      core_data = RestKitGenerate.config[:core_data]
+
+      RestKitGenerate.properties.each{|key, value| dynamic << key }
+      RestKitGenerate.properties.each{|key, value| mapping << "#{tab}@\"#{value[:original_name]}\", @\"#{key}\"" }
+      RestKitGenerate.properties.each{|key, value| decoders << "#{tab}[coder encodeObject:self.#{key} forKey:@\"#{key}\"];" }
+      RestKitGenerate.properties.each{|key, value| encoders << "#{tab}#{tab}self.#{key} = [coder decodeObjectForKey:@\"#{key}\"];" }
+
+      erb = ERB.new(File.read(File.join($lib, 'restkit-generate', !core_data ? 'nsobject.m.erb' : 'nsmanagedobject.m.erb')))
+      result = erb.result(binding)
+
+      if RestKitGenerate.config[:verbose]
+        puts result
+      end
+
+      File.open("#{prefix}#{model_name}.m", 'w') {|f| f.write(result) }
+    end
+  end
+end

data/lib/restkit-generate/nsmanagedobject.h.erb

@@ -0,0 +1,16 @@
+//
+//  <%= prefix %><%= model_name %>.h
+//  Command: <%= $0 %> model <%= model_name %> <%= ARGV.join( ' ' ) %>
+//
+
+#import <Foundation/Foundation.h>
+#import <RestKit/RestKit.h>
+#import <CoreData/CoreData.h>
+
+@interface <%= prefix %><%= model_name %> : NSManagedObject
+
+<%= props.join("\n") %>
+
++ (RKManagedObjectMapping *)objectMapping;
+
+@end

data/lib/restkit-generate/nsmanagedobject.m.erb

@@ -0,0 +1,27 @@
+//
+//  <%= prefix %><%= model_name %>.m
+//
+
+#import "<%= prefix %><%= model_name %>.h"
+
+@implementation <%= prefix %><%= model_name %>
+
+@dynamic <%= dynamic.join(", ") %>;
+
++ (RKManagedObjectMapping *)objectMapping
+{
+    RKManagedObjectMapping* mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:[RKObjectManager sharedManager].objectStore];
+    <%
+      unless RestKitGenerate.config[:primary_key].nil?
+    %>
+    mapping.primaryKeyAttribute = @"<%= RestKitGenerate.config[:primary_key] %>";
+    <%
+      end
+    %>
+    [mapping mapKeyPathsToAttributes:
+<%= mapping.join(",\n") %>,
+    nil];
+    return mapping;
+}
+
+@end

data/lib/restkit-generate/nsobject.h.erb

@@ -0,0 +1,15 @@
+//
+//  <%= prefix %><%= model_name %>.h
+//  Command: <%= $0 %> model <%= model_name %> <%= ARGV.join( ' ' ) %>
+//
+
+#import <Foundation/Foundation.h>
+#import <RestKit/RestKit.h>
+
+@interface <%= prefix %><%= model_name %> : NSObject <NSCoding>
+
+<%= props.join("\n") %>
+
++ (RKObjectMapping *)objectMapping;
+
+@end

data/lib/restkit-generate/nsobject.m.erb

@@ -0,0 +1,32 @@
+//
+//  <%= prefix %><%= model_name %>.m
+//
+
+#import "<%= prefix %><%= model_name %>.h"
+
+@implementation <%= prefix %><%= model_name %>
+
++ (RKObjectMapping *)objectMapping
+{
+    RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[self class]];
+    [mapping mapKeyPathsToAttributes:
+<%= mapping.join(",\n") %>,
+    nil];
+    return mapping;
+}
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    self = [[[self class] alloc] init];
+    if (self) {
+<%= encoders.join("\n") %>
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+<%= decoders.join("\n") %>
+}
+
+@end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restkit-generate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies: []
 description: A model generator for iOS RestKit (Rails-like)
 email: romefimov@gmail.com
@@ -19,10 +19,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/restkit-generate
-- lib/generator.rb
-- lib/generator/common.rb
-- lib/generator/header.rb
-- lib/generator/mk.rb
+- lib/restkit-generate.rb
+- lib/restkit-generate/common.rb
+- lib/restkit-generate/h.rb
+- lib/restkit-generate/m.rb
+- lib/restkit-generate/nsmanagedobject.h.erb
+- lib/restkit-generate/nsmanagedobject.m.erb
+- lib/restkit-generate/nsobject.h.erb
+- lib/restkit-generate/nsobject.m.erb
 homepage: https://github.com/romaonthego
 licenses: []
 post_install_message: 

data/lib/generator.rb

@@ -1,5 +0,0 @@
-module Generator ; end
-
-require 'generator/common'
-require 'generator/header'
-require 'generator/mk'

data/lib/generator/header.rb

@@ -1,28 +0,0 @@
-module Generator
-  module Header
-    def self.make
-      props = []
-      model_name = Generator.config[:model_name]
-      prefix = Generator.config[:prefix]
-      Generator.properties.each{|key, value| props << "@property (nonatomic, #{value[:type] == "NSString" ? "copy" : "strong"}) #{value[:type]} *#{key};" }
-      
-      header =
-        "//\n"+ 
-        "//  #{prefix}#{model_name}.h\n"+
-        "//  Command: #{$0} model #{model_name} #{ARGV.join( ' ' )}\n"+
-        "//\n\n"+
-        "#import <Foundation/Foundation.h>\n"+
-        "#import <RestKit/RestKit.h>\n\n"+
-        "@interface #{prefix}#{model_name} : NSObject <NSCoding>\n\n"+
-        props.join("\n")+"\n\n"+
-        "+ (RKObjectMapping *)objectMapping;\n\n"+
-        "@end"
-      
-      if Generator.config[:verbose]
-        puts header
-      end
-      
-      File.open("#{prefix}#{model_name}.h", 'w') {|f| f.write(header) }
-    end
-  end
-end

data/lib/generator/mk.rb

@@ -1,51 +0,0 @@
-module Generator
-  module MakeFile
-    def self.make
-      model_name = Generator.config[:model_name]
-      prefix = Generator.config[:prefix]
-      mapping = []
-      decoders = []
-      encoders = []
-      Generator.properties.each{|key, value| mapping << "	@\"#{value[:original_name]}\", @\"#{key}\"" }
-      Generator.properties.each{|key, value| decoders << "	[coder encodeObject:self.#{key} forKey:@\"#{key}\"];" }
-      Generator.properties.each{|key, value| encoders << "		self.#{key} = [coder decodeObjectForKey:@\"#{key}\"];" }
-
-      source =
-        "//\n"+
-        "//  #{prefix}#{model_name}.m\n"+
-        "//\n\n"+
-
-        "#import \"#{prefix}#{model_name}.h\"\n\n"+
-        "@implementation #{prefix}#{model_name}\n\n"+
-        "+ (RKObjectMapping *)objectMapping\n"+
-        "{\n"+
-        "	RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[self class]];\n"+
-        "	[mapping mapKeyPathsToAttributes:\n"+
-        mapping.join(",\n")+", nil];\n"+
-        "	return mapping;\n"+
-        "}\n\n"+
-
-        "- (id)initWithCoder:(NSCoder *)coder\n"+
-        "{\n"+
-        "	self = [[[self class] alloc] init];\n"+
-        "	if (self) {\n"+
-        encoders.join("\n")+"\n"+
-        "	}\n"+
-        "	return self;\n"+
-        "}\n\n"+
-
-        "- (void)encodeWithCoder:(NSCoder *)coder\n"+
-        "{\n"+
-        decoders.join("\n")+"\n"+
-        "}\n\n"+
-
-        "@end"
-
-      if Generator.config[:verbose]
-        puts source
-      end
-
-      File.open("#{prefix}#{model_name}.m", 'w') {|f| f.write(source) }
-    end
-  end
-end