effective_resources 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ae9635ad1328b7109aaaf6250dd6e73b1e82c94883a26128f6c175dfaa541d2d
-  data.tar.gz: 5921dbfd7773c0b1eb440b2864de2b1f1c95f0ec0d0de543de70433f185ed165
+SHA1:
+  metadata.gz: a5581c1ca7e6f7a54decd9c6ea534aec3a9c61c4
+  data.tar.gz: ef4bbf6529ccff4299b90645e081379ef4953619
 SHA512:
-  metadata.gz: 973334cca43d4337328170e7b97f95d2e97d678d24181c067d7f7e1e0c2cd81f79154a8c3c29745fbdace515cb8ea77c53dbbf313804e5331f8f36dc8270b4ab
-  data.tar.gz: 43e5b2f690eac1dbd8b81cb9fbf54f2f3efa95b8886c15cce725b6f6299d4acfca795ef92e4d235caf3189bb3a944beb62e5cd51a4212f6694594c02fa574ef3
+  metadata.gz: a2d4d1a86fab8cfeb839226e621ac3c3be2b6818fb0d9d2e77e8da847e992ce44a46426b32c7f9c5b446f400152199446517ed122c13ca161d3b63c08befc3c5
+  data.tar.gz: 2a4d94ed4a0dc9f5f49c7c4ca29d6b84dd5946510b3be812e7bfd0a1dbeb43015484bdf51e605fd6f521705021216adf01b21b50cab992d1a92fdd63cfb8a3c3

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

@@ -6,6 +6,7 @@ module Effective
         submit = commit_action(action)
         redirect = submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]
 
+        # If we have a specific redirect for it
         commit_action_redirect = case redirect
           when :index     ; resource_index_path
           when :edit      ; resource_edit_path
@@ -14,29 +15,42 @@ module Effective
           when :duplicate ; resource_duplicate_path
           when :back      ; referer_redirect_path
           when :save      ; [resource_edit_path, resource_show_path].compact.first
-          when Symbol     ; resource_action_path(submit[:action])
+          when Symbol     ; resource_action_path(redirect)
           when String     ; redirect
           else            ; nil
         end
 
         return commit_action_redirect if commit_action_redirect.present?
 
-        if action == :destroy
-          return [referer_redirect_path, resource_index_path, root_path].compact.first
-        end
-
-        case params[:commit].to_s
-        when 'Save'
+        # If we have a magic name
+        commit_name_redirect = case params[:commit].to_s
+          when 'Save and Add New', 'Add New'
+            [resource_new_path, resource_index_path]
+          when 'Duplicate'
+            [resource_duplicate_path, resource_index_path]
+          when 'Continue', 'Save and Continue'
+            [resource_index_path]
+          else
+            []
+        end.compact.first
+
+        return commit_name_redirect if commit_name_redirect.present?
+
+        # Otherwise consider the action
+        commit_default_redirect = case action
+        when :create
+          [resource_show_path, resource_edit_path, resource_index_path]
+        when :update
           [resource_edit_path, resource_show_path, resource_index_path]
-        when 'Save and Add New', 'Add New'
-          [resource_new_path, resource_index_path]
-        when 'Duplicate'
-          [resource_duplicate_path, resource_index_path]
-        when 'Continue', 'Save and Continue'
-          [resource_index_path]
+        when :destroy
+          [referer_redirect_path, resource_index_path]
         else
           [referer_redirect_path, resource_edit_path, resource_show_path, resource_index_path]
-        end.compact.first.presence || root_path
+        end.compact.first
+
+        return commit_default_redirect if commit_default_redirect.present?
+
+        root_path
       end
 
       def referer_redirect_path

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.2.5'.freeze
+  VERSION = '1.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Make any controller an effective resource controller.