clearance 0.12.0 → 0.13.0

data/spec/models/user_spec.rb

@@ -15,27 +15,6 @@ describe User do
     it { should_not allow_value("foo").for(:email) }
     it { should_not allow_value("example.com").for(:email) }
 
-    it "should initialize salt" do
-      Factory(:user).salt.should_not be_nil
-    end
-
-    describe "encrypt password" do
-      before do
-        @salt = "salt"
-        @user = Factory.build(:user, :salt => @salt)
-        def @user.initialize_salt; end
-        @user.save!
-        @password = @user.password
-
-        @user.send(:encrypt, @password)
-        @expected = Digest::SHA1.hexdigest("--#{@salt}--#{@password}--")
-      end
-
-      it "should create an encrypted password using SHA1 encryption" do
-        @user.encrypted_password.should == @expected
-      end
-    end
-
     it "should store email in down case" do
       user = Factory(:user, :email => "John.Doe@example.com")
       user.email.should == "john.doe@example.com"
@@ -210,4 +189,17 @@ describe User do
       @user.remember_token.should_not be_nil
     end
   end
+
+  describe "The password setter on a User" do
+    let(:password) { "a-password" }
+    before { subject.send(:password=, password) }
+
+    it "sets password to the plain-text password" do
+      subject.password.should == password
+    end
+
+    it "also sets encrypted_password" do
+      subject.encrypted_password.should_not be_nil
+    end
+  end
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clearance
-version: !ruby/object:Gem::Version 
-  hash: 47
+version: !ruby/object:Gem::Version
+  version: 0.13.0
   prerelease: 
-  segments: 
-  - 0
-  - 12
-  - 0
-  version: 0.12.0
 platform: ruby
-authors: 
+authors:
 - Dan Croak
 - Mike Burns
 - Jason Morrison
@@ -23,71 +18,109 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-30 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70265408068760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: diesel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70265408068760
+- !ruby/object:Gem::Dependency
+  name: diesel
+  requirement: &70265408068200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
+      - !ruby/object:Gem::Version
+        version: 0.1.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70265408068200
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70265408067620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70265408067620
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70265408067060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :development
+  prerelease: false
+  version_requirements: *70265408067060
+- !ruby/object:Gem::Dependency
+  name: cucumber-rails
+  requirement: &70265408066600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: *70265408066600
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70265408066020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70265408066020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70265408065580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265408065580
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70265408065080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265408065080
 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
 - Appraisals
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -103,6 +136,7 @@ files:
 - app/views/passwords/create.html.erb
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
+- app/views/sessions/_form.html.erb
 - app/views/sessions/new.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/new.html.erb
@@ -118,22 +152,20 @@ files:
 - features/integration.feature
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/engine/clearance_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/appraisal.rb
 - features/support/aruba.rb
 - features/support/clearance.rb
 - features/support/env.rb
-- features/support/paths.rb
-- features/support/selectors.rb
 - gemfiles/3.0.9.gemfile
 - gemfiles/3.0.9.gemfile.lock
-- gemfiles/3.1.0.rc4.gemfile
-- gemfiles/3.1.0.rc4.gemfile.lock
+- gemfiles/3.1.0.gemfile
+- gemfiles/3.1.0.gemfile.lock
 - init.rb
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/configuration.rb
 - lib/clearance/engine.rb
+- lib/clearance/password_strategies.rb
+- lib/clearance/password_strategies/sha1.rb
 - lib/clearance/testing.rb
 - lib/clearance/testing/assertion_error.rb
 - lib/clearance/testing/deny_access_matcher.rb
@@ -153,45 +185,38 @@ files:
 - spec/controllers/users_controller_spec.rb
 - spec/factories.rb
 - spec/mailers/clearance_mailer_spec.rb
+- spec/models/clearance_user_spec.rb
+- spec/models/sha1_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb
-has_rdoc: true
 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.6.2
+rubygems_version: 1.8.6
 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
@@ -199,10 +224,6 @@ test_files:
 - features/integration.feature
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/engine/clearance_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/appraisal.rb
 - features/support/aruba.rb
 - features/support/clearance.rb
 - features/support/env.rb
-- features/support/paths.rb
-- features/support/selectors.rb

data/features/step_definitions/web_steps.rb

@@ -1,211 +0,0 @@
-# TL;DR: YOU SHOULD DELETE THIS FILE
-#
-# This file was generated by Cucumber-Rails and is only here to get you a head start
-# These step definitions are thin wrappers around the Capybara/Webrat API that lets you
-# visit pages, interact with widgets and make assertions about page content.
-#
-# If you use these step definitions as basis for your features you will quickly end up
-# with features that are:
-#
-# * Hard to maintain
-# * Verbose to read
-#
-# A much better approach is to write your own higher level step definitions, following
-# the advice in the following blog posts:
-#
-# * http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
-# * http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
-# * http://elabs.se/blog/15-you-re-cuking-it-wrong
-#
-
-
-require 'uri'
-require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
-
-module WithinHelpers
-  def with_scope(locator)
-    locator ? within(*selector_for(locator)) { yield } : yield
-  end
-end
-World(WithinHelpers)
-
-# Single-line step scoper
-When /^(.*) within ([^:]+)$/ do |step, parent|
-  with_scope(parent) { When step }
-end
-
-# Multi-line step scoper
-When /^(.*) within ([^:]+):$/ do |step, parent, table_or_string|
-  with_scope(parent) { When "#{step}:", table_or_string }
-end
-
-Given /^(?:|I )am on (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )press "([^"]*)"$/ do |button|
-  click_button(button)
-end
-
-When /^(?:|I )follow "([^"]*)"$/ do |link|
-  click_link(link)
-end
-
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
-end
-
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
-end
-
-# Use this to fill in an entire form with data from a table. Example:
-#
-#   When I fill in the following:
-#     | Account Number | 5002       |
-#     | Expiry date    | 2009-11-01 |
-#     | Note           | Nice guy   |
-#     | Wants Email?   |            |
-#
-# TODO: Add support for checkbox, select og option
-# based on naming conventions.
-#
-When /^(?:|I )fill in the following:$/ do |fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "#{name}" with "#{value}"}
-  end
-end
-
-When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
-end
-
-When /^(?:|I )check "([^"]*)"$/ do |field|
-  check(field)
-end
-
-When /^(?:|I )uncheck "([^"]*)"$/ do |field|
-  uncheck(field)
-end
-
-When /^(?:|I )choose "([^"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
-  attach_file(field, File.expand_path(path))
-end
-
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
-  end
-end
-
-Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
-  else
-    assert page.has_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
-  else
-    assert page.has_no_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should
-      field_value.should =~ /#{value}/
-    else
-      assert_match(/#{value}/, field_value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should_not
-      field_value.should_not =~ /#{value}/
-    else
-      assert_no_match(/#{value}/, field_value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_true
-    else
-      assert field_checked
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_false
-    else
-      assert !field_checked
-    end
-  end
-end
- 
-Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  query = URI.parse(current_url).query
-  actual_params = query ? CGI.parse(query) : {}
-  expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
-end
-
-Then /^show me the page$/ do
-  save_and_open_page
-end