mattscilipoti-model_steps 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/model_steps/step_definitions.rb

@@ -67,6 +67,7 @@ Then /^I should see (?:these|this|the following) (\D+):$/ do |requested_model, t
 
   css_class = requested_table.pluralize.underscore
 
+  #TODO: yell if table does not exist
   html_table = table(tableish("table.#{css_class} tr", 'td,th'))
 
   mapped_table.diff!(html_table)
@@ -129,23 +130,22 @@ Given /^(\D+):(.+) has (\D+):(.+)$/ do |requested_model, default_identifier, ass
   model_under_test = requested_model_with_identifier_to_model_instance(requested_model, default_identifier)
   associated_model = requested_model_to_model(association_model_name)
   factory_name = model_to_factory_symbol(associated_model)
-  associated_model_under_test = associated_model.find(default_identifier) || Factory(factory_name, associated_model.friendly_id_config.column => default_identifier)
 
-  possible_associations = [association_model_name.underscore, association_model_name.pluralize.underscore]
-  association_name = possible_associations.detect {|association_name| model_under_test.respond_to?(association_name)}
+  parent = model_under_test.class.name.underscore
 
-  if association_name
-    if association_name.pluralize == association_name
-      associated_items = model_under_test.send(association_name)
-      associated_items << associated_model_under_test
-    else
-      model_under_test.send(association_name + '=', associated_model_under_test)
-    end
-    model_under_test.save!
+  parent_association = associated_model.instance_methods.include?(parent.pluralize) ?
+          {parent.pluralize => [model_under_test]} :
+          {parent => model_under_test}
 
-  else
-    raise "Neither of these associations exist for #{model_under_test.class.name}: #{possible_associations.inspect}"
+  begin
+    associated_model_under_test = associated_model.find(associated_model_default_identifier)
+    associated_model_under_test.update_attributes!(parent_association)
+  rescue ActiveRecord::RecordNotFound
+    associated_model_params = { associated_model.friendly_id_config.column => associated_model_default_identifier}.merge(parent_association)
+    associated_model_under_test = Factory(factory_name, associated_model_params)
   end
+
+  model_under_test
 end
 
 Given /^(.+):(.+) (?:has|had) (?:these|this|the following) attributes:$/ do |requested_model, default_identifier, table|
@@ -563,7 +563,7 @@ def create_requested_model_associations(model_under_test, association_quantity,
     if scope
       associated_models = associated_models.send(scope)
     end
-    
+
     #TODO: smoke test
   end
 end

data/mattscilipoti-model_steps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mattscilipoti-model_steps}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Scilipoti", "Chris Cahoon"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-05}
   s.description = %q{Step Definitions for cucumber which support ActiveRecord Models}
   s.email = %q{matt@scilipoti.name}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mattscilipoti-model_steps
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Matt Scilipoti
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -04:00
+date: 2010-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency