clearance 0.10.1 → 0.10.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.10.2
+------------------
+
+* Replaced test/rails_root & general testing strategy with Diesel. (Joe Ferris)
+* Conveniences in factories for password/confirmation.
+* New generator command: rails generate clearance:install.
+* Step definitions are now prefixed with visitor_ to use thoughtbot convention.
+* When Clearance installed in an app that already has users, allow old users to sign in by resetting their password.
+
 0.10.1
 ------------------
 

data/Gemfile

@@ -0,0 +1,21 @@
+source "http://rubygems.org"
+gem "cucumber"
+gem "aruba", "~> 0.2.7"
+gem "rake"
+gem "rails", ">= 3.0.3"
+gem "thin"
+gem "shoulda"
+gem "sqlite3-ruby"
+gem "factory_girl"
+gem "diesel"
+gem "cucumber-rails"
+gem "capybara"
+gem "factory_girl_rails"
+gem "rspec-rails"
+gem "formtastic"
+gem "database_cleaner"
+gem "dynamic_form"
+gem "launchy"
+gem "redgreen"
+gem "mocha"
+

data/Gemfile.lock

@@ -0,0 +1,171 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    aruba (0.2.8)
+      childprocess (~> 0.1.6)
+      cucumber (~> 0.10.0)
+      rspec (~> 2.3.0)
+    builder (2.1.2)
+    capybara (0.4.0)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.2)
+    celerity (0.8.7)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
+    configuration (1.2.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.14)
+    daemons (1.1.0)
+    database_cleaner (0.6.0)
+    diesel (0.1.4)
+      railties (~> 3.0.3)
+    diff-lcs (1.1.2)
+    dynamic_form (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    eventmachine (0.12.10)
+    factory_girl (1.3.3)
+    factory_girl_rails (1.0.1)
+      factory_girl (~> 1.3)
+      railties (>= 3.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    formtastic (1.2.3)
+      actionpack (>= 2.3.7)
+      activesupport (>= 2.3.7)
+      i18n (~> 0.4)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    i18n (0.5.0)
+    json (1.4.6)
+    json_pure (1.4.6)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    redgreen (1.2.2)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    rspec-rails (2.3.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.3.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
+    shoulda (2.11.3)
+    sqlite3-ruby (1.3.2)
+    term-ansicolor (1.0.5)
+    thin (1.2.7)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    xpath (0.1.3)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (~> 0.2.7)
+  capybara
+  cucumber
+  cucumber-rails
+  database_cleaner
+  diesel
+  dynamic_form
+  factory_girl
+  factory_girl_rails
+  formtastic
+  launchy
+  mocha
+  rails (>= 3.0.3)
+  rake
+  redgreen
+  rspec-rails
+  shoulda
+  sqlite3-ruby
+  thin

data/README.md

@@ -5,37 +5,28 @@ Rails authentication with email & password.
 
 [We have clearance, Clarence.](http://www.youtube.com/watch?v=fVq4_HhBK8Y)
 
-Clearance was extracted out of [Hoptoad](http://hoptoadapp.com). We merged the
-authentication code from two of thoughtbot's client Rails apps and have since
-used it each time we needed authentication.
+Clearance was extracted out of [Hoptoad](http://hoptoadapp.com).
 
 Help
 ----
 
-* [documentation](http://rdoc.info/gems/clearance)
-* [#thoughtbot](irc://irc.freenode.net/thoughtbot) IRC channel on freenode
-* [mailing list](http://groups.google.com/group/thoughtbot-clearance)
-
-Bugs, Patches
--------------
-
-Fork away and create a [Github Issue](http://github.com/thoughtbot/clearance/issues).
+* [Documentation](http://rdoc.info/gems/clearance) at RDoc.info.
+* [Patches welcome](http://github.com/thoughtbot/clearance/issues) via Github Issues.
+* [#thoughtbot](irc://irc.freenode.net/thoughtbot) IRC channel on freenode.
+* [Mailing list](http://groups.google.com/group/thoughtbot-clearance) on Google Groups.
 
 Installation
 ------------
 
 Clearance is a Rails engine for Rails 3.
 
-Use the [0.8.x](https://github.com/thoughtbot/clearance/tree/v0.8.8)
-series of Clearance if you have a Rails 2 app.
-
 Include the gem in your Gemfile:
 
     gem "clearance"
 
 Make sure the development database exists, then run the generator:
 
-    rails generate clearance
+    rails generate clearance:install
 
 This:
 
@@ -43,6 +34,9 @@ This:
 * inserts Clearance::Authentication into your ApplicationController
 * creates a migration that either creates a users table or adds only missing columns
 
+Use the [0.8.x](https://github.com/thoughtbot/clearance/tree/v0.8.8)
+series of Clearance if you have a Rails 2 app.
+
 Usage
 -----
 
@@ -82,35 +76,29 @@ can be overridden by re-defining url_after_(action) methods as seen above.
 Optional Cucumber features
 --------------------------
 
-As your app evolves, you want to know that authentication still works. Our
-opinion is that you should test its integration with your app using
-[Cucumber](http://cukes.info).
-
-Run the Cucumber generator and Clearance feature generator:
+As your app evolves, you want to know that authentication still works. If you
+use [Cucumber](http://cukes.info), run the Clearance features generator:
 
-    script/rails generate cucumber
-    script/rails generate clearance_features
+    rails generate clearance_features
 
 Edit your Gemfile to include:
 
     gem 'factory_girl_rails'
 
-Edit your config/enviroments/cucumber.rb to include the following:
+Edit config/enviroments/test.rb to include the following:
 
     config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
-Then run rake!
+Then run your tests!
+
+    rake
 
 Optional Formtastic views
 -------------------------
 
-We use & recommend [Formtastic](http://github.com/justinfrench/formtastic).
-
-Clearance has another generator to generate Formastic views:
-
-    script/rails generate clearance_views
+Clearance can also generate [Formtastic](http://github.com/justinfrench/formtastic) views:
 
-Its implementation is designed so other view styles (Haml?) can be generated.
+    rails generate clearance_views
 
 Extensions
 ----------

data/Rakefile

@@ -1,133 +1,24 @@
 # encoding: utf-8
 
-ENV['BUNDLE_GEMFILE'] = File.dirname(__FILE__) + '/test/rails_root/Gemfile'
-
+require 'rubygems'
+require 'bundler/setup'
 require 'rake'
-require 'rake/testtask'
+require 'rake/gempackagetask'
 require 'cucumber/rake/task'
-require 'spec/rake/spectask'
-
-namespace :test do
-  Rake::TestTask.new(:basic => ["generator:cleanup",
-                                "generator:clearance"]) do |task|
-    task.libs << "lib"
-    task.libs << "test"
-    task.pattern = "test/*/*_test.rb"
-    task.verbose = false
-  end
-
-  Rake::TestTask.new(:views => ["generator:cleanup",
-                                "generator:clearance",
-                                "generator:clearance_views"]) do |task|
-    task.libs << "lib"
-    task.libs << "test"
-    task.pattern = "test/*/*_test.rb"
-    task.verbose = false
-  end
-
-
-  Cucumber::Rake::Task.new(:features => ["generator:cleanup",
-                                         "generator:clearance",
-                                         "generator:clearance_features"]) do |t|
-    t.cucumber_opts   = "--format progress"
-    t.profile = 'features'
-  end
+require 'diesel/tasks'
 
-  Cucumber::Rake::Task.new(:features_for_views => ["generator:cleanup",
-                                                   "generator:clearance",
-                                                   "generator:clearance_features",
-                                                   "generator:clearance_views"]) do |t|
-    t.cucumber_opts   = "--format progress"
-    t.profile = 'features_for_views'
-  end
+Rake::TestTask.new do |task|
+  task.libs << "lib"
+  task.libs << "test"
+  task.pattern = "test/*/*_test.rb"
+  task.verbose = false
 end
 
-namespace :spec do
-  Spec::Rake::SpecTask.new(:basic => %w(spec:generator:cleanup spec:generator:clearance)) do |task|
-    task.spec_files = FileList['spec/*/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:views => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_views)) do |task|
-    task.spec_files = FileList['spec/*/*_spec.rb']
-  end
-
-  Cucumber::Rake::Task.new(:features => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_features)) do |task|
-    task.cucumber_opts = '--format progress'
-    task.profile = 'features_with_rspec'
-  end
-
-  Cucumber::Rake::Task.new(:features_for_views => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_features spec:generator:clearance_views)) do |task|
-    task.cucumber_opts = '--format progress'
-    task.profile = 'features_for_views_with_rspec'
-  end
-
-  namespace :generator do
-    task :cleanup do
-      FileList["spec/rails_root/db/**/*"].each do |each|
-        FileUtils.rm_rf(each)
-      end
-
-      FileUtils.rm_rf("spec/rails_root/vendor/plugins/clearance")
-      FileUtils.rm_rf("spec/rails_root/app/views/passwords")
-      FileUtils.rm_rf("spec/rails_root/app/views/sessions")
-      FileUtils.rm_rf("spec/rails_root/app/views/users")
-      FileUtils.mkdir_p("spec/rails_root/vendor/plugins")
-      clearance_root = File.expand_path(File.dirname(__FILE__))
-      system("ln -s #{clearance_root} spec/rails_root/vendor/plugins/clearance")
-      FileList["spec/rails_root/features/*.feature"].each do |each|
-        FileUtils.rm_rf(each)
-      end
-    end
-
-    task :clearance do
-      system "cd spec/rails_root && bundle install && ./script/rails generate clearance && rake db:migrate db:test:prepare"
-    end
-
-    task :clearance_features do
-      system "cd spec/rails_root && ./script/rails generate clearance_features"
-    end
-
-    task :clearance_views do
-      system "cd spec/rails_root && ./script/rails generate clearance_views"
-    end
-  end
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.fork = true
+  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-namespace :generator do
-  desc "Cleans up the test app before running the generator"
-  task :cleanup do
-    FileList["test/rails_root/db/**/*"].each do |each|
-      FileUtils.rm_rf(each)
-    end
-
-    FileUtils.rm_rf("test/rails_root/app/views/passwords")
-    FileUtils.rm_rf("test/rails_root/app/views/sessions")
-    FileUtils.rm_rf("test/rails_root/app/views/users")
-    FileUtils.mkdir_p("test/rails_root/vendor/plugins")
-    clearance_root = File.expand_path(File.dirname(__FILE__))
-    FileList["test/rails_root/features/*.feature"].each do |each|
-      FileUtils.rm_rf(each)
-    end
-  end
-
-  desc "Run the clearance generator"
-  task :clearance do
-    system "cd test/rails_root && bundle install && ./script/rails generate clearance && rake db:migrate db:test:prepare"
-  end
-
-  desc "Run the clearance features generator"
-  task :clearance_features do
-    system "cd test/rails_root && ./script/rails generate clearance_features"
-  end
-
-  desc "Run the clearance views generator"
-  task :clearance_views do
-    system "cd test/rails_root && ./script/rails generate clearance_views"
-  end
-end
+desc "Default: run the unit tests and cucumber features"
+task :default => [:test, :cucumber]
 
-desc "Run the test suite"
-task :default => ['test:basic', 'test:features',
-                  'test:views', 'test:features_for_views',
-                  'spec:basic', 'spec:features',
-                  'spec:views', 'spec:features_for_views']