effective_resources 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60db7705f1fb377c10d9bd981079ce1eea482636
-  data.tar.gz: f05b029bd2600fddbb9871b248d94b704617a35d
+  metadata.gz: 998ed6153bddd85970840b07e11a165512fcce3e
+  data.tar.gz: 04d9581c21c2ff8499abf8bfc0995956b476eb96
 SHA512:
-  metadata.gz: 5acca8d4926d6cec59a2cffbbe521fb5abb873cb7e2559952ef9964d6832f9990984ade64711768d0ff412b6b61a2b8a3fbf5e149f9a19f7d32efaa90a022886
-  data.tar.gz: 92d3bf93a553331231c93c6f40d54dad32132d642fa0c62ab3421a382917c7e784c1233edea43a9651a81c9db190c587715266efcf12ff1de388feac7d322eb2
+  metadata.gz: 484de341ce813ef6fe402dd59b33ad0a5e5c8d8dfab95fcccb1230359a60ad1a888ba75de70951138e5172087dc49f3a531af0742dd8ba19338f47ad6915f871
+  data.tar.gz: 80059d4e5ce2b3fe4625ecfbfe6bda6cb6b4c5c924f37c2ba27861955cf6433f51d77dce5534814448cb940878a5b4af3994a3000340b6d133f6c515a45327d5

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

@@ -147,13 +147,7 @@ module Effective
           if save_resource(resource, action)
             respond_with_success(format, resource, action)
           else
-            flash.delete(:success)
-            request.format = :html  # Don't run destroy.js.erb
-
-            format.html do
-              flash[:danger] = (flash.now[:danger].presence || resource_flash(:danger, resource, action))
-              redirect_to(resource_redirect_path(action))
-            end
+            respond_with_error(format, resource, action)
           end
         end
       end
@@ -175,31 +169,9 @@ module Effective
 
         respond_to do |format|
           if save_resource(resource, action)
-            respond_with_success(format, resource, action) || render_member_action(action)
+            respond_with_success(format, resource, action)
           else
-            flash.delete(:success)
-            flash.now[:danger] ||= resource_flash(:danger, resource, action)
-
-            run_callbacks(:resource_render)
-
-            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(action))
-              end
-            end
-
-            format.js { render_member_action(action) }
+            respond_with_error(format, resource, action)
           end
         end
       end
@@ -246,13 +218,5 @@ module Effective
       end
     end
 
-    private
-
-    # Which member javascript view to render: #{action}.js or effective_resources member_action.js
-    def render_member_action(action)
-      view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
-      render(view, locals: { action: action })
-    end
-
   end
 end

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

@@ -2,7 +2,7 @@ module Effective
   module CrudController
     module Respond
       def respond_with_success(format, resource, action)
-        if specific_redirect_path?
+        if specific_redirect_path?(action)
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path(action))
@@ -12,12 +12,7 @@ module Effective
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path(action))
           end
-
-          return true
-        end
-
-        # Render template if it exists
-        if lookup_context.template_exists?(action, _prefixes)
+        elsif lookup_context.template_exists?(action, _prefixes)
           format.html do
             flash.now[:success] ||= resource_flash(:success, resource, action)
             # action.html.haml
@@ -28,22 +23,17 @@ module Effective
             reload_resource
             # action.js.erb
           end
+        else # Default
+          format.html do
+            flash[:success] ||= resource_flash(:success, resource, action)
+            redirect_to(resource_redirect_path(action))
+          end
 
-          return false
-        end
-
-        # Default
-        format.html do
-          flash[:success] ||= resource_flash(:success, resource, action)
-          redirect_to(resource_redirect_path(action))
-        end
-
-        format.js do
-          flash[:success] ||= resource_flash(:success, resource, action)
-          redirect_to(resource_redirect_path(action))
+          format.js do
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            render(:member_action, locals: { action: action })
+          end
         end
-
-        true
       end
 
       def respond_with_error(format, resource, action)
@@ -57,11 +47,52 @@ module Effective
           format.html { render :new }
         when 'update'
           format.html { render :edit }
-        else
-          format.html { render action }
+        when 'destroy'
+          # We always need to redirect here
+          flash[:danger] = flash.now.delete(:danger)
+
+          format.html { redirect_to(resource_redirect_path(action)) }
+          format.js { redirect_to(resource_redirect_path(action)) }
+        else # member_action
+          format.html do
+            if lookup_context.template_exists?(action, _prefixes)
+              @page_title ||= "#{action.to_s.titleize} #{resource}"
+              render(action, locals: { action: action })
+            elsif 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.delete(:danger)
+              redirect_to(referer_redirect_path || resource_redirect_path(action))
+            end
+          end
         end
 
-        format.js {}
+        format.js do
+          view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
+          render(view, locals: { action: action })
+        end
+      end
+
+      # For destroy.js
+      def respond_with_error_and_redirect(format, resource, action)
+        flash.delete(:success)
+        flash[:danger] ||= resource_flash(:danger, resource, action)
+
+        format.html do
+          redirect_to(resource_redirect_path(action))
+        end
+
+        format.js do
+          redirect_to(resource_redirect_path(action))
+        end
       end
 
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.12'.freeze
+  VERSION = '1.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails