devise 0.7.2 → 0.7.3

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.7.3
+
+* bug fix
+  * Give scope to the proper model validation
+
+* enhancements
+  * Mail views are scoped as well
+  * Added update_with_password for authenticatable
+  * Allow render_with_scope to accept :controller option
+
 == 0.7.2
 
 * deprecation

data/TODO

@@ -1,2 +1,3 @@
-* Create update_with_password
 * Make test run with different ORMs
+* Add registerable support
+* Add http authentication support

data/app/models/devise_mailer.rb

@@ -26,7 +26,7 @@ class DeviseMailer < ::ActionMailer::Base
 
     # Configure default email options
     def setup_mail(record, key)
-      mapping = Devise.mappings.values.find { |m| m.to == record.class }
+      mapping = Devise::Mapping.find_by_class(record.class)
       raise "Invalid devise resource #{record}" unless mapping
 
       subject      translate(mapping, key)
@@ -34,7 +34,19 @@ class DeviseMailer < ::ActionMailer::Base
       recipients   record.email
       sent_on      Time.now
       content_type 'text/html'
-      body         mapping.name => record, :resource => record
+      body         render_with_scope(key, mapping, mapping.name => record, :resource => record)
+    end
+
+    def render_with_scope(key, mapping, assigns)
+      if Devise.scoped_views
+        begin
+          render :file => "devise_mailer/#{mapping.as}/#{key}", :body => assigns
+        rescue ActionView::MissingTemplate
+          render :file => "devise_mailer/#{key}", :body => assigns
+        end
+      else
+        render :file => "devise_mailer/#{key}", :body => assigns
+      end
     end
 
     # Setup subject namespaced by model. It means you're able to setup your

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

@@ -1,18 +1,20 @@
 <h2>Sign in</h2>
 
-<% form_for resource_name, resource, :url => session_path(resource_name) do |f| -%>
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
+<%- if devise_mapping.authenticatable? %>
+  <% form_for resource_name, resource, :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>
+    <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 -%>
+    <% if devise_mapping.rememberable? -%>
+      <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+    <% end -%>
 
-  <p><%= f.submit "Sign in" %></p>
-<% end -%>
+    <p><%= f.submit "Sign in" %></p>
+  <% end -%>
+<% end%>
 
 <%- if devise_mapping.recoverable? %>
   <%= link_to "Forgot password?", new_password_path(resource_name) %><br />

data/generators/devise_install/templates/devise.rb

@@ -41,8 +41,9 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in DeviseMailer.
   # config.mailer_sender = "foo.bar@yourapp.com"
 
-  # Configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
-  # config.orm = :active_record
+  # Load and configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
+  # require 'devise/orm/mongo_mapper'
+  # config.orm = :mongo_mapper
 
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "sessions/users/new". It's turned off by default because it's slower if you

data/lib/devise/controllers/helpers.rb

@@ -97,15 +97,17 @@ module Devise
       end
 
       # Render a view for the specified scope. Turned off by default.
-      def render_with_scope(action)
+      # Accepts just :controller as option.
+      def render_with_scope(action, options={})
+        controller_name = options.delete(:controller) || self.controller_name
         if Devise.scoped_views
           begin
             render :template => "#{controller_name}/#{devise_mapping.as}/#{action}"
           rescue ActionView::MissingTemplate
-            render action
+            render action, :controller => controller_name
           end
         else
-          render action
+          render action, :controller => controller_name
         end
       end
 

data/lib/devise/models/authenticatable.rb

@@ -47,7 +47,7 @@ module Devise
           extend ClassMethods
           extend SessionSerializer
 
-          attr_reader :password
+          attr_reader :password, :old_password
           attr_accessor :password_confirmation
         end
       end
@@ -62,11 +62,22 @@ module Devise
         end
       end
 
-      # Verifies whether an incoming_password (ie from login) is the user password.
+      # Verifies whether an incoming_password (ie from sign in) is the user password.
       def valid_password?(incoming_password)
         password_digest(incoming_password) == encrypted_password
       end
 
+      # Update record attributes when :old_password matches, otherwise returns
+      # error on :old_password.
+      def update_with_password(params={})
+        if valid_password?(params[:old_password])
+          update_attributes(params)
+        else
+          errors.add(:old_password, :invalid)
+          false
+        end
+      end
+
       protected
 
         # Digests the password using the configured encryptor.

data/lib/devise/models/validatable.rb

@@ -19,9 +19,8 @@ module Devise
 
         base.class_eval do
           validates_presence_of   :email
-          validates_uniqueness_of :email, :allow_blank => true
-          validates_format_of     :email, :with => EMAIL_REGEX, :allow_blank => true,
-                                          :scope => authentication_keys[1..-1]
+          validates_uniqueness_of :email, :scope => authentication_keys[1..-1], :allow_blank => true
+          validates_format_of     :email, :with  => EMAIL_REGEX, :allow_blank => true
 
           with_options :if => :password_required? do |v|
             v.validates_presence_of     :password

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.7.2".freeze
+  VERSION = "0.7.3".freeze
 end

data/test/mailers/confirmation_instructions_test.rb

@@ -56,4 +56,10 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
     confirmation_url_regexp = %r{<a href=\"http://#{host}/users/confirmation\?confirmation_token=#{user.confirmation_token}">}
     assert_match confirmation_url_regexp, mail.body
   end
+
+  test 'renders a scoped if scoped_views is set to true' do
+    swap Devise, :scoped_views => true do
+      assert_equal user.email, mail.body
+    end
+  end
 end

data/test/models/authenticatable_test.rb

@@ -152,4 +152,30 @@ class AuthenticatableTest < ActiveSupport::TestCase
       User.serialize_from_session([Admin, user.id])
     end
   end
+
+  test 'should respond to old password' do
+    assert new_user.respond_to?(:old_password)
+  end
+
+  test 'should update password with valid old password' do
+    user = create_user
+    assert user.update_with_password(:old_password => '123456',
+      :password => 'pass321', :password_confirmation => 'pass321')
+    assert user.reload.valid_password?('pass321')
+  end
+
+  test 'should add an error to old password when it is invalid' do
+    user = create_user
+    assert_not user.update_with_password(:old_password => 'other',
+      :password => 'pass321', :password_confirmation => 'pass321')
+    assert_equal 'is invalid', user.errors[:old_password]
+    assert user.reload.valid_password?('123456')
+  end
+
+  test 'should not update password with invalid confirmation' do
+    user = create_user
+    assert_not user.update_with_password(:old_password => '123456',
+      :password => 'pass321', :password_confirmation => 'other')
+    assert user.reload.valid_password?('123456')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +01:00
+date: 2009-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency