RubyGems - clearance - Versions diffs - 1.0.0.rc7 → 1.0.0.rc8 - Mend

clearance 1.0.0.rc7 → 1.0.0.rc8

Potentially problematic release.

This version of clearance might be problematic. Click here for more details.

Files changed (55) hide show

checksums.yaml +6 -14
data/.gitignore +3 -3
data/.travis.yml +0 -17
data/Appraisals +2 -6
data/Gemfile +16 -1
data/Gemfile.lock +116 -107
data/NEWS.md +7 -3
data/README.md +195 -129
data/Rakefile +5 -9
data/app/views/layouts/application.html.erb +1 -1
data/clearance.gemspec +20 -17
data/config/locales/clearance.en.yml +2 -1
data/config/routes.rb +2 -2
data/features/add_migrations_to_project.feature +7 -37
data/features/integration_with_rspec.feature +5 -4
data/features/integration_with_test_unit.feature +11 -38
data/features/step_definitions/configuration_steps.rb +94 -8
data/features/step_definitions/gem_file_steps.rb +8 -0
data/features/support/env.rb +7 -0
data/lib/clearance/authorization.rb +16 -3
data/lib/clearance/configuration.rb +2 -0
data/lib/clearance/engine.rb +1 -1
data/lib/clearance/session.rb +12 -11
data/lib/clearance/testing.rb +0 -4
data/lib/clearance/testing/application.rb +23 -24
data/lib/clearance/testing/helpers.rb +1 -1
data/lib/clearance/user.rb +17 -10
data/lib/clearance/version.rb +1 -1
data/lib/generators/clearance/specs/templates/{integration → features}/clearance/user_signs_out_spec.rb +0 -0
data/lib/generators/clearance/specs/templates/{integration → features}/clearance/visitor_resets_password_spec.rb +24 -0
data/lib/generators/clearance/specs/templates/{integration → features}/clearance/visitor_signs_in_spec.rb +0 -0
data/lib/generators/clearance/specs/templates/{integration → features}/clearance/visitor_signs_up_spec.rb +8 -0
data/lib/generators/clearance/specs/templates/{integration → features}/clearance/visitor_updates_password_spec.rb +0 -0
data/lib/generators/clearance/specs/templates/support/features.rb +5 -0
data/lib/generators/clearance/specs/templates/support/{integration → features}/clearance_helpers.rb +1 -1
data/spec/clearance/session_spec.rb +27 -0
data/spec/controllers/apis_controller_spec.rb +36 -0
data/spec/controllers/passwords_controller_spec.rb +13 -11
data/spec/controllers/sessions_controller_spec.rb +13 -27
data/spec/controllers/users_controller_spec.rb +6 -2
data/spec/factories.rb +5 -0
data/spec/models/user_spec.rb +13 -19
data/spec/support/clearance.rb +9 -0
metadata +36 -218
data/gemfiles/3.0.20.gemfile +0 -7
data/gemfiles/3.0.20.gemfile.lock +0 -173
data/gemfiles/3.1.11.gemfile +0 -7
data/gemfiles/3.1.11.gemfile.lock +0 -183
data/gemfiles/3.2.12.gemfile +0 -7
data/gemfiles/3.2.12.gemfile.lock +0 -182
data/gemfiles/3.2.13.rc2.gemfile +0 -7
data/gemfiles/3.2.13.rc2.gemfile.lock +0 -182
data/lib/clearance/password_strategies/fake.rb +0 -23
data/lib/generators/clearance/specs/templates/support/integration.rb +0 -6
data/lib/generators/clearance/specs/templates/support/integration/action_mailer_helpers.rb +0 -19

data/Rakefile CHANGED

@@ -12,21 +12,17 @@ require 'appraisal'
 require 'clearance/testing/application'
 Clearance::Testing::Application.load_tasks
-task :default do
-  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
-    exec 'rake spec cucumber'
-  else
-    Rake::Task['appraise'].execute
-  end
-end
+desc 'Default'
+task :default => [:all]
-task :appraise => ['appraisal:install'] do
+desc 'Test the engine under all supported Rails versions'
+task :all => ['appraisal:install'] do |t|
   exec 'rake appraisal spec cucumber'
 end
 RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.fork = true
+  t.fork = false
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end

data/app/views/layouts/application.html.erb CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%= javascript_include_tag :defaults %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tag %>
 </head>
 <body>

data/clearance.gemspec CHANGED

@@ -6,8 +6,24 @@ Gem::Specification.new do |s|
   s.name = %q{clearance}
   s.version = Clearance::VERSION
   s.authors = [
-    'Dan Croak', 'Mike Burns', 'Jason Morrison', 'Joe Ferris', 'Eugene Bolshakov',
-    'Nick Quaranto', 'Josh Nichols', 'Mike Breen', 'Jon Yurek', 'Chad Pytel'
+    'Dan Croak',
+    'Eugene Bolshakov',
+    'Mike Burns',
+    'Joe Ferris',
+    'Nick Quaranto',
+    'Josh Nichols',
+    'Matt Jankowski',
+    'Josh Clayton',
+    'Gabe Berke-Williams',
+    'Greg Lazarev',
+    'Mike Breen',
+    'Prem Sichanugrist',
+    'Harlow Ward',
+    'Ryan McGeary',
+    'Derek Prior',
+    'Jason Morrison',
+    'Galen Frechette',
+    'Josh Steiner'
   ]
   s.email = %q{support@thoughtbot.com}
   s.homepage = %q{http://github.com/thoughtbot/clearance}
@@ -23,19 +39,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
   s.add_dependency 'bcrypt-ruby'
-  s.add_dependency 'email_validator'
-  s.add_dependency 'rails', '>= 3.0'
-  s.add_development_dependency 'appraisal', '0.4.1'
-  s.add_development_dependency 'aruba', '0.4.11'
-  s.add_development_dependency 'bourne', '1.3.0'
-  s.add_development_dependency 'bundler', '~> 1.1'
-  s.add_development_dependency 'capybara', '1.1.2'
-  s.add_development_dependency 'cucumber-rails', '1.1.1'
-  s.add_development_dependency 'database_cleaner', '0.8.0'
-  s.add_development_dependency 'factory_girl_rails', '3.5.0'
-  s.add_development_dependency 'psych', '~> 1.3.4'
-  s.add_development_dependency 'rspec-rails', '2.12.2'
-  s.add_development_dependency 'shoulda-matchers', '1.2.0'
-  s.add_development_dependency 'sqlite3', '1.3.6'
-  s.add_development_dependency 'timecop', '0.3.5'
+  s.add_dependency 'email_validator', '~> 1.4'
+  s.add_dependency 'rails', '>= 3.1'
 end

data/config/locales/clearance.en.yml CHANGED

@@ -59,11 +59,12 @@ en:
       title:
         'Reset your password'
   sessions:
-    new:
+    form:
       forgot_password:
         'Forgot password?'
       sign_up:
         'Sign up'
+    new:
       title:
         'Sign in'
   users:

data/config/routes.rb CHANGED

@@ -5,11 +5,11 @@ Rails.application.routes.draw do
   resource :session,
     :controller => 'clearance/sessions',
-    :only => [:create, :new, :destroy]
+    :only => [:create]
   resources :users,
     :controller => 'clearance/users',
-    :only => [:create, :new] do
+    :only => [:create] do
       resource :password,
         :controller => 'clearance/passwords',
         :only => [:create, :edit, :update]

data/features/add_migrations_to_project.feature CHANGED

@@ -2,9 +2,9 @@ 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
+    When I install dependencies
     And I successfully run `bundle exec rails generate clearance:install`
     And I successfully run `ls db/migrate`
     Then the output should contain:
@@ -13,20 +13,9 @@ Feature: add migrations to the project
       """
   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`
+    When I install dependencies
+    And I create a simple migration
+    And I successfully run `bundle exec rake db:migrate`
     And I successfully run `bundle exec rails generate clearance:install`
     And I successfully run `ls db/migrate`
     Then the output should contain:
@@ -35,28 +24,9 @@ Feature: add migrations to the project
       """
   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`
+    When I install dependencies
+    And I create a migration with clearance fields
+    And I successfully run `bundle exec rake db:migrate`
     And I successfully run `bundle exec rails generate clearance:install`
     And I successfully run `ls db/migrate`
     Then the output should not contain:

data/features/integration_with_rspec.feature CHANGED

@@ -7,14 +7,15 @@ Feature: generate rspec integration tests with application
       | 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
+    When I install dependencies
+    And I successfully run `bundle exec rails generate rspec:install`
+    And I successfully run `bundle exec rails generate clearance:specs`
     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`
+    When I successfully run `bundle exec rake db:migrate`
+    And I successfully run `bundle exec rake db:test:prepare`
     And I successfully run `bundle exec rspec`
     Then the output should contain "Finished"
     And the output should not contain "Failed examples"

data/features/integration_with_test_unit.feature CHANGED

@@ -1,43 +1,16 @@
-Feature: integrate with test unit
+Feature: integrate with test-unit
   Background:
-    When I successfully run `bundle exec rails new testapp`
-    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 "factory_girl_rails" gem
-    And I run `bundle install --local`
+    Given I have a project with clearance and the following gems:
+      | gem                |
+      | factory_girl_rails |
+      | cucumber-rails     |
   Scenario: generate a Rails app, run the generators, and run the tests
-    When I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `bundle exec rake db:migrate --trace`
+    When I install dependencies
+    And I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `bundle exec rake db:migrate`
     And I successfully run `bundle exec rails generate controller posts index`
-    And I add the "cucumber-rails" gem
-    And I write to "test/test_helper.rb" with:
-    """
-    ENV['RAILS_ENV'] = 'test'
-    require File.expand_path('../../config/environment', __FILE__)
-    require 'rails/test_help'
-    class ActiveSupport::TestCase
-      fixtures :all
-    end
-    require 'clearance/testing'
-    """
-    And I write to "test/functionals/posts_controller_test.rb" with:
-    """
-    require 'test_helper'
-    class PostsControllerTest < ActionController::TestCase
-      test 'should get index' do
-        sign_in
-        get :index
-        assert_response :success
-      end
-    end
-    """
-    And I successfully run `bundle exec rake --trace`
-    Then the output should contain "1 tests, 1 assertions, 0 failures"
+    And I configure test-unit
+    And I successfully run `bundle exec rake`
+    Then the output should match /1 tests.+1 assertions/

data/features/step_definitions/configuration_steps.rb CHANGED

@@ -1,20 +1,31 @@
+When /^I install dependencies$/ do
+  step "I successfully run `bundle install --local`"
+end
 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 }
+  table.rows.flatten.each do |gem|
+    step %Q{I add the "#{gem}" gem}
   end
 end
 When "I have a project with clearance" do
-  step "I successfully run `bundle exec rails new testapp`"
+  Bundler.with_original_env do
+    step "I successfully run `bundle exec rails new testapp --skip-bundle --skip-javascript --skip-sprockets`"
+  end
+  step 'I cd to "testapp"'
+  unless Clearance::Testing.rails4?
+    step 'I remove the file "public/index.html"'
+  end
   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 remove the "turn" gem from this project
     And I add the "clearance" gem from this project
   }
 end
@@ -49,8 +60,83 @@ When /^I configure a root route$/ do
   CONTROLLER
 end
-When /^I copy the locked Gemfile from this project$/ do
-  in_current_dir do
-    FileUtils.cp(File.join(PROJECT_ROOT, 'Gemfile.lock'), 'Gemfile.lock')
+When /^I configure test-unit$/ do
+  factories_path = File.join(
+    'lib', 'generators', 'clearance', 'specs', 'templates', 'factories',
+    'clearance.rb'
+  )
+  steps %Q{
+    When I append to "test/test_helper.rb" with:
+    """
+    require 'clearance/testing'
+    """
+    And I overwrite "test/#{controller_test_dir}/posts_controller_test.rb" with:
+    """
+    require 'test_helper'
+    class PostsControllerTest < ActionController::TestCase
+      test 'should get index' do
+        sign_in
+        get :index
+        assert_response :success
+      end
+    end
+    """
+    And I write to "test/factories.rb" with:
+    """
+    #{File.read(factories_path)}
+    """
+  }
+end
+When /^I create a simple migration$/ do
+  steps %Q{
+    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
+      """
+  }
+end
+When /^I create a migration with clearance fields$/ do
+  steps %Q{
+    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
+      """
+  }
+end
+def controller_test_dir
+  if Clearance::Testing.rails4?
+    'controllers'
+  else
+    'functional'
   end
 end

data/features/step_definitions/gem_file_steps.rb CHANGED

@@ -5,3 +5,11 @@ end
 When /^I add the "([^"]*)" gem from this project$/ do |gem_name|
   append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "../../.."\n})
 end
+When /^I remove the "([^"]*)" gem from this project$/ do |gem_name|
+  in_current_dir do
+    content = File.read('Gemfile')
+    content.gsub!(/^.*gem 'turn'.*\n/, '')
+    File.open('Gemfile', 'w') { |file| file.write(content) }
+  end
+end

data/features/support/env.rb CHANGED

@@ -13,6 +13,7 @@ require 'clearance/testing/application'
 require 'cucumber/rails/action_controller'
 require 'cucumber/rails/application'
 require 'cucumber/rails/capybara'
+require 'cucumber/rails/database'
 require 'cucumber/rails/hooks'
 require 'cucumber/rails/world'
@@ -26,3 +27,9 @@ begin
 rescue NameError
   raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
 end
+Around do |scenario, block|
+  Bundler.with_clean_env do
+    block.call
+  end
+end

data/lib/clearance/authorization.rb CHANGED

@@ -13,6 +13,15 @@ module Clearance
     end
     def deny_access(flash_message = nil)
+      respond_to do |format|
+        format.any(:js, :json, :xml) { head :unauthorized }
+        format.any { redirect_request(flash_message) }
+      end
+    end
+    protected
+    def redirect_request(flash_message)
       store_location
       if flash_message
@@ -26,8 +35,6 @@ module Clearance
       end
     end
-    protected
     def clear_return_to
       session[:return_to] = nil
     end
@@ -44,7 +51,13 @@ module Clearance
     end
     def return_to
-      session[:return_to] || params[:return_to]
+      if return_to_url
+        URI.parse(return_to_url).path
+      end
+    end
+    def return_to_url
+      session[:return_to]
     end
     def url_after_denied_access_when_signed_in