pickle 0.2.11 → 0.2.12

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.12
+
+* 1 bugfix
+  * script/generate pickle paths now works correctly with cucumber-rails 0.3.2
+
+
 == 0.2.11
 
 * 1 improvement

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/features/generator/generators.feature

@@ -6,14 +6,14 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle"
+    When I run "script/generate pickle -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/step_definitions/pickle_steps.rb should be identical to the local step_definitions/pickle_steps.rb
     
   Scenario: script/generate pickle path on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle path"
+    When I run "script/generate pickle path -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/path\/world'/
@@ -22,7 +22,7 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle email on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle email"
+    When I run "script/generate pickle email -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/email\/world'/
@@ -32,7 +32,7 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle path email on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle path email"
+    When I run "script/generate pickle path email -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should be identical to the local support/pickle.rb
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
@@ -46,7 +46,7 @@ Feature: allow pickle to generate steps
   Scenario: regenerating pickle
     Given cucumber has been freshly generated
     And pickle path email has been freshly generated
-    When I run "script/generate pickle path email"
+    When I run "script/generate pickle path email -f"
     Then the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/path\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/email\/world'/

data/features/step_definitions/generator_steps.rb

@@ -12,7 +12,7 @@ Given(/^cucumber has been freshly generated$/) do
 end
 
 Given(/^pickle path email has been freshly generated$/) do
-  `cd #{Rails.root}; script/generate pickle path email`
+  `cd #{Rails.root}; script/generate -f pickle paths email`
 end
 
 Given(/^env\.rb already requires (.+)$/) do |file|

data/features/support/paths.rb

@@ -7,17 +7,11 @@ module NavigationHelpers
   #
   def path_to(page_name)
     case page_name
-    
+
     when /the home\s?page/
       '/'
-    
-    # Add more mappings here.
-    # Here is an example that pulls values out of the Regexp:
-    #
-    #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
 
-    # added by script/generate pickle path
+    # the following are examples using path_to_pickle
 
     when /^#{capture_model}(?:'s)? page$/                           # eg. the forum's page
       path_to_pickle $1
@@ -31,16 +25,23 @@ module NavigationHelpers
     when /^#{capture_model}(?:'s)? (.+?) page$/                     # eg. the forum's posts page
       path_to_pickle $1, :extra => $2                               #  or the forum's edit page
 
-    when /^the (.+?) page$/                                         # translate to named route
-      send "#{$1.downcase.gsub(' ','_')}_path"
-  
-    # end added by pickle path
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
 
     else
-      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-        "Now, go and add a mapping in #{__FILE__}"
+      begin
+        page_name =~ /the (.*) page/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue Object => e
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
     end
   end
 end
 
-World(NavigationHelpers)
+World(NavigationHelpers)

data/pickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.2.11"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-06-23}
   s.description = %q{Easy model creation and reference in your cucumber features}
   s.email = %q{ian.w.white@gmail.com}
   s.extra_rdoc_files = [
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ianwhite/pickle/tree}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easy model creation and reference in your cucumber features}
   s.test_files = [
     "spec/pickle/adapter_spec.rb",
@@ -106,7 +106,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/rails_generators/pickle/pickle_generator.rb

@@ -17,14 +17,7 @@ class PickleGenerator < Rails::Generator::Base
       
       if @generate_path_steps
         pickle_assigns[:pickle_path] = true
-        current_paths = File.read('features/support/paths.rb')
-        unless current_paths.include?('#{capture_model}')
-          if current_paths =~ /^(.*)(\n\s+else\n\s+raise "Can't find.*".*$)/m
-            pickle_assigns[:current_paths_header] = $1
-            pickle_assigns[:current_paths_footer] = $2
-            m.template 'paths.rb', File.join('features/support', 'paths.rb'), :assigns => pickle_assigns, :collision => :force
-          end
-        end
+        m.template 'paths.rb', File.join('features/support', 'paths.rb')
       end
       
       if @generate_email_steps

data/rails_generators/pickle/templates/paths.rb

@@ -1,5 +1,17 @@
-<%= current_paths_header %>
-    # added by script/generate pickle path
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+
+    when /the home\s?page/
+      '/'
+
+    # the following are examples using path_to_pickle
 
     when /^#{capture_model}(?:'s)? page$/                           # eg. the forum's page
       path_to_pickle $1
@@ -13,8 +25,23 @@
     when /^#{capture_model}(?:'s)? (.+?) page$/                     # eg. the forum's posts page
       path_to_pickle $1, :extra => $2                               #  or the forum's edit page
 
-    when /^the (.+?) page$/                                         # translate to named route
-      send "#{$1.downcase.gsub(' ','_')}_path"
-  
-    # end added by pickle path
-<%= current_paths_footer %>
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      begin
+        page_name =~ /the (.*) page/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue Object => e
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
+    end
+  end
+end
+
+World(NavigationHelpers)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pickle
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Ian White
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +01:00
+date: 2010-06-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -104,23 +105,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy model creation and reference in your cucumber features