devise 1.3.4 → 1.4.1

data/test/rails_app/app/controllers/users_controller.rb

@@ -1,5 +1,6 @@
 class UsersController < ApplicationController
-  before_filter :authenticate_user!, :except => :accept
+  prepend_before_filter :current_user, :only => :exhibit
+  before_filter :authenticate_user!, :except => [:accept, :exhibit]
   respond_to :html, :xml
 
   def index
@@ -11,6 +12,10 @@ class UsersController < ApplicationController
     @current_user = current_user
   end
 
+  def exhibit
+    render :text => current_user ? "User is authenticated" : "User is not authenticated"
+  end
+
   def expire
     user_session['last_request_at'] = 31.minutes.ago.utc
     render :text => 'User will be expired on next request'

data/test/rails_app/app/views/home/admin_dashboard.html.erb

@@ -0,0 +1 @@
+Admin dashboard

data/test/rails_app/app/views/home/join.html.erb

@@ -0,0 +1 @@
+Join

data/test/rails_app/app/views/home/user_dashboard.html.erb

@@ -0,0 +1 @@
+User dashboard

data/test/rails_app/config/initializers/devise.rb

@@ -35,6 +35,11 @@ Devise.setup do |config|
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [ :email ]
+  
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
 
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
@@ -172,6 +177,7 @@ Devise.setup do |config|
   # ==> OmniAuth
   config.omniauth :facebook, 'APP_ID', 'APP_SECRET', :scope => 'email,offline_access'
   config.omniauth :open_id
+  config.omniauth :open_id, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

data/test/rails_app/config/routes.rb

@@ -3,6 +3,10 @@ Rails.application.routes.draw do
   resources :users, :only => [:index] do
     get :expire, :on => :member
     get :accept, :on => :member
+
+    authenticate :user do
+      post :exhibit, :on => :member
+    end
   end
 
   resources :admins, :only => [:index]
@@ -19,7 +23,7 @@ Rails.application.routes.draw do
   match "/sign_in", :to => "devise/sessions#new"
 
   # Admin scope
-  devise_for :admin, :path => "admin_area", :controllers => { :sessions => "admins/sessions" }, :skip => :passwords
+  devise_for :admin, :path => "admin_area", :controllers => { :sessions => :"admins/sessions" }, :skip => :passwords
 
   match "/admin_area/home", :to => "admins#index", :as => :admin_root
   match "/anywhere", :to => "foo#bar", :as => :new_admin_password
@@ -28,6 +32,29 @@ Rails.application.routes.draw do
     match "/private", :to => "home#private", :as => :private
   end
 
+  authenticated :admin do
+    match "/dashboard", :to => "home#admin_dashboard"
+  end
+
+  authenticated do
+    match "/dashboard", :to => "home#user_dashboard"
+  end
+
+  unauthenticated do
+    match "/join", :to => "home#join"
+  end
+
+  # Routes for constraints testing
+  devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
+  
+  constraints(:host => /192\.168\.1\.\d\d\d/) do
+    devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
+  end
+  
+  # Routes for format=false testing
+  devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false
+  devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false
+  
   # Other routes for routing_test.rb
   devise_for :reader, :class_name => "User", :only => :passwords
 
@@ -53,5 +80,6 @@ Rails.application.routes.draw do
 
   match "/set", :to => "home#set"
   match "/unauthenticated", :to => "home#unauthenticated"
+
   root :to => "home#index"
-end
+end

data/test/routes_test.rb

@@ -96,6 +96,11 @@ class DefaultRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'users/omniauth_callbacks', :action => 'facebook'}, {:path => 'users/auth/facebook/callback', :method => :post})
     assert_named_route "/users/auth/facebook/callback", :user_omniauth_callback_path, :facebook
 
+    # named open_id
+    assert_recognizes({:controller => 'users/omniauth_callbacks', :action => 'google'}, {:path => 'users/auth/google/callback', :method => :get})
+    assert_recognizes({:controller => 'users/omniauth_callbacks', :action => 'google'}, {:path => 'users/auth/google/callback', :method => :post})
+    assert_named_route "/users/auth/google/callback", :user_omniauth_callback_path, :google
+
     assert_raise ActionController::RoutingError do
       assert_recognizes({:controller => 'ysers/omniauth_callbacks', :action => 'twitter'}, {:path => 'users/auth/twitter/callback', :method => :get})
     end
@@ -171,6 +176,55 @@ class CustomizedRoutingTest < ActionController::TestCase
       assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/delete_or_posts/sign_out', :method => :get})
     end
   end
+  
+  test 'map with constraints defined in hash' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'http://192.168.1.100/headquarters/sign_up', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'http://10.0.0.100/headquarters/sign_up', :method => :get})
+    end
+  end
+  
+  test 'map with constraints defined in block' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'http://192.168.1.100/homebase/sign_up', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'http://10.0.0.100//homebase/sign_up', :method => :get})
+    end
+  end
+  
+  test 'map with format false for sessions' do
+    assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => '/htmlonly_admin/sign_in', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => '/htmlonly_admin/sign_in.xml', :method => :get})
+    end
+  end
+  
+  test 'map with format false for passwords' do
+    assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => '/htmlonly_admin/password', :method => :post})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => '/htmlonly_admin/password.xml', :method => :post})
+    end
+  end
+  
+  test 'map with format false for registrations' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => '/htmlonly_admin/sign_up', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => '/htmlonly_admin/sign_up.xml', :method => :get})
+    end
+  end
+  
+  test 'map with format false for confirmations' do
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => '/htmlonly_users/confirmation', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => '/htmlonly_users/confirmation.xml', :method => :get})
+    end
+  end
+  
+  test 'map with format false for unlocks' do
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => '/htmlonly_users/unlock', :method => :get})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => '/htmlonly_users/unlock.xml', :method => :get})
+    end
+  end
 end
 
 class ScopedRoutingTest < ActionController::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 3
   - 4
-  version: 1.3.4
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-06-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/shared_helpers.rb
 - lib/devise/controllers/url_helpers.rb
+- lib/devise/email.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
 - lib/devise/encryptors/clearance_sha1.rb
@@ -124,6 +125,7 @@ files:
 - lib/devise/hooks/rememberable.rb
 - lib/devise/hooks/timeoutable.rb
 - lib/devise/hooks/trackable.rb
+- lib/devise/mailers/helpers.rb
 - lib/devise/mapping.rb
 - lib/devise/models.rb
 - lib/devise/models/authenticatable.rb
@@ -162,6 +164,13 @@ files:
 - lib/generators/devise/devise_generator.rb
 - lib/generators/devise/install_generator.rb
 - lib/generators/devise/orm_helpers.rb
+- lib/generators/devise/simple_form_for/confirmations/new.html.erb
+- lib/generators/devise/simple_form_for/passwords/edit.html.erb
+- lib/generators/devise/simple_form_for/passwords/new.html.erb
+- lib/generators/devise/simple_form_for/registrations/edit.html.erb
+- lib/generators/devise/simple_form_for/registrations/new.html.erb
+- lib/generators/devise/simple_form_for/sessions/new.html.erb
+- lib/generators/devise/simple_form_for/unlocks/new.html.erb
 - lib/generators/devise/views_generator.rb
 - lib/generators/mongoid/devise_generator.rb
 - lib/generators/templates/README
@@ -178,6 +187,7 @@ files:
 - test/generators/install_generator_test.rb
 - test/generators/mongoid_generator_test.rb
 - test/generators/views_generator_test.rb
+- test/helpers/devise_helper_test.rb
 - test/indifferent_hash.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
@@ -227,8 +237,11 @@ files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
+- test/rails_app/app/views/home/admin_dashboard.html.erb
 - test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/home/join.html.erb
 - test/rails_app/app/views/home/private.html.erb
+- test/rails_app/app/views/home/user_dashboard.html.erb
 - test/rails_app/app/views/layouts/application.html.erb
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb
@@ -311,6 +324,7 @@ test_files:
 - test/generators/install_generator_test.rb
 - test/generators/mongoid_generator_test.rb
 - test/generators/views_generator_test.rb
+- test/helpers/devise_helper_test.rb
 - test/indifferent_hash.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
@@ -360,8 +374,11 @@ test_files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
+- test/rails_app/app/views/home/admin_dashboard.html.erb
 - test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/home/join.html.erb
 - test/rails_app/app/views/home/private.html.erb
+- test/rails_app/app/views/home/user_dashboard.html.erb
 - test/rails_app/app/views/layouts/application.html.erb
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb