josevalim-auth_helpers 0.4.1 → 0.5.0

data/README

@@ -17,13 +17,17 @@ Authlogic also include some controllers to deal with the modules added. For
 example, if you add Recoverable to your model, you can have all password
 management for free, if you inherit from the Recoverable controller:
 
-  class AccountPasswordsController < AuthHelpers::Controller:Recoverable
+  class AccountPasswordsController < AuthHelpers::Controller::Recoverable
   end
 
 This functionality is powered by InheritedResources, which is available at:
 
   http://github.com/josevalim/inherited_resources
 
+You can see an example at:
+
+  http://github.com/josevalim/starter
+
 Installation
 ------------
 

data/lib/auth_helpers/controller/confirmable.rb

@@ -13,53 +13,41 @@ module AuthHelpers
       # GET /account/confirmation/new
       def new(&block)
         object = get_or_set_with_send(:new)
-        respond_to(:with => object, &block)
+        respond_with(object, &block)
       end
       alias :new! :new
 
       # POST /account/confirmation
       # POST /account/confirmation.xml
-      def create(&block)
+      def create(options={}, &block)
         object = get_or_set_with_send(:find_and_resend_confirmation_instructions, params[self.instance_name])
-        respond_block, redirect_block = select_block_by_arity(block)
 
         if object.errors.empty?
           set_flash_message!(:notice, 'We sent confirmation instructions to your email, please check your inbox.')
-
-          respond_to_with_dual_blocks(true, block) do |format|
-            format.html { redirect_to_block_or_scope_to(redirect_block, :session) }
-            format.all  { head :ok }
+          respond_with_dual_blocks(object, options, true, block) do |format|
+            format.html { redirect_to(options[:location] || url_by_name_and_scope(:session)) }
           end
         else
           set_flash_message!(:error)
-          options = { :with => object.errors, :status => :unprocessable_entity }
-
-          respond_to_with_dual_blocks(false, block, options) do |format|
-            format.html { render :action => 'new' }
-          end
+          respond_with_dual_blocks(object, options, false, block)
         end
       end
       alias :create! :create
 
       # GET /account/confirmation?account[perishable_token]=xxxx
-      # GET /account/confirmation.xml?account[perishable_token]=xxxx
-      def show(&block)
+      # POST /account/confirmation.xml?account[perishable_token]=xxxx
+      def show(options={}, &block)
         object = get_or_set_with_send(:find_and_confirm, params[self.instance_name])
-        respond_block, redirect_block = select_block_by_arity(block)
 
         if object.errors.empty?
           set_flash_message!(:notice, '{{resource_name}} was successfully confirmed.')
-
-          respond_to_with_dual_blocks(true, block) do |format|
-            format.html { redirect_to_block_or_scope_to(redirect_block, :session) }
-            format.all  { head :ok }
+          respond_with_dual_blocks(object, options, true, block) do |format|
+            format.html { redirect_to(options[:location] || url_by_name_and_scope(:session)) }
           end
         else
           set_flash_message!(:error, object.errors.on(:perishable_token))
-          options = { :with => object.errors, :status => :unprocessable_entity }
-
-          respond_to_with_dual_blocks(false, block, options) do |format|
-            format.html { redirect_to :action => 'new' }
+          respond_with_dual_blocks(object, options, false, block) do |format|
+            format.html { render :action => "new" }
           end
         end
       end

data/lib/auth_helpers/controller/helpers.rb

@@ -4,6 +4,7 @@ module AuthHelpers
 
       def self.included(base)
         base.extend ClassMethods
+        base.respond_to :html
       end
 
       module ClassMethods
@@ -37,18 +38,17 @@ module AuthHelpers
             self.instance_name  = klass.name.downcase
             self.route_name     = klass.name.downcase
           end
-      end
-
+      end
+
       protected
 
-        # If a block is given, redirect to the url in the block, otherwise
-        # try to call the url given by scope, for example:
+        # Try to call a url using resource object and the scope, for example:
         #
         #   new_account_session_url
         #   new_account_password_url
         #
-        def redirect_to_block_or_scope_to(redirect_block, scope) #:nodoc:
-          redirect_to redirect_block ? redirect_block.call : send("new_#{self.route_name}_#{scope}_url")
+        def url_by_name_and_scope(scope) #:nodoc:
+          send("new_#{self.route_name}_#{scope}_url")
         end
 
         # Try to get the instance variable, otherwise send the args given to
@@ -57,7 +57,8 @@ module AuthHelpers
         def get_or_set_with_send(*args) #:nodoc:
           instance_variable_get("@#{self.instance_name}") || instance_variable_set("@#{self.instance_name}", resource_class.send(*args))
         end
-
+
     end
-  end
+  end
+end
 

data/lib/auth_helpers/controller/recoverable.rb

@@ -9,67 +9,53 @@ module AuthHelpers
       class << self
         alias :has_recoverable :set_class_accessors_with_class
       end
-
-      # GET /account/password/new
+
+      # GET /account/password/new
       def new(&block)
-        object = get_or_set_with_send(:new)
-        respond_to(:with => object, &block)
-      end
-      alias :new! :new
-
-      # POST /account/password
-      # POST /account/password.xml
-      def create(&block)
-        object = get_or_set_with_send(:find_and_send_reset_password_instructions, params[self.instance_name])
-        respond_block, redirect_block = select_block_by_arity(block)
+        object = get_or_set_with_send(:new)
+        respond_with(object, &block)
+      end
+      alias :new! :new
+
+      # POST /account/password
+      # POST /account/password.xml
+      def create(options={}, &block)
+        object = get_or_set_with_send(:find_and_send_reset_password_instructions, params[self.instance_name])
 
         if object.errors.empty?
           set_flash_message!(:notice, 'We sent instruction to reset your password, please check your inbox.')
-
-          respond_to_with_dual_blocks(true, block) do |format|
-            format.html { redirect_to_block_or_scope_to(redirect_block, :session) }
-            format.all  { head :ok }
+          respond_with_dual_blocks(object, options, true, block) do |format|
+            format.html { redirect_to(options[:location] || url_by_name_and_scope(:session)) }
           end
         else
-          set_flash_message!(:error)
-          options = { :with => object.errors, :status => :unprocessable_entity }
-
-          respond_to_with_dual_blocks(false, block, options) do |format|
-            format.html { render :action => 'new' }
-          end
+          set_flash_message!(:error)
+          respond_with_dual_blocks(object, options, false, block)
         end
       end
       alias :create! :create
 
-      # GET /account/password/edit?account[perishable_token]=xxxx
+      # GET /account/password/edit?account[perishable_token]=xxxx
       def edit(&block)
         object = get_or_set_with_send(:new)
-        object.perishable_token = params[self.instance_name].try(:fetch, :perishable_token)
-        respond_to(:with => object, &block)
+        object.perishable_token = params[self.instance_name].try(:fetch, :perishable_token)
+        respond_with(object, &block)
       end
-      alias :edit! :edit
-
-      # PUT /account/password
-      # PUT /account/password.xml
-      def update(&block)
-        object = get_or_set_with_send(:find_and_reset_password, params[self.instance_name])
-        respond_block, redirect_block = select_block_by_arity(block)
+      alias :edit! :edit
+
+      # PUT /account/password
+      # PUT /account/password.xml
+      def update(options={}, &block)
+        object = get_or_set_with_send(:find_and_reset_password, params[self.instance_name])
 
         if object.errors.empty?
           set_flash_message!(:notice, 'Your password was successfully reset.')
-
-          respond_to_with_dual_blocks(true, block) do |format|
-            format.html { redirect_to_block_or_scope_to(redirect_block, :session) }
-            format.all  { head :ok }
+          respond_with_dual_blocks(object, options, true, block) do |format|
+            format.html { redirect_to(options[:location] || url_by_name_and_scope(:session)) }
           end
         else
-          set_flash_message!(:error)
-          options = { :with => object.errors, :status => :unprocessable_entity }
-
-          respond_to_with_dual_blocks(false, block, options) do |format|
-            format.html { render :action => 'edit' }
-          end
-        end
+          set_flash_message!(:error)
+          respond_with_dual_blocks(object, options, false, block)
+        end
       end
       alias :update! :update
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-auth_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: josevalim-inherited_resources
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+    version: 
 description: AuthHelpers is a collection of modules to improve your Authlogic resources.
 email: jose.valim@gmail.com
 executables: []