clearance 1.0.0.rc8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f594b3d9373f5783a6e2304f49ca636bbf7b904d
-  data.tar.gz: e2731151ddda9ff6b6a746b3f789b23f5305335e
+  metadata.gz: dee0a601f1ee2b04fc8878923101650fc4304caa
+  data.tar.gz: 7327399d9f9e95f00b7846b2969a57617f0f6a80
 SHA512:
-  metadata.gz: 633e6622929f3ae73a267f607167f004915f61b679cad2867923cc0ff249eabdf6f3cb29d2dcb9f1fa2b5519f5841468f6e8c2888bd51fe9122865ef4934ce16
-  data.tar.gz: d52bc8b9c6b5e4007d9461b91721ac0db05e7df9b6c4efcb36d93a253ece3d04d09e07e68d0341b10e73128bbf23bd786a7a3b6522c69d6ac91770e3a9b629b1
+  metadata.gz: 3972adda04cb8f7a6d61d963cd5454b1dece3836e74722d91f59b5749a8f88b0e84e437461336c3ed30b9fe3f469d058e06340e339ba78ae48b784ce1dd9d3d5
+  data.tar.gz: 177c710269e683a5a97af3ee372be2fed1db48cb49089c9156a9adc5538c20f3ecf47519546a44fb92a70be212f0794cb6915a5930f33579cba0c1b6f110bb3a

data/.travis.yml

@@ -1,9 +1,16 @@
-language: ruby
+language:
+  - ruby
+
 rvm:
   - 1.9.3
   - 2.0.0
+
+install:
+  - "bundle install"
+
 before_script:
   - "bundle exec rake db:migrate"
+
 branches:
   only:
     - master

data/Gemfile

@@ -13,6 +13,8 @@ gem 'factory_girl_rails', '~> 4.2'
 gem 'jbuilder', '~> 1.2'
 gem 'rspec-rails', '~> 2.13'
 gem 'sdoc'
-gem 'shoulda-matchers', github: 'thoughtbot/shoulda-matchers' , branch: 'dp-rails-four'
+gem 'shoulda-matchers',
+  github: 'thoughtbot/shoulda-matchers',
+  branch: 'dp-rails-four'
 gem 'sqlite3', '~> 1.3'
 gem 'timecop', '~> 0.6'

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/thoughtbot/shoulda-matchers.git
-  revision: 96e734d8946151ebf0e0d4488d05f2da30fdb59a
+  revision: 2b452d5d3970e7319d0d4ea82942960616e05453
   branch: dp-rails-four
   specs:
-    shoulda-matchers (2.1.0)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
 
 PATH
   remote: .
   specs:
-    clearance (1.0.0.rc8)
+    clearance (1.0.0)
       bcrypt-ruby
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -17,45 +17,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
+    arel (4.0.0)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    atomic (1.1.10)
     bcrypt-ruby (3.1.1)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
+    builder (3.1.4)
     capybara (2.0.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -65,16 +63,16 @@ GEM
       xpath (~> 1.0.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.2)
+    cucumber (1.3.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
-      multi_json (~> 1.3)
-    cucumber-rails (1.3.1)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.2.0)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-      rails (~> 3.0)
     database_cleaner (1.0.1)
     diff-lcs (1.2.4)
     email_validator (1.4.0)
@@ -90,60 +88,54 @@ GEM
       multi_json (~> 1.3)
     hike (1.2.3)
     i18n (0.6.4)
-    jbuilder (1.4.2)
+    jbuilder (1.5.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    journey (1.0.4)
     json (1.8.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.23)
-    mini_portile (0.5.0)
-    mocha (0.13.3)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.7.7)
+    multi_test (0.0.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rspec-mocks (2.14.2)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     rubyzip (0.9.9)
     sdoc (0.3.20)
       json (>= 1.1.3)
@@ -153,15 +145,21 @@ GEM
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sprockets (2.2.2)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
     thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
     tilt (1.4.1)
-    timecop (0.6.1)
+    timecop (0.6.2.2)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)

data/NEWS.md

@@ -1,6 +1,6 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
-New for 1.0.0:
+New for 1.0.0 (August 1, 2013):
 
 * Support Rails 4.
 * Change default password strategy to BCrypt.

data/README.md

@@ -23,7 +23,7 @@ It works with Rails 4 and Ruby 2.
 Include the gem in your Gemfile:
 
 ```ruby
-gem 'clearance', '1.0.0.rc7'
+gem 'clearance', '1.0.0'
 ```
 
 Bundle:
@@ -57,11 +57,11 @@ Override any of these defaults in `config/initializers/clearance.rb`:
 Clearance.configure do |config|
   config.cookie_expiration = lambda { 1.year.from_now.utc }
   config.httponly = false
-  config.secure_cookie = false
   config.mailer_sender = 'reply@example.com'
   config.password_strategy = Clearance::PasswordStrategies::BCrypt
-  config.user_model = User
   config.redirect_url = '/'
+  config.secure_cookie = false
+  config.user_model = User
 end
 ```
 
@@ -330,6 +330,30 @@ Clearance.configure do |config|
 end
 ```
 
+Deliver password reset email in a background job
+------------------------------------------------
+
+Clearance has one mailer. It is used to reset the user's password.
+
+To deliver it in a background job using a queue system like [Delayed
+Job](https://github.com/collectiveidea/delayed_job), subclass
+`Clearance::PasswordsController` and define the behavior you need in its
+`deliver_email` method:
+
+```ruby
+class PasswordsController < Clearance::PasswordsController
+  def deliver_email(user)
+    ClearanceMailer.delay.change_password(user)
+  end
+end
+```
+
+Then, override the route:
+
+```ruby
+resources :passwords, only: [:create]
+```
+
 Optional feature specs
 ----------------------
 

data/clearance.gemspec

@@ -3,8 +3,9 @@ require 'clearance/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.name = %q{clearance}
-  s.version = Clearance::VERSION
+  s.add_dependency 'bcrypt-ruby'
+  s.add_dependency 'email_validator', '~> 1.4'
+  s.add_dependency 'rails', '>= 3.1'
   s.authors = [
     'Dan Croak',
     'Eugene Bolshakov',
@@ -25,20 +26,17 @@ Gem::Specification.new do |s|
     'Galen Frechette',
     'Josh Steiner'
   ]
-  s.email = %q{support@thoughtbot.com}
-  s.homepage = %q{http://github.com/thoughtbot/clearance}
-  s.summary = %q{Rails authentication & authorization with email & password.}
-  s.description = %q{Rails authentication & authorization with email & password.}
-
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {features,spec}/*`.split("\n")
+  s.description = 'Rails authentication & authorization with email & password.'
+  s.email = 'support@thoughtbot.com'
   s.extra_rdoc_files = %w(LICENSE README.md)
+  s.files = `git ls-files`.split("\n")
+  s.homepage = 'http://github.com/thoughtbot/clearance'
+  s.license = 'MIT'
+  s.name = %q{clearance}
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']
-
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
-
-  s.add_dependency 'bcrypt-ruby'
-  s.add_dependency 'email_validator', '~> 1.4'
-  s.add_dependency 'rails', '>= 3.1'
+  s.summary = 'Rails authentication & authorization with email & password.'
+  s.test_files = `git ls-files -- {features,spec}/*`.split("\n")
+  s.version = Clearance::VERSION
 end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.0.0.rc8'
+  VERSION = '1.0.0'
 end

data/lib/generators/clearance/install/install_generator.rb

@@ -21,7 +21,11 @@ module Clearance
 
       def create_or_inject_clearance_into_user_model
         if File.exists? 'app/models/user.rb'
-          inject_into User, 'app/models/user.rb', 'include Clearance::User'
+          inject_into_file(
+            'app/models/user.rb',
+            "include Clearance::User\n\n",
+            after: "class User < ActiveRecord::Base\n"
+          )
         else
           copy_file 'user.rb', 'app/models/user.rb'
         end

data/spec/models/bcrypt_migration_from_sha1_spec.rb

@@ -54,9 +54,9 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
       end
 
       it 'does not raise a BCrypt error for invalid passwords' do
-        lambda {
+        expect {
           subject.authenticated? 'bad' + password
-        }.should_not raise_error(BCrypt::Errors::InvalidHash)
+        }.not_to raise_error
       end
 
       it 'saves the subject to database' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc8
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -189,7 +189,8 @@ files:
 - spec/support/fake_model_with_password_strategy.rb
 - spec/support/request_with_remember_token.rb
 homepage: http://github.com/thoughtbot/clearance
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -203,9 +204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.5