devise 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,4 +1,16 @@
-== (development)
+== 0.2.1
+
+* refactor
+  * Clean devise_views generator to use devise existing views
+
+* enhancements
+  * [#7] Create instance variables (like @user) for each devise controller
+  * Use Devise::Controller::Helpers only internally
+
+* bug fix
+  * [#6] Fix a bug with Mongrel and Ruby 1.8.6
+
+== 0.2.0
 
 * enhancements
   * [#4] Allow option :null => true in authenticable migration

data/app/controllers/confirmations_controller.rb

@@ -1,8 +1,9 @@
 class ConfirmationsController < ApplicationController
-  before_filter :is_devise_resource?
+  include Devise::Controllers::Helpers
 
   # GET /resource/confirmation/new
   def new
+    build_resource
   end
 
   # POST /resource/confirmation

data/app/controllers/passwords_controller.rb

@@ -1,8 +1,11 @@
 class PasswordsController < ApplicationController
-  before_filter :is_devise_resource?, :require_no_authentication
+  include Devise::Controllers::Helpers
+
+  before_filter :require_no_authentication
 
   # GET /resource/password/new
   def new
+    build_resource
   end
 
   # POST /resource/password

data/app/controllers/sessions_controller.rb

@@ -1,11 +1,13 @@
 class SessionsController < ApplicationController
-  before_filter :is_devise_resource?
+  include Devise::Controllers::Helpers
+
   before_filter :require_no_authentication, :only => [ :new, :create ]
 
   # GET /resource/sign_in
   def new
     unauthenticated! if params[:unauthenticated]
     unconfirmed!     if params[:unconfirmed]
+    build_resource
   end
 
   # POST /resource/sign_in
@@ -15,6 +17,7 @@ class SessionsController < ApplicationController
       redirect_back_or_to home_or_root_path
     else
       unauthenticated!
+      build_resource
       render :new
     end
   end

data/app/views/confirmations/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Resend confirmation instructions</h2>
 
-<% form_for resource_name, :url => confirmation_path(resource_name) do |f| %>
+<% form_for resource, :url => confirmation_path(resource_name) do |f| %>
   <%= f.error_messages %>
 
   <p><%= f.label :email %></p>

data/app/views/passwords/edit.html.erb

@@ -1,6 +1,6 @@
 <h2>Change your password</h2>
 
-<% form_for resource_name, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
+<% form_for resource, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
   <%= f.error_messages %>
   <%= f.hidden_field :reset_password_token %>
 

data/app/views/passwords/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Forgot your password?</h2>
 
-<% form_for resource_name, :url => password_path(resource_name) do |f| %>
+<% form_for resource, :url => password_path(resource_name) do |f| %>
   <%= f.error_messages %>
 
   <p><%= f.label :email %></p>

data/app/views/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Sign in</h2>
 
-<% form_for resource_name, :url => session_path(resource_name) do |f| -%>
+<% form_for resource, :url => session_path(resource_name) do |f| -%>
   <p><%= f.label :email %></p>
   <p><%= f.text_field :email %></p>
 

data/generators/devise_views/devise_views_generator.rb

@@ -1,22 +1,20 @@
 class DeviseViewsGenerator < Rails::Generator::Base
 
+  def initialize(*args)
+    super
+    @source_root = options[:source] || File.join(spec.path, '..', '..', 'app', 'views')
+  end
+
   def manifest
     record do |m|
       views_directory = File.join('app', 'views')
       m.directory views_directory
 
-      {
-        :sessions => [:new],
-        :passwords => [:new, :edit],
-        :confirmations => [:new],
-        :notifier => [:confirmation_instructions, :reset_password_instructions]
-      }.each do |dir, templates|
-        m.directory File.join(views_directory, dir.to_s)
+      Dir[File.join(@source_root, "**/*.erb")].each do |file|
+        file = file.gsub(@source_root, "")[1..-1]
 
-        templates.each do |template|
-          template_path = "#{dir}/#{template}.html.erb"
-          m.file "#{template_path}", "#{views_directory}/#{template_path}"
-        end
+        m.directory  File.join(views_directory, File.dirname(file))
+        m.file       file, File.join(views_directory, file)
       end
     end
   end

data/lib/devise/controllers/filters.rb

@@ -1,5 +1,7 @@
 module Devise
   module Controllers
+    # Those filters are convenience methods added to ApplicationController to
+    # deal with Warden.
     module Filters
 
       def self.included(base)
@@ -89,21 +91,6 @@ module Devise
         METHODS
       end
 
-    protected
-
-      # Helper for use in before_filters where no authentication is required.
-      #
-      # Example:
-      #   before_filter :require_no_authentication, :only => :new
-      def require_no_authentication
-        redirect_to root_path if warden.authenticated?(resource_name)
-      end
-
-      # Checks whether it's a devise mapped resource or not.
-      def is_devise_resource? #:nodoc:
-        raise ActionController::UnknownAction unless devise_mapping && devise_mapping.allows?(controller_name)
-      end
-
     end
   end
 end

data/lib/devise/controllers/helpers.rb

@@ -1,10 +1,16 @@
 module Devise
   module Controllers
+    # Those helpers are used only inside Devise controllers and should not be
+    # included in ApplicationController since they all depend on the url being
+    # accessed.
     module Helpers
 
       def self.included(base)
         base.class_eval do
           helper_method :resource, :resource_name, :resource_class, :devise_mapping
+          hide_action   :resource, :resource_name, :resource_class, :devise_mapping
+
+          before_filter :is_devise_resource?
         end
       end
 
@@ -23,6 +29,11 @@ module Devise
         devise_mapping.to
       end
 
+      # Attempt to find the mapped route for devise based on request path
+      def devise_mapping
+        @devise_mapping ||= Devise.find_mapping_by_path(request.path)
+      end
+
     protected
 
       # Redirects to stored uri before signing in or the default path and clear
@@ -57,9 +68,9 @@ module Devise
         respond_to?(home_path, true) ? send(home_path) : root_path
       end
 
-      # Attempt to find the mapped route for devise based on request path
-      def devise_mapping
-        @devise_mapping ||= Devise.find_mapping_by_path(request.path)
+      # Checks whether it's a devise mapped resource or not.
+      def is_devise_resource? #:nodoc:
+        raise ActionController::UnknownAction unless devise_mapping && devise_mapping.allows?(controller_name)
       end
 
       # Sets the resource creating an instance variable
@@ -67,6 +78,19 @@ module Devise
         instance_variable_set(:"@#{resource_name}", new_resource)
       end
 
+      # Build a devise resource
+      def build_resource
+        self.resource = resource_class.new(params[resource_name])
+      end
+
+      # Helper for use in before_filters where no authentication is required.
+      #
+      # Example:
+      #   before_filter :require_no_authentication, :only => :new
+      def require_no_authentication
+        redirect_to root_path if warden.authenticated?(resource_name)
+      end
+
       # Sets the flash message with :key, using I18n. By default you are able
       # to setup your messages using specific resource scope, and if no one is
       # found we look to default scope.

data/lib/devise/controllers/url_helpers.rb

@@ -15,12 +15,14 @@ module Devise
     #
     #   new_confirmation_path(:user) => new_user_confirmation_path
     #   confirmation_path(:user)     => user_confirmation_path
+    #
+    # Those helpers are added to your ApplicationController.
     module UrlHelpers
 
       [:session, :password, :confirmation].each do |module_name|
         [:path, :url].each do |path_or_url|
           actions = [ nil, :new_ ]
-          actions << :edit_ if module_name == :password
+          actions << :edit_    if module_name == :password
           actions << :destroy_ if module_name == :session
 
           actions.each do |action|

data/lib/devise/failure.rb

@@ -23,7 +23,7 @@ module Devise
       headers["Content-Type"] = 'text/plain'
 
       message = options[:message] || "You are being redirected to #{redirect_path}"
-      [302, headers, message]
+      [302, headers, [message]]
     end
   end
 end

data/lib/devise/routes.rb

@@ -8,7 +8,6 @@ module ActionController::Routing
       load_routes_without_devise!
 
       ActionController::Base.send :include, Devise::Controllers::Filters
-      ActionController::Base.send :include, Devise::Controllers::Helpers
       ActionController::Base.send :include, Devise::Controllers::UrlHelpers
 
       ActionView::Base.send :include, Devise::Controllers::UrlHelpers

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/test/controllers/filters_test.rb

@@ -83,13 +83,6 @@ class ControllerAuthenticableTest < ActionController::TestCase
     @controller.admin_session
   end
 
-  test 'require no authentication tests current mapping' do
-    @controller.expects(:resource_name).returns(:user)
-    @mock_warden.expects(:authenticated?).with(:user).returns(true)
-    @controller.expects(:redirect_to).with(root_path)
-    @controller.send :require_no_authentication
-  end
-
   test 'sign in automatically proxy to set user on warden' do
     @mock_warden.expects(:set_user).with(user = mock, :scope => :user).returns(true)
     @controller.sign_in(:user, user)

data/test/controllers/helpers_test.rb

@@ -1,7 +1,11 @@
 require 'test/test_helper'
 
+class MyController < ApplicationController
+  include Devise::Controllers::Helpers
+end
+
 class HelpersTest < ActionController::TestCase
-  tests ApplicationController
+  tests MyController
 
   test 'get resource name from request path' do
     @request.path = '/users/session'
@@ -37,4 +41,11 @@ class HelpersTest < ActionController::TestCase
   test 'resources methods are not controller actions' do
     assert @controller.class.action_methods.empty?
   end
+
+  test 'require no authentication tests current mapping' do
+    @controller.expects(:resource_name).returns(:user)
+    @mock_warden.expects(:authenticated?).with(:user).returns(true)
+    @controller.expects(:redirect_to).with(root_path)
+    @controller.send :require_no_authentication
+  end
 end

data/test/failure_test.rb

@@ -25,10 +25,10 @@ class FailureTest < ActiveSupport::TestCase
   end
 
   test 'setup a default message' do
-    assert_equal 'You are being redirected to /users/sign_in', call_failure.last
+    assert_equal ['You are being redirected to /users/sign_in'], call_failure.last
   end
 
   test 'pass in a different message' do
-    assert_equal 'Hello world', call_failure(:message => 'Hello world').last
+    assert_equal ['Hello world'], call_failure(:message => 'Hello world').last
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-24 00:00:00 -02:00
+date: 2009-10-27 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,12 +56,6 @@ files:
 - generators/devise/templates/model.rb
 - generators/devise_views/USAGE
 - generators/devise_views/devise_views_generator.rb
-- generators/devise_views/templates/confirmations/new.html.erb
-- generators/devise_views/templates/notifier/confirmation_instructions.html.erb
-- generators/devise_views/templates/notifier/reset_password_instructions.html.erb
-- generators/devise_views/templates/passwords/edit.html.erb
-- generators/devise_views/templates/passwords/new.html.erb
-- generators/devise_views/templates/sessions/new.html.erb
 - init.rb
 - lib/devise.rb
 - lib/devise/active_record.rb
@@ -113,42 +107,42 @@ signing_key:
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
 test_files: 
-- test/controllers/filters_test.rb
-- test/controllers/helpers_test.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/routes.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/environment.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/new_rails_defaults.rb
+- test/rails_app/app/controllers/users_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/models/admin.rb
+- test/rails_app/app/models/organizer.rb
+- test/rails_app/app/models/account.rb
+- test/rails_app/app/models/user.rb
 - test/controllers/url_helpers_test.rb
-- test/models/validatable_test.rb
-- test/models/rememberable_test.rb
-- test/models/confirmable_test.rb
-- test/models/authenticable_test.rb
-- test/models/recoverable_test.rb
-- test/integration/rememberable_test.rb
-- test/integration/confirmable_test.rb
+- test/controllers/helpers_test.rb
+- test/controllers/filters_test.rb
 - test/integration/authenticable_test.rb
+- test/integration/rememberable_test.rb
 - test/integration/recoverable_test.rb
-- test/active_record_test.rb
-- test/test_helper.rb
-- test/mailers/reset_password_instructions_test.rb
+- test/integration/confirmable_test.rb
 - test/mailers/confirmation_instructions_test.rb
+- test/mailers/reset_password_instructions_test.rb
+- test/models/authenticable_test.rb
+- test/models/rememberable_test.rb
+- test/models/recoverable_test.rb
+- test/models/validatable_test.rb
+- test/models/confirmable_test.rb
 - test/failure_test.rb
-- test/routes_test.rb
-- test/rails_app/app/controllers/admins_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/models/account.rb
-- test/rails_app/app/models/user.rb
-- test/rails_app/app/models/admin.rb
-- test/rails_app/app/models/organizer.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/config/environment.rb
-- test/mapping_test.rb
 - test/support/model_tests_helper.rb
 - test/support/assertions_helper.rb
 - test/support/integration_tests_helper.rb
+- test/routes_test.rb
+- test/test_helper.rb
+- test/mapping_test.rb
+- test/active_record_test.rb

data/generators/devise_views/templates/confirmations/new.html.erb

@@ -1,16 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<% form_for resource_name, :url => confirmation_path(resource_name) do |f| %>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend confirmation instructions" %></p>
-<% end %>
-
-<%= link_to "Sign in", new_session_path(resource_name) %><br />
-
-<%- if devise_mapping.recoverable? %>
-  <%= link_to "Forgot password?", new_password_path(resource_name) %><br />
-<% end -%>

data/generators/devise_views/templates/notifier/confirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-Welcome <%= @resource.email %>!
-
-You can confirm your account through the link below:
-
-<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

data/generators/devise_views/templates/notifier/reset_password_instructions.html.erb

@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password, and you can do this through the link below.
-
-<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.

data/generators/devise_views/templates/passwords/edit.html.erb

@@ -1,20 +0,0 @@
-<h2>Change your password</h2>
-
-<% form_for resource_name, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
-  <%= f.error_messages %>
-  <%= f.hidden_field :reset_password_token %>
-
-  <p><%= f.label :password %></p>
-  <p><%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %></p>
-  <p><%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= link_to "Sign in", new_session_path(resource_name) %><br />
-
-<%- if devise_mapping.confirmable? %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>

data/generators/devise_views/templates/passwords/new.html.erb

@@ -1,16 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<% form_for resource_name, :url => password_path(resource_name) do |f| %>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= link_to "Sign in", new_session_path(resource_name) %><br />
-
-<%- if devise_mapping.confirmable? %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>

data/generators/devise_views/templates/sessions/new.html.erb

@@ -1,23 +0,0 @@
-<h2>Sign in</h2>
-
-<% form_for resource_name, :url => session_path(resource_name) do |f| -%>
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.label :password %></p>
-  <p><%= f.password_field :password %></p>
-
-  <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-  <% end -%>
-
-  <p><%= f.submit "Sign in" %></p>
-<% end -%>
-
-<%- if devise_mapping.recoverable? %>
-  <%= link_to "Forgot password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>