lib/auth_helpers/controller/confirmable.rb in josevalim-auth_helpers-0.4.1 vs lib/auth_helpers/controller/confirmable.rb in josevalim-auth_helpers-0.5.0

@@ -11,56 +11,44 @@
       end
 
       # 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
       alias :show! :show