clearance 1.0.0.rc2 → 1.0.0.rc3

data/lib/generators/clearance/specs/templates/support/integration/clearance_helpers.rb

@@ -0,0 +1,49 @@
+module Integration
+  module ClearanceHelpers
+    def sign_up_with(email, password)
+      visit sign_up_path
+      fill_in 'Email', :with => email
+      fill_in 'Password', :with => password
+      click_button 'Sign up'
+    end
+
+    def sign_in_with(email, password)
+      visit sign_in_path
+      fill_in 'Email', :with => email
+      fill_in 'Password', :with => password
+      click_button 'Sign in'
+    end
+
+    def signed_in_user
+      password = 'password'
+      user = create(:user, :password => password)
+      sign_in_with user.email, password
+      user
+    end
+
+    def user_should_be_signed_in
+      visit root_path
+      page.should have_content('Sign out')
+    end
+
+    def sign_out
+      click_link 'Sign out'
+    end
+
+    def user_should_be_signed_out
+      page.should have_content('Sign in')
+    end
+
+    def user_with_reset_password
+      user = create(:user)
+      reset_password_for user.email
+      user.reload
+    end
+
+    def reset_password_for(email)
+      visit new_password_path
+      fill_in 'Email address', :with => email
+      click_button 'Reset password'
+    end
+  end
+end

data/lib/generators/clearance/views/USAGE

@@ -0,0 +1,15 @@
+Description:
+  Override the default clearance views. This generator will copy all off the
+  base clearance views into your project.
+
+Examples:
+    rails generate clearance:views
+
+      View: app/views/clearance_mailer/change_password.html.erb
+      View: app/views/passwords/create.html.erb
+      View: app/views/passwords/edit.html.erb
+      View: app/views/passwords/new.html.erb
+      View: app/views/sessions/_form.html.erb
+      View: app/views/sessions/new.html.erb
+      View: app/views/users/_form.html.erb
+      View: app/views/users/new.html.erb

data/lib/generators/clearance/views/views_generator.rb

@@ -1,8 +1,29 @@
-require 'diesel/generators/views_base'
+require 'rails/generators/base'
 
 module Clearance
   module Generators
-    class ViewsGenerator < Diesel::Generators::ViewsBase
+    class ViewsGenerator < Rails::Generators::Base
+      source_root Clearance.root
+
+      def create_views
+        views.each do |view|
+          copy_file view
+        end
+      end
+
+      private
+
+      def views
+        files_within_root('.', 'app/views/**/*.*')
+      end
+
+      def files_within_root(prefix, glob)
+        root = "#{self.class.source_root}/#{prefix}"
+
+        Dir["#{root}/#{glob}"].sort.map do |full_path|
+          full_path.sub(root, '.').gsub('/./', '/')
+        end
+      end
     end
   end
 end

data/spec/controllers/passwords_controller_spec.rb

@@ -53,8 +53,7 @@ describe Clearance::PasswordsController do
           ActionMailer::Base.deliveries.should be_empty
         end
 
-        it { should set_the_flash.to(/unknown email/i).now }
-        it { should render_template(:new) }
+        it { should render_template(:create) }
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,15 +8,17 @@ require 'rails/test_help'
 
 Bundler.require
 
-require 'diesel/testing'
+require 'clearance/testing/application'
 require 'rspec/rails'
 require 'bourne'
-require 'timecop'
 require 'factory_girl_rails'
 require 'shoulda-matchers'
 require 'clearance/testing'
+require 'timecop'
+
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
-Dir[Rails.root.join('spec/support/**/*.rb')].each {|f| require f}
+Clearance::Testing::Application.initialize!
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -36,22 +36,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: diesel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -297,16 +281,12 @@ files:
 - cucumber.yml
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
-- features/engine/visitor_resets_password.feature
-- features/engine/visitor_signs_in.feature
-- features/engine/visitor_signs_out.feature
-- features/engine/visitor_signs_up.feature
-- features/integration.feature
+- features/add_migrations_to_project.feature
+- features/integration_with_rspec.feature
 - features/integration_with_test_unit.feature
 - features/step_definitions/configuration_steps.rb
-- features/step_definitions/engine/clearance_steps.rb
+- features/step_definitions/gem_file_steps.rb
 - features/support/aruba.rb
-- features/support/clearance.rb
 - features/support/env.rb
 - gemfiles/3.0.17.gemfile
 - gemfiles/3.0.17.gemfile.lock
@@ -330,17 +310,36 @@ files:
 - lib/clearance/rack_session.rb
 - lib/clearance/session.rb
 - lib/clearance/testing.rb
+- lib/clearance/testing/app/controllers/application_controller.rb
+- lib/clearance/testing/application.rb
 - lib/clearance/testing/assertion_error.rb
+- lib/clearance/testing/config/database.yml
+- lib/clearance/testing/config/routes.rb
 - lib/clearance/testing/deny_access_matcher.rb
 - lib/clearance/testing/helpers.rb
 - lib/clearance/user.rb
 - lib/clearance/version.rb
-- lib/generators/clearance/features/features_generator.rb
 - lib/generators/clearance/install/install_generator.rb
 - lib/generators/clearance/install/templates/README
 - lib/generators/clearance/install/templates/clearance.rb
-- lib/generators/clearance/install/templates/db/migrate/upgrade_clearance_to_diesel.rb
+- lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb
+- lib/generators/clearance/install/templates/db/migrate/create_users.rb
 - lib/generators/clearance/install/templates/user.rb
+- lib/generators/clearance/specs/USAGE
+- lib/generators/clearance/specs/specs_generator.rb
+- lib/generators/clearance/specs/templates/factories/clearance.rb
+- lib/generators/clearance/specs/templates/integration/clearance/user_signs_out_spec.rb
+- lib/generators/clearance/specs/templates/integration/clearance/visitor_resets_password_spec.rb
+- lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_in_spec.rb
+- lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_up_spec.rb
+- lib/generators/clearance/specs/templates/integration/clearance/visitor_updates_password_spec.rb
+- lib/generators/clearance/specs/templates/support/action_mailer.rb
+- lib/generators/clearance/specs/templates/support/clearance.rb
+- lib/generators/clearance/specs/templates/support/factory_girl.rb
+- lib/generators/clearance/specs/templates/support/integration.rb
+- lib/generators/clearance/specs/templates/support/integration/action_mailer_helpers.rb
+- lib/generators/clearance/specs/templates/support/integration/clearance_helpers.rb
+- lib/generators/clearance/views/USAGE
 - lib/generators/clearance/views/views_generator.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb
@@ -386,21 +385,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails authentication & authorization with email & password.
 test_files:
-- features/engine/visitor_resets_password.feature
-- features/engine/visitor_signs_in.feature
-- features/engine/visitor_signs_out.feature
-- features/engine/visitor_signs_up.feature
-- features/integration.feature
+- features/add_migrations_to_project.feature
+- features/integration_with_rspec.feature
 - features/integration_with_test_unit.feature
 - features/step_definitions/configuration_steps.rb
-- features/step_definitions/engine/clearance_steps.rb
+- features/step_definitions/gem_file_steps.rb
 - features/support/aruba.rb
-- features/support/clearance.rb
 - features/support/env.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb

data/features/engine/visitor_resets_password.feature

@@ -1,34 +0,0 @@
-Feature: Password reset
-
-  In order to sign in even if I forgot my password
-  As a user
-  I want to reset my password
-
-  Scenario: User is not signed up
-    When I reset the password for "unknown.email@example.com"
-    Then I am told email is unknown
-
-  Scenario: User is signed up and requests password reset
-    Given I signed up with "email@example.com"
-    When I reset the password for "email@example.com"
-    Then instructions for changing my password are emailed to "email@example.com"
-
-  Scenario: User tries to reset his password with a blank password
-    Given I signed up with "email@example.com"
-    When I reset the password for "email@example.com"
-    And I follow the password reset link sent to "email@example.com"
-    And I update my password with ""
-    Then I am told to enter a password
-    And I should be signed out
-
-  Scenario: User is signed up and updates his password
-    Given I signed up with "email@example.com"
-    When I reset the password for "email@example.com"
-    And I follow the password reset link sent to "email@example.com"
-    And I update my password with "newpassword"
-    Then I should be signed in
-    When I sign out
-    Then I should be signed out
-    When I sign in with "email@example.com" and "newpassword"
-    Then I should be signed in
-

data/features/engine/visitor_signs_in.feature

@@ -1,33 +0,0 @@
-Feature: Sign in
-
-  In order to get access to protected sections of the site
-  As a visitor
-  I want to sign in
-
-  Scenario: Visitor is not signed up
-    When I sign in as "unknown.email@example.com"
-    Then I am told email or password is bad
-    And I should be signed out
-
- Scenario: Visitor enters wrong password
-    Given I am signed up as "email@example.com"
-    When I sign in as "email@example.com" and "badpassword"
-    Then I am told email or password is bad
-    And I should be signed out
-
- Scenario: Visitor signs in successfully
-    Given I am signed up as "email@example.com"
-    When I sign in as "email@example.com"
-    Then I should be signed in
-
- Scenario: Visitor signs in successfully with uppercase email
-    Given I am signed up as "email@example.com"
-    When I sign in as "Email@example.com"
-    Then I should be signed in
-
- Scenario: Visitor enters wrong password and goes to sign up
-    Given I am signed up as "email@example.com"
-    When I sign in as "email@example.com" and "badpassword"
-    Then I am told email or password is bad
-    When I follow the sign up link in the flash
-    Then I should be on the sign up page

data/features/engine/visitor_signs_out.feature

@@ -1,12 +0,0 @@
-Feature: Sign out
-
-  In order to protect my account from unauthorized access
-  As a signed in user
-  I want to sign out
-
-  Scenario: User signs out
-    Given I am signed up as "email@example.com"
-    When I sign in as "email@example.com"
-    Then I should be signed in
-    When I sign out
-    Then I should be signed out

data/features/engine/visitor_signs_up.feature

@@ -1,17 +0,0 @@
-Feature: Sign up
-
-  In order to access protected sections of the site
-  As a visitor
-  I want to sign up
-
-  Scenario: Visitor signs up with invalid email
-    When I sign up with "invalidemail" and "password"
-    Then I should be signed out
-
-  Scenario: Visitor signs up with blank password
-    When I sign up with "email@example.com" and ""
-    Then I should be signed out
-
-  Scenario: Visitor signs up with valid data
-    When I sign up with "email@example.com" and "password"
-    Then I should be signed in

data/features/integration.feature

@@ -1,50 +0,0 @@
-Feature: integrate with application
-
-  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 "cucumber-rails" gem
-    And I add the "capybara" gem
-    And I add the "rspec-rails" gem
-    And I add the "factory_girl_rails" gem
-    And I add the "database_cleaner" gem
-    And I add the "clearance" gem from this project
-    And I run `bundle install --local`
-    And I successfully run `bundle exec rails generate cucumber:install`
-    And I successfully run `bundle exec rails generate clearance:features`
-
-  Scenario: generate a Rails app, run the generators, and run the tests
-    When 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 rake --trace`
-    Then the output should contain "passed"
-    And the output should not contain "failed"
-    And the output should not contain "Could not find generator"
-
-  Scenario: Developer already has a users table in their 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 `bundle exec rake db:migrate --trace`
-    And I successfully run `bundle exec rake --trace`
-    Then the output should contain "passed"
-    And the output should not contain "failed"
-    And the output should not contain "Could not find generator"
-

data/features/step_definitions/engine/clearance_steps.rb

@@ -1,124 +0,0 @@
-# Existing users
-
-require 'factory_girl_rails'
-
-Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
-  FactoryGirl.create :user, :email => email
-end
-
-# Sign up
-
-When /^I sign up (?:with|as) "(.*)" and "(.*)"$/ do |email, password|
-  visit sign_up_path
-  page.should have_css("input[type='email']")
-  fill_in 'Email', :with => email
-  fill_in 'Password', :with => password
-  click_button 'Sign up'
-end
-
-# Sign in
-
-Given /^I sign in$/ do
-  email = FactoryGirl.generate(:email)
-  steps %{
-    Given I have signed up with "#{email}"
-    And I sign in with "#{email}"
-  }
-end
-
-When /^I sign in (?:with|as) "([^"]*)"$/ do |email|
-  step %{I sign in with "#{email}" and "password"}
-end
-
-When /^I sign in (?:with|as) "([^"]*)" and "([^"]*)"$/ do |email, password|
-  visit sign_in_path
-  page.should have_css("input[type='email']")
-  fill_in 'Email', :with => email
-  fill_in 'Password', :with => password
-  click_button 'Sign in'
-end
-
-# Sign out
-
-When 'I sign out' do
-  visit '/'
-  click_link 'Sign out'
-end
-
-# Reset password
-
-When /^I reset the password for "(.*)"$/ do |email|
-  visit new_password_path
-  page.should have_css("input[type='email']")
-  fill_in 'Email address', :with => email
-  click_button 'Reset password'
-end
-
-Then /^instructions for changing my password are emailed to "(.*)"$/ do |email|
-  page.should have_content('instructions for changing your password')
-  user = User.find_by_email!(email)
-  assert !user.confirmation_token.blank?
-  assert !ActionMailer::Base.deliveries.empty?
-
-  result = ActionMailer::Base.deliveries.any? do |email|
-    email.to == [user.email] &&
-    email.subject =~ /password/i &&
-    email.body =~ /#{user.confirmation_token}/
-  end
-
-  assert result
-end
-
-When /^I follow the password reset link sent to "(.*)"$/ do |email|
-  user = User.find_by_email!(email)
-  visit edit_user_password_path(:user_id => user,
-                                :token   => user.confirmation_token)
-end
-
-When /^I change the password of "(.*)" without token$/ do |email|
-  user = User.find_by_email!(email)
-  visit edit_user_password_path(:user_id => user)
-end
-
-When /^I update my password with "(.*)"$/ do |password|
-  fill_in 'Choose password', :with => password
-  click_button 'Save this password'
-end
-
-# Navigation
-
-Then /^I should be on the sign up page$/ do
-  page.current_path.should == sign_up_path
-end
-
-# Flashes
-
-Then /^I am told email or password is bad$/ do
-  page.should have_content('Bad email or password. Are you trying to register a new account? Sign up.')
-end
-
-When /^I follow the sign up link in the flash$/ do
-  within '#flash' do
-    click_link 'Sign up'
-  end
-end
-
-Then /^I am told email is unknown$/ do
-  page.should have_content('Unknown email')
-end
-
-Then /^I am told to enter a password$/ do
-  page.should have_content("Password can't be blank")
-end
-
-# Verification
-
-Then /^I should be signed in$/ do
-  visit '/'
-  page.should have_content 'Sign out'
-end
-
-Then /^I should be signed out$/ do
-  visit '/'
-  page.should have_content 'Sign in'
-end