effective_resources 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a779e0658cce584ace850ad214ad99b8590c08
-  data.tar.gz: d6f9d9f97090b0a37eeeee405e5f3fbf30ce3c71
+  metadata.gz: 5227cd81c0ab72a5764f6e0f0d9f34fdc0619838
+  data.tar.gz: d30f8ea5e36ec64c34aec2b9e85c9e313029d0f2
 SHA512:
-  metadata.gz: 071eb0886b9e5f92be4479a64616ed68e1da4ce613e9d518c30c8db660abacd0b9cdab836f187e88c6e338e2a544314c1b5a69c85d1491e32adf8e89dc799475
-  data.tar.gz: 1da07444c0d9766ba1c6b5a8abc1ee13671414a16f9f6d71699f3b6db7ca435d4462a2fc6f73579c6437f4dee2d17b39902a477277b14a4dc51f383072eaf770
+  metadata.gz: 81ffdd31a4ca269fcfccb636fa1800f8fb50590cdd070190384b979f1b3d00d61828abd3dc12f60d6081f5723a3529b7321ab200b21d8673799a562f22deb6ac
+  data.tar.gz: 8a570e966b5f190f3c594186a1151797b38d21dfd99a8eb2d60f5b8a03b5feac7a0a26d023e437e18f18c4347a2f204b36d748928aa1b2aa3f64b9f022cc0c96

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

@@ -204,25 +204,23 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action, send(resource_params_method_name))
+          request.format = :html if specific_redirect_path?
+
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path)
           end
 
           format.js do
-            if specific_redirect_path?
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path)
-            else
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource
-              # create.js.erb
-            end
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            reload_resource # create.js.erb
           end
         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
         end
@@ -258,25 +256,23 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action, send(resource_params_method_name))
+          request.format = :html if specific_redirect_path?
+
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path)
           end
 
           format.js do
-            if specific_redirect_path?
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path)
-            else
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource
-              # update.js.erb
-            end
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            reload_resource # update.js.erb
           end
         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
         end
@@ -292,19 +288,16 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action)
+          request.format = :html if specific_redirect_path?
+
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path(action))
           end
 
           format.js do
-            if specific_redirect_path?
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(esource_redirect_path(action))
-            else
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              # destroy.js.erb
-            end
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            # destroy.js.erb
           end
         else
           flash.delete(:success)
@@ -327,25 +320,24 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action, (send(resource_params_method_name) rescue {}))
+          request.format = :html if specific_redirect_path?
+
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path(action))
           end
 
           format.js do
-            if specific_redirect_path?(action)
-              flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
-            else
-              flash.now[:success] ||= resource_flash(:success, resource, action)
-              reload_resource
-              render_member_action(action)
-            end
+            flash.now[:success] ||= resource_flash(:success, resource, action)
+            reload_resource
+            render_member_action(action)
           end
         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}"
@@ -413,6 +405,7 @@ module Effective
           end
 
           yield if block_given?
+
           run_callbacks(:resource_save)
           return true
         rescue => e
@@ -442,9 +435,9 @@ module Effective
     def resource_flash(status, resource, action)
       submit = commit_action(action)
       message = submit[status].respond_to?(:call) ? instance_exec(&submit[status]) : submit[status]
-      return message if message.present?
+      return if message.present?
 
-      message || case status
+      case status
       when :success then flash_success(resource, action)
       when :danger then flash_danger(resource, action)
       else
@@ -565,10 +558,6 @@ module Effective
       effective_resource.plural_name
     end
 
-    def action_verb(action)
-      (action.to_s + (action.to_s.end_with?('e') ? 'd' : 'ed'))
-    end
-
     # Based on the incoming params[:commit] or passed action
     def commit_action(action = nil)
       self.class.submits[params[:commit].to_s] ||

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

@@ -6,11 +6,9 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      name ||= resource.class.model_name.human
+      name ||= resource.class.model_name.human.downcase
 
-      action = (action || :save).to_s.gsub('_', ' ')
-
-      "#{name.to_s.titleize} was successfully #{action}#{(action == 'submit' ? 't' : '')}#{(action.end_with?('e') ? 'd' : 'ed')}"
+      "Successfully #{action_verb(action)} #{name}"
     end
 
     # flash.now[:danger] = flash_danger(@post)
@@ -19,10 +17,11 @@ module Effective
 
       action ||= resource.respond_to?(:new_record?) ? (resource.new_record? ? :create : :update) : :save
       action = action.to_s.gsub('_', ' ')
-      name ||= resource.class.model_name.human
+
+      name ||= resource.class.model_name.human.downcase
       messages = flash_errors(resource, e: e)
 
-      ["Unable to #{action} #{name.to_s.downcase}", (": #{messages}." if messages)].compact.join.html_safe
+      ["Unable to #{action} #{name}", (": #{messages}." if messages)].compact.join.html_safe
     end
 
     # flash.now[:danger] = "Unable to accept: #{flash_errors(@post)}"
@@ -45,5 +44,17 @@ module Effective
 
       messages.to_sentence.presence
     end
+
+    def action_verb(action)
+      action = action.to_s.gsub('_', ' ')
+      word = action.split(' ').first
+
+      if word.end_with?('e')
+        action.sub(word, word + 'd')
+      else
+        action.sub(word, word + 'ed')
+      end
+    end
+
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.18'.freeze
+  VERSION = '0.8.19'.freeze
 end

metadata

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