fwtoolkit 0.3.4 → 0.4.0

data/lib/fwtoolkit/tasks/build_tasks.rb

@@ -3,6 +3,8 @@ require 'rubygems'
 require 'xcodebuild'
 require 'cucumber/rake/task'
 
+TEMPLATES_DIR = File.expand_path('../../../templates/', File.dirname(__FILE__))
+
 module XcodeBuild
   def self.run(args = "", output_buffer = STDOUT)
     command = "xcodebuild #{args} DSTROOT=/tmp/artifacts 2>&1"
@@ -28,8 +30,9 @@ end
 module FWToolkit
   module Tasks
     class BuildTask < ::Rake::TaskLib
+      
       include Rake::DSL if defined?(Rake::DSL)
-
+      
       attr_accessor :workspace
       attr_accessor :scheme
       attr_accessor :bundle_identifier
@@ -69,24 +72,44 @@ module FWToolkit
             sh command
           end
           
-          desc 'Upload IPA to FWBuild'
+          task :validate_auth_token do
+            puts 'Please set FWBUILD_AUTH_TOKEN environment variable'
+            exit(-1) unless ENV['FWBUILD_AUTH_TOKEN']
+          end
+          
           task :upload do 
-            auth_token=ENV['FWBUILD_AUTH_TOKEN']
+            auth_token = ENV['FWBUILD_AUTH_TOKEN']            
             file_name = "#{scheme}.ipa"
             key = File.join('uploads', file_name)
             sh("curl -X POST -F 'key=#{key}' -F 'acl=bucket-owner-full-control' -F 'file=@/tmp/artifacts/Applications/#{scheme}.ipa' https://fw.fwbuild.production.s3.amazonaws.com/ --progress-bar")
-            sh("curl 'http://fwbuild.futureworkshops.com/apps/builds.json?bundle_identifier=#{@bundle_identifier}&s3_upload_name=#{file_name}&auth_token=#{auth_token}'")
+            sh("curl 'http://fwbuild.futureworkshops.com/apps/builds.json?bundle_identifier=#{@bundle_identifier}&s3_upload_name=#{file_name}&auth_token=#{auth_token}&build[version]=#{DateTime.now.to_s}'")
           end
           
           desc 'Build and Upload IPA'
-          task :build_upload => ['release_iphoneos:archive', :ipa, :upload]
+          task :build_upload => [:validate_auth_token, 'release_iphoneos:archive', :ipa, :upload]
         end
         
         namespace :frank do
-
           desc 'Setup Frank'
           task :setup do
-            sh "frank setup"
+            sh 'frank setup'
+
+            test_dir = File.join(TEMPLATES_DIR, 'cucumber')
+            features_dir = File.join('Frank', 'features')
+            support_dir = File.join(features_dir, 'support')
+            steps_dir = File.join(features_dir, 'step_definitions')
+            views_dir = File.join(support_dir, 'views')
+
+            remove_file(File.join(features_dir, 'my_first.feature'))
+            cp(File.join(test_dir, 'env.rb'), support_dir)
+            cp(File.join(test_dir, 'mimic.rb'), support_dir)
+            mkdir(views_dir)
+            cp(File.join(test_dir, 'my_objects_json.erb'), views_dir)
+            cp(File.join(test_dir, 'my_objects_xml.erb'), views_dir)
+            cp(File.join(test_dir, 'launch_steps.rb'), steps_dir)
+            cp(File.join(test_dir, 'example.feature'), features_dir)
+            cp(File.join(test_dir, 'AppDelegate+Frank.h'), './')
+            cp(File.join(test_dir, 'AppDelegate+Frank.m'), './')
           end
                     
           desc 'Build the frankified App'

data/lib/fwtoolkit/test/frank_model.rb

@@ -2,6 +2,49 @@ require 'pickle'
 
 module FWToolkit
   module Test
+    class FrankCache
+      @@klass_to_objects = {}
+      @@id_to_object = {}
+      
+      def self.add_object(object)
+        object.id = object.object_id
+        
+        # add to id to object hash
+        @@id_to_object[object.object_id.to_s] = object
+        
+        # add to klass to object hash
+        @@klass_to_objects[object.class.name] = [] unless @@klass_to_objects[object.class.name]
+        @@klass_to_objects[object.class.name] << object
+      end
+      
+      def self.all_objects(klass)
+        @@klass_to_objects[klass.name] ? @@klass_to_objects[klass.name] : []
+      end
+      
+      def self.find(id)
+        @@id_to_object[id.to_s]
+      end
+      
+      def self.find_first(klass, conditions)
+        self.find_all(klass, conditions).first
+      end
+      
+      def self.find_all(klass, conditions)
+        objects = []
+        FWToolkit::Test::FrankCache.all_objects(klass).each do |o|      
+          match = true
+          conditions.keys.each do |k|
+            if not eval("o.#{k}").eql? conditions[k]
+              match = false
+              break
+            end
+          end
+          objects << o if match
+        end
+        objects
+      end
+    end
+    
     class FrankModel
 
       attr_accessor :id, :core_data_entity
@@ -12,33 +55,26 @@ module FWToolkit
         # Gets a list of the available models for this adapter
         def self.model_classes
           klasses = ::FWToolkit::Test::FrankModel.__send__(:descendants)
-
-          #klasses.select do |klass|
-          #  !klass.abstract_class? && klass.table_exists? && !except_classes.include?(klass.name)
-          #end
         end
 
         # get a list of column names for a given class
         def self.column_names(klass)
-          #klass.column_names
-          []
+          klass.new.methods
         end
 
         # Get an instance by id of the model
         def self.get_model(klass, id)
-          FWToolkit::Test::FrankModel.object_in_cache(id)
+          FWToolkit::Test::FrankCache.find(id)
         end
 
         # Find the first instance matching conditions
         def self.find_first_model(klass, conditions)
-          #klass.find(:first, :conditions => conditions)
-          puts "find_first_model"
+          FWToolkit::Test::FrankCache.find_first(klass, conditions)
         end
 
         # Find all models matching conditions
         def self.find_all_models(klass, conditions)
-          #klass.find(:all, :conditions => conditions)
-          puts "find_all_models"
+          FWToolkit::Test::FrankCache.find_all(klass, conditions)
         end
 
         # Create a model using attributes
@@ -47,15 +83,28 @@ module FWToolkit
         end
       end
 
-      @@object_cache = {}
-
       def self.object_in_cache(id)
-        return @@object_cache[id.to_s]
+        FWToolkit::Test::FrankCache.find(id)
+      end
+      
+      def self.all_objects
+        FWToolkit::Test::FrankCache.all_objects(self)
       end
 
       def save!
-        self.id = self.object_id
-        @@object_cache[self.object_id.to_s] = self
+        FWToolkit::Test::FrankCache.add_object(self)
+      end
+      
+      def self.find(id)
+        FWToolkit::Test::FrankCache.find(id)
+      end
+      
+      def self.find_first(conditions={})
+        FWToolkit::Test::FrankCache.find_first(self, conditions)
+      end
+      
+      def self.find_all(conditions={})
+        FWToolkit::Test::FrankCache.find_all(self, conditions)
       end
     end
   end

data/lib/fwtoolkit/test/model_helper.rb

@@ -1,26 +1,11 @@
-require 'mimic'
-require 'socket'
-require 'net/http'
 require 'json'
-require 'erb'
 require 'frank-cucumber/gateway'
-require 'pickle/world'
 require 'cfpropertylist'
 
 module FWToolkit
   module Test
     module ModelHelpers
     
-      def mimic_server(port=11988)
-        @mimic = Mimic.mimic(:port => port) unless @mimic
-        @mimic
-      end
-
-      # todo: remove default response_content_type
-      def queue_mimic_get_response(path, content, response_content_type = 'application/xml')
-        mimic_server.get(path).returning(content, 200, {'Content-Type' => response_content_type})
-      end
-    
       def fwt_app_exec(method_name, *method_args)
         operation_map = Frank::Cucumber::Gateway.build_operation_map(method_name,method_args)
   
@@ -31,53 +16,6 @@ module FWToolkit
 
         return Frank::Cucumber::Gateway.evaluate_frankly_response( res, "app_exec #{method_name}" )
       end
-
-      def fwt_template_response(template_file_name, capture_models = [], options = nil)
-
-        # probably should put some asserts in here
-        # template_file_name should be single if capture_models.count == 0
-        # template_file_name should be plural if capture_models.count > 0
-        unless capture_models.empty?
-          factory, name_or_index = *parse_model(capture_models[0])
-          unless template_file_name
-            template_file_name = factory.pluralize
-          end
-  
-          objects = []
-          capture_models.each do |capture_model|
-            objects << model!(capture_model)
-          end
-    
-          eval("@#{factory.pluralize} = objects")
-          eval("@#{factory} = objects.first")
-        end
-  
-        if options
-          options.each do |option|
-            key, value = option.split(":")
-            eval("@#{key} = value")
-          end
-        end
-  
-        template_file =  File.join(Dir.pwd, 'Frank', 'features', 'support', 'templates',  "#{template_file_name}.erb")
-        erb = ERB.new(File.open(template_file).read, 0,"")
-        result = erb.result(binding)
-      
-        # cleanup
-        unless capture_models.empty?
-          eval("@#{factory.pluralize} = nil")
-          eval("@#{factory} = nil")
-        end
-      
-        if options
-          options.each do |option|
-            key, value = option.split(":")
-            eval("@#{key} = nil")
-          end
-        end
-      
-        result
-      end
       
       def fwt_simulator_applications_dir
         File.join(Dir.home, 'Library', 'Application Support', 'iPhone Simulator', fwt_ios_sdk, 'Applications')
@@ -130,12 +68,4 @@ module FWToolkit
     end
   end
 end
-World(FWToolkit::Test::ModelHelpers)
-
-Before do |scenario|
-  fwt_simulator_reset_data(fwt_ios_sdk)
-end
-
-After do |scenario|
-  Mimic.cleanup!
-end
+World(FWToolkit::Test::ModelHelpers)

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/templates/cucumber/AppDelegate+Frank.h

@@ -0,0 +1,15 @@
+//
+//  AppDelegate+Frank.h
+//  FWToolkit
+//
+//  Created by Matt Brooke-Smith on 14/10/2012.
+//  Copyright (c) 2012 Future Workshops. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@interface AppDelegate (Frank)
+
+- (void) seedCoreData:(NSString *)json;
+
+@end

data/templates/cucumber/AppDelegate+Frank.m

@@ -0,0 +1,41 @@
+//
+//  AppDelegate+Frank.m
+//  QlikView
+//
+//  Created by Matt Brooke-Smith on 18/07/2012.
+//  Copyright (c) 2012 Future Workshops. All rights reserved.
+//
+
+#import "AppDelegate+Frank.h"
+#import <CoreData/CoreData.h>
+#import <JSONKit/JSONKit.h>
+#import <RestKit/RestKit.h>
+#import "RKObjectManager+QVWOfflineTests.h"
+
+@implementation AppDelegate (Frank)
+
+- (void) seedCoreData:(NSString *)json
+{
+    NSArray *objectsArray = [json objectFromJSONString];
+    NSManagedObjectContext *managedObjectContext = [[RKObjectManager sharedManager].objectStore managedObjectContextForCurrentThread];
+    for (NSDictionary *objectDictionary in objectsArray) {
+        NSString *entityName = [objectDictionary allKeys][0];
+        NSDictionary *dictionary = [objectDictionary objectForKey:entityName];
+        NSManagedObject *object = [NSEntityDescription insertNewObjectForEntityForName:entityName inManagedObjectContext:managedObjectContext];
+        for (NSString *nextKey in [dictionary allKeys]) {
+            if ([object respondsToSelector:NSSelectorFromString(nextKey)]) {
+                NSObject *value = [dictionary objectForKey:nextKey];
+                if (value != [NSNull null]) {
+                    [object setValue:value forKey:nextKey];
+                }
+            }
+        }
+    }
+
+    NSError *error = nil;
+    if (![managedObjectContext save:&error]) {
+        WLog(@"Error saving: %@", [error localizedDescription]);
+    }
+}
+
+@end

data/templates/cucumber/env.rb

@@ -0,0 +1,19 @@
+require 'fwtoolkit'
+require 'frank-cucumber'
+
+Frank::Cucumber::FrankHelper.use_shelley_from_now_on
+
+APP_BUNDLE_PATH = File.expand_path( '../../../frankified_build/Frankified.app', __FILE__ )
+
+IOS_SDK_VERSION = '6.0'
+#XCODE_VERSION = '4.5.1' # not currently used - look out for this in FWToolkit 0.5
+
+AfterConfiguration do
+  require 'pickle/world'
+  require 'fwtoolkit/test/pickle_steps'
+  require 'fwtoolkit/test/ui_steps'
+end
+
+After do |scenario|
+  Mimic.cleanup!
+end

data/templates/cucumber/example.feature

@@ -0,0 +1,7 @@
+Feature: 
+  As an # Actor in the system
+  I want to # perform a task
+  In order to # achieve something
+
+  Scenario: Open the App
+		Given I launch the app in the iphone simulator

data/templates/cucumber/launch_steps.rb

@@ -0,0 +1,29 @@
+require 'pickle/world'
+
+def ios_sdk_version
+  IOS_SDK_VERSION
+end
+
+def xcode_version
+  XCODE_VERSION
+end
+
+def app_path
+  ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+end
+
+Given /^I launch the app in the (iphone|ipad) simulator$/ do |device|
+  launch_app app_path, ios_sdk_version, device
+end
+
+Given /^I reset and launch the app in the (iphone|ipad) simulator$/ do |device|
+  fwt_simulator_reset_data ios_sdk_version 
+  launch_app app_path, ios_sdk_version, 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 
+  launch_app app_path, ios_sdk_version, device
+  fwt_seed_app [capture_model]
+  launch_app app_path, ios_sdk_version, device
+end

data/templates/cucumber/mimic.rb

@@ -0,0 +1,93 @@
+require 'mimic'
+
+# Listen on the following :port
+# Add the following to your objective-c code, in the place where your 
+# server root is configured
+#   #ifdef FRANIFIFIED
+#     server = "http://localhost:11988"
+#   #else
+#     server = <your production server>
+#   #endif
+Mimic.mimic(:port => 11988) do |m|
+  
+  # use the 'views' directory adjacent to this file for API templates
+  set :views, File.expand_path('views', File.dirname(__FILE__))
+       
+# EXAMPLE ROUTE 1 - XML summary using erb template
+# Uncomment to get xml defined by 'views/my_objects_xml.erb' containing all MyObject instances
+# @see views/my_objects_xml.erb
+#
+#  get '/my_objects.xml' do
+#    @my_objects = MyObject.find_all
+#    erb :my_objects_xml, :content_type => 'application/xml'
+#  end
+
+# EXAMPLE ROUTE 2 - JSON summary using erb template
+# Uncomment to get json defined by 'views/my_objects_json.erb' containing all MyObject instances
+# @see views/my_objects_json.erb
+#
+#  get '/my_objects.json' do
+#    @my_objects = MyObject.find_all
+#    erb :my_objects_json, :content_type => 'application/json'
+#  end
+
+# EXAMPLE ROUTE 3 - JSON detail using erb template
+# Uncomment to get json defined by 'views/my_object_json.erb' containing detail about a single MyObject instance
+# found using the URL parameter "name", i.e. /myobject.json?name=Fred
+#
+#  get '/my_object.json' do
+#    @my_objects = MyObject.find_first({:name => params[:name]})
+#    erb :my_object_json, :content_type => 'application/json'
+#  end
+
+# EXAMPLE ROUTE 4 - JSON summary using JBuilder
+# Uncomment to get json defined programatically. 
+# This is recommended if you are building from scratch or testing a system which has concise, well defined JSON,
+# as this will be more maintainable than erb templates
+# You will also need to add
+#   gem 'jbuilder' 
+# to your Gemfile
+# See more on JBuilder here https://github.com/rails/jbuilder
+#
+#  get '/my_objects.json' do
+#    my_objects = MyObject.find_all
+#    json = Jbuilder.encode do |json|
+#      json.array!(my_objects) do |o|
+#        json.name o.name
+#      end   
+#    end
+#    [200, {'Content-Type' => 'application/json'}, json]
+#  end
+
+# EXAMPLE ROUTE 5 - Authentication
+# An example route requiring authentication, and setting a cookie once the user 'admin', 'password' authorized
+#  def protected!
+#    unless authorized?
+#      response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+#      throw(:halt, [401, "Not authorized\n"])
+#    end
+#  end
+#
+#  def authorized?
+#    if request.cookies.key?('my cookie')
+#      true
+#    else
+#      @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+#      if(@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ['admin', 'password'])
+#        response.set_cookie('my cookie', :value => {:user => 'admin@admin.com'}, :expires => Time.now + 10.minutes, :path => "/")
+#        true
+#      else
+#        false
+#      end
+#    end
+#  end
+#
+#  get '/my_secret_objects.xml' do
+#    protected!
+#    @my_objects = MyObject.find_all({:name => 'secret'})
+#    erb :my_objects_json, :content_type => 'application/json'
+#  end
+
+
+
+end

data/templates/cucumber/my_objects_json.erb

@@ -0,0 +1,7 @@
+[
+<%- @my_objects.each do |o| %>
+	{
+		"name": "<%= o.name %>"
+	},
+<% end %>
+]

data/templates/cucumber/my_objects_xml.erb

@@ -0,0 +1,7 @@
+<my_objects>
+	<%- @my_objects.each do |t| %>
+		<my_object>
+			<name><%= t.name %></name>
+		<my_object>
+	<% end %>
+</my_objects>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,19 @@ files:
 - lib/fwtoolkit/test/frank_model.rb
 - lib/fwtoolkit/test/misc_steps.rb
 - lib/fwtoolkit/test/model_helper.rb
-- lib/fwtoolkit/test/model_steps.rb
 - lib/fwtoolkit/test/network_steps.rb
 - lib/fwtoolkit/test/pickle_steps.rb
 - lib/fwtoolkit/test/ui_helper.rb
 - lib/fwtoolkit/test/ui_steps.rb
 - lib/fwtoolkit/version.rb
+- templates/cucumber/AppDelegate+Frank.h
+- templates/cucumber/AppDelegate+Frank.m
+- templates/cucumber/env.rb
+- templates/cucumber/example.feature
+- templates/cucumber/launch_steps.rb
+- templates/cucumber/mimic.rb
+- templates/cucumber/my_objects_json.erb
+- templates/cucumber/my_objects_xml.erb
 - templates/models/factories.rb.erb
 - templates/models/model.rb.erb
 homepage: ''

data/lib/fwtoolkit/test/model_steps.rb

@@ -1,19 +0,0 @@
-# This file is generated by FWToolkit and is covered by the license at
-# 
-require 'fwtoolkit/test/model_helper.rb'
-
-Given /^the server responds with(?: "([^\"]*)" for)? path "([^\"]*)" 0 ([^"]*)$/ do |template_file_name, path, variable_name|
-  eval("@#{variable_name} = []")
-  content = fwt_template_response(template_file_name != nil ? template_file_name : variable_name)
-  queue_mimic_get_response(path, content)
-end
-
-Given /^the server responds with "([^\"]*)" for path "([^\"]*)" with #{capture_model}(?: with #{capture_fields})?$/ do |template_file_name, path, capture_model, options|
-  content = fwt_template_response(template_file_name, [capture_model], options)
-  queue_mimic_get_response(path, content)
-end
-
-Given /^the server responds with "([^\"]*)" for path "([^\"]*)" with #{capture_model} and #{capture_model}(?: with #{capture_fields})?$/ do |template_file_name, path, capture_model_1, capture_model_2, options|
-  content = fwt_template_response(template_file_name, [capture_model_1, capture_model_2], options)
-  queue_mimic_get_response(path, content)
-end