lanekit 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhjZDVkYzIyYmY4ZWM4OWQ1Y2VlOTRhZTI1N2RiNGMwNDZiOTg1Yw==
+    YzI4ZDM1ZGM3MjhkYjRmYjU1NzkxZGM1ZDdmYzM2MjBjZTUyODgzOA==
   data.tar.gz: !binary |-
-    MDg1NmM1MDlmYmRkMGQ3M2ZkMTQ4ODdiZTZlZWYzN2QzYjUwN2Q4Zg==
+    MDIxOTc1ZTM4NjdiOTk2NTZjYzk2NWFjMGE1YjY0M2RiZjgzNTU5Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmRkODljYjQ5ODE4NTBhNmZhMzU2Y2I2YTA0MThkYmM2MDYxNzdlYzRmNWY0
-    NWE4YjdmNTkzMzgwNzlmYzFkMmY0ZWY5MjA3ZDM1NzU2MjFlMzMwOWM0MTdm
-    NDQ4YzA0ZWI1NmJjMTg2MjNmNzc2NmI3MGVjNGNhNDUzMjFhYjY=
+    OTY4N2M1NmQxYmIzOWEwODlhOTMzMmI4YWU2OTU2YzBlY2VmYzlhMzQ5OTBm
+    Zjc5ZjkzODViMWY3MDJhZGMwYzFhYjI2MjRmMDE5MDFiNzkzNGRkMzc3YTMw
+    MWE2NTAwOTJkMjE3ZjljOGE4ZWUzY2JlMTNiZWQ4YWI4MDdiYjQ=
   data.tar.gz: !binary |-
-    MmMxZThlYzk5NDFmODg2MGU4ZWYwM2MwMzNiNDkwODljOWE3NjZmMzViNDQx
-    OTc2NTZjZDJhM2IxMWNhYzVjM2U3NDlkMjYzNDQ5MmU1NDM2N2RmMTcwOTM5
-    MDZmMGE4NmM1MzE1YzBkMzRlNGQ5ZTQ4NDgzNzUzYjM2ZTE4ODU=
+    YmFiZDM3NWQ4YzY3NGE0NjhjOWI3ZmQyNDkxZGIxODhjMDNhYzAyMTllZDRh
+    NDU4ZGZhODkzMTU4N2JiNDE1MTY0OTMxNDJhMTMzYTg2ZjZjNTliYmRmNjBj
+    MGYyYzBhNjU2OGJlNjcyMzE0YjYzN2E4NjYzMzBlNGRhYmMwY2Q=

data/README.md

@@ -1,6 +1,9 @@
 ## LaneKit
 
-LaneKit is a Ruby command line app that creates iOS Objective-C models for integration with RestKit.
+
+LaneKit is a code generator for iOS Objective-C models 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.
 
 - [Source code for LaneKit](https://github.com/LarryAasen/LaneKit/zipball/master) from [GitHub](http://github.com).
 - Questions? [Stack Overflow](http://stackoverflow.com/questions/tagged/lanekit) is the best place to find answers.
@@ -17,12 +20,18 @@ LaneKit is a Ruby command line app that creates iOS Objective-C models for integ
 ## Example Usage
 
 ### Add a new model called Video to an existing Xcode project.
-```
-$ lanekit generate model Video duration:string headline:string image:string location:string
-create  Classes/model
-create  Classes/model/Video.h
-create  Classes/model/Video.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/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
 
 and here is the Objective-C header file that was generated by LaneKit:
 
@@ -30,10 +39,10 @@ and here is the Objective-C header file that was generated by LaneKit:
 //
 //  Video.h
 //
-//  This model was created on 2013-07-23 by LaneKit v0.1.6.
+//  This model was created on 2013-08-10 by LaneKit v0.1.7.
 //
 // The following LaneKit command was used to generate this model:
-// lanekit generate model Video duration:string headline:string image:string location:string
+// lanekit generate model Video duration:string headline:string id:integer image:string location:string
 //
 
 #import <Foundation/Foundation.h>
@@ -44,6 +53,7 @@ and here is the Objective-C header file that was generated by LaneKit:
 
 @property (nonatomic,strong) NSString *duration;
 @property (nonatomic,strong) NSString *headline;
+@property (nonatomic,strong) NSNumber *id;
 @property (nonatomic,strong) NSString *image;
 @property (nonatomic,strong) NSString *location;
 
@@ -59,16 +69,12 @@ and here is the Objective-C .m file that was generated by LaneKit:
 //
 //  Video.m
 //
-//  This model was created on 2013-07-23 by LaneKit v0.1.6.
-//
+//  This model was created on 2013-08-10 by LaneKit v0.1.7.
 //
 
 #import "Video.h"
-#import "MobileCoreServices/MobileCoreServices.h"
-#import "SystemConfiguration/SystemConfiguration.h"
 #import "RestKit.h"
 
-
 @implementation Video
 
 + (void)initialize
@@ -83,6 +89,7 @@ and here is the Objective-C .m file that was generated by LaneKit:
     return @{
         @"duration": @"duration",
         @"headline": @"headline",
+        @"id": @"id",
         @"image": @"image",
         @"location": @"location"
     };

data/lib/lanekit/version.rb

@@ -1,3 +1,3 @@
 module LaneKit
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/lanekit.rb

@@ -49,16 +49,54 @@ module LaneKit
     end
     type
   end
+  
+  def self.objective_c_type_fixture_value(type_name)
+    if type_name == "array"
+      value = "@[]"
+    elsif type_name == "date"
+      value = "NSDate.new"
+    elsif type_name == "integer"
+      value = "[NSNumber numberWithInteger:1]"
+    elsif type_name == "string"
+      value = "@\"MyString\""
+    elsif type_name
+      value = "nil"
+    else
+      value = "nil"
+    end
+    value
+  end
+  
+  def self.objective_c_type_unit_test_assert(model_name, name, type_name)
+    if type_name == "array"
+      assert = "STAssertNotNil(#{model_name}.#{name}, @\"#{name} is nil\")"
+    elsif type_name == "date"
+      assert = "STAssertNotNil(#{model_name}.#{name}, @\"#{name} is nil\")"
+    elsif type_name == "integer"
+      assert = "STAssertTrue(#{model_name}.#{name}.integerValue == #{self.objective_c_type_fixture_value(type_name)}.integerValue, @\"#{name} not #{self.objective_c_type_fixture_value(type_name)}\")"
+    elsif type_name == "string"
+      assert = "STAssertTrue([#{model_name}.#{name} isEqualToString:#{self.objective_c_type_fixture_value(type_name)}], @\"#{name} not correct value\")"
+    elsif type_name
+      assert = "STAssertNotNil(#{model_name}.#{name}, @\"#{name} is nil\")"
+    else
+      assert = "STAssertNotNil(#{model_name}.#{name}, @\"#{name} is nil\")"
+    end
+    assert
+  end
 
   module Generators
 
     class Generate < Thor
       include Thor::Actions
 
-      desc "model [name] [name:type:relationship, name:type:relationship, ...] where type is [date|integer|string|<class_name>] and relationship (optional) is []", "Generates an Objective-C model for RestKit"
+      desc "model [name] [name:type:relationship, name:type:relationship, ...] where type is [date|integer|string|<class_name>] and relationship (optional) is []", "Generates an Objective-C model for RestKit including unit tests"
       def model(model_name, *attributes)
         @model_name = LaneKit.derive_model_name(model_name)
-        @file_name = LaneKit.derive_file_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)
         @lanekit_version = VERSION;
         
@@ -72,7 +110,10 @@ module LaneKit
             :type => type,
             :name => name,
             :objective_c_type => objective_c_type,
-            :relationship => relationship
+            :relationship => relationship,
+            :relationship_fixtures_file_name => "#{relationship}Fixtures",
+            :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
         }
@@ -95,7 +136,11 @@ module LaneKit
       no_commands {
         def initialize_stuff
           @model_date = Date.today.to_s
-          @models_folder = "Classes/model"
+          
+          @models_folder         = "Classes/Models"
+          @tests_fixtures_folder = "Classes/Tests/Fixtures"
+          @tests_models_folder = "Classes/Tests/Models"
+          
           @template_folder = File.expand_path('../template', __FILE__)
           @using_core_data = false
         end
@@ -106,20 +151,45 @@ module LaneKit
 
         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, "#{@file_name}.h")
+          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, "#{@file_name}.m")
+          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)
+
+          # 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
   
@@ -134,7 +204,7 @@ end
 
 module LaneKit  
   class CLI < Thor
-    desc "generate", "Generate a model compatible with RestKit"
+    desc "generate", "Generate a model compatible with RestKit that includes unit tests"
 
     # register(class_name, subcommand_alias, usage_list_string, description_string)
     register(LaneKit::Generators::Generate, "generate", "generate", "Runs a generator")

data/lib/template/model.h.erb

@@ -1,5 +1,5 @@
 //
-//  <%=@file_name%>.h
+//  <%=@model_file_name%>.h
 //
 //  This model was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
 //

data/lib/template/model.m.erb

@@ -1,15 +1,12 @@
 //
-//  <%=@file_name%>.m
+//  <%=@model_file_name%>.m
 //
 //  This model was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
 //
-//
 
-#import "<%=@file_name%>.h"
-#import "MobileCoreServices/MobileCoreServices.h"
-#import "SystemConfiguration/SystemConfiguration.h"
-#import "RestKit.h"
-<% @attributes.each do |attribute| %><% if attribute[:relationship] %>#import "<%=attribute[:relationship]%>.h"<%end%><%end%>
+#import "<%=@model_file_name%>.h"
+#import "RestKit.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>
+#import "<%=attribute[:relationship]%>.h"<%end%><%end%>
 
 @implementation <%=@class_name%>
 

data/lib/template/model_fixture.h.erb

@@ -0,0 +1,16 @@
+//
+//  <%=@model_fixtures_file_name%>.h
+//
+//  This model fixture was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//
+
+#import <Foundation/Foundation.h>
+#import "<%=@model_file_name%>.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>
+#import "<%=attribute[:relationship]%>.h"<%end%><%end%>
+
+@interface <%=@class_name%>Fixtures : NSObject
+
++ (<%=@class_name%> *)one;
++ (<%=@class_name%> *)two;
+
+@end

data/lib/template/model_fixture.m.erb

@@ -0,0 +1,30 @@
+//
+//  <%=@model_fixtures_file_name%>.m
+//
+//  This model fixture was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//
+
+#import "<%=@model_fixtures_file_name%>.h"<% @attributes.each do |attribute| %><% if attribute[:relationship] %>
+#import "<%=attribute[:relationship_fixtures_file_name]%>.h"<%end%><%end%>
+
+@implementation <%=@class_name%>Fixtures
+
++ (<%=@class_name%> *)one
+{
+  <%=@class_name%> *<%=@model_name%> = <%=@class_name%>.new;
+
+<% @attributes.each_with_index do |attribute, index| %><% if attribute[:relationship] %>  <%=@model_name%>.<%=attribute[:name]%> = @[<%=attribute[:relationship]%>Fixtures.one];<% else %><%=@model_name%>.<%=attribute[:name]%> = <%=attribute[:fixture_value]%>;<% end %>
+<% end %>
+  return <%=@model_name%>;
+}
+
++ (<%=@class_name%> *)two
+{
+  <%=@class_name%> *<%=@model_name%> = <%=@class_name%>.new;
+
+<% @attributes.each_with_index do |attribute, index| %><% if attribute[:relationship] %>  <%=@model_name%>.<%=attribute[:name]%> = @[<%=attribute[:relationship]%>Fixtures.one, <%=attribute[:relationship]%>Fixtures.two];<% else %>  <%=@model_name%>.<%=attribute[:name]%> = <%=attribute[:fixture_value]%>;<% end %>
+<% end %>
+  return <%=@model_name%>;
+}
+
+@end

data/lib/template/model_test.h.erb

@@ -0,0 +1,10 @@
+//
+//  <%=@model_tests_file_name%>.h
+//
+//  This model test was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface <%=@class_name%>Test : SenTestCase
+@end

data/lib/template/model_test.m.erb

@@ -0,0 +1,51 @@
+//
+//  <%=@model_tests_file_name%>.m
+//
+//  This model test was created on <%=@model_date%> by LaneKit v<%=@lanekit_version%>.
+//
+
+#import "<%=@model_tests_file_name%>.h"
+#import "<%=@model_fixtures_file_name%>.h"
+
+@implementation <%=@class_name%>Test
+
+- (void)setUp
+{
+  [super setUp];
+  
+  // Set-up code here.
+}
+
+- (void)tearDown
+{
+  // Tear-down code here.
+  
+  [super tearDown];
+}
+
+- (void)test<%=@class_name%>NewOne
+{
+  <%=@class_name%> *<%=@model_name%> = <%=@class_name%>Fixtures.one;
+  STAssertNotNil(<%=@model_name%>, @"<%=@model_name%> is nil");
+
+<% @attributes.each_with_index do |attribute, index| %><% if !attribute[:relationship] %>  <%=attribute[:unit_test_assert]%>;<% end %>
+<% end %>}
+
+- (void)test<%=@class_name%>NewTwo
+{
+  <%=@class_name%> *<%=@model_name%> = <%=@class_name%>Fixtures.two;
+  STAssertNotNil(<%=@model_name%>, @"<%=@model_name%> is nil");
+
+<% @attributes.each_with_index do |attribute, index| %><% if !attribute[:relationship] %>  <%=attribute[:unit_test_assert]%>;<% end %>
+<% end %>}
+
+- (void)testMapping
+{
+  RKObjectMapping *requestMapping = [<%=@class_name%> requestMapping];
+  STAssertNotNil(requestMapping, @"[<%=@class_name%> requestMapping] returned nil.");
+  
+  RKObjectMapping *responseMapping = [<%=@class_name%> responseMapping];
+  STAssertNotNil(responseMapping, @"[<%=@class_name%> responseMapping] returned nil.");
+}
+
+@end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanekit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Larry Aasen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,7 +38,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-description: an Objective-C model creator for RestKit.
+description: a code generator for iOS Objective-C models for integration with RestKit.
 email:
 - larryaasen@gmail.com
 executables:
@@ -50,6 +50,10 @@ files:
 - lib/lanekit.rb
 - lib/template/model.h.erb
 - lib/template/model.m.erb
+- lib/template/model_fixture.h.erb
+- lib/template/model_fixture.m.erb
+- lib/template/model_test.h.erb
+- lib/template/model_test.m.erb
 - bin/lanekit
 - README.md
 - LICENSE
@@ -76,6 +80,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: LaneKit is a Ruby command line app that creates Objective-C models for integration
-  to RestKit.
+summary: LaneKit is a code generator for iOS Objective-C models for integration with
+  RestKit.
 test_files: []