effective_resources 2.4.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a393d33cfa210550260fe050c11b1eab54ff0b7f534391aad7bb2058a01ea0
-  data.tar.gz: 5edbfb9aa5538100895dc35e2fb4806a5915c730862d9e312f4900e858914b66
+  metadata.gz: 856d2a15f81a4ecff7c02f01a0e6444e5d81999af6f357428b86a6479bd126fb
+  data.tar.gz: 72a6da8d12e0b5ce4465028fe5269ca2ef22cfb3f4f70655783cf8db1ecd97b5
 SHA512:
-  metadata.gz: bb45c37f2c5e2afef660925a218aceb7ee93f6ed7cc3e670c82e002edce9c9670e5a93604c677ea792999ecfa14ec93dfc25050de9ff0a66a151cf8ac9ebd568
-  data.tar.gz: cd3e71440f3693dcb12278dea707273c974beff4dbd6801546d199d618dc731877f4487726a8c4519f4beb1d3492c727f693dc5d5b9a706dfee6dc2e214d6b88
+  metadata.gz: 3a18cacf16dd2d0c54f14b4995f73708b9136baf1701d75d3d0cc5c186b782bee8bee3fc49a54658da1794b9faac59dc6544f8a53a9eddbe033c25af6360e0bd
+  data.tar.gz: fea55cc3cc15071d6bf80a34b4bbb1ab975d5f173434f4589277a9ed1885166f205b0c2c710c1c73ffc169c5a624daa6f1ada46f16aa0941e4b3cb6a145d7634

data/app/helpers/effective_resources_private_helper.rb

@@ -3,6 +3,7 @@
 module EffectiveResourcesPrivateHelper
   REPLACE_PAGE_ACTIONS = {'update' => :edit, 'create' => :new}
   BLACKLIST = [:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass]
+  REPLACE_RESOURCE_METHODS = Regexp.new('@resource\.\w+')
 
   def permitted_resource_actions(resource, actions)
     page_action = REPLACE_PAGE_ACTIONS[params[:action]] || params[:action].try(:to_sym) || :save
@@ -20,7 +21,7 @@ module EffectiveResourcesPrivateHelper
       next unless permitted
 
       opts = args.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass)
-      resource_to_s = resource.to_s.presence || resource.class.name.underscore
+      resource_to_s = resource.to_s.presence || EffectiveResources.et(resource)
 
       # Transform data: { ... } hash into 'data-' keys
       if opts.key?(:data)
@@ -35,9 +36,16 @@ module EffectiveResourcesPrivateHelper
         opts[:href] = opts.delete(:url)
       end
 
-      # Replace resource name in any token strings
+      # Replaces @resource.emails_send_to and @resource in data-confirm
       if opts.key?('data-confirm') && opts['data-confirm'].to_s.include?('@resource')
-        opts['data-confirm'] = opts['data-confirm'].gsub('@resource', resource_to_s)
+        confirm = opts['data-confirm']
+
+        confirm.gsub!(REPLACE_RESOURCE_METHODS) do |value|
+          method = value.to_s.split('.').last
+          resource.public_send(method)
+        end
+
+        opts['data-confirm'] = confirm.gsub('@resource', resource_to_s)
       end
 
       # Assign class
@@ -56,10 +64,10 @@ module EffectiveResourcesPrivateHelper
       # Assign title
       opts[:title] ||= case opts[:action]
         when :save then commit
-        when :edit then "Edit #{resource_to_s}"
+        when :edit then "#{et("effective_resources.actions.edit")} #{resource_to_s}"
         when :show then "#{resource_to_s}"
-        when :destroy then "Delete #{resource_to_s}"
-        when :index then "All #{resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ').titleize.pluralize}"
+        when :destroy then "#{et("effective_resources.actions.destroy")} #{resource_to_s}"
+        when :index then "#{et("effective_resources.actions.index")} #{ets(resource)}"
         else "#{opts[:action].to_s.titleize} #{resource_to_s}"
       end
 

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

@@ -25,44 +25,45 @@ module Effective
       end
 
       def buttons
+        human_index = EffectiveResources.et("effective_resources.actions.index")
+        human_new = EffectiveResources.et("effective_resources.actions.new")
+
         {}.tap do |buttons|
           member_get_actions.each do |action| # default true means it will be overwritten by dsl methods
-            buttons[action.to_s.titleize] = { action: action, default: true }
+            buttons[human_action_name(action)] = { action: action, default: true }
           end
 
           (member_post_actions - crud_actions).each do |action| # default true means it will be overwritten by dsl methods
-            action_name = action.to_s.titleize
+            name = human_action_name(action)
+            confirm = human_action_confirm(action)
 
-            buttons[action_name] = case action
+            buttons[name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => confirm }
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => confirm }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => confirm }
             end
           end
 
           member_delete_actions.each do |action|
-            action_name = action.to_s.titleize
+            name = human_action_name(action)
+            confirm = human_action_confirm(action)
 
-            if action == :destroy
-              buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
-            else
-              buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
-            end
+            buttons[name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => confirm }
           end
 
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}"] = { action: :index, default: true }
+            buttons["#{human_index} #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}"] = { action: :new, default: true }
+            buttons["#{human_new} #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|
-            buttons[action.to_s.titleize] = { action: action, default: true }
+            buttons[human_action_name(action)] = { action: action, default: true }
           end
         end
       end
@@ -73,37 +74,35 @@ module Effective
         {}.tap do |actions|
           member_get_actions.reverse_each do |action|
             next unless crud_actions.include?(action)
-            actions[action.to_s.titleize] = { action: action, default: true }
+            actions[human_action_name(action)] = { action: action, default: true }
           end
 
           member_get_actions.each do |action|
             next if crud_actions.include?(action)
-            actions[action.to_s.titleize] = { action: action, default: true }
+            actions[human_action_name(action)] = { action: action, default: true }
           end
 
           member_post_actions.each do |action|
             next if crud_actions.include?(action)
 
-            action_name = action.to_s.titleize
+            name = human_action_name(action)
+            confirm = human_action_confirm(action)
 
-            actions[action_name] = case action
+            actions[name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => confirm }
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => confirm }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => confirm }
             end
           end
 
           member_delete_actions.each do |action|
-            action_name = action.to_s.titleize
+            name = human_action_name(action)
+            confirm = human_action_confirm(action)
 
-            if action == :destroy
-              actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
-            else
-              actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
-            end
+            actions[name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => confirm }
           end
         end
       end
@@ -111,26 +110,29 @@ module Effective
       # Used by datatables
       def fallback_resource_actions
         {
-          'Show': { action: :show, default: true },
-          'Edit': { action: :edit, default: true },
-          'Delete': { action: :destroy, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
+          human_action_name(:show) => { action: :show, default: true },
+          human_action_name(:edit) => { action: :edit, default: true },
+          human_action_name(:destroy) => { action: :destroy, default: true, 'data-method' => :delete, 'data-confirm' => human_action_confirm(:destroy) }
         }
       end
 
       # This is the fallback for render_resource_actions when no actions are specified, but a class is given
       # Used by Datatables new
       def resource_klass_actions
+        human_index = EffectiveResources.et("effective_resources.actions.index")
+        human_new = EffectiveResources.et("effective_resources.actions.new")
+
         {}.tap do |buttons|
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}"] = { action: :index, default: true }
+            buttons["#{human_index} #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}"] = { action: :new, default: true }
+            buttons["#{human_new} #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|
-            buttons[action.to_s.titleize] = { action: action, default: true }
+            buttons[human_action_name(action)] = { action: action, default: true }
           end
         end
       end

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

@@ -4,6 +4,29 @@ module Effective
   module Resources
     module I18n
 
+      def human_action_name(action)
+        if klass.respond_to?(:model_name)
+          value = ::I18n.t("activerecord.actions.#{klass.model_name.i18n_key}.#{action}")
+          return value unless value.start_with?('translation missing:')
+        end
+
+        if(crud_actions.include?(action))
+          # Raises exception if not present
+          return EffectiveResources.et("effective_resources.actions.#{action}")
+        end
+
+        action.to_s.titleize
+      end
+
+      def human_action_confirm(action)
+        if klass.respond_to?(:model_name)
+          value = ::I18n.t("activerecord.actions.#{klass.model_name.i18n_key}.#{action}_confirm")
+          return value unless value.start_with?('translation missing:')
+        end
+
+        "Really #{human_action_name(action)} @resource?"
+      end
+
       def human_name
         if klass.respond_to?(:model_name)
           klass.model_name.human

data/config/locales/effective_resources.en.yml

@@ -0,0 +1,10 @@
+en:
+  effective_resources:
+    name: 'Effective Resources'
+
+    actions:
+      index: 'All'
+      new: 'New'
+      edit: 'Edit'
+      show: 'Show'
+      destroy: 'Delete'

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.4.7'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ files:
 - app/views/effective/resource/_actions_glyphicons.html.haml
 - app/views/layouts/effective_mailer_layout.html.haml
 - config/effective_resources.rb
+- config/locales/effective_resources.en.yml
 - config/routes.rb
 - lib/effective_resources.rb
 - lib/effective_resources/effective_gem.rb