rescue-dog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1931c553f09ed1cf0e12f65479dbbc0a949d76
-  data.tar.gz: 49b18603085618a2120933598e512d0e9a3c1491
+  metadata.gz: 04a759ce546669df119ad51af2b97b93a417db88
+  data.tar.gz: 6ec7e0fef288002684edc508f39baadf6fd1ba39
 SHA512:
-  metadata.gz: 27f9b874868af6234c7a1ca9cdb4d7e0b7d597e100303991b554e2ece7d20c0441db504593c2f2b647fea7414caab95d64d22349d9a9c41d577f27798a553a6f
-  data.tar.gz: 788415d867e62f4083d66675aba84476ae5458c3da8024851c3b991b0b9215d56edb66a1e14e89b493f173f52697d26a00342b7d85fc7d5d1f3321a32407feff
+  metadata.gz: 3c506070a73c70ef41bfb5049e0f217b16b2c424a37c268e9656d3b730196a9db5b42e1bf92f92cb99702695350e92b5007148de909769fa0aedfe2f5d8b2334
+  data.tar.gz: 618a85f1e3f2b7f1f4f1df03e776c54072746bea2e80a00b83485e52da43253e1b658aa641b32bdcf0023ec3a5fc3062df940e6533a7385c7a4fa66d834e5b6d

data/lib/rescue/controller.rb

@@ -45,26 +45,21 @@ module Rescue
         Parameter.define(self)
         Action.define(self, clazz, var_sym, params_sym)
 
-        [:new].each do |type|
+        [:new, :edit, :show, :create, :update, :delete].each do |type|
           args = options.delete(type) || (actions.delete(type) ? {} : nil)
-          define_action_method(type, :new_call, args) if args
-        end
-
-        [:show, :edit].each do |type|
-          args = options.delete(type) || (actions.delete(type) ? {} : nil)
-          define_action_method(type, :find_call, args) if args
-        end
- 
-        [:create, :update, :delete].each do |type|
-          args = options.delete(type) || (actions.delete(type) ? {} : nil)
-          if args
-            args[:flash] ||= true
-            define_action_method(type, :"#{type}_call", args) if args
-          end
+          define_action_method(type, args) if args
         end
       end
 
-      def define_action_method name, call_method, options = {}
+      def define_action_method name, options = {}
+        raise RuntimeError "`name` is already defined." if method_defined?(name)
+        options[:type]  ||= name
+        options[:flash] ||= [:create, :update, :delete].include?(options[:type])
+        call_method = case options[:type]
+          when :show, :edit ; :find_call
+          else ; :"#{options[:type]}_call"
+        end
+        rescue_given    = options[:rescue]||options[:error]||options[:flash]
         success_message = options[:success]
         error_message   = options[:error]
         if options[:flash]
@@ -72,14 +67,21 @@ module Rescue
           error_message   ||= Flash.message(self, name, :error)
         end
 
-        define_method name do
-          begin
+        if rescue_given
+          define_method name do
+            begin
+              send(call_method)
+              flash[:success] = success_message unless success_message.blank?
+              instance_exec(&options[:render]) if options[:render]
+            rescue
+              flash.now[:error] = error_message unless error_message.blank?
+              instance_exec(&options[:rescue]) if options[:rescue]
+            end
+          end
+        else
+          define_method name do
             send(call_method)
-            flash[:success] = success_message unless success_message.blank?
             instance_exec(&options[:render]) if options[:render]
-          rescue
-            flash.now[:error] = error_message unless error_message.blank?
-            instance_exec(&options[:rescue]) if options[:rescue]
           end
         end
       end

data/lib/rescue/controllers/action.rb

@@ -8,7 +8,7 @@ module Rescue
           instance_variable_set(var_sym, clazz.new)
         end
         object.send(:define_method, :find_call) do
-          id = find_params[Rescue.config.primary_key]
+          id   = find_params[Rescue.config.primary_key]
           instance_variable_set(var_sym, clazz.find(id))
         end
         object.send(:define_method, :create_call) do

data/lib/rescue/version.rb

@@ -1,3 +1,3 @@
 module Rescue
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rescue-dog
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yulii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails