lanekit 0.2.0 → 0.2.1

data/README.md

@@ -1,6 +1,6 @@
 ## LaneKit
 
-LaneKit is a code generator for iOS Objective-C models for integration with RestKit. It includes support
+LaneKit is an iOS Objective-C code generator of models and resource providers for integration with RestKit. It includes support
 for unit testing with SenTestingKit including fixtures and tests. LaneKit is a command line app written
 in Ruby and packaged as a Ruby Gem.
 
@@ -8,13 +8,13 @@ in Ruby and packaged as a Ruby Gem.
 - Questions? [Stack Overflow](http://stackoverflow.com/questions/tagged/lanekit) is the best place to find answers.
 
 ## Benefits
-* properly implemented models
+* properly implemented models and resource providers
+* easy integration with RestKit
 * consistent Objective-C code
 * unit tests
 * test fixtures in JSON and Objective-C
 * tested code
 * rapid development
-* easy integration with RestKit
 * enhanced productivity of junior developers
 * reduces dependency on senior developers
 
@@ -31,17 +31,21 @@ in Ruby and packaged as a Ruby Gem.
 
 ### Add a new model called Video to an existing Xcode project.
 
-        $ lanekit generate model Video duration:string headline:string id:integer image:string location:string
-
-        create  Classes/Models
-        create  Classes/Tests/Fixtures
-        create  Classes/Tests/Models
-        create  Classes/Models/Video.h
-        create  Classes/Models/Video.m
-        create  Classes/Tests/Fixtures/VideoFixtures.h
-        create  Classes/Tests/Fixtures/VideoFixtures.m
-        create  Classes/Tests/Models/VideoTest.h
-        create  Classes/Tests/Models/VideoTest.m
+    $ lanekit generate model Video duration:string headline:string id:integer image:string location:string
+
+    create  Classes/Models
+    create  Classes/Tests/Fixtures
+    create  Classes/Tests/Models
+    create  Classes/Models/Contents.h
+    create  Classes/Models/Contents.m
+    create  Classes/Tests/Fixtures/ContentsFixtures.h
+    create  Classes/Tests/Fixtures/ContentsFixtures.m
+    create  Classes/Tests/Fixtures/ContentsFixtures.one.json
+    create  Classes/Tests/Fixtures/ContentsFixtures.two.json
+    create  Classes/Tests/Models/ContentsTest.h
+    create  Classes/Tests/Models/ContentsTest.m
+    create  Classes/Models/LKModel.h
+    create  Classes/Models/LKModel.m
 
 and here is the Objective-C header file that was generated by LaneKit:
 
@@ -124,17 +128,100 @@ and here is the Objective-C .m file that was generated by LaneKit:
 @end
 ```
 
+and here is the unit test fixtures file that was generated by LaneKit:
 
-### Add a new model called Contents that contains a list of Videos and uses a relationship mapping.
+```objective-c
+//
+//  VideoFixtures.m
+//
+//  This model fixture was created on 2013-08-11 by LaneKit v0.2.0.
+//
+
+#import "VideoFixtures.h"
+
+@implementation VideoFixtures
+
++ (Video *)one
+{
+  Video *video = Video.new;
+
+  video.duration = @"MyString";
+  video.headline = @"MyString";
+  video.id = [NSNumber numberWithInteger:1];
+  video.image = @"MyString";
+  video.itemDate = NSDate.new;
+  video.location = @"MyString";
+
+  return video;
+}
+
++ (Video *)two
+{
+  Video *video = Video.new;
+
+  video.duration = @"MyString";
+  video.headline = @"MyString";
+  video.id = [NSNumber numberWithInteger:1];
+  video.image = @"MyString";
+  video.itemDate = NSDate.new;
+  video.location = @"MyString";
+
+  return video;
+}
+
+@end
 ```
-$ lanekit generate model contents contents:array:Video
- exist  Classes/model
-create  Classes/model/Contents.h
-create  Classes/model/Contents.m
+
+and here is the RestKit compatible JSON fixture file that was generated by LaneKit:
+
+```json
+{
+  "video": {
+    "duration": "MyString",
+    "headline": "MyString",
+    "id": "1",
+    "image": "MyString",
+    "itemDate": "03/01/2012",
+    "location": "MyString"
+  }
+}
 ```
 
+and here is a unit test that was generated in Models/VideoTest.m by LaneKit:
+
+```objective-c
+- (void)testVideoNewOne
+{
+  Video *video = VideoFixtures.one;
+  STAssertNotNil(video, @"video is nil");
+
+  STAssertTrue([video.duration isEqualToString:@"MyString"], @"duration not correct value");
+  STAssertTrue([video.headline isEqualToString:@"MyString"], @"headline not correct value");
+  STAssertTrue(video.id.integerValue == [NSNumber numberWithInteger:1].integerValue, @"id not [NSNumber numberWithInteger:1]");
+  STAssertTrue([video.image isEqualToString:@"MyString"], @"image not correct value");
+  STAssertNotNil(video.itemDate, @"itemDate is nil");
+}
+```
+
+### Add a new model called Contents that contains a list of Videos and uses a relationship mapping.
+
+    $ lanekit generate model contents contents:array:Video
+     exist  Classes/model
+    create  Classes/model/Contents.h
+    create  Classes/model/Contents.m
+
+### Add a new resource provider called Contents.
+
+    $ lanekit generate provider Contents Contents http://scores.espn.go.com/allsports/scorecenter/v2/videos/build?sport=top
+    create  Classes/Controllers
+    create  Classes/Controllers/LKResourceProvider.h
+    create  Classes/Controllers/LKResourceProvider.m
+    create  Classes/Controllers/ContentsProvider.h
+    create  Classes/Controllers/ContentsProvider.m
+
 ### Sample App
-The SportsFrames app is a fully functional sample app created to demonstrate the use of LaneKit in a real world app.
+The SportsFrames app is a fully functional sample app using RestKit created to demonstrate the use of LaneKit in a real world app. It
+has models and resource providers that are generated from LaneKit.
 Download the code from [GitHub](https://github.com/larryaasen/SportsFrames).
 
 ## Credits

data/lib/lanekit/generate/model.rb

@@ -0,0 +1,137 @@
+module LaneKit
+  class Generate < Thor
+    
+      include Thor::Actions
+
+      desc "model [options] NAME [attributes]", "Generates an Objective-C model for RestKit including unit tests"
+      long_desc <<-LONGDESC
+      Generates the Objective-C code for a model that is compatible with RestKit. It also generates test fixtures and unit tests.\n
+      NAME: the name of the model\n
+      [attributes] name:type:relationship, name:type:relationship, ...\n
+      where type is [date|integer|string|<class_name>] and relationship (optional) is the name of another class.
+      LONGDESC
+      
+      def model(model_name, *attributes)
+        @using_core_data = options[:use_core_data]
+        #puts " using Core Data: #{@using_core_data}"
+        #puts "            name: #{model_name}"        
+
+        @model_name = LaneKit.derive_model_name(model_name)
+
+        @model_file_name = LaneKit.derive_file_name(@model_name)
+        @model_fixtures_file_name = "#{@model_file_name}Fixtures"
+        @model_tests_file_name = "#{@model_file_name}Test"
+
+        @class_name = LaneKit.derive_class_name(@model_name)
+        
+        @attributes = []
+        @any_relationships = false
+        
+        attributes.each {|attribute|
+          name, type, relationship = attribute.split(":")
+          objective_c_type = LaneKit.objective_c_type(type)
+          @attributes << {
+            :type => type,
+            :name => name,
+            :objective_c_type => objective_c_type,
+            :relationship => relationship,
+            :relationship_fixtures_file_name => "#{relationship}Fixtures",
+            :fixture_json => LaneKit.objective_c_type_fixture_json(type),
+            :fixture_value => LaneKit.objective_c_type_fixture_value(type),
+            :unit_test_assert => LaneKit.objective_c_type_unit_test_assert(@model_name, name, type)
+          }
+          @any_relationships = relationship ? true : @any_relationships
+        }
+
+        self.initialize_model
+        self.create_model_folders
+        self.create_model_files
+        self.update_xcode_project
+      end
+
+      def self.source_root
+        File.dirname('./')
+      end
+      
+      no_tasks {
+        def initialize_model
+          # Model Base Class
+          @model_base_name = "LKModel"
+          @model_base_class_name = "LKModel"
+          @model_base_file_name = "LKModel"
+          
+          @models_folder         = "Classes/Models"
+          @tests_fixtures_folder = "Classes/Tests/Fixtures"
+          @tests_models_folder   = "Classes/Tests/Models"
+          
+        end
+      
+        def source_paths
+          [@@template_folder]
+        end
+
+        def create_model_folders
+          empty_directory @models_folder
+          empty_directory @tests_fixtures_folder
+          empty_directory @tests_models_folder
+        end
+      
+        def create_model_files
+          # 1) Create the Models
+          # Create the .h file
+          source = "model.h.erb"
+          target = File.join(@models_folder, "#{@model_file_name}.h")
+          template(source, target, @@template_opts)
+
+          # Create the .m file
+          source = "model.m.erb"
+          target = File.join(@models_folder, "#{@model_file_name}.m")
+          template(source, target, @@template_opts)
+
+          # 2) Create the Model Test Fixtures
+          # Create the .h file
+          source = "model_fixture.h.erb"
+          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.h")
+          template(source, target, @@template_opts)
+
+          # Create the .m file
+          source = "model_fixture.m.erb"
+          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.m")
+          template(source, target, @@template_opts)
+
+          # Create the one json file
+          source = "model_fixture.json.erb"
+          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.one.json")
+          template(source, target, @@template_opts)
+
+          # Create the two json file
+          source = "model_fixture.json.erb"
+          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.two.json")
+          template(source, target, @@template_opts)
+
+          # 3) Create the Model Tests
+          # Create the .h file
+          source = "model_test.h.erb"
+          target = File.join(@tests_models_folder, "#{@model_tests_file_name}.h")
+          template(source, target, @@template_opts)
+
+          # Create the .m file
+          source = "model_test.m.erb"
+          target = File.join(@tests_models_folder, "#{@model_tests_file_name}.m")
+          template(source, target, @@template_opts)
+          
+          # 4) Create the base model
+          # Create the .h file
+          source = "model_base.h.erb"
+          target = File.join(@models_folder, "#{@model_base_file_name}.h")
+          template(source, target, @@template_opts)
+
+          # Create the .m file
+          source = "model_base.m.erb"
+          target = File.join(@models_folder, "#{@model_base_file_name}.m")
+          template(source, target, @@template_opts)
+        end
+      }
+    end
+end
+

data/lib/lanekit/generate/provider.rb

@@ -0,0 +1,82 @@
+module LaneKit
+  class Generate
+    
+    include Thor::Actions
+
+    desc "provider [options] NAME MODEL_NAME URL", "Generates an Objective-C resource provider for RestKit including unit tests"
+    long_desc <<-LONGDESC
+    Generates the Objective-C code for a resource provider that is compatible with RestKit. It also generates test fixtures and unit tests.\n
+    NAME: the name of the provider\n
+    MODEL_NAME: the name of the model\n
+    URL: the HTTP URL to the data\n
+    LONGDESC
+  
+    def provider(name, model_name, url)
+      @using_core_data = options[:use_core_data]
+      #puts " using Core Data: #{@using_core_data}"
+      #puts "            name: #{name}"        
+      #puts "      model_name: #{model_name}"        
+      #puts "             url: #{url}"
+
+      @provider_name = "#{LaneKit.derive_class_name(name)}Provider"
+      @model_name = LaneKit.derive_model_name(model_name)
+      @model_class_name = LaneKit.derive_class_name(@model_name)
+      @model_file_name = LaneKit.derive_file_name(@model_name)
+      @provider_url = url
+
+      self.initialize_provider
+      self.create_provider_folders
+      self.create_provider_files
+    end
+
+    def self.source_root
+      File.dirname('./')
+    end
+      
+    no_commands do
+
+      def initialize_provider
+        @providers_folder = "Classes/Controllers"
+          
+        # Resource Provider Base Class
+        @provider_base_name = "LKResourceProvider"
+        @provider_base_class_name = "LKResourceProvider"
+        @provider_base_file_name = "LKResourceProvider"
+  
+        @provider_file_name = @provider_name
+      end
+
+      def source_paths
+        [@@template_folder]
+      end
+
+      def create_provider_folders
+        empty_directory @providers_folder
+      end
+  
+      def create_provider_files
+        # 1) Create the base resource provider
+        # Create the .h file
+        source = "provider_base.h.erb"
+        target = File.join(@providers_folder, "#{@provider_base_file_name}.h")
+        template(source, target, @@template_opts)
+  
+        # Create the .m file
+        source = "provider_base.m.erb"
+        target = File.join(@providers_folder, "#{@provider_base_file_name}.m")
+        template(source, target, @@template_opts)
+
+        # 2) Create the resource provider
+        # Create the .h file
+        source = "provider.h.erb"
+        target = File.join(@providers_folder, "#{@provider_file_name}.h")
+        template(source, target, @@template_opts)
+  
+        # Create the .m file
+        source = "provider.m.erb"
+        target = File.join(@providers_folder, "#{@provider_file_name}.m")
+        template(source, target, @@template_opts)
+      end
+    end
+  end
+end

data/lib/lanekit/generate.rb

@@ -0,0 +1,24 @@
+class LaneKit::Generate < Thor
+  
+  @@lanekit_version = LaneKit::VERSION;
+  @@template_folder = File.expand_path('../../template', __FILE__)
+  @@generate_date = Date.today.to_s
+
+  no_tasks do
+    def update_xcode_project
+      xcworkspace_path = ""
+      Xcodeproj::Workspace.new_from_xcworkspace(xcworkspace_path)
+    end
+  end
+
+  @@template_opts = {
+    :command => LaneKit::CLI.command,
+    :generate_date => @@generate_date,
+    :lanekit_version => @@lanekit_version
+  }
+
+  require 'lanekit/generate/model'
+  require 'lanekit/generate/provider'
+
+  class_option :use_core_data, :type => :boolean, :default => false, :banner => "generate code compatible with Core Data (the default is false)", :aliases => "-c"     # option --use_core_data=true
+end

data/lib/lanekit/version.rb

@@ -1,3 +1,3 @@
 module LaneKit
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/lanekit.rb

@@ -1,9 +1,9 @@
 require 'date'
 require 'thor'
 require 'xcodeproj'
-require 'lanekit/version'
 require 'active_support'
 require 'active_support/inflector'
+require 'lanekit/version'
 
 module LaneKit
   @@objc_types = {
@@ -101,152 +101,35 @@ module LaneKit
     assert
   end
 
-  module Generators
-
-    class Generate < Thor
-      include Thor::Actions
-
-      desc "model NAME [attributes]", "Generates an Objective-C model for RestKit including unit tests"
-      long_desc <<-LONGDESC
-      Generates the Objective-C code for a model that is compatible with RestKit. It also generates test fixtures and unit tests.\n
-      NAME: the name of the model\n
-      [attributes] name:type:relationship, name:type:relationship, ...\n
-      where type is [date|integer|string|<class_name>] and relationship (optional) is the name of another class.
-      LONGDESC
-      
-      option :use_core_data, :type => :boolean, :default => false, :banner => "generate code compatible with Core Data", :aliases => :c     # option --use_core_data=true
-      def model(model_name, *attributes)
-        @using_core_data = options[:use_core_data]
-        puts "  using Core Data: #{@using_core_data}"
-
-        @model_name = LaneKit.derive_model_name(model_name)
-
-        @model_file_name = LaneKit.derive_file_name(@model_name)
-        @model_fixtures_file_name = "#{@model_file_name}Fixtures"
-        @model_tests_file_name = "#{@model_file_name}Test"
+end
 
-        @class_name = LaneKit.derive_class_name(@model_name)
-        @lanekit_version = VERSION;
-        
-        @attributes = []
-        @any_relationships = false
-        
-        attributes.each {|attribute|
-          name, type, relationship = attribute.split(":")
-          objective_c_type = LaneKit.objective_c_type(type)
-          @attributes << {
-            :type => type,
-            :name => name,
-            :objective_c_type => objective_c_type,
-            :relationship => relationship,
-            :relationship_fixtures_file_name => "#{relationship}Fixtures",
-            :fixture_json => LaneKit.objective_c_type_fixture_json(type),
-            :fixture_value => LaneKit.objective_c_type_fixture_value(type),
-            :unit_test_assert => LaneKit.objective_c_type_unit_test_assert(@model_name, name, type)
-          }
-          @any_relationships = relationship ? true : @any_relationships
-        }
-        
-        script_name = File.basename($0)
-        script_args = ARGV.join(' ')
+module LaneKit
+  class CLI < Thor
         
-        @command = "#{script_name} #{script_args}"
-
-        self.initialize_stuff
-        self.create_model_folders
-        self.create_model_files @model_name
-        self.update_xcode_project @model_name
-      end
+    script_name = File.basename($0)
+    script_args = ARGV.join(' ')
+    
+    @command = "#{script_name} #{script_args}"
 
-      def self.source_root
-        File.dirname('./')
+    no_commands do    
+      def self.command
+        @command
       end
-      
-      no_commands {
-        def initialize_stuff
-          @model_date = Date.today.to_s
-          
-          @models_folder         = "Classes/Models"
-          @tests_fixtures_folder = "Classes/Tests/Fixtures"
-          @tests_models_folder = "Classes/Tests/Models"
-          
-          @template_folder = File.expand_path('../template', __FILE__)
-        end
-      
-        def source_paths
-          [@template_folder]
-        end
-
-        def create_model_folders
-          empty_directory @models_folder
-          empty_directory @tests_fixtures_folder
-          empty_directory @tests_models_folder
-        end
-      
-        def create_model_files(model_name)
-          # Files are created lowercase
-          # Class names are camel case, videodata => VideoData
-
-          # 1) Create the Models
-          # Create the .h file
-          source = "model.h.erb"
-          target = File.join(@models_folder, "#{@model_file_name}.h")
-          template(source,target)
-
-          # Create the .m file
-          source = "model.m.erb"
-          target = File.join(@models_folder, "#{@model_file_name}.m")
-          template(source,target)
-
-          # 2) Create the Model Test Fixtures
-          # Create the .h file
-          source = "model_fixture.h.erb"
-          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.h")
-          template(source,target)
-
-          # Create the .m file
-          source = "model_fixture.m.erb"
-          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.m")
-          template(source,target)
-
-          # Create the json file
-          source = "model_fixture.json.erb"
-          target = File.join(@tests_fixtures_folder, "#{@model_fixtures_file_name}.json")
-          template(source,target)
-
-          # 3) Create the Model Tests
-          # Create the .h file
-          source = "model_test.h.erb"
-          target = File.join(@tests_models_folder, "#{@model_tests_file_name}.h")
-          template(source,target)
-
-          # Create the .m file
-          source = "model_test.m.erb"
-          target = File.join(@tests_models_folder, "#{@model_tests_file_name}.m")
-          template(source,target)
-        end
-  
-        def update_xcode_project(model_name)
-          xcworkspace_path = ""
-          Xcodeproj::Workspace.new_from_xcworkspace(xcworkspace_path)
-        end
-      }
     end
-  end
-end
-
-module LaneKit  
-  class CLI < Thor
     
-    desc "generate", "Invoke a code generator"
-    long_desc "Invoke a code generator. There is only one generator so far: 'model' that generates Objective-C code compatible with RestKit that includes unit tests"
-    subcommand "generate", LaneKit::Generators::Generate
+    map ["-v", "--version"] => :version
 
-    # register(class_name, subcommand_alias, usage_list_string, description_string)
-    #register(LaneKit::Generators::Generate, "generate", "generate", "Runs a code generator")
+    desc "generate", "Invoke a code generator"
+    long_desc <<-LONGDESC
+    Invoke a code generator:\n
+    -'model' that generates Objective-C code compatible with RestKit that includes unit tests\n
+    -'provider' that generates Objective-C code compatible with RestKit
+    LONGDESC
     
-    desc "version", "Display the LaneKit version"
+    require 'lanekit/generate'
+    subcommand "generate", LaneKit::Generate
     
+    desc "version", "Display the LaneKit version"
     def version
       puts "LaneKit #{VERSION}"
     end

data/lib/template/model.h.erb

@@ -1,25 +1,16 @@
 //
 //  <%=@model_file_name%>.h
 //
-//  This model was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
 //
-// The following LaneKit command was used to generate this model:
-// <%=@command%>
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
-<% if @using_core_data %>#import <CoreData/CoreData.h><% else %>#import <Foundation/Foundation.h><% end %>
+#import "<%=@model_base_file_name%>.h"
 
-@class RKObjectMapping;
-
-@interface <%=@class_name%> : <% if @using_core_data %>NSManagedObject<% else %>NSObject<% end %>
+@interface <%=@class_name%> : <%=@model_base_class_name%>
 <% @attributes.each do |attribute| %>
 @property (nonatomic,strong) <%=attribute[:objective_c_type]%><%=attribute[:name]%>;<% if attribute[:relationship] %>  // relates to: <%=attribute[:relationship]%><% end %><% end %>
-<% if @using_core_data %>
-+ (NSString *)entityName;
-+ (<%=@class_name%> *)create:(NSManagedObjectContext *)moc;<% end %>
-+ (NSString *)keyPath;        // Used by providers. The subset of the parsed response for which the mapping is to be used.
-+ (NSString *)pathPattern;    // Used by providers. The pattern that matches against URLs for which the mapping should be used.
-+ (RKObjectMapping *)requestMapping;    // Used by providers. Returns the request RKObjectMapping
-+ (RKObjectMapping *)responseMapping;   // Used by providers. Returns the response RKObjectMapping
 
 @end

data/lib/template/model.m.erb

@@ -1,11 +1,13 @@
 //
 //  <%=@model_file_name%>.m
 //
-//  This model was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
-#import "<%=@model_file_name%>.h"
-#import "RestKit.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>
+#import "<%=@model_file_name%>.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>
 #import "<%=attribute[:relationship]%>.h"<%end%><%end%>
 
 @implementation <%=@class_name%><% if @using_core_data %>
@@ -13,62 +15,36 @@
 // All properties in this NSManagedObject need to be defined with @dynamic<% @attributes.each do |attribute| %>
 @dynamic <%=attribute[:name]%>;<% end %><% end %>
 
-+ (void)initialize
-{
-  if (self == [<%=@class_name%> class])
-  {
-  }
-}<% if @using_core_data %>
-
-+ (NSString *)entityName
+// Dictionary to convert self to JSON
++ (NSDictionary *)dictionaryForRequestMappings
 {
-    return NSStringFromClass([self class]);
+    return @{
+             // source key path : destination attribute name
+<% @attributes.each_with_index do |attribute, index| %><% if !attribute[:relationship] %>             @"<%=attribute[:name]%>": @"<%=attribute[:name]%>"<% if index != @attributes.size-1 %>,<% end %>
+<% end %><% end %>    };
 }
 
-+ (<%=@class_name%> *)create:(NSManagedObjectContext *)moc
+// Dictionary to convert JSON to self
++ (NSDictionary *)dictionaryForResponseMappings
 {
-    <%=@class_name%> *entity = nil;
-    @try {
-        entity = [NSEntityDescription insertNewObjectForEntityForName:self.entityName inManagedObjectContext:moc];
-    }
-    @catch (NSException *exception) {
-        NSLog(@"[%@ %@] %@", [self description], NSStringFromSelector(_cmd), exception);
-        @throw exception;
-    }
-    return entity;
-}<% end %>
-
-+ (NSDictionary *)dictionaryForMappings
-{
-    return @{
-<% @attributes.each_with_index do |attribute, index| %><% if !attribute[:relationship] %>        @"<%=attribute[:name]%>": @"<%=attribute[:name]%>"<% if index != @attributes.size-1 %>,<% end %>
+  return @{
+           // source key path : destination attribute name
+<% @attributes.each_with_index do |attribute, index| %><% if !attribute[:relationship] %>             @"<%=attribute[:name]%>": @"<%=attribute[:name]%>"<% if index != @attributes.size-1 %>,<% end %>
 <% end %><% end %>    };
 }
 
 + (NSString *)keyPath
 {
   return @"<%=@model_name%>";
-}
-
-+ (NSString *)pathPattern
-{
-  return nil;
-}
-
-+ (RKObjectMapping *)requestMapping
-{
-    RKObjectMapping *requestMapping = [RKObjectMapping requestMapping];
-    [requestMapping addAttributeMappingsFromDictionary:[self dictionaryForMappings]];
-    return requestMapping;
-}
+}<% if @any_relationships %>
 
 + (RKObjectMapping *)responseMapping
 {
     RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[<%=@class_name%> class]];
-    [mapping addAttributeMappingsFromDictionary:[self dictionaryForMappings]];
+    [mapping addAttributeMappingsFromDictionary:[self dictionaryForResponseMappings]];
 <% @attributes.each_with_index do |attribute, index| %><% if attribute[:relationship] %>
     [mapping addRelationshipMappingWithSourceKeyPath:@"<%=attribute[:name]%>" mapping:[<%=attribute[:relationship]%> responseMapping]];
 <% end %><% end %>    return mapping;
-}
+}<% end %>
 
 @end

data/lib/template/model_base.h.erb

@@ -0,0 +1,23 @@
+//
+//  <%=@model_base_file_name%>.h
+//
+//  This base model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "RestKit.h"
+
+@interface <%=@model_base_class_name%> : <% if @using_core_data %>NSManagedObject<% else %>NSObject<% end %>
+
++ (NSDictionary *)dictionaryForRequestMappings;  // Used by providers.
++ (NSDictionary *)dictionaryForResponseMappings; // Used by providers.
++ (NSString *)keyPath;                    // Used by providers. The subset of the parsed response for which the mapping is to be used.
++ (NSString *)pathPattern;                // Used by providers. The pattern that matches against URLs for which the mapping should be used.
++ (RKObjectMapping *)requestMapping;      // Used by providers. Returns the request RKObjectMapping
++ (RKObjectMapping *)responseMapping;     // Used by providers. Returns the response RKObjectMapping
+<% if @using_core_data %>
++ (NSString *)entityName;
++ (<%=@class_name%> *)create:(NSManagedObjectContext *)moc;<% end %>
+@end

data/lib/template/model_base.m.erb

@@ -0,0 +1,77 @@
+//
+//  <%=@model_base_file_name%>.m
+//
+//  This base model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "<%=@model_base_file_name%>.h"
+
+@implementation <%=@model_base_class_name%><% if @using_core_data %>
+
++ (NSString *)entityName
+{
+    return NSStringFromClass([self class]);
+}
+
++ (<%=@class_name%> *)create:(NSManagedObjectContext *)moc
+{
+    <%=@class_name%> *entity = nil;
+    @try {
+        entity = [NSEntityDescription insertNewObjectForEntityForName:self.entityName inManagedObjectContext:moc];
+    }
+    @catch (NSException *exception) {
+        NSLog(@"[%@ %@] %@", [self description], NSStringFromSelector(_cmd), exception);
+        @throw exception;
+    }
+    return entity;
+}<% end %>
+
+// Dictionary to convert self to JSON
+// Subclasses may need to override this method
++ (NSDictionary *)dictionaryForRequestMappings
+{
+  return @{
+           };
+}
+
+// Dictionary to convert JSON to self
+// Subclasses may need to override this method
++ (NSDictionary *)dictionaryForResponseMappings
+{
+  return @{
+           };
+}
+
+// Subclasses should override this method
++ (NSString *)keyPath
+{
+  return nil;
+}
+
+// Subclasses may need to override this method
++ (NSString *)pathPattern
+{
+  return nil;
+}
+
+// Returns the request RKObjectMapping for this class
++ (RKObjectMapping *)requestMapping
+{
+  RKObjectMapping *mapping = [RKObjectMapping requestMapping];
+  [mapping addAttributeMappingsFromDictionary:[self dictionaryForRequestMappings]];
+  return mapping;
+}
+
+// Returns the response RKObjectMapping for this class
+// Subclasses may need to override this method
++ (RKObjectMapping *)responseMapping
+{
+  RKObjectMapping *mapping = [RKObjectMapping mappingForClass:self.class];
+  [mapping addAttributeMappingsFromDictionary:[self dictionaryForResponseMappings]];
+  return mapping;
+}
+
+@end

data/lib/template/model_fixture.h.erb

@@ -1,7 +1,10 @@
 //
 //  <%=@model_fixtures_file_name%>.h
 //
-//  This model fixture was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model fixture was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
 #import <Foundation/Foundation.h>

data/lib/template/model_fixture.m.erb

@@ -1,7 +1,10 @@
 //
 //  <%=@model_fixtures_file_name%>.m
 //
-//  This model fixture was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model fixture was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
 #import "<%=@model_fixtures_file_name%>.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>

data/lib/template/model_test.h.erb

@@ -1,7 +1,10 @@
 //
 //  <%=@model_tests_file_name%>.h
 //
-//  This model test was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model test was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
 #import <SenTestingKit/SenTestingKit.h>

data/lib/template/model_test.m.erb

@@ -1,7 +1,10 @@
 //
 //  <%=@model_tests_file_name%>.m
 //
-//  This model test was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//  This model test was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
 //
 
 #import "<%=@model_tests_file_name%>.h"

data/lib/template/provider.h.erb

@@ -0,0 +1,15 @@
+//
+//  <%=@provider_file_name%>.h
+//
+//  This provider was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "<%=@provider_base_file_name%>.h"
+#import "<%=@model_file_name%>.h"
+
+@interface <%=@provider_name%> : <%=@provider_base_class_name%>
+
+@end

data/lib/template/provider.m.erb

@@ -0,0 +1,31 @@
+//
+//  <%=@provider_file_name%>.m
+//
+//  This provider was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "<%=@provider_file_name%>.h"
+
+@implementation <%=@provider_name%>
+
+- (NSString *)baseURL
+{
+  return @"<%=@provider_url%>";
+}
+
+- (Class)modelClass
+{
+  return [<%=@model_class_name%> class];
+}
+
+- (id)processResult:(RKMappingResult *)mappingResult withError:(NSError **)error
+{
+  <%=@model_class_name%> *results = [mappingResult firstObject];
+  id result = results;
+  return result;
+}
+
+@end

data/lib/template/provider_base.h.erb

@@ -0,0 +1,23 @@
+//
+//  <%=@provider_base_file_name%>.h
+//
+//  This base provider was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "RestKit.h"
+
+typedef void(^<%=@provider_base_class_name%>CallbackBlock)(NSError *error, id result);
+
+@interface <%=@provider_base_class_name%> : NSObject
+
+@property (nonatomic,strong) NSString *baseURL;
+
+- (void)downloadWithCompletionBlock:(LKResourceProviderCallbackBlock)completionBlock;
+- (Class)modelClass;
+- (id)processResult:(RKMappingResult *)mappingResult withError:(NSError **)error;
+- (RKResponseDescriptor *)responseDescriptor;
+
+@end

data/lib/template/provider_base.m.erb

@@ -0,0 +1,55 @@
+//
+//  <%=@provider_base_file_name%>.m
+//
+//  This base provider was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "<%=@provider_base_file_name%>.h"
+#import "LKModel.h"
+
+@implementation <%=@provider_base_class_name%>
+
+- (void)downloadWithCompletionBlock:(LKResourceProviderCallbackBlock)completionBlock
+{
+  NSString *baseURL = self.baseURL;
+  NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:baseURL]];
+  RKResponseDescriptor *responseDescriptor = [self responseDescriptor];
+  RKObjectRequestOperation *operation = [[RKObjectRequestOperation alloc] initWithRequest:request responseDescriptors:@[responseDescriptor]];
+  
+  [operation setCompletionBlockWithSuccess:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+    NSError *error = nil;
+    id result = [self processResult:mappingResult withError:&error];
+    completionBlock(nil, result);
+  } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+    completionBlock(error, nil);
+  }];
+  [operation start];
+}
+
+// Subclasses should override this method
+- (Class)modelClass
+{
+  return [LKModel class];
+}
+
+// Subclasses should override this method
+- (id)processResult:(RKMappingResult *)mappingResult withError:(NSError **)error
+{
+  return nil;
+}
+
+// Subclasses may need to override this method
+- (RKResponseDescriptor *)responseDescriptor
+{
+  NSIndexSet *statusCodes = RKStatusCodeIndexSetForClass(RKStatusCodeClassSuccessful);
+  return [RKResponseDescriptor responseDescriptorWithMapping:[self.modelClass responseMapping]
+                                                      method:RKRequestMethodGET
+                                                 pathPattern:[self.modelClass pathPattern]
+                                                     keyPath:[self.modelClass keyPath]
+                                                 statusCodes:statusCodes];
+}
+
+@end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: lanekit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Larry Aasen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,11 +38,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-description: a code generator for iOS Objective-C models for integration with RestKit.
+description: an iOS Objective-C code generator for models and resource providers for
+  integration with RestKit.
 email:
 - larryaasen@gmail.com
 executables:
@@ -46,41 +52,53 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/lanekit/generate/model.rb
+- lib/lanekit/generate/provider.rb
+- lib/lanekit/generate.rb
 - lib/lanekit/version.rb
 - lib/lanekit.rb
 - lib/template/model.h.erb
 - lib/template/model.m.erb
+- lib/template/model_base.h.erb
+- lib/template/model_base.m.erb
 - lib/template/model_fixture.h.erb
 - lib/template/model_fixture.json.erb
 - lib/template/model_fixture.m.erb
 - lib/template/model_test.h.erb
 - lib/template/model_test.m.erb
+- lib/template/provider.h.erb
+- lib/template/provider.m.erb
+- lib/template/provider_base.h.erb
+- lib/template/provider_base.m.erb
 - bin/lanekit
 - README.md
 - LICENSE
 homepage: https://github.com/LarryAasen/LaneKit
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: LaneKit is a code generator for iOS Objective-C models for integration with
-  RestKit.
+specification_version: 3
+summary: LaneKit is an iOS Objective-C code generator of models and resource providers
+  for integration with RestKit. It includes support for unit testing with SenTestingKit
+  including fixtures and tests. LaneKit is a command line app written in Ruby and
+  packaged as a Ruby Gem.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2ZkNjM1Yjk4OGNhNGQ2OWNhNTM1ZDY4Y2FhZGY1ZDE4ZThjMDA2YQ==
-  data.tar.gz: !binary |-
-    MDNhY2RiNDIwMzk5ZWY5NzBlMDM4ODgxNjlhMDAxM2MyYzg0NWZhZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGVhOWRlMjg2YTNiMTQ3NDZiYzU5NGE3MDUzNmIwNzRlMTMxYTViM2E3YjM1
-    ZGUxOTA5YjRhNWMxMmY3ZjBlZWFiMDkyYmI0NjQ3YTk5ZmEzZGJhODAwMDcx
-    ZDI0OWVlMmIwOGQzMzJkM2U2ZWYyMTAxODRiYTE2NWY0YmVhMmQ=
-  data.tar.gz: !binary |-
-    N2FkYmExMzRhZmQ4OTJhMjY4NmE0YTFkYzYxNmE2NGUwNmMyZGY2YWFkZGJh
-    NjVhODE3YTc4Y2E3M2M1MmRlNmRkNTFhMmI1Y2RiMTZmZjM0OTkzMTliYWE4
-    ZDk4YzJiOWY5NWQ0ZjUwZWQ3YmQ0MTMwOGM1OTdmNjRhMGVlNTE=