fwtoolkit 0.5.0 → 0.5.1

data/lib/fwtoolkit/test/model_helper.rb

@@ -46,12 +46,20 @@ module FWToolkit
       end
     
       def fwt_seed_app(model_names=[])
+        puts "Deprecated: fwt_seed_app(). Please use fwt_seed_app_with_pickle_models(). Will be changed in 0.6.0 to accept objects."
+        fwt_seed_app_with_pickle_models(model_names)
+      end
+      
+      def fwt_seed_app_with_pickle_models(model_names=[])
         objects = model_names.collect{|n| model!(n)}
-        fwt_app_exec("seedCoreData:", objects.to_json)
+        fwt_seed_app_with_objects(objects)
+      end
+      
+      def fwt_seed_app_with_objects(objects = [])
+        fwt_app_exec("seedCoreData:", objects.to_json)        
       end
       
       def fwt_set_user_defaults(bundle_identifier, user_defaults)
-        
         app_dir = Dir.entries(fwt_simulator_applications_dir)
         app_dir.delete "."
         app_dir.delete ".."
@@ -62,9 +70,7 @@ module FWToolkit
         data.merge! user_defaults
         plist.value = CFPropertyList.guess(data)
         plist.save(plist_file, CFPropertyList::List::FORMAT_BINARY)
-        
       end
-    
     end
   end
 end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/fwtoolkit.rb

@@ -6,3 +6,15 @@ require 'fwtoolkit/version'
 require 'fwtoolkit/test/frank_model'
 
 Dir["tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
+
+# add as_json to Array
+class Array
+  def to_json(*)
+    contents = ""
+    self.each_index do |i|
+      contents << self[i].to_json
+      contents << ',' unless i == self.length - 1 
+    end
+    "[#{contents}]"
+  end
+end

data/templates/cucumber/AppDelegate+Frank.m

@@ -1,6 +1,6 @@
 //
 //  AppDelegate+Frank.m
-//  QlikView
+//  FWToolkit
 //
 //  Created by Matt Brooke-Smith on 18/07/2012.
 //  Copyright (c) 2012 Future Workshops. All rights reserved.
@@ -10,7 +10,6 @@
 #import <CoreData/CoreData.h>
 #import <JSONKit/JSONKit.h>
 #import <RestKit/RestKit.h>
-#import "RKObjectManager+QVWOfflineTests.h"
 
 @implementation AppDelegate (Frank)
 
@@ -34,7 +33,7 @@
 
     NSError *error = nil;
     if (![managedObjectContext save:&error]) {
-        WLog(@"Error saving: %@", [error localizedDescription]);
+        NSLog(@"Error saving: %@", [error localizedDescription]);
     }
 }
 

data/templates/cucumber/launch_steps.rb

@@ -17,12 +17,12 @@ Given /^I launch the app in the (iphone|ipad) simulator$/ do |device|
 end
 
 Given /^I reset and launch the app in the (iphone|ipad) simulator$/ do |device|
-  fwt_simulator_reset_data ios_sdk_version 
+  fwt_simulator_reset_data ios_sdk 
   launch_app app_path, ios_sdk, device
 end
 
 Given /^I reset and launch the app in the (iphone|ipad) simulator, seeded with #{capture_model}$/ do |device, capture_model|
-  fwt_simulator_reset_data ios_sdk_version 
+  fwt_simulator_reset_data ios_sdk 
   launch_app app_path, ios_sdk, device
   fwt_seed_app [capture_model]
   launch_app app_path, ios_sdk, device

data/templates/models/model.rb.erb

@@ -1,5 +1,3 @@
-require 'jbuilder'
-
 # Generated code
 class <%= @class_name %> < FWToolkit::Test::FrankModel
   # attributes
@@ -7,10 +5,6 @@ class <%= @class_name %> < FWToolkit::Test::FrankModel
   # relationships
   attr_reader <%= @model.relationships.select{|r| r.inverse != nil}.map{|r| ":#{r.name.ruby_format}"}.join(', ') %>
 
-	def initialize
-    @core_data_entity = '<%= @model.name %>'
-  end
-
   # inverse relationship setters
   <% @model.relationships.select{|r| not r.to_many? and r.inverse}.each do |r| %><% name = r.name.ruby_format %>
   def <%= name %>=(_<%= name %>)
@@ -30,17 +24,7 @@ class <%= @class_name %> < FWToolkit::Test::FrankModel
 	<% end %>
 
 	def as_json(options={})
-		Jbuilder.encode do |json|
-			json.<%= @model.name %> do
-				<% @model.attributes.each do |a| %>
-		    json.<%= a.name %> self.<%= a.name.ruby_format %>
-				<% end %>
-				<% @model.relationships.select{|r| r.to_many? and r.inverse}.each do |r| %>
-				json.<%= r.name %> self.<%= r.name.ruby_format %> do |obj|
-					# fill out object properties
-				end
-				<% end %>
-		  end
-		end
+		<% attributes_and_properties = @model.attributes + @model.relationships.select{|r| r.to_many? and r.inverse} %>
+  	{'<%= @model.name %>' => {<%= attributes_and_properties.map {|p| ":#{p.name} => self.#{p.name.ruby_format}"}.join(', ') %>}}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber