are_you_sure 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd7edc4ed641ec451b630969d5cb73827391288
-  data.tar.gz: 04b79123503d1fbb8ef06427a5f228e653fafec3
+  metadata.gz: 4690d42c5e420098af7909cc52201c9ce32cabe4
+  data.tar.gz: 5de10e9fe31de9a96f450347786f92b93d031797
 SHA512:
-  metadata.gz: 582f128024ae6f6ca1d4839103697d0a5b52aa1d19eb582e63cfe2afae2a4ddb1973e5fb00a7542639fd77209940a53941bc448aab8d0bfa5aaadc077b5f5ed6
-  data.tar.gz: 1a5b9d3292a4e1680efe13c642136fdbbf584e8656ef40795baf4cebbde74e018e4ef1daba3b851fc09652a3f8ef06d564f8f32ec0018f9f532709130f552d9c
+  metadata.gz: 3797c6097ab201109c556bcfe2d69c0bace347d5b31f29e29e1d3ef26e282e2bc7a1c57615db7a771b02efbb1efa3eca32dcfb937e838a6f5d9fe1c6a17eceb1
+  data.tar.gz: 4d70e98d946e32b3bee83a83c23d4c3162702b069e197a7727cbe77a82befffb99068a4c568d844293239799fe4c68248de2cb2ca97eef637d6fcecd3add6e1b

data/lib/are_you_sure/action_controller_extensions/confirmation_helper.rb

@@ -4,10 +4,18 @@ module AreYouSure
 
       def confirm_for(model)
         model.extend(Confirmable).tap do |model|
-          model.confirmed = param_confirmed
+          model.prepare_confirmation(param_confirmed, session)
         end
       end
 
+      def fill_confirmed(model)
+        confirm_for(model).tap do |model|
+          model.fill_confirmed_attributes
+        end
+      end
+
+    private
+
       def param_confirmed
         params[:confirmed]
       end

data/lib/are_you_sure/confirmable.rb

@@ -1,28 +1,28 @@
 module AreYouSure
   module Confirmable
 
-    def confirmed=(confirmed)
+    def prepare_confirmation(confirmed, session)
       @are_you_sure_confirmed = confirmed
+      @are_you_sure_session = session
+    end
+
+    def fill_confirmed_attributes
+      self.attributes = @are_you_sure_session[:model_attributes]
+      clear_attributes_cache
     end
 
     def save_if_confirmed
-      do_if_valid_and_confirmed do
-        self.save
-      end
+      confirm_with_persist { self.save }
     end
 
     def update_if_confirmed(attributes)
       self.attributes = attributes
-      do_if_valid_and_confirmed do
-        self.update(attributes)
-      end
+      confirm_with_persist { self.update(attributes) }
     end
 
     def update_attributes_if_confirmed(attributes)
       self.attributes = attributes
-      do_if_valid_and_confirmed do
-        self.update_attributes(attributes)
-      end
+      confirm_with_persist { self.update_attributes(attributes) }
     end
 
     def update_attribute_if_confirmed(name, value)
@@ -39,10 +39,19 @@ module AreYouSure
 
   private
 
-    def do_if_valid_and_confirmed
+    def confirm_with_persist
       return false unless self.valid?
-      return false unless confirmed?
-      yield
+      if confirmed?
+        clear_attributes_cache
+        yield
+      else
+        @are_you_sure_session[:model_attributes] = self.attributes
+        false
+      end
+    end
+
+    def clear_attributes_cache
+      @are_you_sure_session[:model_attributes] = nil
     end
   end
 end

data/lib/are_you_sure/form_builders/confirm_form_builder.rb

@@ -18,7 +18,10 @@ module AreYouSure
     end
 
     def cancel(value=nil, options={})
-      @template.link_to(value || I18n.t('are_you_sure.helpers.cancel', default: 'Cancel'), :back)
+      @template.link_to(
+        value || I18n.t('are_you_sure.helpers.cancel', default: 'Cancel'),
+        @template.polymorphic_path(@object, action: @object.persisted? ? :edit : :new)
+      )
     end
 
     def method_missing(method, *args, &block)

data/lib/are_you_sure/version.rb

@@ -1,3 +1,3 @@
 module AreYouSure
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: are_you_sure
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - haazime
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails