thoughtbot-clearance 0.3.2 → 0.3.3

data/README.textile

@@ -6,14 +6,14 @@ Simple, complete Ruby web app authentication.
 
 h2. Gem installation (Rails 2.1+)
 
-Specify the gem dependency in your config/environment.rb file:
+In config/environments/test.rb:
 
-    Rails::Initializer.run do |config|
-      # ...
-      config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => "http://gems.github.com"
-      config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => "http://gems.github.com"
-      config.gem "thoughtbot-clearance", :lib => 'clearance', :source => 'http://gems.github.com/'
-    end
+    config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => "http://gems.github.com"
+    config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => "http://gems.github.com"
+
+In config/environment.rb:
+
+    config.gem "thoughtbot-clearance", :lib => 'clearance', :source => 'http://gems.github.com/'
 
 Then:
 
@@ -101,6 +101,9 @@ Your users table needs a few columns.
     end
 
     add_index :users, [:email, :crypted_password]
+    add_index :users, [:id, :salt]
+    add_index :users, :email
+    add_index :users, :remember_token
 
 h2. Routes
 

data/Rakefile

@@ -1,35 +1,27 @@
 require 'rake'
 require 'rake/testtask'
 require 'date'
- 
+
 test_files_pattern = 'test/rails_root/test/{unit,functional,other}/**/*_test.rb'
 Rake::TestTask.new do |t|
   t.libs << 'lib'
   t.pattern = test_files_pattern
   t.verbose = false
 end
- 
+
 desc "Run the test suite"
 task :default => :test
- 
+
 spec = Gem::Specification.new do |s|
   s.name = "clearance"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/clearance"
   s.description = "Simple, complete Rails authentication scheme."
-  s.authors = ["thoughtbot, inc.", "Dan Croak", "Josh Nichols", "Jason Morrison", "Mike Burns", "Mike Breen"]
+  s.authors = ["thoughtbot, inc.", "Josh Nichols", "Mike Breen"]
   s.files = FileList["[A-Z]*", "{generators,lib,test}/**/*"]
 end
- 
-begin
-  require 'rubygems'
-  require 'jeweler'
-  Jeweler.gemspec = spec
-rescue LoadError 
-  puts "Jeweler not available. sudo gem install technicalpickles-jeweler --source=http://gems.github.com"
-end
- 
+
 namespace :generator do
   task :templates do
     app_files = FileList["test/rails_root/app/{controllers,models,views}/**/*"]
@@ -55,4 +47,4 @@ namespace :generator do
       end
     end
   end
-end
+end

data/generators/clearance/clearance_generator.rb

@@ -66,4 +66,4 @@ class ClearanceGenerator < Rails::Generator::Base
     end
   end
   
-end
+end

data/lib/clearance/app/controllers/application_controller.rb

@@ -62,7 +62,7 @@ module Clearance
           end
 
           def deny_access(flash_message = nil, opts = {})
-            opts[:redirect] ||= new_session_url
+            opts[:redirect] ||= root_url
             store_location
             flash[:error] = flash_message if flash_message
             redirect_to opts[:redirect]

data/lib/clearance/test/functional/confirmations_controller_test.rb

@@ -10,7 +10,7 @@ module Clearance
               context "with the User with the given id's salt" do
                 setup do
                   @user = Factory :user
-                  get :new, :user_id => @user.id, :salt => @user.salt
+                  get :new, :user_id => @user.to_param, :salt => @user.salt
                 end
 
                 should 'find the User record with the given id and salt' do
@@ -27,7 +27,7 @@ module Clearance
                   salt = ''
                   assert_not_equal salt, user.salt
 
-                  get :new, :user_id => user.id, :salt => ''
+                  get :new, :user_id => user.to_param, :salt => ''
                 end
 
                 should_respond_with :not_found

data/lib/clearance/test/functional/passwords_controller_test.rb

@@ -12,7 +12,7 @@ module Clearance
               setup { @user = Factory :user }
 
               context 'A GET to #new' do
-                setup { get :new, :user_id => @user_id }
+                setup { get :new, :user_id => @user.to_param }
 
                 should_respond_with :success
                 should_render_template 'new'
@@ -59,7 +59,7 @@ module Clearance
                 context "with an existing user's id and password" do
                   setup do
                     get :edit, 
-                      :user_id => @user.id, 
+                      :user_id => @user.to_param, 
                       :password => @user.crypted_password, 
                       :email => @user.email
                   end
@@ -86,7 +86,7 @@ module Clearance
 
                 context "with an existing user's id but not password" do
                   setup do
-                    get :edit, :user_id => @user.id, :password => ''
+                    get :edit, :user_id => @user.to_param, :password => ''
                   end
 
                   should_respond_with :not_found
@@ -100,7 +100,7 @@ module Clearance
               context 'A PUT to #update' do
                 context "with an existing user's id but not password" do
                   setup do
-                    put :update, :user_id => @user.id, :password => ''
+                    put :update, :user_id => @user.to_param, :password => ''
                   end
 
                   should "not update the user's password" do
@@ -154,7 +154,7 @@ module Clearance
                     @encrypted_new_password = Digest::SHA1.hexdigest encryption_format
 
                     put(:update,
-                        :user_id => @user.id,
+                        :user_id => @user.to_param,
                         :password => @user.crypted_password,
                         :user => {
                           :password => new_password,

data/lib/clearance/version.rb

@@ -1,7 +1,7 @@
-module Clearance
-  module Version
-    MAJOR = 0
-    MINOR = 3
-    PATCH = 2
+  module Clearance
+    module Version
+      MAJOR = 0
+      MINOR = 3
+      PATCH = 3
+    end
   end
-end

data/test/rails_root/test/test_helper.rb

@@ -7,21 +7,15 @@ ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate("#{RAILS_ROOT}/db/migrate")
 
 gem 'mocha'
-gem 'thoughtbot-quietbacktrace'
 gem 'thoughtbot-factory_girl' # from github
 
 require 'mocha'
-require 'quietbacktrace'
 require 'factory_girl'
+require File.expand_path(File.dirname(__FILE__)) + '/factories'
 
 class Test::Unit::TestCase
-  
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  
-  self.backtrace_silencers << :rails_vendor
-  self.backtrace_filters   << :rails_root
-  
+
   include Clearance::Test::TestHelper
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -07:00
+date: 2008-10-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -142,8 +142,10 @@ files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db
 - test/rails_root/db/bootstrap
+- test/rails_root/db/development.sqlite3
 - test/rails_root/db/migrate
 - test/rails_root/db/migrate/001_create_users.rb
+- test/rails_root/db/schema.rb
 - test/rails_root/db/test.sqlite3
 - test/rails_root/doc
 - test/rails_root/doc/README_FOR_APP
@@ -198,6 +200,8 @@ files:
 - test/rails_root/script/server
 - test/rails_root/test
 - test/rails_root/test/factories.rb
+- test/rails_root/test/fixtures
+- test/rails_root/test/fixtures/mailer
 - test/rails_root/test/functional
 - test/rails_root/test/functional/confirmations_controller_test.rb
 - test/rails_root/test/functional/passwords_controller_test.rb
@@ -211,6 +215,11 @@ files:
 - test/rails_root/test/unit
 - test/rails_root/test/unit/user_mailer_test.rb
 - test/rails_root/test/unit/user_test.rb
+- test/rails_root/tmp
+- test/rails_root/tmp/cache
+- test/rails_root/tmp/pids
+- test/rails_root/tmp/sessions
+- test/rails_root/tmp/sockets
 - test/rails_root/vendor
 - test/rails_root/vendor/gems
 - test/rails_root/vendor/gems/mocha-0.9.1

data/test/rails_root/vendor/plugins/factory_girl_on_rails/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/rails_root/vendor/plugins/factory_girl_on_rails/README

@@ -1,34 +0,0 @@
-factory_girl_on_rails
-=====================
-
-factory_girl_on_rails provides some minor creature comforts for using factory_girl on a Rails project:
-
- * Automatically load factories in RAILS_ROOT/test/factories
- * A generator for putting new factories in RAILS_ROOT/test/factories
-
-
-Installing
-==========
-
-    script/plugin install git://github.com/technicalpickles/factory_girl_on_rails.git
-
-Example
-=======
-
-After installing this plugin, you just start using factories in RAILS_ROOT/test/factories.
-
-As a convenience, a factory generator is provided:
-
-`./script/generate factory account`
-
-    creates an Account factory: test/factories/account_factory.rb
-
-`./script/generate factory post title:string body:text published:boolean`
-
-    creates a Post factory with a string title, text body, and published flag.
-
-
-Copyright
-=========
-
-Copyright (c) 2008 Josh Nichols, released under the MIT license

data/test/rails_root/vendor/plugins/factory_girl_on_rails/init.rb

@@ -1,9 +0,0 @@
-require 'factory_girl'
-
-%w(test spec).each do |dir|
-  factories = File.join(RAILS_ROOT, dir, 'factories.rb')
-  require factories if File.exists?(factories)
-  Dir[File.join(RAILS_ROOT, dir, 'factories', '*.rb')].each do |file|
-    require file
-  end
-end

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/USAGE

@@ -1,18 +0,0 @@
-Description:
-    Stubs out a new factory. Pass the factory name name, under_scored,
-    and an optional list of attribute pairs as arguments.
-
-    Attribute pairs are column_name:sql_type arguments specifying the
-    model's attributes. Timestamps are added by default, so you don't have to
-    specify them by hand as 'created_at:datetime updated_at:datetime'.
-
-    This generates a file in test/factories.
-
-Examples:
-    `./script/generate factory account`
-
-        creates an Account factory: test/factories/account_factory.rb
-
-    `./script/generate factory post title:string body:text published:boolean`
-
-        creates a Post factory with a string title, text body, and published flag.

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/factory_generator.rb

@@ -1,17 +0,0 @@
-class FactoryGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.directory File.join('test/factories', class_path)
-     	m.template 'factory.rb',  File.join('test/factories', class_path, "#{file_name}_factory.rb")
-    end
-  end
-
-  def factory_line(attribute)
-    "#{file_name}.#{attribute.name} '#{attribute.default}'"
-  end
-
-  protected
-    def banner
-      "Usage: #{$0} #{spec.name} FactoryName [field:type, field:type]"
-    end
-end

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/factory.rb

@@ -1,5 +0,0 @@
-Factory.define :<%= file_name %> do |<%= file_name %>|
-<% for attribute in attributes -%>
-  <%= factory_line(attribute) %>
-<% end -%>
-end

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/fixtures.yml

@@ -1,19 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-<% unless attributes.empty? -%>
-one:
-<% for attribute in attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<% end -%>
-
-two:
-<% for attribute in attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<% end -%>
-<% else -%>
-# one:
-#   column: value
-#
-# two:
-#   column: value
-<% end -%>

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/migration.rb

@@ -1,16 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name %> do |t|
-<% for attribute in attributes -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end -%>
-<% unless options[:skip_timestamps] %>
-      t.timestamps
-<% end -%>
-    end
-  end
-
-  def self.down
-    drop_table :<%= table_name %>
-  end
-end

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/model.rb

@@ -1,2 +0,0 @@
-class <%= class_name %> < ActiveRecord::Base
-end

data/test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/unit_test.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class <%= class_name %>Test < ActiveSupport::TestCase
-<% for attribute in attributes -%>
-  should_have_db_column :<%= attribute.name %>
-<% end -%>
-end