effective_resources 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571da9239743b31a993c4c7f3f4f12b298aaae57df08e032e045df1db52dea73
-  data.tar.gz: 7999a8faebcdc0a9192bfb9a375386c803690a23af20376233665de05b09865c
+  metadata.gz: 7c4f700e19057fb28260220750481c0e31de2b9800b3620b4ec480deaf15814c
+  data.tar.gz: 2004bea3ba5a18301aef5fa315c35b6f3c3421559f9263734ca04c0e73587f0b
 SHA512:
-  metadata.gz: 4d3851cc02705cf17afbad40ca397e420c62b2d5dcc29ee372cf8f7532e5e36ded201dae5b85a3f3bc4484bafb45dd2158d6dc0ce15cb44697af7fa03b105e5a
-  data.tar.gz: eabc40a3e44b973ef323f409a4923710aa5e4ab23b28813ba3cc916c156f709f8f8d4f2f8743166b2f394b7c2561d1efe754145186daa549f48aad28878cdee8
+  metadata.gz: 1fa70e959c9286c9334765cce3f4070adcfbda17a749ae664c121819482fb22c14451dfa82a192979e74f166c2261e21e77e755e7ba1d4aa93b67f612a2022a7
+  data.tar.gz: 747e552fc23f61ff06467ab36cec1f67a8cb92e46859c3a7271036d7a6be0e8aa51dc1a4a30871c1ad62122841cd2ebdf84009eff1a1ab8f1246f228d2eda330

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

@@ -51,7 +51,7 @@ module Effective
         flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
         respond_to do |format|
-          case action.to_sym
+          case action_name.to_sym
           when :create
             format.html { render :new }
           when :update
@@ -61,24 +61,11 @@ module Effective
               redirect_flash
               redirect_to(resource_redirect_path(action))
             end
-          else # member action
-            from_path = referer_redirect_path.to_s
-
-            format.html do
-              if resource_edit_path && from_path.end_with?(resource_edit_path)
-                @page_title ||= "Edit #{resource}"
-                render :edit
-              elsif resource_new_path && from_path.end_with?(resource_new_path)
-                @page_title ||= "New #{resource_name.titleize}"
-                render :new
-              elsif resource_action_path(action) && from_path.end_with?(resource_action_path(action)) && template_present?(action)
-                @page_title ||= "#{action.to_s.titleize} #{resource}"
-                render(action, locals: { action: action })
-              elsif resource_show_path && from_path.end_with?(resource_show_path)
-                @page_title ||= resource_name.titleize
-                render :show
-              else
-                @page_title ||= resource.to_s
+          else
+            if template_present?(action)
+              format.html { render(action, locals: { action: action }) }
+            else
+              format.html do
                 redirect_flash
                 redirect_to(from_path.presence || resource_redirect_path(action))
               end
@@ -92,6 +79,54 @@ module Effective
         end
       end
 
+      # def respond_with_error(resource, action)
+      #   return if response.body.present?
+
+      #   flash.delete(:success)
+      #   flash.now[:danger] ||= resource_flash(:danger, resource, action)
+
+      #   respond_to do |format|
+      #     case action.to_sym
+      #     when :create
+      #       format.html { render :new }
+      #     when :update
+      #       format.html { render :edit }
+      #     when :destroy
+      #       format.html do
+      #         redirect_flash
+      #         redirect_to(resource_redirect_path(action))
+      #       end
+      #     else # member action
+      #       from_path = referer_redirect_path.to_s
+
+      #       format.html do
+      #         if resource_edit_path && from_path.end_with?(resource_edit_path)
+      #           @page_title ||= "Edit #{resource}"
+      #           render :edit
+      #         elsif resource_new_path && from_path.end_with?(resource_new_path)
+      #           @page_title ||= "New #{resource_name.titleize}"
+      #           render :new
+      #         elsif resource_action_path(action) && from_path.end_with?(resource_action_path(action)) && template_present?(action)
+      #           @page_title ||= "#{action.to_s.titleize} #{resource}"
+      #           render(action, locals: { action: action })
+      #         elsif resource_show_path && from_path.end_with?(resource_show_path)
+      #           @page_title ||= resource_name.titleize
+      #           render :show
+      #         else
+      #           @page_title ||= resource.to_s
+      #           redirect_flash
+      #           redirect_to(from_path.presence || resource_redirect_path(action))
+      #         end
+      #       end
+      #     end
+
+      #     format.js do
+      #       view = template_present?(action) ? action : :member_action
+      #       render(view, locals: { action: action }) # action.js.erb
+      #     end
+      #   end
+      # end
+
       private
 
       def redirect_flash

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.4.5'.freeze
+  VERSION = '1.4.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails