clearance 0.11.1 → 0.11.2

data/.gitignore

@@ -4,5 +4,7 @@ pkg
 *.swo
 *~
 !.keep
-tmp
-*.sqlite3
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "3.0.9" do
+  gem "rails", "3.0.9"
+end
+
+appraise "3.1.0.rc4" do
+  gem "rails", "3.1.0.rc4"
+  gem 'sass-rails'
+  gem 'coffee-script'
+  gem 'uglifier'
+  gem 'jquery-rails'
+end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.11.2
+-------------------
+
+* Rails 3.1.rc compatible. (Prem Sichanugrist and Dan Croak)
+* Cucumber features no longer require password. (Dan Croak)
+* No more Clearance shoulda_macros. Instead providing RSpec- and Test::Unit-compliant test matchers (sign_in, sign_in_as, should deny_access, etc). (Dan Croak)
+
 0.11.1
 -------------------
 

data/Gemfile

@@ -1,15 +1,17 @@
 source "http://rubygems.org"
-gem "aruba", "~> 0.2.7"
-gem "rake"
-gem "rails", ">= 3.0.7"
-gem "thin"
-gem "shoulda"
+
+gem "rails", "3.0.9"
 gem "sqlite3"
-gem "factory_girl"
-gem "diesel"
-gem "cucumber-rails", '0.3.2'
-gem "capybara"
+
+gem "diesel", :git => "git://github.com/thoughtbot/diesel.git"
+
+gem "cucumber-rails", '1.0.0'
+gem "capybara", "1.0.0"
 gem "factory_girl_rails"
-gem "rspec-rails"
+gem "shoulda-matchers", :git => "git://github.com/thoughtbot/shoulda-matchers.git"
+gem "database_cleaner"
+gem "rspec-rails", "~> 2.6.0"
 gem "launchy"
 gem "mocha"
+gem "appraisal", :git => "git://github.com/thoughtbot/appraisal.git"
+gem "aruba", "~> 0.4.2"

data/Gemfile.lock

@@ -1,13 +1,35 @@
+GIT
+  remote: git://github.com/thoughtbot/appraisal.git
+  revision: f8029181543b4bc4bdea03735a3b1e558fd66501
+  specs:
+    appraisal (0.3.5)
+      aruba (~> 0.4.2)
+      bundler
+      rake
+
+GIT
+  remote: git://github.com/thoughtbot/diesel.git
+  revision: f68a990573e2684bb4645a90876603de0a772b69
+  specs:
+    diesel (0.1.4)
+      railties
+
+GIT
+  remote: git://github.com/thoughtbot/shoulda-matchers.git
+  revision: a922b8ec38b65ae3274f194e90eaff6ac642d0b1
+  specs:
+    shoulda-matchers (1.0.0.beta3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,65 +37,64 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
-    aruba (0.2.8)
-      childprocess (~> 0.1.6)
-      cucumber (~> 0.10.0)
-      rspec (~> 2.3.0)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    arel (2.0.10)
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
-    childprocess (0.1.8)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
       ffi (~> 1.0.6)
-    configuration (1.2.0)
-    cucumber (0.10.2)
+    configuration (1.3.1)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    culerity (0.2.15)
-    daemons (1.1.3)
-    diesel (0.1.4)
-      railties (~> 3.0.3)
+    cucumber-rails (1.0.0)
+      capybara (>= 1.0.0)
+      cucumber (~> 1.0.0)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    eventmachine (0.12.10)
     factory_girl (1.3.3)
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
       railties (>= 3.0.0)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
-    gherkin (2.3.6)
+    ffi (1.0.9)
+    gherkin (2.4.1)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json (1.5.3)
+    json_pure (1.5.3)
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -84,57 +105,55 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
-    nokogiri (1.4.4)
+    nokogiri (1.4.6)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rdoc (3.7)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.0)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    shoulda (2.11.3)
     sqlite3 (1.3.3)
     term-ansicolor (1.0.5)
-    thin (1.2.11)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -142,17 +161,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.2.7)
-  capybara
-  cucumber-rails (= 0.3.2)
-  diesel
-  factory_girl
+  appraisal!
+  aruba (~> 0.4.2)
+  capybara (= 1.0.0)
+  cucumber-rails (= 1.0.0)
+  database_cleaner
+  diesel!
   factory_girl_rails
   launchy
   mocha
-  rails (>= 3.0.7)
-  rake
-  rspec-rails
-  shoulda
+  rails (= 3.0.9)
+  rspec-rails (~> 2.6.0)
+  shoulda-matchers!
   sqlite3
-  thin

data/README.md

@@ -17,7 +17,7 @@ Help
 Installation
 ------------
 
-Clearance is a Rails engine for Rails 3.
+Clearance is a Rails engine for Rails 3. It is currently tested against Rails 3.0.9 and Rails 3.1.0.rc4.
 
 Include the gem in your Gemfile:
 
@@ -33,6 +33,8 @@ This:
 * inserts Clearance::Authentication into your ApplicationController
 * creates a migration that either creates a users table or adds only missing columns
 
+Follow the instructions that are output from the generator.
+
 Use the [0.8.x](https://github.com/thoughtbot/clearance/tree/v0.8.8)
 series of Clearance if you have a Rails 2 app.
 
@@ -44,20 +46,30 @@ method in a before_filter.
 
     class WidgetsController < ApplicationController
       before_filter :authorize
+
       def index
         @widgets = Widget.all
       end
     end
 
+If you want to reference the current user in a controller, view, or helper, use
+the current_user method.
+
+    def index
+      current_user.articles
+    end
+
 Customizing
 -----------
 
-To change any of provided actions, subclass a Clearance controller...
+If you ever need to change the logic in any of the four provided controllers,
+subclass the Clearance controller. You don't need to do this by default.
 
     class SessionsController < Clearance::SessionsController
       def new
         # my special new action
       end
+
       def url_after_create
         my_special_path
       end
@@ -96,6 +108,15 @@ Then run your tests!
 
     rake
 
+Optional test matchers
+----------------------
+
+Clearance comes with test matchers that are compatible with RSpec and Test::Unit.
+
+To use them, require the test matchers. For example, in spec/support/clearance.rb:
+
+    require 'clearance/shoulda_matchers'
+
 Extensions
 ----------
 

data/Rakefile

@@ -7,6 +7,15 @@ require 'rake/gempackagetask'
 require 'cucumber/rake/task'
 require 'diesel/tasks'
 require 'rspec/core/rake_task'
+require 'appraisal'
+
+desc "Default: run the specs and cucumber features"
+task :default => [:all]
+
+desc 'Test the plugin under all supported Rails versions.'
+task :all => ["appraisal:install"] do |t|
+  exec('rake appraisal spec cucumber')
+end
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
@@ -16,7 +25,3 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
-
-desc "Default: run the specs and cucumber features"
-task :default => [:spec, :cucumber]
-

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/app/mailers/clearance_mailer.rb

@@ -1,10 +1,10 @@
 class ClearanceMailer < ActionMailer::Base
   def change_password(user)
     @user = user
-    from       Clearance.configuration.mailer_sender
-    recipients @user.email
-    subject    I18n.t(:change_password,
-                      :scope   => [:clearance, :models, :clearance_mailer],
-                      :default => "Change your password")
+    mail :from    => Clearance.configuration.mailer_sender,
+         :to      => @user.email,
+         :subject => I18n.t(:change_password,
+                           :scope   => [:clearance, :models, :clearance_mailer],
+                           :default => "Change your password")
   end
 end

data/app/views/clearance_mailer/change_password.html.erb

@@ -2,8 +2,6 @@ Someone, hopefully you, has requested that we send you a link to change your pas
 
 Here's the link:
 
-<%= edit_user_password_url(@user,
-      :token  => @user.confirmation_token,
-      :escape => false) %>
+<%= edit_user_password_url(@user, :token => @user.confirmation_token.html_safe) %>
 
 If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed.

data/clearance.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ["lib"]
   s.rubygems_version = %q{1.3.7}
 
-  s.add_dependency('rails',  '~> 3.0.0')
+  s.add_dependency('rails',  '>= 3.0')
   s.add_dependency('diesel', '~> 0.1.4')
 
   s.add_development_dependency('bundler', '~> 1.0.0')