cucumber-rails 1.0.0 → 1.0.1

data/.gitignore

@@ -3,3 +3,4 @@ doc
 tmp
 coverage
 .bundle
+.yardoc/

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    cucumber-rails (1.0.0)
+    cucumber-rails (1.0.1)
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
-      nokogiri (>= 1.4.4)
-      rack-test (>= 0.5.7)
+      nokogiri (>= 1.4.6)
+      rack-test (>= 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -42,7 +42,7 @@ GEM
       multi_json (~> 1.0)
     ansi (1.2.5)
     arel (2.1.1)
-    aruba (0.4.2)
+    aruba (0.4.3)
       bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
       cucumber (>= 0.10.7)
@@ -84,11 +84,11 @@ GEM
       json (>= 1.4.6)
     hike (1.1.0)
     i18n (0.6.0)
-    jquery-rails (1.0.11)
+    jquery-rails (1.0.12)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.5.2)
-    json_pure (1.5.2)
+    json (1.5.3)
+    json_pure (1.5.3)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -145,8 +145,8 @@ GEM
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
     sass (3.1.3)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -165,30 +165,34 @@ GEM
     turn (0.8.2)
       ansi (>= 1.2.2)
     tzinfo (0.3.28)
-    uglifier (0.5.4)
+    uglifier (1.0.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
+    yard (0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (>= 0.4.1)
+  aruba (>= 0.4.3)
+  bcat (= 0.6.1)
   bson_ext (>= 1.3.1)
   bundler (>= 1.0.15)
   coffee-script (>= 2.2.0)
   cucumber-rails!
   database_cleaner (>= 0.6.7)
   factory_girl (>= 2.0.0.beta2)
-  jquery-rails (>= 1.0.9)
+  jquery-rails (>= 1.0.12)
   mongoid (>= 2.0.2)
   rails (>= 3.1.0.rc4)
   rake (>= 0.9.2)
+  rdiscount (= 1.6.8)
   rspec (>= 2.6.0)
   rspec-rails (>= 2.6.1)
-  sass (>= 3.1.1)
+  sass (>= 3.1.3)
   sqlite3-ruby (>= 1.3.3)
   turn (>= 0.8.2)
-  uglifier (>= 0.5.4)
+  uglifier (>= 1.0.0)
+  yard (= 0.7.1)

data/{History.txt → History.md}

@@ -1,51 +1,62 @@
-== 0.5.2 2011-06-07
+## [v1.0.1](https://github.com/cucumber/cucumber-rails/compare/v1.0.0...v1.0.1)
 
-=== New Features
+### New Features
+* Added a @no-database-cleaner tag you can add if you don't want to run DatabaseCleaner. Useful for debugging if you want to leave data in the database. Typical use case is to run `rails server --environment test` to look at/try app with data from test. (Aslak Hellesøy)
+* History file is now in Markdown format. (Aslak Hellesøy)
+
+## [v1.0.0](https://github.com/cucumber/cucumber-rails/compare/v0.5.2...v1.0.0)
+
+### New Features
+* Upgraded Cucumber dependency to 1.0.0. (Aslak Hellesøy)
+
+## [v0.5.2](https://github.com/cucumber/cucumber-rails/compare/v0.5.1...v0.5.2)
+
+### New Features
 * Upgraded to Capybara 1.0.0.rc1 (Aslak Hellesøy)
 * Add stats to generator (#144 Aslak Hellesøy)
 
-== 0.5.1 2011-05-25
+## [v0.5.1](https://github.com/cucumber/cucumber-rails/compare/v0.5.0...v0.5.1)
 
-=== Bugfixes
+### Bugfixes
 * Mixed DB access feature for @javascript drivers (#142 Alexander Mankuta)
 * cucumber:feature and integers. not creating feature correctly (#30 John Ivanoff, Aslak Hellesøy)
 * New project can't find capybara's "visit" (#143 Aslak Hellesøy)
 * rails generate cucumber:install attempts double run (#140 Aslak Hellesøy)
 
-== 0.5.0 2011-05-17
+## [v0.5.0](https://github.com/cucumber/cucumber-rails/compare/v0.5.0.beta1...v0.5.0)
 
-=== Bugfixes
+### Bugfixes
 * undefined method `add_assertion' for nil:NilClass (#96, #97, #98 Aslak Hellesøy)
 * Capybara name error from env.rb (#125 Aslak Hellesøy)
 * Fixed date-localization bug (#138 Michael Opitz)
 
-== 0.5.0.beta1 2011-05-08
+## [v0.5.0.beta1](https://github.com/cucumber/cucumber-rails/compare/v0.4.1...v0.5.0.beta1)
 
-=== Removed features
+### Removed features
 * Dropped support for Rails 2 (Aslak Hellesøy)
 * Dropped support for Webrat (Aslak Hellesøy)
 * Removed database cleaner strategy overrides (#134 Daniel Morrison, Daniel Duvall)
 
-=== Improvements
+### Improvements
 * Upgrade to Capybara 1.0.0.beta1 or newer (#129, #130 Simon Menke, Klaus Hartl, Aslak Hellesøy)
 * Generated paths.rb cleanup (#133 Tim Pope)
 * Allow css pseudo-classes in scopers (#122 twalpole)
 
-== 0.4.1 2011-04-05
+## [v0.4.1](https://github.com/cucumber/cucumber-rails/compare/v0.4.0...v0.4.1)
 
-=== Bugfixes
+### Bugfixes
 * Fixed incorrect warning in generated files. (#115 Emanuele Vicentini)
 * Fixed incorrect hooks for DatabaseCleaner (#113 Markus Bengts)
 * Throw an error if the user forgot to add DatabaseCleaner to the Gemfile, allowing them to decide whether or not to use it. (#36 Aslak Hellesøy, Ryan Bigg)
 
-== 0.4.0 2011-03-20
+## [v0.4.0](https://github.com/cucumber/cucumber-rails/compare/v0.3.2...v0.4.0)
 
-=== New Features
+### New Features
 * Add selectors helper (#63 Bodaniel Jeanes)
 * Capybara date stepdefs (#66 Rob Holland)
 * The World now includes Rack::Test::Methods, allowing get, post, put delete (Aslak Hellesøy)
 
-=== Bugfixes
+### Bugfixes
 * Allow setting rails root (#102, #103, Fabio Kreusch)
 * Fix Date selection steps and helpers (#93, #99, #100, #101, #109 James Herdman, John Ferlito, twalpole, Geoff Drake, Ricky Robinson, Michael Fleet)
 * Can not run cucumber-rails (0.4.0.beta.1) with cucumber (0.10.0) (#89 Aslak Hellesøy)
@@ -55,20 +66,18 @@
 * @allow-rescue not working in rails 3 (#31 Joe Ferris, Aslak Hellesøy)
 * Gem dependency on Nokogiri (for #tableish). (#53 Aslak Hellesøy)
 
-=== Removed Features
+### Removed Features
 * Automatic detection of RSpec, Capybara and Webrat for install generator. Set gems explicitly in your Gemfile (Rails3) or environment.rb (Rails2)
 * Then /^(?:|I )should see JSON:$/. Use #get and #last_response instead. See features/rails3.feature. (Aslak Hellesøy)
 * Cucumber::Rails::World.use_transactional_fixtures. TODO: Explain what to do instead.
   No more Cucumber::Rails::World.use_transactional_fixtures = false. Use DatabaseCleaner.strategy = :none instead
 
-== 0.3.2 2010-06-06
-
-== Changed features
+## [v0.3.2](https://github.com/cucumber/cucumber-rails/compare/v0.3.1...v0.3.2)
 * web_steps.rb uses "([^"]*)" instead of "([^\"]*)" (Aslak Hellesøy)
 * Renamed cucumber:skeleton to cucumber:install (Rails 3 generator). (Aslak Hellesøy)
 * Upgraded to be compatible with rspec 2.0.0.beta.10 (#35 Gabor Ratky, Pete Yandell)
 
-== 0.3.1 2010-05-03
+## [v0.3.1](https://github.com/cucumber/cucumber-rails/compare/v0.3.0...v0.3.1)
 
 This release has a lot of bugfixes! The test suite (based on Aruba) verifies that Cucumber-Rails
 now works with various combinations of: 
@@ -82,7 +91,6 @@ now works with various combinations of:
 This one requires a special mention: The handy (but error prone) rerun functionality has moved to a 
 separate rerun profile, so all rerun.txt related issues should now be gone.
 
-== New features
 * New Capybara Step Definitions for Dates. (Rob Holland)
 * Steps now recognise "Given I am on the users page" etc. (Solomon White)
 * Relegate rerun to its own profile and rake task (Mike Sassak)
@@ -92,47 +100,46 @@ separate rerun profile, so all rerun.txt related issues should now be gone.
 * Added @no-js-emulation, which turns off javascript emulation for delete links when not using browser testing. (Rob Holland, Aslak Hellesøy)
 * Korean translation (Shim Taewon)
 
-=== Bugfixes
+### Bugfixes
 * No longer need to install the test-unit gem on 1.9.1 (Aslak Hellesøy)
 * capybara rack-test field should contain step support for textarea (#28 Nicholas Rutherford)
 * "Rspec is not missing constant Matchers!" error. (#27 David Chelimsky, Aslak Hellesøy)
 * @culerity tag breaks Rails 3 RESTful helpers (#17 Aslak Hellesøy)
 
-== 0.3.0 2010-02-25
+## [v0.3.0](https://github.com/cucumber/cucumber-rails/compare/v0.2.4...v0.3.0)
 
 This is a major release since we're now supporting both Rails 3 and RSpec 2. Older versions
 (Rails 2 and RSpec 1) are still supported.
 
-=== New Features
+### New Features
 * Support for both Rails-2.x and Rails-3.x (#10 Kristian Mandrup, Aleksey Gureiev, Ashley Moran, Aslak Hellesøy)
 * Support for both RSpec-1.x and RSpec-2.x (Louis Rose, Aslak Hellesøy)
 * Features will default to Javascript emulation unless you turn it off with @culerity,  (Aslak Hellesøy)
 * Japanese translation. (MOROHASHI Kyosuke)
 
-=== Bugfixes
+### Bugfixes
 * Support projects that don't use ActiveRecord (#14 Aslak Hellesøy)
 * Running test/unit tests when creating a skeleton (#12 Aleksey Gureiev)
 * Inform that config/database.yml is overwritten, be smarter about it and inform the user that it is forced. (#15 Aslak Hellesøy)
 * Reverts changes from issue #5 where verification of query string params was added to the step for being on a page.  Adds step discussed in issue #11 for verification of query string. (#5, #11 Eric Milford)
 * Fixed typos in Capybara's web steps (has_not_xpath? => has_no_xpath?) (Thorbjørn Hermansen, Carlos Antonio da Silva)
 
-== 0.2.5 2010-02-07
 
-=== New Features
+### New Features
 * Added Danish translation (Kristian Mandrup)
 * Using Gemfile for Rails 3. Tidies it up and adds cucumber gems only if not already present! (Kristian Mandrup)
 * Added Generators wrapper module for Rails 3 generators so they are now all in Cucumber::Generators (Kristian Mandrup)
 
-=== Bugfixes
+### Bugfixes
 * Started to work on solutions for generating suitable support files depending on Rails version
   - see skeleton_base.rb#create_feature_support and templates/support  
 
-== 0.2.4 2010-01-18
+## [v0.2.4](https://github.com/cucumber/cucumber-rails/compare/v0.2.3...v0.2.4)
 
-=== New Features
+### New Features
 * Added Spanish translation (Gabriel)
 
-=== Bugfixes
+### Bugfixes
 * Fixed some broken Webrat/Test::Unit step definitions. (Aslak Hellesøy)
 * Better Javascript emulation with Capybara (#7 Thorbjørn Hermansen)
 * Removed stray quote in i18n web_steps.rb (Gabriel)
@@ -142,46 +149,45 @@ This is a major release since we're now supporting both Rails 3 and RSpec 2. Old
 * Capybara web_steps.rb with_scope didn't work in nested steps (Lenny Marks)
 * Fixed "should not see" steps in web_steps.rb to use the correct selector (Toni Tuominen)
 
-== 0.2.3 2010-01-03
+## [v0.2.3](https://github.com/cucumber/cucumber-rails/compare/v0.2.2...v0.2.3)
 
-=== New Features
+### New Features
 * The #tableish Proc can return Strings as well as Nokogiri nodes now. (Aslak Hellesøy)
 
-=== Bugfixes
+### Bugfixes
 * Handle all types of URIs in "I should be on ..." steps. (#5 Andrew D. Smith)
 
-== 0.2.2 2009-12-21
+## [v0.2.2](https://github.com/cucumber/cucumber-rails/compare/v0.2.1...v0.2.2)
 
-=== Bugfixes
+### Bugfixes
 * Fix bad link in gemspec. (Aslak Hellesøy)
 * Unified file attaching step names. (Jiří Zajpt)
 * Fix typos in variable names in several step definitions. (Jiří Zajpt)
 * cucumber.rake finds the wrong vendored cucumber when a plugin name starts with "cucumber" (#4 James Herdman, Paco Benavent, Aslak Hellesøy)
 
-=== New features
+### New features
 * Czech translations. (Jiří Zajpt)
 
-== 0.2.1 2009-12-15
+## [v0.2.1](https://github.com/cucumber/cucumber-rails/compare/v0.2.0...v0.2.1)
 
 Small bugfix release
 
-=== Bugfixes
+### Bugfixes
 * Made sure database_cleaner is always set up as a dependency in config/environments/cucumber.rb. (Aslak Hellesøy)
 
-== 0.2.0 2009-12-14
 
 This is the first release of cucumber-rails, which was factored out of cucumber.
 We're calling it 0.2.0 just because we did some prereleases in the 0.1 series,
 and to celebrate that cucumber-rails now supports Capybara as an alternative to Webrat.
 
-=== UPGRADING FROM A PREVIOUS CUCUMBER SETUP
+### UPGRADING FROM A PREVIOUS CUCUMBER SETUP
 
-1) Remove your features/support/version_check.rb
-2) Remove your features/step_definitions/webrat_steps.rb
+1. Remove your features/support/version_check.rb
+1. Remove your features/step_definitions/webrat_steps.rb
    If you have added your own custom step definitions to this file,
    put them in a different file under features/step_definitions
-3) run "ruby script/generate cucumber --help" to see what options you have.
-4) run "ruby script/generate cucumber" - plus whatever options you think fit for you.
+1. run "ruby script/generate cucumber --help" to see what options you have.
+1. run "ruby script/generate cucumber" - plus whatever options you think fit for you.
    Answer "n" (no) when asked to overwrite paths.rb.
    Answer "y" (yes) when asked to overwrite other files, but do "d" (diff) first.
    If you have edits in some of these files that you want to keep, store the diff
@@ -196,13 +202,13 @@ and to celebrate that cucumber-rails now supports Capybara as an alternative to
    If you have a Spork setup, see the end of this thread:
    http://groups.google.com/group/cukes/browse_thread/thread/475385cc26377215
 
-=== New features
+### New features
 * Added an @emulate_rails_javascript tag that will emulate onclick with Capybara (Aslak Hellesøy, Rob Holland)
 * Added a smart config/cucumber.yml file that will rerun previously failing scenarios (Aslak Hellesøy)
 * Support for Capybara. Run "script/generate --capybara" if you want that. (Rob Holland, Aslak Hellesøy)
 * New #tableish method to extract table-like data from a HTML page. Pure Nokogiri/CSS3/XPath. (Aslak Hellesøy)
 
-=== Bugfixes
+### Bugfixes
 * Webrat step "Then I should be on" should use request_uri instead of path for missing query string parameters (ZhangJinzhu)
 * Added MIME type parameter to attach file step definition (Felix Flores)
 * Added check when including ActiveSupport::Testing::SetupAndTeardown for older Rails versions (Jeremy Durham)

data/Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+CUCUMBER_RAILS_VERSION = Gem::Specification.load(File.dirname(__FILE__) + '/cucumber-rails.gemspec').version.version
 require 'rubygems'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks

data/cucumber-rails.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.0.0'
+  s.version     = '1.0.1'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generators and Runtime for Rails"
   s.summary     = "#{s.name}-#{s.version}"
@@ -11,13 +11,13 @@ Gem::Specification.new do |s|
   s.homepage    = "http://cukes.info"
 
   s.add_dependency('cucumber', '~> 1.0.0')
-  s.add_dependency('rack-test', '>= 0.5.7')
-  s.add_dependency('nokogiri', '>= 1.4.4')
+  s.add_dependency('rack-test', '>= 0.6.0')
+  s.add_dependency('nokogiri', '>= 1.4.6')
   s.add_dependency('capybara', '>= 1.0.0')
   s.add_development_dependency('rails', '>= 3.1.0.rc4')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.15')
-  s.add_development_dependency('aruba', '>= 0.4.1')
+  s.add_development_dependency('aruba', '>= 0.4.3')
   s.add_development_dependency('sqlite3-ruby', '>= 1.3.3')
   s.add_development_dependency('rspec', '>= 2.6.0')
   s.add_development_dependency('rspec-rails', '>= 2.6.1')
@@ -29,16 +29,19 @@ Gem::Specification.new do |s|
 
   # Various Stuff that Rails 3.1 puts inside apps.
   s.add_development_dependency('turn', '>= 0.8.2')
-  s.add_development_dependency('sass', '>= 3.1.1')
+  s.add_development_dependency('sass', '>= 3.1.3')
   s.add_development_dependency('coffee-script', '>= 2.2.0')
-  s.add_development_dependency('uglifier', '>= 0.5.4')
-  s.add_development_dependency('jquery-rails', '>= 1.0.9')
+  s.add_development_dependency('uglifier', '>= 1.0.0')
+  s.add_development_dependency('jquery-rails', '>= 1.0.12')
+
+  # For Documentation:
+  s.add_development_dependency('yard', '= 0.7.1')
+  s.add_development_dependency('rdiscount', '= 1.6.8')
+  s.add_development_dependency('bcat', '= 0.6.1')
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = ["LICENSE", "README.md", "History.txt"]
-  s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 end

data/dev_tasks/yard.rake

@@ -0,0 +1,17 @@
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
+YARD::Rake::YardocTask.new(:yard) do |t|
+  t.options = %w{--no-private --title Cucumber-Rails}
+  t.files = %w{lib - README.md History.md LICENSE}
+end
+
+desc "Push yardoc to http://cukes.info/cucumber-rails/api/#{CUCUMBER_RAILS_VERSION}"
+task :push_yard => :yard do
+  sh("tar czf tmp/api-#{CUCUMBER_RAILS_VERSION}.tgz -C doc .")
+  sh("scp tmp/api-#{CUCUMBER_RAILS_VERSION}.tgz cukes.info:/var/www/cucumber-rails/api")
+  sh("ssh cukes.info 'cd /var/www/cucumber-rails/api && rm -rf #{CUCUMBER_RAILS_VERSION} && mkdir #{CUCUMBER_RAILS_VERSION} && tar xzf api-#{CUCUMBER_RAILS_VERSION}.tgz -C #{CUCUMBER_RAILS_VERSION} && rm -f latest && ln -s #{CUCUMBER_RAILS_VERSION} latest'")
+end
+
+task :release => :push_yard

data/dev_tasks/yard/default/layout/html/footer.erb

@@ -0,0 +1,5 @@
+<div id="footer">
+  Generated on <%= Time.now.strftime("%c") %> by 
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  <%= YARD::VERSION %> (ruby-<%= RUBY_VERSION %>).
+</div>

data/dev_tasks/yard/default/layout/html/index.erb

@@ -0,0 +1 @@
+<%= yieldall %>

data/dev_tasks/yard/default/layout/html/layout.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <%= erb(:headers) %>
+  </head>
+  <body>
+    <script type="text/javascript" charset="utf-8">
+      if (window.top.frames.main) document.body.className = 'frames';
+    </script>
+    
+    <div id="header">
+      <%= erb(:logo) %>
+      <%= erb(:breadcrumb) %>
+      <%= erb(:search) %>
+      <div class="clear"></div>
+    </div>
+    
+    <iframe id="search_frame"></iframe>
+    
+    <div id="content"><%= yieldall %></div>
+    
+    <%= erb(:footer) %>
+  </body>
+</html>

data/dev_tasks/yard/default/layout/html/logo.erb

@@ -0,0 +1 @@
+<h3><img src="<%= url_for('images/bubble_32x32.png') %>"></img> Cucumber-Rails <%= CUCUMBER_RAILS_VERSION %></h3>

data/dev_tasks/yard/default/layout/html/setup.rb

@@ -0,0 +1,4 @@
+def init
+  super
+  options[:serializer].serialize('/images/bubble_32x32.png', IO.read(File.dirname(__FILE__) + '/bubble_32x32.png'))
+end

data/features/step_definitions/cucumber_rails_steps.rb

@@ -17,6 +17,10 @@ Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support$
       """
     And I successfully run `bundle exec rails generate cucumber:install`
   }
+  if(ENV['ARUBA_REPORT_DIR'])
+    @aruba_report_start = Time.new
+    sleep(1)
+  end
 end
 
 Given /^a project without ActiveRecord$/ do
@@ -58,6 +62,10 @@ Given /^a project without ActiveRecord$/ do
       """
     And I remove the file "config/database.yml"
   }
+  if(ENV['ARUBA_REPORT_DIR'])
+    @aruba_report_start = Time.new
+    sleep(1)
+  end
 end
 
 And /^a cukes resource$/ do

data/features/support/env.rb

@@ -8,3 +8,30 @@ Before do
   @aruba_timeout_seconds = 120 # A long time needed some times
   unset_bundler_env_vars
 end
+
+if(ENV['ARUBA_REPORT_DIR'])
+  # Override reporting behaviour so we don't document all files, only the ones
+  # that have been created after @aruba_report_start (a Time object). This is
+  # given a value after the Rails app is generated (see cucumber_rails_steps.rb)
+  module Aruba
+    module Reporting
+      def children(dir)
+        children = Dir["#{dir}/*"].sort
+        
+        # include
+        children = children.select do |child|
+          File.directory?(child) || 
+          (@aruba_report_start && File.stat(child).mtime > @aruba_report_start)
+        end
+        
+        # exclude
+        children = children.reject do |child|
+          child =~ /Gemfile/ || 
+          child =~ /\.log$/
+        end
+
+        children
+      end
+    end
+  end
+end

data/lib/cucumber/rails.rb

@@ -1,5 +1,20 @@
 require 'rails'
-require 'cucumber/rails3'
+require 'cucumber/rails/application'
+ENV["RAILS_ENV"] ||= "test"
+ENV["RAILS_ROOT"] ||= File.expand_path(File.dirname(caller.detect{|f| f =~ /\/env\.rb:/}) + '/../..')
+require File.expand_path(ENV["RAILS_ROOT"] + '/config/environment')
+require 'cucumber/rails/action_controller'
+
+if defined?(ActiveRecord::Base)
+  require 'rails/test_help'
+else
+  require 'action_dispatch/testing/test_process'
+  require 'action_dispatch/testing/integration'
+end
+
+if !Rails.application.config.cache_classes
+  warn "WARNING: You have set Rails' config.cache_classes to false (most likely in config/environments/cucumber.rb).  This setting is known to cause problems with database transactions. Set config.cache_classes to true if you want to use transactions.  For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165."
+end
 
 require 'cucumber/rails/world'
 require 'cucumber/rails/hooks'

data/lib/cucumber/rails/hooks/active_record.rb

@@ -1,5 +1,12 @@
 if defined?(ActiveRecord::Base)
-  require 'cucumber/rails3/active_record'
+  class ActiveRecord::Base
+    mattr_accessor :shared_connection
+    @@shared_connection = nil
+
+    def self.connection
+      @@shared_connection || retrieve_connection
+    end
+  end
 
   Before('@javascript') do
     # Forces all threads to share the same connection. This works on

data/lib/cucumber/rails/hooks/database_cleaner.rb

@@ -1,11 +1,11 @@
 begin
   require 'database_cleaner'
 
-  Before do
+  Before('~@no-database-cleaner') do
     DatabaseCleaner.start
   end
 
-  After do
+  After('~@no-database-cleaner') do
     DatabaseCleaner.clean
   end
 

metadata

@@ -2,7 +2,7 @@
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 Z
+date: 2011-06-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.4
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -98,7 +98,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: *id008
@@ -197,7 +197,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.1
+        version: 3.1.3
   type: :development
   prerelease: false
   version_requirements: *id017
@@ -219,7 +219,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.4
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id019
@@ -230,27 +230,58 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 1.0.12
   type: :development
   prerelease: false
   version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.6.8
+  type: :development
+  prerelease: false
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: bcat
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: *id023
 description: Cucumber Generators and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
-- History.txt
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.md
 - LICENSE
 - README.md
 - Rakefile
@@ -259,6 +290,13 @@ files:
 - cucumber-rails.gemspec
 - dev_tasks/cucumber.rake
 - dev_tasks/rspec.rake
+- dev_tasks/yard.rake
+- dev_tasks/yard/default/layout/html/bubble_32x32.png
+- dev_tasks/yard/default/layout/html/footer.erb
+- dev_tasks/yard/default/layout/html/index.erb
+- dev_tasks/yard/default/layout/html/layout.erb
+- dev_tasks/yard/default/layout/html/logo.erb
+- dev_tasks/yard/default/layout/html/setup.rb
 - features/allow_rescue.feature
 - features/capybara_javascript_drivers.feature
 - features/database_cleaner.feature
@@ -278,6 +316,8 @@ files:
 - features/support/env.rb
 - features/test_unit.feature
 - lib/cucumber/rails.rb
+- lib/cucumber/rails/action_controller.rb
+- lib/cucumber/rails/application.rb
 - lib/cucumber/rails/capybara.rb
 - lib/cucumber/rails/capybara/javascript_emulation.rb
 - lib/cucumber/rails/capybara/select_dates_and_times.rb
@@ -288,10 +328,6 @@ files:
 - lib/cucumber/rails/hooks/mail.rb
 - lib/cucumber/rails/rspec.rb
 - lib/cucumber/rails/world.rb
-- lib/cucumber/rails3.rb
-- lib/cucumber/rails3/action_controller.rb
-- lib/cucumber/rails3/active_record.rb
-- lib/cucumber/rails3/application.rb
 - lib/cucumber/web/tableish.rb
 - lib/generators/cucumber/feature/USAGE
 - lib/generators/cucumber/feature/feature_generator.rb
@@ -327,8 +363,8 @@ homepage: http://cukes.info
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -336,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -421986760782023532
+      hash: 3340904103093087338
       segments: 
       - 0
       version: "0"
@@ -345,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -421986760782023532
+      hash: 3340904103093087338
       segments: 
       - 0
       version: "0"
@@ -355,7 +391,7 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: cucumber-rails-1.0.0
+summary: cucumber-rails-1.0.1
 test_files: 
 - features/allow_rescue.feature
 - features/capybara_javascript_drivers.feature

data/lib/cucumber/rails3.rb

@@ -1,16 +0,0 @@
-require 'cucumber/rails3/application'
-ENV["RAILS_ENV"] ||= "test"
-ENV["RAILS_ROOT"] ||= File.expand_path(File.dirname(caller.detect{|f| f =~ /\/env\.rb:/}) + '/../..')
-require File.expand_path(ENV["RAILS_ROOT"] + '/config/environment')
-require 'cucumber/rails3/action_controller'
-
-if defined?(ActiveRecord::Base)
-  require 'rails/test_help'
-else
-  require 'action_dispatch/testing/test_process'
-  require 'action_dispatch/testing/integration'
-end
-
-if !Rails.application.config.cache_classes
-  warn "WARNING: You have set Rails' config.cache_classes to false (most likely in config/environments/cucumber.rb).  This setting is known to cause problems with database transactions. Set config.cache_classes to true if you want to use transactions.  For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165."
-end

data/lib/cucumber/rails3/active_record.rb

@@ -1,8 +0,0 @@
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end