effective_resources 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f342d10de6f2f7786972e79f3afa354685bf31
-  data.tar.gz: efe2fbb67f1f01c850e2e6a5e4040b03889fd20c
+  metadata.gz: 3c5735d626c13c149f4c5e519769686ac75a3c9b
+  data.tar.gz: 5b86c718b4b6814616ffabf641befd81cb4b7897
 SHA512:
-  metadata.gz: aeed7f84960367679ebab343fc64638aa1ad433ee64376042cfb519578583270a1ac15bbd03d3182a44d329d94d1ba44fbf02d427d0068967cb10734c19f0a69
-  data.tar.gz: 48af4ce59340e3f97c5216ed7aacdaa2aac4bf4a0bf7778f3be810f15fca533c8b989e241e98fc2d4b81d31fc871038a3008e6c4a66c98f363ba2d56327ca020
+  metadata.gz: aced45e77272bc6492bda40dec68233e19d00bf04c7a391950b76c1a802a83d05c3406843bd36fa9a81e552042a2d153e483737a2680e2a49b057803dbee5505
+  data.tar.gz: 6f05a66c4a972d894dd598654362ff4f32abbf68c4351d38720e4fe16782b88071c2b67eedcb81b8ddf4e1fb824585954a3a2da17131f1dfe6587bcc6ac43cd0

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -42,6 +42,9 @@ module Effective
         # That class doesn't implement effective_resource do .. end block
         return [] unless effective_resource.present?
 
+        @permitted_params_for_seen_klasses ||= []
+        @permitted_params_for_seen_klasses << effective_resource.klass
+
         # This is :id, all belongs_to ids, and model attributes
         permitted_params = effective_resource.permitted_attributes.select do |name, (_, atts)|
           if BLACKLIST.include?(name)
@@ -85,6 +88,8 @@ module Effective
 
         # Recursively add any accepts_nested_resources
         effective_resource.accepts_nested_attributes.each do |nested|
+          next if @permitted_params_for_seen_klasses.include?(nested.klass)
+
           if (nested_params = permitted_params_for(nested.klass, namespaces)).present?
             nested_params.insert(nested_params.rindex { |obj| !obj.kind_of?(Hash)} + 1, :_destroy)
             permitted_params << { "#{nested.name}_attributes".to_sym => nested_params }

data/app/controllers/concerns/effective/crud_controller/respond.rb

@@ -40,16 +40,8 @@ module Effective
         flash.delete(:success)
         flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
-        redirect_flash if specific_redirect_path?(:error)
-
         run_callbacks(:resource_render)
 
-        if specific_redirect_path?(:error)
-          format.html { redirect_to resource_redirect_path(:error) }
-          format.js { redirect_to resource_redirect_path(:error) }
-          return
-        end
-
         # HTML responder
         case action.to_sym
         when :create

data/app/models/concerns/acts_as_statused.rb

@@ -120,26 +120,44 @@ module ActsAsStatused
 
     # Create an received scope and approved? method for each status
     acts_as_statused_options[:statuses].each do |sym|
-      define_method("#{sym}?") { status == sym.to_s }
-      define_method("#{sym}_at") { status_steps["#{sym}_at".to_sym] }
-      define_method("#{sym}_by") { acts_as_statused_by_user(sym) }
-      define_method("#{sym}_by_id") { status_steps["#{sym}_by".to_sym] }
-      define_method("was_#{sym}?") { send("#{sym}_at").present? }
+      unless respond_to?("#{sym}?")
+        define_method("#{sym}?") { status == sym.to_s }
+      end
 
-      # approved!
-      define_method("#{sym}!") do |atts = {}|
-        raise 'expected a Hash of passed attributes' unless atts.kind_of?(Hash)
-        update!(atts.merge(status: sym))
+      unless respond_to?("#{sym}_at")
+        define_method("#{sym}_at") { status_steps["#{sym}_at".to_sym] }
       end
 
-      # unapproved!
-      define_method("un#{sym}!") do
-        self.status = nil if (status == sym.to_s)
+      unless respond_to?("#{sym}_by")
+        define_method("#{sym}_by") { acts_as_statused_by_user(sym) } 
+      end
 
-        status_steps.delete("#{sym}_at".to_sym)
-        status_steps.delete("#{sym}_by".to_sym)
+      unless respond_to?("#{sym}_by_id")
+        define_method("#{sym}_by_id") { status_steps["#{sym}_by".to_sym] } 
+      end
+
+      unless respond_to?("was_#{sym}?")
+        define_method("was_#{sym}?") { send("#{sym}_at").present? } 
+      end
 
-        true
+      # approved!
+      unless respond_to?("#{sym}!")
+        define_method("#{sym}!") do |atts = {}|
+          raise 'expected a Hash of passed attributes' unless atts.kind_of?(Hash)
+          update!(atts.merge(status: sym))
+        end
+      end
+
+      # unapproved!
+      unless respond_to?("un#{sym}!")
+        define_method("un#{sym}!") do
+          self.status = nil if (status == sym.to_s)
+
+          status_steps.delete("#{sym}_at".to_sym)
+          status_steps.delete("#{sym}_by".to_sym)
+          
+          true
+        end
       end
 
       scope(sym, -> { where(status: sym.to_s) })

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails