effective_resources 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e0b794db680cc5d1128cec78d437057338870c
-  data.tar.gz: b5ce5e70f5abb3c49dd771ab6745fc859610e82a
+  metadata.gz: 68074e96512d111e7b55e78fd29b1b15496f4363
+  data.tar.gz: df35b07a9314f9f181b3505e808b1693d4d9756c
 SHA512:
-  metadata.gz: 0e25d29b786c84a6337c1a655d90719dfecdeb4a824db2d37d2815cb9a6c485df6a5c7fe7e53da9cfc509c0f3d0d5e9e959bff939ee38f5f197dfe7c468f33bd
-  data.tar.gz: 41a58b98945b99b7725f45b7c7b7f4ff5de90f2c3cb1e659f1f031cf2e6d0ea05a4648fdf418360da6105a5b29fb43afff8ae40286ae95f3f8ffcb103244b418
+  metadata.gz: ba76ceb463231bbf9c61e844ddc39dd60cd010c18b61bc7d121ed890ead8bc97e15aafacd96a50ba208c67211578b20a0ac30a82769e2c679de263fe8d3f5aec
+  data.tar.gz: 44235f52f3fdfcf346b4fec727439b032ba51e82928bcf21ab43f554161d59b95d585359490c20da636cbbd41cafaf9cdd376b901abcc422f9f00098daecab17

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

@@ -82,11 +82,12 @@ module Effective
 
       # page_title 'My Title', only: [:new]
       def page_title(label = nil, opts = {}, &block)
+        opts = label if label.kind_of?(Hash)
         raise 'expected a label or block' unless (label || block_given?)
 
         instance_exec do
           before_action(opts) do
-            @page_title ||= (block_given? ? instance_exec(&block) : label)
+            @page_title ||= (block_given? ? instance_exec(&block) : label).to_s
           end
         end
       end
@@ -328,13 +329,13 @@ module Effective
         if save_resource(resource, action, (send(resource_params_method_name) rescue {}))
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
-            redirect_to(resource_redirect_path)
+            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)
+              redirect_to(resource_redirect_path(action))
             else
               flash.now[:success] ||= resource_flash(:success, resource, action)
               reload_resource
@@ -358,7 +359,7 @@ module Effective
             else
               @page_title ||= resource.to_s
               flash[:danger] = flash.now[:danger]
-              redirect_to(referer_redirect_path || resource_redirect_path)
+              redirect_to(referer_redirect_path || resource_redirect_path(action))
             end
           end
 
@@ -439,7 +440,8 @@ module Effective
     end
 
     def resource_flash(status, resource, action)
-      message = commit_action[status].respond_to?(:call) ? instance_exec(&commit_action[status]) : commit_action[status]
+      submit = commit_action(action)
+      message = submit[status].respond_to?(:call) ? instance_exec(&submit[status]) : submit[status]
       return message if message.present?
 
       message || case status
@@ -450,8 +452,9 @@ module Effective
       end
     end
 
-    def resource_redirect_path
-      redirect = commit_action[:redirect].respond_to?(:call) ? instance_exec(&commit_action[:redirect]) : commit_action[:redirect]
+    def resource_redirect_path(action = nil)
+      submit = commit_action(action)
+      redirect = submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]
 
       commit_action_redirect = case redirect
         when :index     ; resource_index_path
@@ -461,7 +464,7 @@ 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(commit_action[:action])
+        when Symbol     ; resource_action_path(submit[:action])
         when String     ; redirect
         else            ; nil
       end
@@ -562,20 +565,17 @@ module Effective
       (action.to_s + (action.to_s.end_with?('e') ? 'd' : 'ed'))
     end
 
-    def commit_action
+    # Based on the incoming params[:commit] or passed action
+    def commit_action(action = nil)
       self.class.submits[params[:commit].to_s] ||
-      self.class.submits.find { |_, v| v[:action] == :save }&.last ||
-      { action: :save }
-    end
-
-    def submit_action(action)
       self.class.submits[action.to_s] ||
       self.class.submits.find { |_, v| v[:action] == action }&.last ||
-      { action: action }
+      self.class.submits.find { |_, v| v[:action] == :save }&.last ||
+      { action: (action || :save) }
     end
 
     def specific_redirect_path?(action = nil)
-      submit = (action.nil? ? commit_action : submit_action(action))
+      submit = commit_action(action)
       (submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]).present?
     end
 

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

@@ -6,10 +6,11 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      action ||= :save
       name ||= resource.class.model_name.human
 
-      "#{name.to_s.titleize} was successfully #{action}#{(action.to_s == 'submit' ? 't' : '')}#{(action.to_s.end_with?('e') ? 'd' : 'ed')}"
+      action = (action || :save).to_s.gsub('_', ' ')
+
+      "#{name.to_s.titleize} was successfully #{action}#{(action == 'submit' ? 't' : '')}#{(action.end_with?('e') ? 'd' : 'ed')}"
     end
 
     # flash.now[:danger] = flash_danger(@post)
@@ -17,6 +18,7 @@ module Effective
       raise 'expected an ActiveRecord resource' unless resource.respond_to?(:errors) && (name || resource.class.respond_to?(:model_name))
 
       action ||= resource.respond_to?(:new_record?) ? (resource.new_record? ? :create : :update) : :save
+      action = action.to_s.gsub('_', ' ')
       name ||= resource.class.model_name.human
       messages = flash_errors(resource, e: e)
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.13'.freeze
+  VERSION = '0.8.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Code and Effect