effective_resources 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e1a1245e78f09a87b8d00b5ed756123361f6a2
-  data.tar.gz: 4be2ae1bf73c6774743c3439e2ab1bde1c30b7a4
+  metadata.gz: 7c8bdc84abf94942e54c5007aedf0d5ed6258473
+  data.tar.gz: b4cee9fb014e4a40ba1cdbba3d1caee1e45cf084
 SHA512:
-  metadata.gz: fc0fbf0354dfef9185ce31024b0055b2be3adff96c69d91de1bc512f0e4bd21063d052d883e5bf0bd8678cbba93641c34df89e05867da7c04d78f59bc12ac225
-  data.tar.gz: 9c5faa4057cbfc2e7118df702cffdf1a81aa8485d22f5210b72505b56be92b75d228f84735ee3612a584dcccc121d2f28bf55423069eaafd8208339b7039a3f2
+  metadata.gz: eefe5e914263f9fe5da1c41362d1c67b7289db996a19b86b5cc51edb67848ab07cdfcfa3ce049c7a38d3b85b2fcfd2901c9d6a7eba51aa31de8e0141ab975f56
+  data.tar.gz: 0b37485ef2faca4106f55b81cac1fb8966854c75f9fa8faf31ca1ca8d05d2e8f7b3ba3634ee34ed3a3c2403ea33f5c98475c27759138def3dd7cf7001540d8bd

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

@@ -324,29 +324,52 @@ module Effective
       end
     end
 
-    # No attributes are assigned or saved. We purely call action! on the resource.
     def member_post_action(action)
       raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
 
-      if save_resource(resource, action)
-        flash[:success] ||= resource_flash(:success, resource, action)
-        redirect_to(referer_redirect_path || resource_redirect_path)
-      else
-        flash.now[:danger] ||= resource_flash(:danger, resource, action)
-
-        if resource_edit_path && (referer_redirect_path || '').end_with?(resource_edit_path)
-          @page_title ||= "Edit #{resource}"
-          render :edit
-        elsif resource_new_path && (referer_redirect_path || '').end_with?(resource_new_path)
-          @page_title ||= "New #{resource_name.titleize}"
-          render :new
-        elsif resource_show_path && (referer_redirect_path || '').end_with?(resource_show_path)
-          @page_title ||= resource_name.titleize
-          render :show
+      # TODO: This is a recent change. Used to not assign attributes. Is this breaking?
+      valid_params = (send(resource_params_method_name) rescue {})
+      resource.assign_attributes(valid_params)
+
+      respond_to do |format|
+        if save_resource(resource, action)
+          format.html do
+            flash[:success] ||= resource_flash(:success, resource, action)
+            redirect_to(resource_redirect_path)
+          end
+
+          format.js do
+            if specific_redirect_path?(action)
+              flash[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path)
+            else
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              reload_resource
+              # action.js.erb
+            end
+          end
         else
-          @page_title ||= resource.to_s
-          flash[:danger] = flash.now[:danger]
-          redirect_to(referer_redirect_path || resource_redirect_path)
+          flash.delete(:success)
+          flash.now[:danger] ||= resource_flash(:danger, resource, action)
+
+          format.html do
+            if resource_edit_path && (referer_redirect_path || '').end_with?(resource_edit_path)
+              @page_title ||= "Edit #{resource}"
+              render :edit
+            elsif resource_new_path && (referer_redirect_path || '').end_with?(resource_new_path)
+              @page_title ||= "New #{resource_name.titleize}"
+              render :new
+            elsif resource_show_path && (referer_redirect_path || '').end_with?(resource_show_path)
+              @page_title ||= resource_name.titleize
+              render :show
+            else
+              @page_title ||= resource.to_s
+              flash[:danger] = flash.now[:danger]
+              redirect_to(referer_redirect_path || resource_redirect_path)
+            end
+          end
+
+          format.js {} # action.js.erb
         end
       end
     end
@@ -544,8 +567,15 @@ module Effective
       { action: :save }
     end
 
-    def specific_redirect_path?
-      (commit_action[:redirect].respond_to?(:call) ? instance_exec(&commit_action[:redirect]) : commit_action[:redirect]).present?
+    def submit_action(action)
+      self.class.submits[action.to_s] ||
+      self.class.submits.find { |_, v| v[:action] == action }&.last ||
+      { action: action }
+    end
+
+    def specific_redirect_path?(action = nil)
+      submit = (action.nil? ? commit_action : submit_action(action))
+      (submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]).present?
     end
 
     # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.8.10'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Code and Effect