effective_resources 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9ccd3b1483ba66ad4dbdfd40a2b64ee43ec34d
-  data.tar.gz: e0717b61c8a8c49e62d9221d8e938ce8f37c2b5c
+  metadata.gz: 60db7705f1fb377c10d9bd981079ce1eea482636
+  data.tar.gz: f05b029bd2600fddbb9871b248d94b704617a35d
 SHA512:
-  metadata.gz: 1ad00c6cd0e80ec4145f4e1b708d986649b150f5add0f4a47e68dc063456afd4ad55b5ecfc37ed8b5277c3166a88787c821fcaf6065cd4ae7c912be3f335a5d1
-  data.tar.gz: 5e8954119d5bba19d2d2bd816e38312691f7916124af6d20659c0bdd37309942e0c19bc9d5e65b379a133b0630c98f7e648da5a964de79b1eda0a0b34e9b792e
+  metadata.gz: 5acca8d4926d6cec59a2cffbbe521fb5abb873cb7e2559952ef9964d6832f9990984ade64711768d0ff412b6b61a2b8a3fbf5e149f9a19f7d32efaa90a022886
+  data.tar.gz: 92d3bf93a553331231c93c6f40d54dad32132d642fa0c62ab3421a382917c7e784c1233edea43a9651a81c9db190c587715266efcf12ff1de388feac7d322eb2

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

@@ -5,6 +5,7 @@ module Effective
     include Effective::CrudController::Actions
     include Effective::CrudController::Paths
     include Effective::CrudController::PermittedParams
+    include Effective::CrudController::Respond
     include Effective::CrudController::Save
     include Effective::CrudController::Submits
 

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

@@ -75,25 +75,9 @@ module Effective
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?(action)
-
-            format.html do
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
-            end
-
-            format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource # create.js.erb
-            end
+            respond_with_success(format, resource, action)
           else
-            flash.delete(:success)
-            flash.now[:danger] ||= resource_flash(:danger, resource, action)
-
-            run_callbacks(:resource_render)
-
-            format.html { render :new }
-            format.js {} # create.js.erb
+            respond_with_error(format, resource, action)
           end
         end
       end
@@ -139,25 +123,9 @@ module Effective
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?(action)
-
-            format.html do
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
-            end
-
-            format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource # update.js.erb
-            end
+            respond_with_success(format, resource, action)
           else
-            flash.delete(:success)
-            flash.now[:danger] ||= resource_flash(:danger, resource, action)
-
-            run_callbacks(:resource_render)
-
-            format.html { render :edit }
-            format.js { } # update.js.erb
+            respond_with_error(format, resource, action)
           end
         end
       end
@@ -177,17 +145,7 @@ module Effective
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?(action)
-
-            format.html do
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
-            end
-
-            format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              # destroy.js.erb
-            end
+            respond_with_success(format, resource, action)
           else
             flash.delete(:success)
             request.format = :html  # Don't run destroy.js.erb
@@ -217,18 +175,7 @@ module Effective
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?(action)
-
-            format.html do
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
-            end
-
-            format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource
-              render_member_action(action)
-            end
+            respond_with_success(format, resource, action) || render_member_action(action)
           else
             flash.delete(:success)
             flash.now[:danger] ||= resource_flash(:danger, resource, action)

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

@@ -0,0 +1,69 @@
+module Effective
+  module CrudController
+    module Respond
+      def respond_with_success(format, resource, action)
+        if specific_redirect_path?
+          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))
+          end
+
+          return true
+        end
+
+        # Render template if it exists
+        if lookup_context.template_exists?(action, _prefixes)
+          format.html do
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            # action.html.haml
+          end
+
+          format.js do
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            reload_resource
+            # action.js.erb
+          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))
+        end
+
+        true
+      end
+
+      def respond_with_error(format, resource, action)
+        flash.delete(:success)
+        flash.now[:danger] ||= resource_flash(:danger, resource, action)
+
+        run_callbacks(:resource_render)
+
+        case params[:action]
+        when 'create'
+          format.html { render :new }
+        when 'update'
+          format.html { render :edit }
+        else
+          format.html { render action }
+        end
+
+        format.js {}
+      end
+
+    end
+  end
+end

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,6 +40,7 @@ files:
 - app/controllers/concerns/effective/crud_controller/dsl.rb
 - app/controllers/concerns/effective/crud_controller/paths.rb
 - app/controllers/concerns/effective/crud_controller/permitted_params.rb
+- app/controllers/concerns/effective/crud_controller/respond.rb
 - app/controllers/concerns/effective/crud_controller/save.rb
 - app/controllers/concerns/effective/crud_controller/submits.rb
 - app/controllers/concerns/effective/flash_messages.rb