effective_resources 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01b50384fc2d41b95913769c539276b592257b4f36109917a02afe5a74a8584
-  data.tar.gz: 005a5676dca6e1d0e14a19ad96f31d834a85fdec527514bc75b86d040b3ed2f0
+  metadata.gz: 2b4cbe9d018c7ea4cb40727d321530ba562c0ca873bea3c7e82492cd7d518b64
+  data.tar.gz: f1249c47c44c4095c30441aa636746f298c8591585e14ac948391693ea98cec5
 SHA512:
-  metadata.gz: 0d135e3a5f848c0ee8f40d89e5412a4576fdd4e25068cd5df6ee3d01d3901db36f10c034376dc9bc253cc0f7aebbdce242cebca9c988e8a2bb315621aee80f80
-  data.tar.gz: c7808cfa20c0b8c7b256a0dc5d46ba0b39bf6c638d1200820cd93c50228b8c456b77f9adbe34039825c6e0a00dc5312b6da4ab51a464769ac8b11f91393dcd78
+  metadata.gz: 1b6ae58c5d781ff5ad6378ad6df6f8f5388dd33213fa57c1d2ea902b593d72088e60dbb551fd5185acd442354803c02383b53d7414304ea53740e6c0db5c9d74
+  data.tar.gz: 2df964ebabaa075f388d96ad5e78f9a5d5b27a2071b5320a4f1593fdb882fd717491ddc3ca66a84d027952ed4638f3fa817f48869a2d2d4c4870b831741f3d3f

data/app/models/effective/resources/controller.rb

@@ -31,22 +31,26 @@ module Effective
           end
 
           (member_post_actions - crud_actions).each do |action| # default true means it will be overwritten by dsl methods
-            buttons[action.to_s.titleize] = case action
+            action_name = action.to_s.titleize
+
+            buttons[action_name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             end
           end
 
           member_delete_actions.each do |action|
+            action_name = action.to_s.titleize
+
             if action == :destroy
               next if buttons.values.find { |v| v[:action] == :archive }.present?
               buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
-              buttons[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+              buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
 
@@ -81,24 +85,26 @@ module Effective
           member_post_actions.each do |action|
             next if crud_actions.include?(action)
 
-            actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+            action_name = action.to_s.titleize
 
-            actions[action.to_s.titleize] = case action
+            actions[action_name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
 
           member_delete_actions.each do |action|
+            action_name = action.to_s.titleize
+
             if action == :destroy
               next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
-              actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+              actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
         end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails