clearance 0.11.1 → 0.11.2

data/lib/clearance.rb

@@ -1,5 +1,4 @@
 require 'clearance/configuration'
 require 'clearance/authentication'
 require 'clearance/user'
-
 require 'clearance/engine'

data/lib/clearance/test_matchers.rb

@@ -0,0 +1,60 @@
+module Clearance
+  module Test
+    module Matchers
+      def deny_access(opts = {})
+        if opts[:flash]
+          should set_the_flash.to(opts[:flash])
+        else
+          should_not set_the_flash
+        end
+
+        redirect_to(sign_in_url)
+      end
+
+      def redirect_to_url_after_create
+        redirect_to(@controller.send(:url_after_create))
+      end
+
+      def redirect_to_url_after_update
+        redirect_to(@controller.send(:url_after_update))
+      end
+
+      def redirect_to_url_after_destroy
+        redirect_to(@controller.send(:url_after_destroy))
+      end
+
+      def redirect_to_url_already_confirmed
+        redirect_to(@controller.send(:url_already_confirmed))
+      end
+    end
+
+    module Helpers
+      def sign_in_as(user)
+        @controller.current_user = user
+        return user
+      end
+
+      def sign_in
+        sign_in_as Factory(:user)
+      end
+
+      def sign_out
+        @controller.current_user = nil
+      end
+    end
+  end
+end
+
+if defined?(Test::Unit::TestCase)
+  Test::Unit::TestCase.extend  Clearance::Test::Matchers
+  class Test::Unit::TestCase
+    include Clearance::Test::Helpers
+  end
+end
+
+if defined?(RSpec) && RSpec.respond_to?(:configure)
+  RSpec.configure do |config|
+    config.include Clearance::Test::Matchers
+    config.include Clearance::Test::Helpers
+  end
+end

data/lib/clearance/user.rb

@@ -120,7 +120,19 @@ module Clearance
     protected
 
     def generate_hash(string)
-      Digest::SHA1.hexdigest(string)
+      if RUBY_VERSION >= '1.9'
+        Digest::SHA1.hexdigest(string).encode('UTF-8')
+      else
+        Digest::SHA1.hexdigest(string)
+      end
+    end
+
+    def generate_random_code(length = 20)
+      if RUBY_VERSION >= '1.9'
+        SecureRandom.hex(length).encode('UTF-8')
+      else
+        SecureRandom.hex(length)
+      end
     end
 
     def encrypt(string)
@@ -129,7 +141,7 @@ module Clearance
 
     def initialize_salt
       if salt.blank?
-        self.salt = ActiveSupport::SecureRandom.hex(20)
+        self.salt = generate_random_code
       end
     end
 
@@ -140,11 +152,11 @@ module Clearance
     end
 
     def generate_remember_token
-      self.remember_token = ActiveSupport::SecureRandom.hex(20)
+      self.remember_token = generate_random_code
     end
 
     def generate_confirmation_token
-      self.confirmation_token = ActiveSupport::SecureRandom.hex(20)
+      self.confirmation_token = generate_random_code
     end
 
     # Always false. Override to allow other forms of authentication

data/lib/generators/clearance/install/templates/README

@@ -10,14 +10,14 @@ Next steps:
 
    In production it should be your app's domain name.
 
-2. Migrate:
-
-     rake db:migrate
-
-3. Display flashes. For example, in your application layout:
+2. Display flashes. For example, in your application layout:
 
     <% flash.each do |key, value| -%>
-      <div class="flash <%= key %>"><%=h value %></div>
+      <div class="flash <%= key %>"><%= value %></div>
     <% end -%>
 
+3. Migrate:
+
+     rake db:migrate
+
 *******************************************************************************

data/spec/controllers/passwords_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Clearance::PasswordsController do
-  include Shoulda::ActionMailer::Matchers
+  include Shoulda::Matchers::ActionMailer
 
   it { should route(:get, '/users/1/password/edit').
                 to(:controller => 'clearance/passwords', :action  => 'edit', :user_id => '1') }
@@ -87,7 +87,7 @@ describe Clearance::PasswordsController do
         get :edit, :user_id => @user.to_param, :token => ""
       end
 
-      it { should set_the_flash.to(/double check the URL/i) }
+      it { should set_the_flash.to(/double check the URL/i).now }
       it { should render_template(:new) }
     end
 
@@ -96,7 +96,7 @@ describe Clearance::PasswordsController do
         get :edit, :user_id => @user.to_param
       end
 
-      it { should set_the_flash.to(/double check the URL/i) }
+      it { should set_the_flash.to(/double check the URL/i).now }
       it { should render_template(:new) }
     end
 
@@ -154,7 +154,7 @@ describe Clearance::PasswordsController do
         cookies[:remember_token].should be_nil
       end
 
-      it { should set_the_flash.to(/password can't be blank/i) }
+      it { should set_the_flash.to(/password can't be blank/i).now }
       it { should respond_with(:success) }
       it { should render_template(:edit) }
     end

data/spec/factories.rb

@@ -2,11 +2,11 @@ Factory.sequence :email do |n|
   "user#{n}@example.com"
 end
 
-Factory.define :user do |user|
-  user.email    { Factory.next :email }
-  user.password { "password" }
+Factory.define :user do |factory|
+  factory.email    { Factory.next :email }
+  factory.password { "password" }
 end
 
-Factory.define :email_confirmed_user, :parent => :user do |user|
-  user.after_build { warn "[DEPRECATION] The :email_confirmed_user factory is deprecated, please use the :user factory instead." }
+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/spec_helper.rb

@@ -4,62 +4,18 @@ PROJECT_ROOT = File.expand_path("../..", __FILE__)
 $LOAD_PATH << File.join(PROJECT_ROOT, "lib")
 
 require 'rails/all'
+require 'rails/test_help'
+
 Bundler.require
 
 require 'diesel/testing'
-require 'rails/test_help'
 require 'rspec/rails'
 
-require 'clearance'
-require 'clearance/shoulda_macros'
-
-Clearance.configure do |config|
-end
-
-class ApplicationController < ActionController::Base
-  include Clearance::Authentication
-end
-
-class User < ActiveRecord::Base
-  include Clearance::User
-end
+require 'clearance/test_matchers'
 
 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.backtrace_clean_patterns << %r{gems/}
 end
-
-# class ActiveSupport::TestCase
-#   def self.should_set_cookie(name, value, should_expire_at)
-#     description = "set a '#{name}' cookie to '#{value}'"
-#     if should_expire_at
-#       description << " expiring at #{should_expire_at}"
-#     else
-#       description << " with no expiration date (session cookie)"
-#     end
-#     should description do
-#       assert_equal value, cookies[name]
-#       # the following statement may be redundant with the preceding one, but can't hurt
-#       assert_equal value, @response.cookies[name]
-#       # cookies and @response[cookies] don't give us the expire time, so we need to fish it out 'manually'
-#       set_cookie_headers = @response.headers['Set-Cookie']
-#       assert_not_nil set_cookie_headers, "@response.headers['Set-Cookie'] must not be nil"
-#       set_cookie_headers = [set_cookie_headers] if set_cookie_headers.respond_to?(:to_str)
-#       regex = /^#{name}=#{value}(;|$)/
-#       assert_contains set_cookie_headers, regex
-#       cookie = set_cookie_headers.find {|h| h =~ regex}
-#       regex = /; expires=(.*?)(;|$)/
-#       if should_expire_at
-#         assert_contains cookie, regex, "cookie does not contain an 'expires=' attribute"
-#         cookie =~ regex
-#         expires_at = Time.parse($1)
-#         assert_in_delta should_expire_at, expires_at, 100 # number of seconds we don't expect the test suite to exceed
-#       else
-#         assert_does_not_contain cookie, regex, "cookie contains an 'expires=' attribute but it shouldn't"
-#       end
-#     end
-#   end
-# end

data/spec/support/clearance.rb

@@ -0,0 +1,12 @@
+require 'clearance'
+
+Clearance.configure do |config|
+end
+
+class ApplicationController < ActionController::Base
+  include Clearance::Authentication
+end
+
+class User < ActiveRecord::Base
+  include Clearance::User
+end

metadata

@@ -2,7 +2,7 @@
 name: clearance
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors: 
 - Dan Croak
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -27,9 +27,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,9 +64,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .bundle/config
 - .gitignore
 - .rspec
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -98,14 +98,22 @@ files:
 - 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
 - init.rb
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/configuration.rb
 - lib/clearance/engine.rb
-- lib/clearance/shoulda_macros.rb
+- lib/clearance/test_matchers.rb
 - lib/clearance/user.rb
 - lib/generators/clearance/features/features_generator.rb
 - lib/generators/clearance/install/install_generator.rb
@@ -122,8 +130,7 @@ files:
 - spec/mailers/clearance_mailer_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/authorization.rb
-- spec/support/clearance_redirects.rb
+- spec/support/clearance.rb
 - spec/support/cookies.rb
 homepage: http://github.com/thoughtbot/clearance
 licenses: []
@@ -161,5 +168,9 @@ test_files:
 - 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/.bundle/config

@@ -1,2 +0,0 @@
---- {}
-

data/lib/clearance/shoulda_macros.rb

@@ -1,73 +0,0 @@
-module Clearance
-  module Shoulda
-    # STATE OF AUTHENTICATION
-
-    def should_deny_access(opts = {})
-      if opts[:flash]
-        should set_the_flash.to(opts[:flash])
-      else
-        should_not set_the_flash
-      end
-
-      should redirect_to('sign in page') { sign_in_url }
-    end
-
-    # HTTP FLUENCY
-
-    def should_forbid(description, &block)
-      warn "[DEPRECATION] should_forbid and Clearance's ActionController::Forbidden have been removed. Setting the 403 status code turned out to be an awful user experience in some browsers such as Chrome on Windows machines."
-    end
-
-    # RENDERING
-
-    def should_render_nothing
-      should "render nothing" do
-        assert @response.body.blank?
-      end
-    end
-
-    # REDIRECTS
-
-    def should_redirect_to_url_after_create
-      should redirect_to("the post-create url") { @controller.send(:url_after_create) }
-    end
-
-    def should_redirect_to_url_after_update
-      should redirect_to("the post-update url") { @controller.send(:url_after_update) }
-    end
-
-    def should_redirect_to_url_after_destroy
-      should redirect_to("the post-destroy url") { @controller.send(:url_after_destroy) }
-    end
-
-    def should_redirect_to_url_already_confirmed
-      should redirect_to("the already confirmed url") { @controller.send(:url_already_confirmed) }
-    end
-  end
-end
-
-module Clearance
-  module Shoulda
-    module Helpers
-      def sign_in_as(user)
-        @controller.current_user = user
-        return user
-      end
-
-      def sign_in
-        sign_in_as Factory(:email_confirmed_user)
-      end
-
-      def sign_out
-        @controller.current_user = nil
-      end
-    end
-  end
-end
-
-if defined?(Test::Unit::TestCase)
-  class Test::Unit::TestCase
-    include Clearance::Shoulda::Helpers
-  end
-  Test::Unit::TestCase.extend(Clearance::Shoulda)
-end

data/spec/support/authorization.rb

@@ -1,18 +0,0 @@
-module AuthorizationHelpers
-  def sign_in_as(user)
-    @controller.current_user = user
-    return user
-  end
-
-  def sign_in
-    sign_in_as Factory(:email_confirmed_user)
-  end
-
-  def sign_out
-    @controller.current_user = nil
-  end
-end
-
-RSpec.configure do |config|
-  config.include AuthorizationHelpers
-end