cucumber_factory 1.3.0 → 1.4.0

data/README.rdoc

@@ -37,6 +37,12 @@ You can also refer to the last created object of a kind by saying "above":
 
 {Machinist blueprints}[http://github.com/notahat/machinist] and {factory_girl factories}[http://github.com/thoughtbot/factory_girl] will be used when available.
 
+You can use named Machinist blueprint such as <tt>Movie.blueprint(:comedy)</tt> like this:
+
+    Given a movie (comedy) with the title "Groundhog Day"
+
+Inherited factory_girl factories are not supported yet.
+
 === Credits
 
 Henning Koch

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/cucumber_factory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber_factory}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-01-28}
   s.description = %q{Cucumber Factory allows you to create ActiveRecord models from your Cucumber features without writing step definitions for each model.}
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [

data/lib/cucumber_factory/factory.rb

@@ -12,12 +12,12 @@ module Cucumber
     def self.steps
       [
         [
-          /^"([^\"]*)" is an? (.+?)( with the .+?)?$/, 
-          lambda { |name, raw_model, raw_attributes| Cucumber::Factory.parse_named_creation(self, name, raw_model, raw_attributes) }
+          /^"([^\"]*)" is an? (.+?)( \(.+?\))?( with the .+?)?$/, 
+          lambda { |name, raw_model, raw_variant, raw_attributes| Cucumber::Factory.parse_named_creation(self, name, raw_model, raw_variant, raw_attributes) }
         ],
         [
-          /^there is an? (.+?)( with the .+?)?$/,
-          lambda { |raw_model, raw_attributes| Cucumber::Factory.parse_creation(self, raw_model, raw_attributes) }
+          /^there is an? (.+?)( \(.+?\))?( with the .+?)?$/,
+          lambda { |raw_model, raw_variant, raw_attributes| Cucumber::Factory.parse_creation(self, raw_model, raw_variant, raw_attributes) }
         ]
       ]
     end
@@ -34,13 +34,13 @@ module Cucumber
       raise "No step definition for: #{command}"
     end
     
-    def self.parse_named_creation(world, name, raw_model, raw_attributes)
-      record = parse_creation(world, raw_model, raw_attributes)
+    def self.parse_named_creation(world, name, raw_model, raw_variant, raw_attributes)
+      record = parse_creation(world, raw_model, raw_variant, raw_attributes)
       variable = variable_name_from_prose(name)
       world.instance_variable_set variable, record
     end
   
-    def self.parse_creation(world, raw_model, raw_attributes)
+    def self.parse_creation(world, raw_model, raw_variant, raw_attributes)
       model_class = model_class_from_prose(raw_model)
       attributes = {}
       if raw_attributes.present? && raw_attributes.strip.present?
@@ -52,7 +52,8 @@ module Cucumber
           association = model_class.reflect_on_association(attribute) if model_class.respond_to?(:reflect_on_association)
           if association.present?
             if value_type == "above"
-              value = association.klass.last or raise "There is no last #{attribute}"
+              # Don't use class.last, in sqlite that is not always the last inserted element
+              value = association.klass.find(:last, :order => "id") or raise "There is no last #{attribute}"
             else
               value = world.instance_variable_get(variable_name_from_prose(value))
             end
@@ -60,7 +61,8 @@ module Cucumber
           attributes[attribute] = value
         end
       end
-      create_record(model_class, attributes)
+      variant = raw_variant.present? && /\((.*?)\)/.match(raw_variant)[1].downcase.gsub(" ", "_")
+      create_record(model_class, variant, attributes)
     end
     
     def self.model_class_from_prose(prose)
@@ -81,13 +83,17 @@ module Cucumber
     def self.factory_girl_factory_name(model_class)
       model_class.to_s.underscore.to_sym
     end
-
-    def self.create_record(model_class, attributes)
+    
+    def self.create_record(model_class, variant, attributes)
       factory_name = factory_girl_factory_name(model_class)
       if defined?(::Factory) && factory = ::Factory.factories[factory_name]
         ::Factory.create(factory_name, attributes)
       elsif model_class.respond_to?(:make) # Machinist blueprint
-        model_class.make(attributes)
+        if variant.present?
+          model_class.make(variant.to_sym, attributes)
+        else
+          model_class.make(attributes)
+        end
       elsif model_class.respond_to?(:create!) # Plain ActiveRecord
         model = model_class.new
         model.send(:attributes=, attributes, false) # ignore attr_accessible

data/spec/factory_spec.rb

@@ -59,6 +59,16 @@ describe Cucumber::Factory do
       Cucumber::Factory.parse(@world, 'Given there is a machinist model with the attribute "foo"')
     end
     
+    it "should be able to invoke machinist blueprint variants" do
+      MachinistModel.should_receive(:make).with(:variant, { :attribute => "foo"})
+      Cucumber::Factory.parse(@world, 'Given there is a machinist model (variant) with the attribute "foo"')
+    end
+    
+    it "should be able to invoke machinist blueprint variants containing spaces or uppercase characters in prose" do
+      MachinistModel.should_receive(:make).with(:variant_mark_two, { :attribute => "foo"})
+      Cucumber::Factory.parse(@world, 'Given there is a machinist model (Variant Mark Two) with the attribute "foo"')
+    end
+    
     it "should create models that have a factory_girl factory by calling #Factory.make(:model_name)" do
       Factory.should_receive(:factories).with().and_return({ :job_offer => :job_offer_factory }) # Fake factory look up in factory_girl
       Factory.should_receive(:create).with(:job_offer, { :title => "Awesome job" })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber_factory
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +01:00
+date: 2010-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: []