clearance 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    clearance (1.0.0.rc2)
+    clearance (1.0.0.rc3)
       bcrypt-ruby
-      diesel (= 0.1.5)
       rails (>= 3.0)
 
 GEM
@@ -69,8 +68,6 @@ GEM
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
-    diesel (0.1.5)
-      railties
     diff-lcs (1.1.3)
     erubis (2.7.0)
     factory_girl (3.5.0)
@@ -152,7 +149,7 @@ GEM
     thor (0.15.4)
     tilt (1.3.3)
     timecop (0.3.5)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)

data/NEWS.md

@@ -3,7 +3,7 @@ New for 1.0.0:
 * Change default password strategy to BCrypt.
 * Provide BCryptMigrationFromSHA1 password strategy to help people migrate from
   SHA1 (the old default password strategy) to BCrypt (the new default).
-* Require Ruby 1.9.2.
+* Require > Ruby 1.9.
 * A revamped, more descriptive README.
 * More extension points in more controllers.
 * The email, encrypted_password, and remember_token fields of the users
@@ -14,6 +14,9 @@ New for 1.0.0:
 * Add a fake password strategy, which is useful when writing tests.
 * Remove deprecated methods on User: remember_me!, generate_random_code,
   password_required?.
+* Improve security when changing password.
+* Replace Cucumber feature generator with RSpec + Capybara.
+* Remove Diesel dependency.
 
 New for 0.16.2:
 

data/README.md

@@ -4,9 +4,9 @@ Clearance
 [![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/clearance)
 
-Rails authentication & authorization with email & password.
+Rails authentication with email & password.
 
-Clearance was extracted out of [Airbrake](http://airbrakeapp.com/).
+Clearance was extracted out of [Airbrake](http://airbrake.io/).
 It is intended to be small, simple, well-tested, and easy to override defaults.
 
 Use [Github Issues](/thoughtbot/clearance/issues) for help.
@@ -280,24 +280,24 @@ You can write a custom password strategy that has two instance methods:
       config.password_strategy = CustomPasswordStrategy
     end
 
-Optional Cucumber features
+Optional Integration tests
 --------------------------
 
-Clearance's Cucumber features are dependent on:
+Clearance's integration tests are dependent on:
 
-* Cucumber
 * Capybara
 * RSpec
 * Factory Girl
 
-As your app evolves, you want to know that authentication still works. If you've
-installed [Cucumber](http://cukes.info) into your app:
+As your app evolves, you want to know that authentication still works. We include support for RSpec integration tests.
 
-    rails generate cucumber:install
+If you've installed [RSpec](https://github.com/rspec/rspec) in your app:
 
-Then, you can use the Clearance features generator:
+    rails generate rspec:install
 
-    rails generate clearance:features
+Then, you can use the Clearance specs generator:
+
+    rails generate clearance:specs
 
 Edit your Gemfile to include:
 

data/Rakefile

@@ -5,7 +5,6 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 
 require 'rake'
-require 'diesel/tasks'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'appraisal'

data/app/controllers/clearance/passwords_controller.rb

@@ -9,11 +9,8 @@ class Clearance::PasswordsController < ApplicationController
     if user = find_user_for_create
       user.forgot_password!
       ::ClearanceMailer.change_password(user).deliver
-      render :template => 'passwords/create'
-    else
-      flash_failure_after_create
-      render :template => 'passwords/new'
     end
+    render :template => 'passwords/create'
   end
 
   def edit
@@ -62,12 +59,6 @@ class Clearance::PasswordsController < ApplicationController
       :default => 'Please double check the URL or try submitting the form again.')
   end
 
-  def flash_failure_after_create
-    flash.now[:notice] = translate(:unknown_email,
-      :scope => [:clearance, :controllers, :passwords],
-      :default => 'Unknown email.')
-  end
-
   def flash_failure_after_update
     flash.now[:notice] = translate(:blank_password,
       :scope => [:clearance, :controllers, :passwords],

data/clearance.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
 
   s.add_dependency 'bcrypt-ruby'
-  s.add_dependency 'diesel', '0.1.5'
   s.add_dependency 'rails', '>= 3.0'
   s.add_development_dependency 'appraisal', '0.4.1'
   s.add_development_dependency 'aruba', '0.4.11'

data/features/add_migrations_to_project.feature

@@ -0,0 +1,65 @@
+Feature: add migrations to the project
+
+  Background:
+    Given I have a project with clearance
+    And I run `bundle install --local`
+
+  Scenario: Users table does not exist
+    And I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `ls db/migrate`
+    Then the output should contain:
+      """
+      create_users.rb
+      """
+
+  Scenario: Users table without clearance fields exists in the database
+    When I write to "db/migrate/001_create_users.rb" with:
+      """
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table(:users) do |t|
+            t.string :email
+            t.string :name
+          end
+        end
+        def self.down
+        end
+      end
+      """
+    And I successfully run `bundle exec rake db:migrate --trace`
+    And I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `ls db/migrate`
+    Then the output should contain:
+      """
+      add_clearance_to_users.rb
+      """
+
+  Scenario: Users table with clearance fields exists in the database
+    When I write to "db/migrate/001_create_users.rb" with:
+      """
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users  do |t|
+            t.timestamps :null => false
+            t.string :email, :null => false
+            t.string :encrypted_password, :limit => 128, :null => false
+            t.string :confirmation_token, :limit => 128
+            t.string :remember_token, :limit => 128, :null => false
+          end
+
+          add_index :users, :email
+          add_index :users, :remember_token
+        end
+
+        def self.down
+          drop_table :users
+        end
+      end
+      """
+    And I successfully run `bundle exec rake db:migrate --trace`
+    And I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `ls db/migrate`
+    Then the output should not contain:
+      """
+      add_clearance_to_users.rb
+      """

data/features/integration_with_rspec.feature

@@ -0,0 +1,21 @@
+Feature: generate rspec integration tests with application
+
+  Background:
+    Given I have a project with clearance and the following gems:
+      | gem                |
+      | capybara           |
+      | rspec-rails        |
+      | factory_girl_rails |
+      | database_cleaner   |
+    And I run `bundle install --local`
+    And I successfully run `bundle exec rails generate rspec:install`
+    And I successfully run `bundle exec rails generate clearance:specs`
+
+  Scenario: generate a Rails app, run the generators, and run the tests
+    And I successfully run `bundle exec rails generate clearance:install`
+    Then the output should contain "Next steps"
+    When I successfully run `bundle exec rake db:migrate --trace`
+    And I successfully run `bundle exec rspec`
+    Then the output should contain "Finished"
+    And the output should not contain "Failed examples"
+    And the output should not contain "Could not find generator"

data/features/step_definitions/configuration_steps.rb

@@ -1,3 +1,24 @@
+When "I have a project with clearance and the following gems:" do |table|
+  step "I have a project with clearance"
+
+  table.map_column!('gem') do |gem|
+    step %Q{ And I add the "#{gem}" gem }
+  end
+end
+
+When "I have a project with clearance" do
+  step "I successfully run `bundle exec rails new testapp`"
+
+  steps %Q{
+    And I cd to "testapp"
+    And I remove the file "public/index.html"
+    And I remove the file "app/views/layouts/application.html.erb"
+    And I configure ActionMailer to use "localhost" as a host
+    And I configure a root route
+    And I add the "clearance" gem from this project
+  }
+end
+
 When /^I configure ActionMailer to use "([^"]+)" as a host$/ do |host|
   mailer_config = "config.action_mailer.default_url_options = { :host => '#{host}' }"
   path = 'config/application.rb'

data/features/step_definitions/gem_file_steps.rb

@@ -0,0 +1,7 @@
+When /^I add the "([^"]*)" gem$/ do |gem_name|
+  append_to_file('Gemfile', %{\ngem "#{gem_name}"\n})
+end
+
+When /^I add the "([^"]*)" gem from this project$/ do |gem_name|
+  append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "../../.."\n})
+end

data/features/support/env.rb

@@ -1,35 +1,25 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
 ENV['RAILS_ENV'] ||= 'test'
 
 PROJECT_ROOT = File.expand_path('../../..', __FILE__)
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 
 require 'rails/all'
+require 'rails/test_help'
 
 Bundler.require
 
-require 'diesel/testing'
-require 'diesel/testing/integration'
-require 'cucumber/rails/application'
+require 'aruba/cucumber'
+require 'clearance/testing/application'
 require 'cucumber/rails/action_controller'
-require 'rails/test_help'
-require 'cucumber/rails/world'
-require 'cucumber/rails/hooks'
+require 'cucumber/rails/application'
 require 'cucumber/rails/capybara'
+require 'cucumber/rails/hooks'
+require 'cucumber/rails/world'
 
-# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
-# order to ease the transition to Capybara we set the default here. If you'd
-# prefer to use XPath just remove this line and adjust any selectors in your
-# steps to use the XPath syntax.
+ActionController::Base.allow_rescue = false
 Capybara.default_selector = :css
 Capybara.save_and_open_page_path = 'tmp'
-
-ActionController::Base.allow_rescue = false
+Clearance::Testing::Application.initialize!
 
 begin
   DatabaseCleaner.strategy = :transaction

data/gemfiles/3.0.17.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
-  remote: /Users/croaky/dev/clearance
+  remote: /Users/harlow/Sites/clearance
   specs:
     clearance (1.0.0.rc2)
       bcrypt-ruby
-      diesel (= 0.1.5)
       rails (>= 3.0)
 
 GEM
@@ -69,8 +68,6 @@ GEM
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
-    diesel (0.1.5)
-      railties
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)

data/gemfiles/3.1.8.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
-  remote: /Users/croaky/dev/clearance
+  remote: /Users/harlow/Sites/clearance
   specs:
     clearance (1.0.0.rc2)
       bcrypt-ruby
-      diesel (= 0.1.5)
       rails (>= 3.0)
 
 GEM
@@ -70,8 +69,6 @@ GEM
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
-    diesel (0.1.5)
-      railties
     diff-lcs (1.1.3)
     erubis (2.7.0)
     factory_girl (3.5.0)

data/gemfiles/3.2.8.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
-  remote: /Users/croaky/dev/clearance
+  remote: /Users/harlow/Sites/clearance
   specs:
     clearance (1.0.0.rc2)
       bcrypt-ruby
-      diesel (= 0.1.5)
       rails (>= 3.0)
 
 GEM
@@ -69,8 +68,6 @@ GEM
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
-    diesel (0.1.5)
-      railties
     diff-lcs (1.1.3)
     erubis (2.7.0)
     factory_girl (3.5.0)

data/{features/support/clearance.rb → lib/clearance/testing/app/controllers/application_controller.rb}

@@ -1,8 +1,3 @@
-require 'clearance'
-
-Clearance.configure do |config|
-end
-
 class ApplicationController < ActionController::Base
   include Clearance::Authentication
 
@@ -10,7 +5,3 @@ class ApplicationController < ActionController::Base
     render :text => '', :layout => 'application'
   end
 end
-
-class User < ActiveRecord::Base
-  include Clearance::User
-end

data/lib/clearance/testing/application.rb

@@ -0,0 +1,46 @@
+require 'rails/all'
+
+module Clearance
+  module Testing
+    APP_ROOT = File.expand_path('..', __FILE__).freeze
+
+    class Application < Rails::Application
+      config.encoding = "utf-8"
+      config.action_mailer.default_url_options = { :host => 'localhost' }
+
+      if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 1
+        config.paths['config/database'] = "#{APP_ROOT}/config/database.yml"
+        config.paths['config/routes'] << "#{APP_ROOT}/config/routes.rb"
+        config.paths['app/controllers'] << "#{APP_ROOT}/app/controllers"
+        config.paths['app/views'] << "#{APP_ROOT}/app/views"
+        config.paths['log'] = "tmp/log/development.log"
+        config.assets.enabled = true
+      else
+        config.paths.config.database = "#{APP_ROOT}/config/database.yml"
+        config.paths.config.routes << "#{APP_ROOT}/config/routes.rb"
+        config.paths.app.controllers << "#{APP_ROOT}/app/controllers"
+        config.paths.app.views << "#{APP_ROOT}/app/views"
+        config.paths.log = "tmp/log"
+      end
+
+      config.cache_classes = true
+      config.whiny_nils = true
+      config.consider_all_requests_local = true
+      config.action_controller.perform_caching = false
+      config.action_dispatch.show_exceptions = false
+      config.action_controller.allow_forgery_protection = false
+      config.action_mailer.delivery_method = :test
+      config.active_support.deprecation = :stderr
+      config.secret_token = "SECRET_TOKEN_IS_MIN_30_CHARS_LONG"
+
+      def require_environment!
+        initialize!
+      end
+
+      def initialize!
+        FileUtils.mkdir_p(Rails.root.join("db").to_s)
+        super unless @initialized
+      end
+    end
+  end
+end

data/lib/clearance/testing/config/database.yml

@@ -0,0 +1,11 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/lib/clearance/testing/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root :to => "application#show"
+end