effective_resources 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e70fee638a428f79f18157693b709b98012619
-  data.tar.gz: 90598b13782b0538c1553181e00c822456c14914
+  metadata.gz: a9c1374e91be1d5cc6a59a84d3bf3101b6f070e3
+  data.tar.gz: 54937ae6e523329f6078a89bd9f013978e0cbfb2
 SHA512:
-  metadata.gz: 9012ba03094e3701829fbdf23259c2d119287c57025bba3c44a074436011b01ff9f43fac36202e3a34d41a689324c164e07c4815a9473eee0075ecb7b7a147eb
-  data.tar.gz: 9b15ace87c1582da176f84c737246052086858a4d3971a40368bae80c9ab70dde5255f4ebd85e009d4e6ea5c13b1c3b868e29ca132646cbd688d415ab156dc5c
+  metadata.gz: 105eef30f447c6623b55b0073a3456ad89fad27ab8e0db2589e8402b8b7a491d31f319fc59554b4a8c44e0486ac26112eb54903014c29ce512e5be84ae84c5f3
+  data.tar.gz: 1e1d91e424de80e48c73b630813f9b9b3cf4704b1d4ff60d847672608331de5ae1427d270e93cf202654111125791d8a894f8a4cfe8f565e13f38c3d1d0341d1

data/README.md

@@ -148,7 +148,7 @@ class PostsController < ApplicationController
   # Sets the @page_title in a before_filter
   page_title 'My Posts', only: [:index]
 
-  # Callbacks: before_save, after_save, resource_error
+  # Callbacks: before_render, before_save, after_save, after_error, after_commit
   before_render(only: :new) do
     resource.client = current_user.clients.first
   end
@@ -166,20 +166,6 @@ class PostsController < ApplicationController
     Post.active.where(user: current_user)
   end
 
-  # The following methods are discovered from the routes.rb and defined automatically.
-  # But you could also define them like this if you wanted.
-
-  # When GET request, will render the approve page
-  # When POST|PATCH|PUT request, will call @post.approve! and do the right thing
-  member_action :approve
-
-  # When GET request, will render an index page scoped to this method (if it's a scope on the model i.e. Post.approved)
-  collection_action :approved
-
-  # When POST|PATCH|PUT request, will call @post.approve! on each post as per params[:ids]
-  # Created with effective_datatables bulk actions in mind
-  collection_action :bulk_approve
-
   protected
 
   # The post_params are discovered from the model effective_resource do ... end block.

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

@@ -69,12 +69,10 @@ module Effective
         EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "New #{resource_name.titleize}"
 
-        respond_to do |format|
-          if save_resource(resource, action)
-            respond_with_success(format, resource, action)
-          else
-            respond_with_error(format, resource, action)
-          end
+        if save_resource(resource, action)
+          respond_with_success(resource, action)
+        else
+          respond_with_error(resource, action)
         end
       end
 
@@ -123,12 +121,10 @@ module Effective
 
         resource.assign_attributes(send(resource_params_method_name))
 
-        respond_to do |format|
-          if save_resource(resource, action)
-            respond_with_success(format, resource, action)
-          else
-            respond_with_error(format, resource, action)
-          end
+        if save_resource(resource, action)
+          respond_with_success(resource, action)
+        else
+          respond_with_error(resource, action)
         end
       end
 
@@ -145,12 +141,10 @@ module Effective
         EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "Destroy #{resource}"
 
-        respond_to do |format|
-          if save_resource(resource, action)
-            respond_with_success(format, resource, action)
-          else
-            respond_with_error(format, resource, action)
-          end
+        if save_resource(resource, action)
+          respond_with_success(resource, action)
+        else
+          respond_with_error(resource, action)
         end
       end
 
@@ -176,12 +170,10 @@ module Effective
         to_assign = (send(resource_params_method_name) rescue {})
         resource.assign_attributes(to_assign) if to_assign.present? && to_assign.permitted?
 
-        respond_to do |format|
-          if save_resource(resource, action)
-            respond_with_success(format, resource, action)
-          else
-            respond_with_error(format, resource, action)
-          end
+        if save_resource(resource, action)
+          respond_with_success(resource, action)
+        else
+          respond_with_error(resource, action)
         end
       end
 

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

@@ -1,86 +1,94 @@
 module Effective
   module CrudController
     module Respond
-      def respond_with_success(format, resource, action)
+      def respond_with_success(resource, action)
+        return if response.body.present?
+
         if specific_redirect_path?(action)
-          format.html do
-            flash[:success] ||= resource_flash(:success, resource, action)
-            redirect_to(resource_redirect_path(action))
-          end
+          respond_to do |format|
+            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[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path(action))
+            end
           end
         elsif template_present?(action)
-          format.html do
-            flash.now[:success] ||= resource_flash(:success, resource, action)
-            render(action) # action.html.haml
-          end
+          respond_to do |format|
+            format.html do
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              render(action) # action.html.haml
+            end
 
-          format.js do
-            flash.now[:success] ||= resource_flash(:success, resource, action)
-            #reload_resource unless action == :destroy # Removed.
-            render(action) # action.js.erb
+            format.js do
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              #reload_resource unless action == :destroy # Removed.
+              render(action) # action.js.erb
+            end
           end
-        elsif response_body.present? # We might have done something weird like send_data in an after_save
-          format.html { flash.now[:success] ||= resource_flash(:success, resource, action) }
-          format.js { flash.now[:success] ||= resource_flash(:success, resource, action) }
         else # Default
-          format.html do
-            flash[:success] ||= resource_flash(:success, resource, action)
-            redirect_to(resource_redirect_path(action))
-          end
+          respond_to do |format|
+            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)
-            render(:member_action, locals: { action: action })
+            format.js do
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              render(:member_action, locals: { action: action })
+            end
           end
         end
       end
 
-      def respond_with_error(format, resource, action)
+      def respond_with_error(resource, action)
+        return if response.body.present?
+        
         flash.delete(:success)
         flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
-        run_callbacks(:resource_render)
-
-        # HTML responder
-        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
-          format.html do
-            if resource_edit_path && referer_redirect_path.to_s.end_with?(resource_edit_path)
-              @page_title ||= "Edit #{resource}"
-              render :edit
-            elsif resource_new_path && referer_redirect_path.to_s.end_with?(resource_new_path)
-              @page_title ||= "New #{resource_name.titleize}"
-              render :new
-            elsif resource_action_path(action) && referer_redirect_path.to_s.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 && referer_redirect_path.to_s.end_with?(resource_show_path)
-              @page_title ||= resource_name.titleize
-              render :show
-            else
-              @page_title ||= resource.to_s
+        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(referer_redirect_path || resource_redirect_path(action))
+              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
-        end
 
-        format.js do
-          view = template_present?(action) ? action : :member_action
-          render(view, locals: { action: action }) # action.js.erb
+          format.js do
+            view = template_present?(action) ? action : :member_action
+            render(view, locals: { action: action }) # action.js.erb
+          end
         end
       end
 

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

@@ -64,8 +64,7 @@ module Effective
           end
         end
 
-        run_callbacks(:resource_error) unless success
-        run_callbacks(:resource_after_commit) if success
+        run_callbacks(success ? :resource_after_commit : :resource_error)
 
         success
       end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.2.14'.freeze
+  VERSION = '1.2.15'.freeze
 end

metadata

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