cucumber_scaffold 0.1.2 → 0.1.3

data/Manifest

@@ -9,4 +9,5 @@ lib/generators/cucumber_scaffold/feature/templates/feature.feature
 lib/generators/cucumber_scaffold/feature/templates/steps.rb
 lib/generators/cucumber_scaffold/install/USAGE
 lib/generators/cucumber_scaffold/install/install_generator.rb
-lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb
+lib/generators/cucumber_scaffold/install/templates/step_definitions/web_steps_additional.rb
+lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb

data/README.rdoc

@@ -4,14 +4,29 @@
 
 == Usage
 
+Install the support files (you should also do this when updating the gem):
+
   $ rails generate cucumber_scaffold:install
-  $ rails generate cucumber_scaffold:feature Post name:string body:text
+
+Run the built-in Rails scaffold generator:
+
+  $ rails generate scaffold Post name:string body:text rating:integer published:boolean
+  
+Then run the cucumber_scaffold generator with the same parameters:
+  
+  $ rails generate cucumber_scaffold:feature Post name:string body:text rating:integer published:boolean
+
+== Notes
+
+* By default the generated features are targeted at the Rails scaffold generator
+* Only tested with Rails 3 and Capybara (not webrat)
+* Only supports string, text, integer and boolean fields at present
 
 == Sample Output
 
   # Generated by cucumber_scaffold - http://github.com/andyw8/cucumber_scaffold
 
-  Feature: Manage Posts
+  Feature: Manage posts
     In order to [goal]
     [stakeholder]
     wants [behaviour]
@@ -19,64 +34,77 @@
       @index
       Scenario: List all posts
         Given the following posts:
-          | name   | body   | 
-          | name 1 | body 1 | 
-          | name 2 | body 2 | 
-          | name 3 | body 3 | 
+          | name | body | rating | published | 
+          | name 1 | body 1 | 11 | true | 
+          | name 2 | body 2 | 12 | true | 
+          | name 3 | body 3 | 13 | true | 
         When I go to the posts page
         Then I should see the following posts:
-          | Name   | Body   |
-          | name 1 | body 1 |
-          | name 2 | body 2 |
-          | name 3 | body 3 |
+          | Name | Body | Rating | Published | 
+          | name 1 | body 1 | 11 | true | 
+          | name 2 | body 2 | 12 | true | 
+          | name 3 | body 3 | 13 | true | 
 
       @show
       Scenario: View a post
         Given the following post:
-          | name | name 1 |
-          | body | body 1 |
+          | name | name 10 |
+          | body | body 10 |
+          | rating | 20 |
+          | published | true |
         When I go to the page for that post
         Then I should see the following post:
-          | Name: | name 1 |
-          | Body: | body 1 |
+          | Name: | name 10 |
+          | Body: | body 10 |
+          | Rating: | 20 |
+          | Published: | true |
 
       @edit
       Scenario: Edit a post
         Given the following post:
-          | name | name 1 |
-          | body | body 1 |
+          | name | name 10 |
+          | body | body 10 |
+          | rating | 20 |
+          | published | true |
         When I go to the edit page for that post
         Then I should see the following form field values:
-          | Name | name 1 |
-          | Body | body 1 |
+          | Name | name 10 |
+          | Body | body 10 |
+          | Rating | 20 |
+          | Published | [x] |
 
       @index @destroy
       Scenario: Delete a post via the index page
         Given the following posts:
-          | name   | body | 
-          | name 1 | body 1 | 
-          | name 2 | body 2 | 
-          | name 3 | body 3 |
+          | name | body | rating | published | 
+          | name 1 | body 1 | 11 | true | 
+          | name 2 | body 2 | 12 | true | 
+          | name 3 | body 3 | 13 | true |
         When I go to the posts page
         And I click "Destroy" in the 2nd row
         Then I should see the following posts:
-          | Name   | Body | 
-          | name 1 | body 1 | 
-          | name 3 | body 3 |
+          | Name | Body | Rating | Published | 
+          | name 1 | body 1 | 11 | true | 
+          | name 3 | body 3 | 13 | true |
         And I should be on the posts page
+      
     
       @new @create @show
       Scenario: Create a new post
         Pending
         # Given I am on the new post page
-        # When I fill in the following:
-        #   | Name   | name 1 |
-        #   | Body | body 1 |
+        # When I fill in the form with:
+        #   | Name | name 10 |
+        #   | Body | body 10 |
+        #   | Rating | 20 |
+        #   | Published | [x] |
         # And I press "Create"
         # Then I should see "Post was successfully created."
         # And I should see the following post:
-        #   | Name: | name 1 |
-        #   | Body: | body 1 |
+        #   | Name: | name 10 |
+        #   | Body: | body 10 |
+        #   | Rating: | 20 |
+        #   | Published: | true |
         #
         # In order to confirm that the user is redirected to the correct page
         # after create, you'll need to add an entry to paths.rb to uniquely
@@ -101,18 +129,21 @@
         Pending
         # You should use this scenario as the basis for scenarios involving ActiveRecord validations, or delete it if it's not required
         # Given I am on the new post page
-        # When I fill in the following:
-        #   | Name   | name 1 |
-        #   | Body | body 1 |
+        # When I fill in the form with:
+        #   | Name | name 10 |
+        #   | Body | body 10 |
+        #   | Rating | 20 |
+        #   | Published | [x] |
         # And I press "Create"
         # Then I should see "prohibited this post from being saved:"
         #
         # [You should add checks for specific errors here. It may be appropriate to add extra scenarios.]
         #
-        # And I should be on the posts page
         # And I should see the following form field values:
-        #   | Name: | name 1 |
-        #   | Body: | body 1 |
+        #   | Name | name 10 |
+        #   | Body | body 10 |
+        #   | Rating | 20 |
+        #   | Published | [x] |
 
       @edit @update
       Scenario: Attempt to update a post with invalid input
@@ -120,32 +151,43 @@
         # You should use this scenario as the basis for scenarios involving ActiveRecord validations, or delete it if it's not required
         # Given a post exists
         # When I go to the edit page for that post
-        # And I fill in the following:
-        #   | Name   | name 1 |
-        #   | Body | body 1 |
+        # And I fill in the form with:
+        #   | Name | name 10 |
+        #   | Body | body 10 |
+        #   | Rating | 20 |
+        #   | Published | [x] |
         # And I press "Update"
         # Then I should see "prohibited this post from being saved:"
         #
         # [You should add checks for specific errors here. It may be appropriate to add extra scenarios.]
         #
-        # And I should be on the page for that post
         # And I should see the following form field values:
-        #   | Name: | name 1 |
-        #   | Body: | body 1 |
+        #   | Name | name 10 |
+        #   | Body | body 10 |
+        #   | Rating | 20 |
+        #   | Published | [x] |
 
       @edit @update @show
       Scenario: Update a post
-        Given a post exists
+        Given the following post:
+          | name | name 10 |
+          | body | body 10 |
+          | rating | 20 |
+          | published | true |
         When I go to the edit page for that post
-        And I fill in the following:
-          | Name | name 1 updated |
-          | Body | body 1 updated |
+        And I fill in the form with:
+          | Name | name 10 updated |
+          | Body | body 10 updated |
+          | Rating | -20 |
+          | Published | [ ] | 
         And I press "Update"
         Then I should be on the page for that post
         And I should see "Post was successfully updated."
         And I should see the following post:
-          | Name: | name 1 updated |
-          | Body: | body 1 updated |
+          | Name: | name 10 updated |
+          | Body: | body 10 updated |
+          | Rating: | -20 |
+          | Published: | false |
 
       @index @new
       Scenario: Navigate from the posts page to the new post page
@@ -156,10 +198,10 @@
       @index @show
       Scenario: Navigate from posts page to the show post page
         Given the following posts:
-          | name   | body   |
-          | name 1 | body 1 | 
-          | name 2 | body 2 |
-          | name 3 | body 3 |
+          | name | body | rating | published |
+          | name 1 | body 1 | 11 | true | 
+          | name 2 | body 2 | 12 | true |
+          | name 3 | body 3 | 13 | true |
         When I go to the posts page
         And I click "Show" in the 2nd row
         Then I should be on the page for the 2nd post
@@ -167,10 +209,10 @@
       @index @edit
       Scenario: Navigate from posts page to the edit post page
         Given the following posts:
-          | name   | body   | 
-          | name 1 | body 1 | 
-          | name 2 | body 2 | 
-          | name 3 | body 3 |
+          | name | body | rating | published | 
+          | name 1 | body 1 | 11 | true | 
+          | name 2 | body 2 | 12 | true | 
+          | name 3 | body 3 | 13 | true |
         When I go to the posts page
         And I click "Edit" in the 2nd row
         Then I should be on the edit page for the 2nd post
@@ -213,7 +255,7 @@
       Scenario: Posts page title
         When I go to the posts page
         Then the heading should be "Listing posts"
-
+      
       @new
       Scenario: New post page title
         When I go to the new post page
@@ -224,3 +266,4 @@
         Given a post exists
         When I go to the edit page for that post
         Then the heading should be "Editing post"
+

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('cucumber_scaffold', '0.1.2') do |p|  
+Echoe.new('cucumber_scaffold', '0.1.3') do |p|  
   p.description     = "Generate scaffolding for Cucumber features and steps definitions"  
   p.url             = "http://github.com/andyw8/cucumber_scaffold"  
   p.author          = "Andy Waite"  

data/cucumber_scaffold.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber_scaffold}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Waite"]
-  s.date = %q{2010-11-07}
+  s.date = %q{2010-11-13}
   s.description = %q{Generate scaffolding for Cucumber features and steps definitions}
   s.email = %q{andy@andywaite.com}
-  s.extra_rdoc_files = ["README.rdoc", "TODO", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "TODO", "cucumber_scaffold.gemspec", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "TODO", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/step_definitions/web_steps_additional.rb", "lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "TODO", "cucumber_scaffold.gemspec", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/step_definitions/web_steps_additional.rb", "lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb"]
   s.homepage = %q{http://github.com/andyw8/cucumber_scaffold}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cucumber_scaffold", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/generators/cucumber_scaffold/feature/feature_generator.rb

@@ -28,17 +28,17 @@ module CucumberScaffold
       template('steps.rb', "features/step_definitions/#{singular}_steps.rb")
   
       extra_paths = <<EOF
-      when /edit page for that #{singular}/
+      when /edit page for that #{singular.humanize.downcase}/
         edit_#{singular}_path(@#{singular})
-      when /page for that #{singular}/
-        raise 'no #{singular}' unless @#{singular}
+      when /page for that #{singular.humanize.downcase}/
+        raise 'no #{singular.humanize.downcase}' unless @#{singular}
         #{singular}_path(@#{singular})
-      when /edit page for the (\\d+)(?:st|nd|rd|th) #{singular}/
-        raise 'no #{plural}' unless @#{plural}
+      when /edit page for the (\\d+)(?:st|nd|rd|th) #{singular.humanize.downcase}/
+        raise 'no #{plural.humanize.downcase}' unless @#{plural}
         nth_#{singular} = @#{plural}[$1.to_i - 1]
         edit_#{singular}_path(nth_#{singular})
-      when /page for the (\\d+)(?:st|nd|rd|th) #{singular}/
-        raise 'no #{plural}' unless @#{plural}
+      when /page for the (\\d+)(?:st|nd|rd|th) #{singular.humanize.downcase}/
+        raise 'no #{plural.humanize.downcase}' unless @#{plural}
         nth_#{singular} = @#{plural}[$1.to_i - 1]
         #{singular}_path(nth_#{singular})
 EOF
@@ -69,11 +69,11 @@ EOF
       end
 
       def singular_title
-        singular.titleize
+        singular.humanize
       end
 
       def plural_title
-        plural.titleize
+        plural.humanize
       end
 
       def activerecord_table_header_row
@@ -81,103 +81,116 @@ EOF
       end
 
       def html_table_header_row
-        make_row(attribute_names.map(&:titleize))
+        make_row(attribute_names.map(&:humanize))
       end
 
       def attribute_names
-        @attributes.collect {|a| a.first[0]}
+        @attributes.collect {|a| a.first[0].gsub('_', ' ')}
       end
 
-      def html_single_resource(updated=nil, commented=nil)
+      def html_single_resource(options={})
         lines = []
         @attributes.each do |pair|
           attribute_name = pair.first[0]
-          attribute_value = pair.first[1]
-          lines << "| #{attribute_name.titleize}: | #{default_value(attribute_name, attribute_value, updated)} |"
+          attribute_type = pair.first[1]
+          default_value = default_value(:attribute_name => attribute_name, :attribute_type => attribute_type, :updated => options[:updated])
+          
+          lines << "| #{attribute_name.humanize}: | #{default_value} |"
         end
-        lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
+        lines.join(options[:commented] ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
       end
 
       def form_single_resource_commented
-        form_single_resource(false, true)
+        form_single_resource(:commented => true)
       end
 
       def html_single_resource_commented
-        html_single_resource(false, true)
+        html_single_resource(:commented => true)
       end
 
-      def form_single_resource(updated=nil, commented=nil)
+      def form_single_resource(options = {})
         lines = []
         @attributes.each do |pair|
           attribute_name = pair.first[0]
-          attribute_value = pair.first[1]
-          lines << "| #{attribute_name.titleize} | #{default_value(attribute_name, attribute_value, updated)} |"
+          attribute_type = pair.first[1]
+          lines << "| #{attribute_name.humanize} | #{default_value(:attribute_name => attribute_name, :attribute_type => attribute_type, :updated => options[:updated], :form => true)} |"
         end
-        result = lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
+        result = lines.join(options[:commented] ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
       end
 
-      def activerecord_single_resource(updated=nil)
+      def activerecord_single_resource(options={})
         lines = []
         @attributes.each do |pair|
           attribute_name = pair.first[0]
-          attribute_value = pair.first[1]
-          lines << "| #{attribute_name} | #{default_value(attribute_name, attribute_value, updated)} |"
+          attribute_type = pair.first[1]
+          lines << "| #{attribute_name} | #{default_value(:attribute_name => attribute_name, :attribute_type => attribute_type, :updated =>options[:updated])} |"
         end
         lines.join(LINE_BREAK_WITH_INDENT)
       end
 
       def html_resources
         [html_table_header_row,
-          html_table_row(1),
-          html_table_row(2),
-          html_table_row(3)].join(LINE_BREAK_WITH_INDENT)
+          html_table_row(:index => 1),
+          html_table_row(:index => 2),
+          html_table_row(:index => 3)].join(LINE_BREAK_WITH_INDENT)
       end
 
       def activerecord_resources
         [activerecord_table_header_row,
-           activerecord_table_row(1),
-           activerecord_table_row(2),
-           activerecord_table_row(3)].join(LINE_BREAK_WITH_INDENT)
+           activerecord_table_row(:index => 1),
+           activerecord_table_row(:index => 2),
+           activerecord_table_row(:index => 3)].join(LINE_BREAK_WITH_INDENT)
       end
 
       def activerecord_single_resource_updated
-        activerecord_single_resource(true)
+        activerecord_single_resource(:updated => true)
       end
 
       def form_single_resource_updated
-        form_single_resource(true)
+        form_single_resource(:updated => true)
       end
 
       def html_single_resource_updated
-        html_single_resource(true)
+        html_single_resource(:updated => true)
       end
 
-      def default_value(attribute_name, attribute_type, updated=false, index=1)
+      def default_value(options={}) # attribute_name, attribute_type, updated=false, index=1
         # TODO use an options hash instead of all these arguments
-        if ['string', 'text'].include?(attribute_type)
-          result = "#{attribute_name} #{index}"
-          result += ' updated' if updated
-        elsif attribute_type == 'integer'
-          result = 10 + index
-          result = -result if updated
+        
+        options[:index] ||= 10
+        
+        if ['string', 'text'].include?(options[:attribute_type])
+          result = "#{options[:attribute_name].humanize.downcase} #{options[:index]}"
+          result += ' updated' if options[:updated]
+        elsif options[:attribute_type] == 'integer'
+          result = 10 + options[:index]
+          result = -result if options[:updated]
+        elsif options[:attribute_type] == 'boolean'
+          if options[:form]
+            result = '[x]'
+            result = '[ ]' if options[:updated]
+          else
+            result = true
+            result = false if options[:updated]
+          end
         else
-          raise "Cannot create default value for attribute type '#{attribute_type}'"
+          raise "Cannot create default value for attribute type '#{options[:attribute_type]}'"
         end
         result
       end
 
-      def activerecord_table_row(n)
+      def activerecord_table_row(options)
         data = []
         @attributes.each do |attribute|
           attribute_name = attribute.first[0]
           attribute_type = attribute.first[1]
-          data << default_value(attribute_name, attribute_type, false, n)
+          data << default_value(:attribute_name => attribute_name, :attribute_type => attribute_type, :index => options[:index])
         end
         make_row(data)
       end
 
-      def html_table_row(n)
-        activerecord_table_row(n)
+      def html_table_row(options)
+        activerecord_table_row(options)
       end
 
       def tags(tags)

data/lib/generators/cucumber_scaffold/feature/templates/feature.feature

@@ -25,257 +25,256 @@ else
   edit_heading = "Editing #{singular}"
   new_heading = "New #{singular}"
   back_to_all = 'Back'
-  problems_intro = "prohibited this post from being saved:"
+  problems_intro = "prohibited this #{singular} from being saved:"
 end
 
 pending_explanation_1 = "You should use this scenario as the basis for scenarios involving ActiveRecord validations, or delete it if it's not required"
 pending_explanation_2 = "[You should add checks for specific errors here. It may be appropriate to add extra scenarios.]"
 -%>
 
-Feature: Manage <%= plural_title %>
+Feature: Manage <%= plural_title.humanize.downcase %>
   In order to [goal]
   [stakeholder]
   wants [behaviour]
 
     <%= tags('@index') %>
-    Scenario: List all <%= plural %>
-      Given the following <%= plural %>:
+    Scenario: List all <%= plural.humanize.downcase %>
+      Given the following <%= plural.humanize.downcase %>:
         <%= activerecord_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(2) %> 
-        <%= activerecord_table_row(3) %> 
-      When I go to the <%= plural %> page
-      Then I should see the following <%= plural %>:
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 2) %> 
+        <%= activerecord_table_row(:index => 3) %> 
+      When I go to the <%= plural.humanize.downcase %> page
+      Then I should see the following <%= plural.humanize.downcase %>:
         <%= html_table_header_row %> 
-        <%= html_table_row(1) %> 
-        <%= html_table_row(2) %> 
-        <%= html_table_row(3) %> 
+        <%= html_table_row(:index => 1) %> 
+        <%= html_table_row(:index => 2) %> 
+        <%= html_table_row(:index => 3) %> 
 
     <%= tags('@show') %>
-    Scenario: View a <%= singular %>
-      Given the following <%= singular %>:
+    Scenario: View a <%= singular.humanize.downcase %>
+      Given the following <%= singular.humanize.downcase %>:
         <%= activerecord_single_resource %>
-      When I go to the page for that <%= singular %>
-      Then I should see the following <%= singular %>:
+      When I go to the page for that <%= singular.humanize.downcase %>
+      Then I should see the following <%= singular.humanize.downcase %>:
         <%= html_single_resource %>
 
     <%= tags('@edit') %>
-    Scenario: Edit a <%= singular %>
-      Given the following <%= singular %>:
+    Scenario: Edit a <%= singular.humanize.downcase %>
+      Given the following <%= singular.humanize.downcase %>:
         <%= activerecord_single_resource %>
-      When I go to the edit page for that <%= singular %>
+      When I go to the edit page for that <%= singular.humanize.downcase %>
       Then I should see the following form field values:
         <%= form_single_resource %>
 
     <%= tags('@index @destroy') %>
-    Scenario: Delete a <%= singular %> via the index page
-      Given the following <%= plural %>:
+    Scenario: Delete a <%= singular.humanize.downcase %> via the index page
+      Given the following <%= plural.humanize.downcase %>:
         <%= activerecord_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(2) %> 
-        <%= activerecord_table_row(3) %>
-      When I go to the <%= plural %> page
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 2) %> 
+        <%= activerecord_table_row(:index => 3) %>
+      When I go to the <%= plural.humanize.downcase %> page
       And I click "Destroy" in the 2nd row
-      Then I should see the following <%= plural %>:
+      Then I should see the following <%= plural.humanize.downcase %>:
         <%= html_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(3) %>
-      And I should be on the <%= plural %> page
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 3) %>
+      And I should be on the <%= plural.humanize.downcase %> page
       <% if successful_destroy_message %>
       And I should see "<%= successful_destroy_message %>"
       <% end -%>
 
     <% if nifty? %>
     <%= tags('@show @destroy @index') %>
-    Scenario: Delete a <%= singular %> via the show page
-      Given the following <%= plural %>:
+    Scenario: Delete a <%= singular.humanize.downcase %> via the show page
+      Given the following <%= plural.humanize.downcase %>:
         <%= activerecord_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(2) %> 
-        <%= activerecord_table_row(3) %>
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 2) %> 
+        <%= activerecord_table_row(:index => 3) %>
       When I go to the page for the 2nd post
       And I follow "Destroy"
-      Then I should see the following <%= plural %>:
+      Then I should see the following <%= plural.humanize.downcase %>:
         <%= html_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(3) %>
-      And I should be on the <%= plural %> page
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 3) %>
+      And I should be on the <%= plural.humanize.downcase %> page
       And I should see "<%= successful_destroy_message %>"
       <% end -%>
 
     <%= tags('@new @create @show') %>
-    Scenario: Create a new <%= singular %>
+    Scenario: Create a new <%= singular.humanize.downcase %>
       Pending
-      # Given I am on the new <%= singular %> page
-      # When I fill in the following:
+      # Given I am on the new <%= singular.humanize.downcase %> page
+      # When I fill in the form with:
       #   <%= form_single_resource_commented %>
       # And I press "<%= create_button_title %>"
       # Then I should see "<%= successful_create_message %>"
-      # And I should see the following <%= singular %>:
+      # And I should see the following <%= singular.humanize.downcase %>:
       #   <%= html_single_resource_commented %>
       #
       # In order to confirm that the user is redirected to the correct page
       # after create, you'll need to add an entry to paths.rb to uniquely
-      # find a <%= singular %>, e.g.:
+      # find a <%= singular.humanize.downcase %>, e.g.:
       #
-      #   when /page for the <%= singular %> with name "([^"]*)"$/
+      #   when /page for the <%= singular.humanize.downcase %> with name "([^"]*)"$/
       #     conditions = { :conditions => {:name => $1} }
-      #     matches = <%= singular_title %>.all(conditions)
+      #     matches = <%= singular.camelcase %>.all(conditions)
       #     if matches.size == 0
-      #       raise "Could not find any <%= plural %> using criteria #{conditions.inspect}"
+      #       raise "Could not find any <%= plural.humanize.downcase %> using criteria #{conditions.inspect}"
       #     elsif matches.size > 1
-      #       raise "Could not find a unique <%= singular %> using criteria #{conditions.inspect} (#{matches.size} matches)"
+      #       raise "Could not find a unique <%= singular.humanize.downcase %> using criteria #{conditions.inspect} (#{matches.size} matches)"
       #     end
       #     <%= singular %>_path(matches.first)
       #
       # Then add a step such as this to the scenario:
       #
-      #   And I should be on the page for the <%= singular %> with name "..."
+      #   And I should be on the page for the <%= singular.humanize.downcase %> with name "..."
 
     <%= tags('@new @create') %>
-    Scenario: Attempt to create a new <%= singular %> with invalid input
+    Scenario: Attempt to create a new <%= singular.humanize.downcase %> with invalid input
       Pending
       # <%= pending_explanation_1 %>
-      # Given I am on the new <%= singular %> page
-      # When I fill in the following:
+      # Given I am on the new <%= singular.humanize.downcase %> page
+      # When I fill in the form with:
       #   <%= form_single_resource_commented %>
       # And I press "<%= create_button_title %>"
       # Then I should see "<%= problems_intro %>"
       #
       # <%= pending_explanation_2 %>
       #
-      # And I should be on the <%= plural %> page
       # And I should see the following form field values:
-      #   <%= html_single_resource_commented %>
+      #   <%= form_single_resource_commented %>
 
     <%= tags('@edit @update') %>
-    Scenario: Attempt to update a <%= singular %> with invalid input
+    Scenario: Attempt to update a <%= singular.humanize.downcase %> with invalid input
       Pending
       # <%= pending_explanation_1 %>
-      # Given a <%= singular %> exists
-      # When I go to the edit page for that <%= singular %>
-      # And I fill in the following:
+      # Given a <%= singular.humanize.downcase %> exists
+      # When I go to the edit page for that <%= singular.humanize.downcase %>
+      # And I fill in the form with:
       #   <%= form_single_resource_commented %>
       # And I press "<%= update_button_title %>"
       # Then I should see "<%= problems_intro %>"
       #
       # <%= pending_explanation_2 %>
       #
-      # And I should be on the page for that <%= singular %>
       # And I should see the following form field values:
-      #   <%= html_single_resource_commented %>
+      #   <%= form_single_resource_commented %>
 
     <%= tags('@edit @update @show') %>
-    Scenario: Update a <%= singular %>
-      Given a <%= singular %> exists
-      When I go to the edit page for that <%= singular %>
-      And I fill in the following:
+    Scenario: Update a <%= singular.humanize.downcase %>
+      Given the following <%= singular.humanize.downcase %>:
+        <%= activerecord_single_resource %>
+      When I go to the edit page for that <%= singular.humanize.downcase %>
+      And I fill in the form with:
         <%= form_single_resource_updated %> 
       And I press "<%= update_button_title %>"
-      Then I should be on the page for that <%= singular %>
+      Then I should be on the page for that <%= singular.humanize.downcase %>
       And I should see "<%= successful_update_message %>"
-      And I should see the following <%= singular %>:
+      And I should see the following <%= singular.humanize.downcase %>:
         <%= html_single_resource_updated %>
 
     <%= tags('@index @new') %>
-    Scenario: Navigate from the <%= plural %> page to the new <%= singular %> page
-      Given I am on the <%= plural %> page
+    Scenario: Navigate from the <%= plural.humanize.downcase %> page to the new <%= singular.humanize.downcase %> page
+      Given I am on the <%= plural.humanize.downcase %> page
       When I follow "New <%= singular_title %>"
-      Then I should be on the new <%= singular %> page
+      Then I should be on the new <%= singular.humanize.downcase %> page
 
     <%= tags('@index @show') %>
-    Scenario: Navigate from <%= plural %> page to the show <%= singular %> page
-      Given the following <%= plural %>:
+    Scenario: Navigate from <%= plural.humanize.downcase %> page to the show <%= singular.humanize.downcase %> page
+      Given the following <%= plural.humanize.downcase %>:
         <%= activerecord_table_header_row %>
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(2) %>
-        <%= activerecord_table_row(3) %>
-      When I go to the <%= plural %> page
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 2) %>
+        <%= activerecord_table_row(:index => 3) %>
+      When I go to the <%= plural.humanize.downcase %> page
       And I click "Show" in the 2nd row
-      Then I should be on the page for the 2nd <%= singular %>
+      Then I should be on the page for the 2nd <%= singular.humanize.downcase %>
 
     <%= tags('@index @edit') %>
-    Scenario: Navigate from <%= plural %> page to the edit <%= singular %> page
-      Given the following <%= plural %>:
+    Scenario: Navigate from <%= plural.humanize.downcase %> page to the edit <%= singular.humanize.downcase %> page
+      Given the following <%= plural.humanize.downcase %>:
         <%= activerecord_table_header_row %> 
-        <%= activerecord_table_row(1) %> 
-        <%= activerecord_table_row(2) %> 
-        <%= activerecord_table_row(3) %>
-      When I go to the <%= plural %> page
+        <%= activerecord_table_row(:index => 1) %> 
+        <%= activerecord_table_row(:index => 2) %> 
+        <%= activerecord_table_row(:index => 3) %>
+      When I go to the <%= plural.humanize.downcase %> page
       And I click "Edit" in the 2nd row
-      Then I should be on the edit page for the 2nd <%= singular %>
+      Then I should be on the edit page for the 2nd <%= singular.humanize.downcase %>
 
     <%= tags('@new @index') %>
-    Scenario: Navigate from new <%= singular %> page to <%= plural %> page
-      Given I am on the new <%= singular %> page
+    Scenario: Navigate from new <%= singular.humanize.downcase %> page to <%= plural.humanize.downcase %> page
+      Given I am on the new <%= singular.humanize.downcase %> page
       When I follow "<%= back_to_all %>"
-      Then I should be on the <%= plural %> page
+      Then I should be on the <%= plural.humanize.downcase %> page
 
     <%= tags('@edit @show') %>
-    Scenario: Navigate from the edit <%= singular %> page to the show <%= singular %> page
-      Given a <%= singular %> exists
-      When I go to the edit page for that <%= singular %>
+    Scenario: Navigate from the edit <%= singular.humanize.downcase %> page to the show <%= singular.humanize.downcase %> page
+      Given a <%= singular.humanize.downcase %> exists
+      When I go to the edit page for that <%= singular.humanize.downcase %>
       And I follow "Show"
-      Then I should be on the page for that <%= singular %>
+      Then I should be on the page for that <%= singular.humanize.downcase %>
 
     <%= tags('@edit @index') %>
-    Scenario: Navigate from edit <%= singular %> page to the <%= plural %> page
-      Given a <%= singular %> exists
-      When I go to the edit page for that <%= singular %>
+    Scenario: Navigate from edit <%= singular.humanize.downcase %> page to the <%= plural.humanize.downcase %> page
+      Given a <%= singular.humanize.downcase %> exists
+      When I go to the edit page for that <%= singular.humanize.downcase %>
       And I follow "<%= back_to_all %>"
-      Then I should be on the <%= plural %> page
+      Then I should be on the <%= plural.humanize.downcase %> page
 
     <%= tags('@show @edit') %>
-    Scenario: Navigate from show <%= singular %> page to edit <%= singular %> page
-      Given a <%= singular %> exists
-      When I go to the page for that <%= singular %>
+    Scenario: Navigate from show <%= singular.humanize.downcase %> page to edit <%= singular.humanize.downcase %> page
+      Given a <%= singular.humanize.downcase %> exists
+      When I go to the page for that <%= singular.humanize.downcase %>
       And I follow "Edit"
-      Then I should be on the edit page for that <%= singular %>
+      Then I should be on the edit page for that <%= singular.humanize.downcase %>
 
     <%= tags('@show @index') %>
-    Scenario: Navigate from show <%= singular %> page to <%= plural %> page
-      Given a <%= singular %> exists
-      And I am on the page for that <%= singular %>
+    Scenario: Navigate from show <%= singular.humanize.downcase %> page to <%= plural.humanize.downcase %> page
+      Given a <%= singular.humanize.downcase %> exists
+      When I go to the page for that <%= singular.humanize.downcase %>
       <% if nifty? %>
       And I follow "View All"
       <% else %>
       And I follow "Back"
       <% end %>
-      Then I should be on the <%= plural %> page
+      Then I should be on the <%= plural.humanize.downcase %> page
 
     <%= tags('@index') %>
     Scenario: <%= plural_title %> page title
-      When I go to the <%= plural %> page
+      When I go to the <%= plural.humanize.downcase %> page
       Then the heading should be "<%= index_heading %>"
       <% if index_title %>
       And the title should be "<%= index_title %>"
       <% end -%>
 
-    <%= tags('@show') %>
     <% if show_heading || index_title %>
+    <%= tags('@show') %>
     Scenario: <%= singular_title %> page title
-      Given a <%= singular %> exists
+      Given a <%= singular.humanize.downcase %> exists
       When I go to the page for that <%= singular %>
-      <% if show_heading %>
+      <% if show_heading -%>
       Then the heading should be "<%= show_heading %>"
-      <% end %>
-      <% if index_title %>
+      <% end -%>
+      <% if index_title -%>
       And the title should be "<%= show_title %>"
       <% end -%>
     <% end -%>
 
     <%= tags('@new') %>
-    Scenario: New <%= singular %> page title
-      When I go to the new <%= singular %> page
+    Scenario: New <%= singular.humanize.downcase %> page title
+      When I go to the new <%= singular.humanize.downcase %> page
       Then the heading should be "<%= new_heading %>"
       <% if index_title %>
       And the title should be "<%= new_title %>"
       <% end -%>
 
     <%= tags('@edit') %>
-    Scenario: Edit <%= singular %> page title
-      Given a <%= singular %> exists
-      When I go to the edit page for that <%= singular %>
+    Scenario: Edit <%= singular.humanize.downcase %> page title
+      Given a <%= singular.humanize.downcase %> exists
+      When I go to the edit page for that <%= singular.humanize.downcase %>
       Then the heading should be "<%= edit_heading %>"
       <% if index_title %>
       And the title should be "<%= edit_title %>"

data/lib/generators/cucumber_scaffold/feature/templates/steps.rb

@@ -1,10 +1,10 @@
 <%= generated_by %>
 
-Given /^a <%= singular %> exists$/ do
-  @<%= singular %> = <%= singular_title %>.create!(valid_<%= singular %>_attributes)
+Given /^a <%= singular.humanize.downcase %> exists$/ do
+  @<%= singular %> = <%= singular.camelcase %>.create!(valid_<%= singular %>_attributes)
 end
 
-Then /^I should see the following <%= singular %>:$/ do |expected_table|
+Then /^I should see the following <%= singular.humanize.downcase %>:$/ do |expected_table|
   
   <% if nifty? %>
   show_fields_css_query = 'body p strong'
@@ -22,16 +22,18 @@ Then /^I should see the following <%= singular %>:$/ do |expected_table|
   assert_equal actual, expected_table.rows_hash
 end
 
-Then /^I should see the following <%= plural %>:$/ do |expected_table|
+Then /^I should see the following <%= plural.humanize.downcase %>:$/ do |expected_table|
   expected_table.diff!(tableish('table tr', 'td,th'))
 end
 
-Given /^the following <%= plural %>:$/ do |table|
-  @<%= plural %> = <%= singular_title %>.create!(table.hashes)
+Given /^the following <%= plural.humanize.downcase %>:$/ do |table|
+  hashes = replace_spaces_with_underscores_in_keys(table.hashes)
+  @<%= plural %> = <%= singular.camelcase %>.create!(hashes)
 end
 
-Given /^the following <%= singular %>:$/ do |table|
-  @<%= singular %> = <%= singular_title %>.create!(table.rows_hash)
+Given /^the following <%= singular.humanize.downcase %>:$/ do |table|
+  hashes = replace_spaces_with_underscores_in_keys(table.rows_hash)
+  @<%= singular %> = <%= singular.camelcase %>.create!(hashes)
 end
 
 def valid_<%= singular %>_attributes

data/lib/generators/cucumber_scaffold/install/install_generator.rb

@@ -5,7 +5,8 @@ module CucumberScaffold
 
     def do_it
 
-      template('shared/web_steps_additional.rb', 'features/step_definitions/web_steps_additional.rb')
+      template('step_definitions/web_steps_additional.rb', 'features/step_definitions/web_steps_additional.rb')
+      template('support/table_helpers.rb', 'features/support/table_helpers.rb')
 
     end
 

data/lib/generators/cucumber_scaffold/install/templates/{shared → step_definitions}/web_steps_additional.rb

@@ -26,13 +26,33 @@ end
 def form_field_for_label(label)
   input_tags = label.parent.css('input,textarea')
   return if input_tags.size == 0
-  if input_tags.size > 1
+  # rails renders a hidden input alongside each checkbox
+  input_tag = input_tags.last
+  if input_tags.size > 1 && input_tag['type'] != 'checkbox'
     raise "Wrong number of input tags while parsing form (found #{input_tags.size})"
   end
-  input_tag = input_tags.first
   if input_tag.name == 'textarea'
     input_tag.inner_html
   elsif input_tag.name == 'input'
-    input_tag['value']
+    if input_tag['type'] == 'checkbox'
+      input_tag['checked'] == 'checked' ? '[x]' : '[ ]'
+    else
+      input_tag['value']
+    end
   end
 end
+
+When /^(?:|I )fill in the form with(?: within "([^"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      # assume it's a checkbox
+      if value == '[x]'
+        When %{I check "#{name}"}
+      elsif value == '[ ]'
+        When %{I uncheck "#{name}"}
+      else
+        When %{I fill in "#{name}" with "#{value}"}
+      end
+    end
+  end
+end

data/lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb

@@ -0,0 +1,20 @@
+def replace_spaces_with_underscores_in_keys(hashes)
+  # hashes will either be a single hash or an array of hashes
+  if hashes.class == Hash
+    result = {}
+    hashes.each_pair do |key, value|
+      new_key = key.gsub(' ', '_')
+      result[new_key] = value
+    end
+  else
+    result = []
+    hashes.each do |record|
+      result << {}
+      record.each_pair do |key, value|
+        new_key = key.gsub(' ', '_')
+        result.last[new_key] = value
+      end
+    end
+  end
+  result
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Andy Waite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +00:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,8 @@ extra_rdoc_files:
 - lib/generators/cucumber_scaffold/feature/templates/steps.rb
 - lib/generators/cucumber_scaffold/install/USAGE
 - lib/generators/cucumber_scaffold/install/install_generator.rb
-- lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb
+- lib/generators/cucumber_scaffold/install/templates/step_definitions/web_steps_additional.rb
+- lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb
 files: 
 - Manifest
 - README.rdoc
@@ -47,7 +48,8 @@ files:
 - lib/generators/cucumber_scaffold/feature/templates/steps.rb
 - lib/generators/cucumber_scaffold/install/USAGE
 - lib/generators/cucumber_scaffold/install/install_generator.rb
-- lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb
+- lib/generators/cucumber_scaffold/install/templates/step_definitions/web_steps_additional.rb
+- lib/generators/cucumber_scaffold/install/templates/support/table_helpers.rb
 has_rdoc: true
 homepage: http://github.com/andyw8/cucumber_scaffold
 licenses: []