cucumber_factory 1.6.0 → 1.7.0

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Cucumber Factory allows you to create ActiveRecord objects directly from your {Cucumber}[http://cukes.info/] features. No step definitions required.
 
-== Example 
+== Examples
 
 The following will call {Movie.make}[http://github.com/notahat/machinist], {Factory.create(:movie)}[http://github.com/thoughtbot/factory_girl], Movie.create! or Movie.new, depending on what's available:
     Given there is a movie
@@ -21,6 +21,15 @@ You can also refer to the last created object of a kind by saying "above":
     Given there is a movie with the title "Before Sunrise"
     And "Before Sunset" is a movie with the prequel above
 
+Boolean attributes can be set by appending "which", "that" or "who" at the end:
+    Given there is a movie which is awesome
+    And there is a movie with the name "Sunshine" that is not a comedy
+    And there is a director who is popular
+
+Instead of "and" you can also use "but" and commas to join sentences:
+  Given there is a movie which is awesome, popular and successful but not science fiction
+    And there is a director with the income "500000" but with the account balance "-30000"
+
 == Factory support
 
 {Machinist blueprints}[http://github.com/notahat/machinist] and {factory_girl factories}[http://github.com/thoughtbot/factory_girl] will be used when available.

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/cucumber_factory.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber_factory}
-  s.version = "1.6.0"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2010-08-17}
+  s.date = %q{2010-09-04}
   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 = [
@@ -97,3 +97,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/cucumber/factory.rb

@@ -2,6 +2,8 @@ module Cucumber
   module Factory
     class << self
 
+      ATTRIBUTES_PATTERN = '( with the .+?)?( (?:which|who|that) is .+?)?'
+
       # List of Cucumber step definitions created by #add_steps
       attr_reader :step_definitions
 
@@ -13,60 +15,64 @@ module Cucumber
           end)
         end
       end
-      
+
       def steps
-        [ { :pattern => /^"([^\"]*)" is an? (.+?)( \(.+?\))?( with the .+?)?$/,
-            :action => lambda { |name, raw_model, raw_variant, raw_attributes| Cucumber::Factory.parse_named_creation(self, name, raw_model, raw_variant, raw_attributes) } },
-          { :pattern => /^there is an? (.+?)( \(.+?\))?( with the .+?)?$/,
-            :action => lambda { |raw_model, raw_variant, raw_attributes| Cucumber::Factory.parse_creation(self, raw_model, raw_variant, raw_attributes) } } ]
+        # we cannot use vararg blocks here in Ruby 1.8, as explained by Aslak: http://www.ruby-forum.com/topic/182927
+        [ { :pattern => /^"([^\"]*)" is an? (.+?)( \(.+?\))?#{ATTRIBUTES_PATTERN}?$/,
+            :action => lambda { |a1, a2, a3, a4, a5| Cucumber::Factory.parse_named_creation(self, a1, a2, a3, a4, a5) } },
+          { :pattern => /^there is an? (.+?)( \(.+?\))?#{ATTRIBUTES_PATTERN}$/,
+            :action => lambda { |a1, a2, a3, a4| Cucumber::Factory.parse_creation(self, a1, a2, a3, a4) } } ]
       end
   
-#      # Emulate Cucumber step matching for specs
-#      def parse(world, command)
-#        command = command.sub(/^When |Given |Then /, "")
-#        steps.each do |step|
-#          match = step[:pattern].match(command)
-#          if match
-#            step[:action].bind(world).call(*match.captures)
-#            return
-#          end
-#        end
-#        raise "No step definition for: #{command}"
-#      end
-      
-      def parse_named_creation(world, name, raw_model, raw_variant, raw_attributes)
-        record = parse_creation(world, raw_model, raw_variant, raw_attributes)
+      def parse_named_creation(world, name, raw_model, raw_variant, raw_attributes, raw_boolean_attributes)
+        record = parse_creation(world, raw_model, raw_variant, raw_attributes, raw_boolean_attributes)
         variable = variable_name_from_prose(name)
         world.instance_variable_set variable, record
       end
     
-      def parse_creation(world, raw_model, raw_variant, raw_attributes)
+      def parse_creation(world, raw_model, raw_variant, raw_attributes, raw_boolean_attributes)
         model_class = model_class_from_prose(raw_model)
         attributes = {}
-        if raw_attributes.present? && raw_attributes.strip.present?
-          raw_attributes.scan(/(the|and|with| )+(.*?) ("([^\"]*)"|above)/).each do |fragment|
-            value = nil
-            attribute = fragment[1].downcase.gsub(" ", "_").to_sym
-            value_type = fragment[2] # 'above' or a quoted string
-            value = fragment[3]
-            association = model_class.reflect_on_association(attribute) if model_class.respond_to?(:reflect_on_association)
-            if association.present?
-              if value_type == "above"
-                # 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
-            else
-              value = world.Transform(value)
-            end
-            attributes[attribute] = value
+        if raw_attributes.try(:strip).present?
+          raw_attributes.scan(/(?:the|and|with|but|,| )+(.*?) ("([^\"]*)"|above)/).each do |fragment|
+            attribute = attribute_name_from_prose(fragment[0])
+            value_type = fragment[1] # 'above' or a quoted string
+            value = fragment[2] # the value string without quotes
+            attributes[attribute] = attribute_value(world, model_class, attribute, value_type, value)
+          end
+        end
+        if raw_boolean_attributes.try(:strip).present?
+          raw_boolean_attributes.scan(/(?:which|who|that|is| )*(not )?(.+?)(?: and | but |,|$)+/).each do |fragment|
+            flag = !fragment[0] # if not ain't there, this is true
+            attribute = attribute_name_from_prose(fragment[1])
+            attributes[attribute] = flag
           end
         end
         variant = raw_variant.present? && /\((.*?)\)/.match(raw_variant)[1].downcase.gsub(" ", "_")
         create_record(model_class, variant, attributes)
       end
-      
+
+      private
+
+      def attribute_value(world, model_class, attribute, value_type, value)
+        association = model_class.respond_to?(:reflect_on_association) ? model_class.reflect_on_association(attribute) : nil
+        if association.present?
+          if value_type == "above"
+            # 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
+        else
+          value = world.Transform(value)
+        end
+        value
+      end
+
+      def attribute_name_from_prose(prose)
+        prose.downcase.gsub(" ", "_").to_sym
+      end
+
       def model_class_from_prose(prose)
         # don't use \w which depends on the system locale
         prose.gsub(/[^A-Za-z0-9_]+/, "_").camelize.constantize
@@ -80,8 +86,6 @@ module Cucumber
         :"@#{name}"
       end
       
-      private
-      
       def factory_girl_factory_name(model_class)
         model_class.to_s.underscore.to_sym
       end

data/spec/app_root/db/migrate/002_create_users.rb

@@ -4,6 +4,11 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string :email
       t.string :name
+      t.boolean :deleted
+      t.boolean :locked
+      t.boolean :subscribed
+      t.boolean :scared
+      t.boolean :scared_by_spiders
     end
   end
 

data/spec/factory_spec.rb

@@ -15,8 +15,8 @@ describe Cucumber::Factory do
   describe 'model_class_from_prose' do
 
     it "should return the class matching a natural language expression" do
-      Cucumber::Factory.model_class_from_prose("movie").should == Movie
-      Cucumber::Factory.model_class_from_prose("job offer").should == JobOffer
+      Cucumber::Factory.send(:model_class_from_prose, "movie").should == Movie
+      Cucumber::Factory.send(:model_class_from_prose, "job offer").should == JobOffer
     end
 
   end
@@ -24,13 +24,13 @@ describe Cucumber::Factory do
   describe 'variable_name_from_prose' do
   
     it "should translate natural language to instance variable names" do
-      Cucumber::Factory.variable_name_from_prose("movie").should == :'@movie'
-      Cucumber::Factory.variable_name_from_prose("Some Movie").should == :'@some_movie'
+      Cucumber::Factory.send(:variable_name_from_prose, "movie").should == :'@movie'
+      Cucumber::Factory.send(:variable_name_from_prose, "Some Movie").should == :'@some_movie'
     end
     
     it "should make sure the generated instance variable names are legal" do
-      Cucumber::Factory.variable_name_from_prose("1973").should == :'@_1973'
-      Cucumber::Factory.variable_name_from_prose("%$§").should == :'@_'
+      Cucumber::Factory.send(:variable_name_from_prose, "1973").should == :'@_1973'
+      Cucumber::Factory.send(:variable_name_from_prose, "%$§").should == :'@_'
     end
     
   end

data/spec/steps_spec.rb

@@ -71,6 +71,13 @@ describe 'steps provided by cucumber_factory' do
     @step_mother.invoke('there is a movie with the title "Sunshine" and the year "2007"')
   end
 
+  it "should allow to join attribute lists with 'and's, commas and 'but's" do
+    movie = Movie.new
+    Movie.stub(:new => movie)
+    movie.should_receive(:"attributes=").with({ :title => "Sunshine", :year => "2007", :box_office_result => "32000000" }, false)
+    @step_mother.invoke('there is a movie with the title "Sunshine", the year "2007" but with the box office result "32000000"')
+  end
+
   it "should apply Cucumber transforms to attribute values" do
     movie = Movie.new
     Movie.stub(:new => movie)
@@ -115,9 +122,65 @@ describe 'steps provided by cucumber_factory' do
     @step_mother.invoke('there is a user with the name "Jane"')
     @step_mother.invoke('there is a movie with the title "Before Sunrise"')
     @step_mother.invoke('there is a movie with the title "Before Sunset" and the reviewer above and the prequel above')
-    @before_sunset = Movie.find_by_title!("Before Sunset")
-    @before_sunset.prequel.title.should == "Before Sunrise"
-    @before_sunset.reviewer.name.should == "Jane"
+    before_sunset = Movie.find_by_title!("Before Sunset")
+    before_sunset.prequel.title.should == "Before Sunrise"
+    before_sunset.reviewer.name.should == "Jane"
+  end
+
+  it "should allow to set positive boolean attributes with 'who' after the attribute list" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :name => 'Jane', :deleted => true }, false)
+    @step_mother.invoke('there is a user with the name "Jane" who is deleted')
+  end
+
+  it "should allow to set positive boolean attributes with 'which' after the attribute list" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :name => 'Jane', :deleted => true }, false)
+    @step_mother.invoke('there is a user with the name "Jane" which is deleted')
+  end
+
+  it "should allow to set positive boolean attributes with 'that' after the attribute list" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :name => 'Jane', :deleted => true }, false)
+    @step_mother.invoke('there is a user with the name "Jane" that is deleted')
+  end
+
+  it "should allow to set boolean attributes without regular attributes preceding them" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :deleted => true }, false)
+    @step_mother.invoke('there is a user who is deleted')
+  end
+
+  it "should allow to set negative boolean attribute" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :deleted => false }, false)
+    @step_mother.invoke('there is a user who is not deleted')
+  end
+
+  it "should allow to set multiple boolean attributes" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :locked => true, :deleted => false, :subscribed => true }, false)
+    @step_mother.invoke('there is a user who is locked and not deleted and subscribed')
+  end
+
+  it "should allow to set boolean attributes that are named from multiple words" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :locked => true, :scared => false, :scared_by_spiders => true, :deleted => true }, false)
+    @step_mother.invoke('there is a user who is locked and not scared and scared by spiders and deleted')
+  end
+
+  it "should allow to join boolean attribute lists with 'and's, commas and 'but's" do
+    user = User.new
+    User.stub(:new => user)
+    user.should_receive(:attributes=).with({ :locked => true, :scared => true, :scared_by_spiders => true, :deleted => true }, false)
+    @step_mother.invoke('there is a user who is locked, scared, but scared by spiders and deleted')
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2010-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: []