clearance 0.16.0 → 0.16.1

data/spec/controllers/forgeries_controller_spec.rb

@@ -21,7 +21,7 @@ describe ForgeriesController do
         match 'sign_in'  => 'clearance/sessions#new', :as => 'sign_in'
       end
 
-      @user = Factory(:user)
+      @user = create(:user)
       @user.update_attribute(:remember_token, "old-token")
       @request.cookies["remember_token"] = "old-token"
       @request.session[:_csrf_token] = "golden-ticket"

data/spec/controllers/passwords_controller_spec.rb

@@ -8,7 +8,7 @@ describe Clearance::PasswordsController do
 
   describe "a signed up user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
     end
 
     describe "on GET to #new" do
@@ -60,7 +60,7 @@ describe Clearance::PasswordsController do
 
   describe "a signed up user and forgotten password" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @user.forgot_password!
     end
 
@@ -157,8 +157,8 @@ describe Clearance::PasswordsController do
 
   describe "given two users and user one signs in" do
     before do
-      @user_one = Factory(:user)
-      @user_two = Factory(:user)
+      @user_one = create(:user)
+      @user_two = create(:user)
       sign_in_as @user_one
     end
   end

data/spec/controllers/sessions_controller_spec.rb

@@ -11,7 +11,7 @@ describe Clearance::SessionsController do
 
   describe "on POST to #create with good credentials" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @user.update_attribute(:remember_token, "old-token")
       post :create, :session => {
                       :email    => @user.email,
@@ -31,7 +31,7 @@ describe Clearance::SessionsController do
 
   describe "on POST to #create with good credentials and a session return url" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @return_url = '/url_in_the_session'
       @request.session[:return_to] = @return_url
       post :create, :session => {
@@ -46,7 +46,7 @@ describe Clearance::SessionsController do
 
   describe "on POST to #create with good credentials and a request return url" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @return_url = '/url_in_the_request'
       post :create, :session => {
                       :email     => @user.email,
@@ -61,7 +61,7 @@ describe Clearance::SessionsController do
 
   describe "on POST to #create with good credentials and a session return url and request return url" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @return_url = '/url_in_the_session'
       @request.session[:return_to] = @return_url
       post :create, :session => {
@@ -85,7 +85,7 @@ describe Clearance::SessionsController do
 
   describe "on DELETE to #destroy with a cookie" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @user.update_attribute(:remember_token, "old-token")
       @request.cookies["remember_token"] = "old-token"
       delete :destroy

data/spec/controllers/users_controller_spec.rb

@@ -25,7 +25,7 @@ describe Clearance::UsersController do
 
     describe "on POST to #create with valid attributes" do
       before do
-        user_attributes = Factory.attributes_for(:user)
+        user_attributes = FactoryGirl.attributes_for(:user)
         @old_user_count = User.count
         post :create, :user => user_attributes
       end
@@ -41,7 +41,7 @@ describe Clearance::UsersController do
 
     describe "on POST to #create with valid attributes and a session return url" do
       before do
-        user_attributes = Factory.attributes_for(:user)
+        user_attributes = FactoryGirl.attributes_for(:user)
         @old_user_count = User.count
         @return_url = '/url_in_the_session'
         @request.session[:return_to] = @return_url
@@ -60,7 +60,7 @@ describe Clearance::UsersController do
 
   describe "A signed-in user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       sign_in_as @user
     end
 

data/spec/factories.rb

@@ -1,12 +1,12 @@
-Factory.sequence :email do |n|
-  "user#{n}@example.com"
-end
+FactoryGirl.define do
 
-Factory.define :user do |factory|
-  factory.email    { Factory.next :email }
-  factory.password { "password" }
-end
+  sequence :email do |n|
+    "user#{n}@example.com"
+  end
+
+  factory :user do
+    email
+    password "password"
+  end
 
-Factory.define :email_confirmed_user, :parent => :user do |factory|
-  factory.after_build { warn "[DEPRECATION] The :email_confirmed_user factory is deprecated, please use the :user factory instead." }
 end

data/spec/mailers/clearance_mailer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ClearanceMailer do
   before do
-    @user  = Factory(:user)
+    @user  = create(:user)
     @user.forgot_password!
     @email = ClearanceMailer.change_password(@user)
   end

data/spec/models/user_spec.rb

@@ -16,19 +16,19 @@ describe User do
     it { should_not allow_value("example.com").for(:email) }
 
     it "should store email in down case" do
-      user = Factory(:user, :email => "John.Doe@example.com")
+      user = create(:user, :email => "John.Doe@example.com")
       user.email.should == "john.doe@example.com"
     end
   end
 
   describe "When multiple users have signed up" do
-    before { Factory(:user) }
+    before { create(:user) }
     it { should validate_uniqueness_of(:email) }
   end
 
   describe "A user" do
     before do
-      @user     = Factory(:user)
+      @user     = create(:user)
       @password = @user.password
     end
 
@@ -50,7 +50,7 @@ describe User do
 
   describe "When resetting authentication with reset_remember_token!" do
     before do
-      @user  = Factory(:user)
+      @user  = create(:user)
       @user.remember_token = "old-token"
       @user.reset_remember_token!
     end
@@ -62,7 +62,7 @@ describe User do
 
   describe "An email confirmed user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @old_encrypted_password = @user.encrypted_password
     end
 
@@ -80,15 +80,15 @@ describe User do
   it "should not generate the same remember token for users with the same password at the same time" do
     Time.stubs(:now => Time.now)
     password    = 'secret'
-    first_user  = Factory(:user, :password => password)
-    second_user = Factory(:user, :password => password)
+    first_user  = create(:user, :password => password)
+    second_user = create(:user, :password => password)
 
     second_user.remember_token.should_not == first_user.remember_token
   end
 
   describe "An user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @old_encrypted_password = @user.encrypted_password
     end
 
@@ -168,13 +168,13 @@ describe User do
 
   describe "user factory" do
     it "should create a valid user with just an overridden password" do
-      Factory.build(:user, :password => "test").should be_valid
+      build(:user, :password => "test").should be_valid
     end
   end
 
   describe "when user exists before Clearance was installed" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{@user.id}"
       ActiveRecord::Base.connection.update(sql)
       @user.reload.salt.should be_nil

data/spec/spec_helper.rb

@@ -20,4 +20,5 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 RSpec.configure do |config|
   config.mock_with :mocha
   config.use_transactional_fixtures = true
+  config.include FactoryGirl::Syntax::Methods
 end

data/spec/support/cookies.rb

@@ -58,7 +58,7 @@ RSpec::Matchers.define :set_cookie do |name, expected_value, expected_expires_at
     @path.should == "/"
   end
 
-  failure_message do
+  failure_message_for_should do
     "Expected #{expectation} got #{result}"
   end
 

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clearance
-version: !ruby/object:Gem::Version 
-  hash: 95
+version: !ruby/object:Gem::Version
+  version: 0.16.1
   prerelease: 
-  segments: 
-  - 0
-  - 16
-  - 0
-  version: 0.16.0
 platform: ruby
-authors: 
+authors:
 - Dan Croak
 - Mike Burns
 - Jason Morrison
@@ -23,156 +18,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+date: 2012-04-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: diesel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 1
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.1.5
-  name: diesel
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 3
-        - 8
-        version: 0.3.8
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: appraisal
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+- !ruby/object:Gem::Dependency
   name: cucumber-rails
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bourne
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
-  version_requirements: *id009
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails authentication & authorization with email & password.
 email: support@thoughtbot.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -184,7 +183,6 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
-- VERSION
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
@@ -213,10 +211,12 @@ files:
 - features/support/aruba.rb
 - features/support/clearance.rb
 - features/support/env.rb
-- gemfiles/3.0.9.gemfile
-- gemfiles/3.0.9.gemfile.lock
-- gemfiles/3.1.0.gemfile
-- gemfiles/3.1.0.gemfile.lock
+- gemfiles/3.0.12.gemfile
+- gemfiles/3.0.12.gemfile.lock
+- gemfiles/3.1.4.gemfile
+- gemfiles/3.1.4.gemfile.lock
+- gemfiles/3.2.3.gemfile
+- gemfiles/3.2.3.gemfile.lock
 - init.rb
 - lib/clearance.rb
 - lib/clearance/authentication.rb
@@ -232,6 +232,7 @@ files:
 - 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
@@ -259,36 +260,37 @@ files:
 - spec/support/cookies.rb
 homepage: http://github.com/thoughtbot/clearance
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Rails authentication & authorization with email & password.
-test_files: []
-
+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/step_definitions/configuration_steps.rb
+- features/step_definitions/engine/clearance_steps.rb
+- features/support/aruba.rb
+- features/support/clearance.rb
+- features/support/env.rb