restkit-generate 0.1.1 → 0.1.2

data/bin/restkit-generate

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+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)
 
 require 'optparse'
@@ -10,14 +11,19 @@ options = {}
 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: restkit-generate model NAME [field:type field:type] [options]"
-  
+
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
-  
+
   opts.on("-p prefix", "--[no-]prefix", "Prefix, default: Base") do |p|
     options[:prefix] = p
   end
+
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
 end
 
 begin
@@ -27,6 +33,11 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   exit
 end
 
+if ARGV.empty?
+  puts optparse
+  exit
+end
+
 Generator.configure(options)
 
 begin

data/lib/generator/common.rb

@@ -1,52 +1,52 @@
 module Generator
   @@config = {}
   @@properties = {}
-    
+
   def self.configure(options)
     @@config = options
     if options[:prefix].nil?
-			@@config[:prefix] = "Base"
+      @@config[:prefix] = "Base"
     else
-			if !options[:prefix]
-				@@config[:prefix] = ""
-			end
+      if !options[:prefix]
+        @@config[:prefix] = ""
+      end
     end
   end
-  
+
   def self.config
     @@config
   end
-  
+
   def self.properties
     @@properties
   end
-  
+
   def self.validate!
     type = ARGV[0]
     if type != "model"
-      raise ArgumentError, "Unknown type '#{type}'.", caller
+      raise ArgumentError, "Unknown type '#{type}'.\nRun restkit-generate --help for more information.", caller
     end
-    
+
     @@config[:model_name] = ARGV[1]
     if @@config[:model_name].nil?
       raise ArgumentError, "Model name can't be empty.", caller
     end
-    
+
     ARGV.shift(2)
     if ARGV.nil?
       raise ArgumentError, "No input parameters defined.", caller
     end
-    
+
     ARGV.each do |arg|
       original_name = arg.split(":")[0]
       a = arg.gsub(/_([a-z])/) do |word|
         word.gsub(/_/, "").capitalize
       end
-      
+
       name = a.split(":")[0]
       name = @@config[:model_name].downcase+"Id" if name == "id"
       type = a.split(":")[1]
-      
+
       @@properties[name] = {:type => type, :original_name => original_name}
     end
   end

data/lib/generator/header.rb

@@ -1,7 +1,5 @@
 module Generator
-  
   module Header
-    
     def self.make
       props = []
       model_name = Generator.config[:model_name]
@@ -11,6 +9,7 @@ module Generator
       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"+
@@ -25,7 +24,5 @@ module Generator
       
       File.open("#{prefix}#{model_name}.h", 'w') {|f| f.write(header) }
     end
-    
   end
-  
 end

data/lib/generator/mk.rb

@@ -1,7 +1,5 @@
 module Generator
-  
   module MakeFile
-    
     def self.make
       model_name = Generator.config[:model_name]
       prefix = Generator.config[:prefix]
@@ -19,7 +17,7 @@ module Generator
         "//  #{prefix}#{model_name}.m\n"+
         "//\n\n"+
 
-        "#import \"#{prefix}#{model_name}.h\n\n"+
+        "#import \"#{prefix}#{model_name}.h\"\n\n"+
         "@implementation #{prefix}#{model_name}\n\n"+
         "@synthesize "+synthesize.join(", ")+";\n\n"+
         "+ (RKObjectMapping *)objectMapping\n"+
@@ -27,11 +25,12 @@ module Generator
         "	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 = [[#{prefix}#{model_name} alloc] init];\n"+
+        "	self = [[[self class] alloc] init];\n"+
         "	if (self) {\n"+
         encoders.join("\n")+"\n"+
         "	}\n"+
@@ -51,7 +50,5 @@ module Generator
       
       File.open("#{prefix}#{model_name}.m", 'w') {|f| f.write(source) }
     end
-    
   end
-  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restkit-generate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies: []
 description: A model generator for iOS RestKit (Rails-like), ARC compliant
 email: romefimov@gmail.com
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A model generator for iOS RestKit (Rails-like), ARC compliant