janus 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db69af223011b34004ed7c3b3d3b0b94d1c143ae
-  data.tar.gz: 4648e6814dc5578a272ca63d93d021e7d6753e8c
+  metadata.gz: cfd15bc79e41899bc65c3eddc3042f11524e4616
+  data.tar.gz: f836a95402bb7371fe25d1af49cd5841b74bb6b3
 SHA512:
-  metadata.gz: 0ab6bbc22c50eff38c2162aecad2ce3db7a1ba8a21c17cc06a1cb0a96b554bb2322626747176b294a92efd10a0569f7d269244e09a0df6d6a2bbf8ce7dc38d62
-  data.tar.gz: 23e1f598b215370df21ae5b3e20e10ababf958c275364a717e060f228fa2192f66abe2a0cab981fc63f60b5778403f954da1841a78a25003547458775bfe0927
+  metadata.gz: 15d3598d95a4e264a6087fea6244fe4937849c759dca34ffd0377a0764ef1b5a633bb98004e083e7a15136999d8535d71674e1944a9d913799af69ccb9601720
+  data.tar.gz: ee62d38fd4070283177a52176ac77525ad0994e991aaa0f579b2e9f559ad4ba38ae0a86c679c42f449825f2979c14cac43cb10b1410387d254a4309699e7983a

data/README.rdoc

@@ -25,7 +25,7 @@ As for the strategies and hooks:
   to keep users signed in across top level domains;
 - {TokenAuthenticatable}[http://rdoc.info/github/ysbaddaden/janus/Janus/Models/TokenAuthenticatable]
   to auth users with unique tokens;
-- {Confirmable}[http://rdoc.info/github/ysbaddaden/janus/Janus/Models/RemoteAuthenticatable]
+- {Confirmable}[http://rdoc.info/github/ysbaddaden/janus/Janus/Models/Confirmable]
   to have users confirm their emails upon registration;
 - {Rememberable}[http://rdoc.info/github/ysbaddaden/janus/Janus/Models/Rememberable]
   to keep users authentified;

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

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

@@ -4,6 +4,7 @@
   <%%= janus_error_messages %>
 
   <%%= f.hidden_field :reset_password_token %>
+  <%%= hidden_field_tag :return_to, params[:return_to] if params[:return_to] %>
 
   <div class="field">
     <%%= f.label :password %>

data/lib/janus/controllers/confirmations_controller.rb

@@ -37,7 +37,7 @@ class Janus::ConfirmationsController < ApplicationController
     self.resource = resource_class.find_for_database_authentication(params[resource_name])
 
     if resource
-      mailer_class.confirmation_instructions(resource).deliver
+      deliver_confirmation_instructions
 
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.confirmations.create.email_sent') }
@@ -55,4 +55,10 @@ class Janus::ConfirmationsController < ApplicationController
       end
     end
   end
+
+  # Simple wrapper for Mailer#confirmation_instructions.deliver to
+  # allow customization of the email (eg: to pass additional data).
+  def deliver_confirmation_instructions
+    mailer_class.confirmation_instructions(resource).deliver
+  end
 end

data/lib/janus/controllers/passwords_controller.rb

@@ -15,7 +15,7 @@ class Janus::PasswordsController < ApplicationController
 
     if resource
       resource.generate_reset_password_token!
-      mailer_class.reset_password_instructions(resource).deliver
+      deliver_reset_password_instructions
 
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.passwords.create.email_sent') }
@@ -44,7 +44,7 @@ class Janus::PasswordsController < ApplicationController
     if resource
       if resource.reset_password!(params[resource_name])
         respond_to do |format|
-          format.html { redirect_to root_url, :notice => t('flash.janus.passwords.update.password_updated') }
+          format.html { redirect_after_password_change(self.resource, :notice => t('flash.janus.passwords.update.password_updated')) }
           format.any  { head :ok }
         end
       else
@@ -60,4 +60,24 @@ class Janus::PasswordsController < ApplicationController
       end
     end
   end
+
+  # Simple wrapper for Mailer#reset_password_instructions.deliver to
+  # allow customization of the email (eg: to pass additional data).
+  def deliver_reset_password_instructions
+    mailer_class.reset_password_instructions(resource).deliver
+  end
+
+  # Either redirects the user to after_password_change_url or to
+  # <tt>params[:return_to]</tt> if present.
+  def redirect_after_password_change(user, options = {})
+    if params[:return_to].present?
+      redirect_to params[:return_to], options
+    else
+      redirect_to after_password_change_url(user), options
+    end
+  end
+
+  def after_password_change_url(user)
+    root_url
+  end
 end

data/lib/janus/mailer.rb

@@ -1,5 +1,5 @@
 class Janus::Mailer < ActionMailer::Base
-  default_from = Janus::Config.contact_email
+  default from: Janus::Config.contact_email
 
   def reset_password_instructions(user)
     @user = user

data/lib/janus/routes.rb

@@ -67,6 +67,7 @@ module ActionDispatch # :nodoc:
 
             resource :confirmation, :only => [:show, :new, :create] if options[:confirmation]
             resource :password, :except => [:index, :show, :destroy] if options[:password]
+            yield if block_given?
           end
 
           ActionController::Base.janus(singular)

data/test/functional/users/passwords_controller_test.rb

@@ -73,7 +73,9 @@ class Users::PasswordsControllerTest < ActionController::TestCase
   test "should update" do
     users(:julien).generate_reset_password_token!
 
-    put :update, :user => @attributes.merge(:reset_password_token => users(:julien).reset_password_token)
+    put :update, :user => @attributes.merge(
+      :reset_password_token => users(:julien).reset_password_token
+    )
     assert_redirected_to root_url
     assert flash[:notice]
 
@@ -128,4 +130,12 @@ class Users::PasswordsControllerTest < ActionController::TestCase
     assert_redirected_to root_url
     assert flash[:alert]
   end
+
+  test "should redirect to specified URL" do
+    users(:julien).generate_reset_password_token!
+    user_params = @attributes.merge(:reset_password_token => users(:julien).reset_password_token)
+
+    put :update, :user => user_params, :return_to => 'http://example.com/some/path.html'
+    assert_redirected_to 'http://example.com/some/path.html'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Julien Portalier
@@ -30,7 +30,7 @@ cert_chain:
   KVqCN//9bevjMk5OiMi9X3Wu/GtVWDwC6OTWFWKd54KgbuWlakO8LC1SMmStnCIF
   W4qpyMWMZMcB4ZN/0mUVzY5xwrislBtsmQVUSw==
   -----END CERTIFICATE-----
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Authentication engine for Ruby on Rails