effective_resources 2.2.12 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e1045a3f584c05b66281ec3239905cd43100ee124bf9c0fdcfeff7d289fd6f
-  data.tar.gz: 6276115c7a5104f3f51ce56c54681c0ab775fb63c8ff2f362e3f6fd51fcfebde
+  metadata.gz: 9fc4b2cb86902bbdc801204584d765041a0dded527e894eace36d5ea8d923f3f
+  data.tar.gz: ff36581881c3d5dd3667787cf0395c8b6b7b15676e583ac90e85c3e681a02a10
 SHA512:
-  metadata.gz: b5dfd7efe2f70a7b9b5aa337cfbe915700fa211006e95d5d754e631565a1301367e7690b650394c19681bf3a47f2645ecdc1a02fef850abc3931d65c36893228
-  data.tar.gz: 768dbb29366b8ad1df0cc5e9deed4f3e2c216df6de6175c60384033524f12a49c5425b900e16f6c71cd5fa0cf7e4c537aab28f4b824955ec0ee95e651422bd2f
+  metadata.gz: a6bf9ede63c06935ee24d72e7b11d78950b7b1b2e3540338513ab18be3570a13e14189252279872f485f1755378ab180f4d3b517ad1e2c2b2564b2a9952035e9
+  data.tar.gz: 72aa0f77cef8f2f8477a50e50990a51eaf592e5889811a689e4a9fa095e5adb072d6cd8c626fd3945e831f22e4fb6b37d53a2b2349648d71320561b7244ad26a

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

@@ -6,7 +6,7 @@ module Effective
         Rails.logger.info 'Processed by Effective::CrudController#index'
 
         EffectiveResources.authorize!(self, :index, resource_klass)
-        @page_title ||= resource_plural_name.titleize
+        @page_title ||= resource_human_plural_name
 
         self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
         @datatable = resource_datatable()
@@ -42,12 +42,12 @@ module Effective
 
           if (message = flash[:success].to_s).present?
             flash.delete(:success)
-            flash.now[:success] = "#{message.chomp('.')}. Adding another #{resource_name.titleize} based on previous."
+            flash.now[:success] = "#{message.chomp('.')}. Adding another #{resource_human_name} based on previous."
           end
         end
 
         EffectiveResources.authorize!(self, :new, resource)
-        @page_title ||= "New #{resource_name.titleize}"
+        @page_title ||= "New #{resource_human_name}"
 
         run_callbacks(:resource_render)
 
@@ -74,7 +74,7 @@ module Effective
         resource.assign_attributes(send(resource_params_method_name))
 
         EffectiveResources.authorize!(self, action, resource)
-        @page_title ||= "New #{resource_name.titleize}"
+        @page_title ||= "New #{resource_human_name}"
 
         if save_resource(resource, action)
           respond_with_success(resource, action)
@@ -211,7 +211,7 @@ module Effective
         self.resources ||= resource_scope.all
 
         EffectiveResources.authorize!(self, action, resource_klass)
-        @page_title ||= "#{action.to_s.titleize} #{resource_plural_name.titleize}"
+        @page_title ||= "#{action.to_s.titleize} #{resource_human_name}"
 
         if request.get?
           @datatable = resource_datatable()
@@ -238,7 +238,7 @@ module Effective
           end.length
         end
 
-        render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
+        render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_human_plural_name.downcase}" }
       end
     end
 

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

@@ -34,8 +34,10 @@ module Effective
       # submit :toggle, 'Blacklist', if: -> { sync? }, class: 'btn btn-primary'
       # submit :toggle, 'Whitelist', if: -> { !sync? }, class: 'btn btn-primary'
       # submit :save, 'Save', success: -> { "#{resource} was saved okay!" }
-      def submit(action, label = nil, args = {})
-        _insert_submit(action, label, args)
+      def submit(action, label, args = {})
+        instance_exec do
+          before_action { _insert_submit(action, label, args) }
+        end
       end
 
       # This controls the resource buttons section of the page
@@ -46,13 +48,17 @@ module Effective
       # button :approve, 'Approve', unless: -> { resource.approved? }, redirect: :show
       # button :decline, false
       def button(action, label = nil, args = {})
-        _insert_button(action, label, args)
+        instance_exec do
+          before_action { _insert_button(action, label, args) }
+        end
       end
 
       # This is a way of defining the redirect, flash etc of any action without tweaking defaults
       # submit and buttons options will be merged ontop of these
       def on(action, args = {})
-        _insert_on(action, args)
+        instance_exec do
+          before_action { _insert_on(action, args) }
+        end
       end
 
       # page_title 'My Title', only: [:new]

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

@@ -4,10 +4,8 @@ module Effective
 
       # Based on the incoming params[:commit] or passed action. Merges all options.
       def commit_action(action = nil)
-        #config = (['create', 'update'].include?(params[:action]) ? self.class.submits : self.class.buttons)
-
-        config = self.class.submits
-        ons = self.class.ons
+        config = self.submits()
+        ons = self.ons()
 
         commit = config[params[:commit].to_s]
         commit ||= config.find { |_, v| v[:action] == action }.try(:last)

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

@@ -1,122 +1,122 @@
 module Effective
   module CrudController
     module Submits
-      extend ActiveSupport::Concern
 
-      module ClassMethods
-        # { 'Save' => { action: save, ...}}
-        def submits
-          @_effective_submits ||= effective_resource.submits
-        end
-
-        # { 'Approve' => { action: approve, ...}}
-        def buttons
-          @_effective_buttons ||= effective_resource.buttons
-        end
-
-        # { :approve => { redirect: .. }}
-        def ons
-          @_effective_ons ||= effective_resource.ons
-        end
+      # { 'Save' => { action: save, ...}}
+      def submits
+        @_effective_submits ||= effective_resource.submits()
+      end
 
-        # :only, :except, :if, :unless, :redirect, :success, :danger, :class
-        def _insert_submit(action, label = nil, args = {})
-          raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
+      # { 'Approve' => { action: approve, ...}}
+      def buttons
+        @_effective_buttons ||= effective_resource.buttons()
+      end
 
-          if label == false
-            submits.delete_if { |label, args| args[:action] == action }; return
-          end
+      # { :approve => { redirect: .. }}
+      def ons
+        @_effective_ons ||= effective_resource.ons()
+      end
 
-          if args == false
-            submits.delete(label); return
-          end
+      # :only, :except, :if, :unless, :redirect, :success, :danger, :class
+      def _insert_submit(action, label = nil, args = {})
+        raise "expected first argument to be a Symbol. Try submit :approve, 'Approve'" unless action.kind_of?(Symbol)
+        raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
 
-          if label # Overwrite the default member action when given a custom submit
-            submits.delete_if { |label, args| args[:default] && args[:action] == action }
-          end
+        if label == false
+          submits.delete_if { |label, args| args[:action] == action }; return
+        end
 
-          if args.key?(:if) && args[:if].respond_to?(:call) == false
-            raise "expected if: to be callable. Try submit :approve, 'Save and Approve', if: -> { resource.finished? }"
-          end
+        if args == false
+          submits.delete(label); return
+        end
 
-          if args.key?(:unless) && args[:unless].respond_to?(:call) == false
-            raise "expected unless: to be callable. Try submit :approve, 'Save and Approve', unless: -> { resource.declined? }"
-          end
+        if label # Overwrite the default member action when given a custom submit
+          submits.delete_if { |label, args| args[:default] && args[:action] == action }
+        end
 
-          if args.key?(:only)
-            args[:only] = Array(args[:only])
-            raise "expected only: to be a symbol or array of symbols. Try submit :approve, 'Save and Approve', only: [:edit]" unless args[:only].all? { |v| v.kind_of?(Symbol) }
-          end
+        if args.key?(:if) && args[:if].respond_to?(:call) == false
+          raise "expected if: to be callable. Try submit :approve, 'Save and Approve', if: -> { resource.finished? }"
+        end
 
-          if args.key?(:except)
-            args[:except] = Array(args[:except])
-            raise "expected except: to be a symbol or array of symbols. Try submit :approve, 'Save and Approve', except: [:edit]" unless args[:except].all? { |v| v.kind_of?(Symbol) }
-          end
+        if args.key?(:unless) && args[:unless].respond_to?(:call) == false
+          raise "expected unless: to be callable. Try submit :approve, 'Save and Approve', unless: -> { resource.declined? }"
+        end
 
-          if args.key?(:redirect_to) # Normalize this option to redirect
-            args[:redirect] = args.delete(:redirect_to)
-          end
+        if args.key?(:only)
+          args[:only] = Array(args[:only])
+          raise "expected only: to be a symbol or array of symbols. Try submit :approve, 'Save and Approve', only: [:edit]" unless args[:only].all? { |v| v.kind_of?(Symbol) }
+        end
 
-          args[:action] = action
+        if args.key?(:except)
+          args[:except] = Array(args[:except])
+          raise "expected except: to be a symbol or array of symbols. Try submit :approve, 'Save and Approve', except: [:edit]" unless args[:except].all? { |v| v.kind_of?(Symbol) }
+        end
 
-          (submits[label] ||= {}).merge!(args)
+        if args.key?(:redirect_to) # Normalize this option to redirect
+          args[:redirect] = args.delete(:redirect_to)
         end
 
-        def _insert_button(action, label = nil, args = {})
-          raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
+        args[:action] = action
 
-          if label == false
-            buttons.delete_if { |label, args| args[:action] == action }; return
-          end
+        (submits[label] ||= {}).merge!(args)
+      end
 
-          if args == false
-            buttons.delete(label); return
-          end
+      def _insert_button(action, label = nil, args = {})
+        raise "expected first argument to be a Symbol. Try button :approve, 'Approve'" unless action.kind_of?(Symbol)
+        raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
 
-          if label # Overwrite the default member action when given a custom label
-            buttons.delete_if { |label, args| args[:default] && args[:action] == action }
-          end
+        if label == false
+          buttons.delete_if { |label, args| args[:action] == action }; return
+        end
 
-          if args.key?(:if) && args[:if].respond_to?(:call) == false
-            raise "expected if: to be callable. Try button :approve, 'Approve', if: -> { resource.finished? }"
-          end
+        if args == false
+          buttons.delete(label); return
+        end
 
-          if args.key?(:unless) && args[:unless].respond_to?(:call) == false
-            raise "expected unless: to be callable. Try button :approve, 'Approve', unless: -> { resource.declined? }"
-          end
+        if label # Overwrite the default member action when given a custom label
+          buttons.delete_if { |label, args| args[:default] && args[:action] == action }
+        end
 
-          if args.key?(:only)
-            args[:only] = Array(args[:only])
-            raise "expected only: to be a symbol or array of symbols. Try button :approve, 'Save and Approve', only: [:edit]" unless args[:only].all? { |v| v.kind_of?(Symbol) }
-          end
+        if args.key?(:if) && args[:if].respond_to?(:call) == false
+          raise "expected if: to be callable. Try button :approve, 'Approve', if: -> { resource.finished? }"
+        end
 
-          if args.key?(:except)
-            args[:except] = Array(args[:except])
-            raise "expected except: to be a symbol or array of symbols. Try button :approve, 'Save and Approve', except: [:edit]" unless args[:except].all? { |v| v.kind_of?(Symbol) }
-          end
+        if args.key?(:unless) && args[:unless].respond_to?(:call) == false
+          raise "expected unless: to be callable. Try button :approve, 'Approve', unless: -> { resource.declined? }"
+        end
 
-          if args.key?(:redirect_to) # Normalize this option to redirect
-            args[:redirect] = args.delete(:redirect_to)
-          end
+        if args.key?(:only)
+          args[:only] = Array(args[:only])
+          raise "expected only: to be a symbol or array of symbols. Try button :approve, 'Save and Approve', only: [:edit]" unless args[:only].all? { |v| v.kind_of?(Symbol) }
+        end
 
-          args[:action] = action
+        if args.key?(:except)
+          args[:except] = Array(args[:except])
+          raise "expected except: to be a symbol or array of symbols. Try button :approve, 'Save and Approve', except: [:edit]" unless args[:except].all? { |v| v.kind_of?(Symbol) }
+        end
 
-          (buttons[label] ||= {}).merge!(args)
+        if args.key?(:redirect_to) # Normalize this option to redirect
+          args[:redirect] = args.delete(:redirect_to)
         end
 
-        def _insert_on(action, args = {})
-          raise 'expected args to be a Hash' unless args.kind_of?(Hash)
+        args[:action] = action
 
-          if args.key?(:redirect_to) # Normalize this option to redirect
-            args[:redirect] = args.delete(:redirect_to)
-          end
+        (buttons[label] ||= {}).merge!(args)
+      end
 
-          args[:action] = action
+      def _insert_on(action, args = {})
+        raise "expected first argument to be a Symbol. Try on :approve, success: -> { ... }" unless action.kind_of?(Symbol)
+        raise 'expected args to be a Hash' unless args.kind_of?(Hash)
 
-          (ons[action] ||= {}).merge!(args)
+        if args.key?(:redirect_to) # Normalize this option to redirect
+          args[:redirect] = args.delete(:redirect_to)
         end
-      end
 
+        args[:action] = action
+
+        (ons[action] ||= {}).merge!(args)
+      end
     end
+
   end
 end

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

@@ -18,11 +18,7 @@ module Effective
     module ClassMethods
       include Effective::CrudController::Dsl
 
-      # This is used for the buttons/submits/ons
-      # It doesn't really work with the resource_scope correctly but the routes are important here
-      def effective_resource
-        @_effective_resource ||= Effective::Resource.new(controller_path)
-      end
+      def effective_crud_controller?; true; end
     end
 
     def resource # @thing
@@ -84,6 +80,10 @@ module Effective
       effective_resource.relation
     end
 
+    def resource_klass # Thing
+      effective_resource.klass
+    end
+
     def resource_name # 'thing'
       effective_resource.name
     end
@@ -92,16 +92,16 @@ module Effective
       (effective_resource.name + '_id').to_sym
     end
 
-    def resource_klass # Thing
-      effective_resource.klass
+    def resource_plural_name # 'things'
+      effective_resource.plural_name
     end
 
-    def resource_human_name
+    def resource_human_name # I18n
       effective_resource.human_name
     end
 
-    def resource_plural_name # 'things'
-      effective_resource.plural_name
+    def resource_human_plural_name # I18n
+      effective_resource.human_plural_name
     end
 
     def resource_datatable_attributes

data/app/helpers/effective_resources_helper.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 module EffectiveResourcesHelper
-
   # effective_bootstrap
   def effective_submit(form, options = {}, &block)
-    actions = (controller.respond_to?(:effective_resource) ? controller.class : find_effective_resource).submits
+    actions = controller.try(:submits) || raise('controller must be an Effective::CrudController')
     actions = actions.select { |k, v| v[:default] != true } if options.delete(:defaults) == false
     actions = permitted_resource_actions(form.object, actions)
 
@@ -17,7 +16,7 @@ module EffectiveResourcesHelper
 
   # effective_form_inputs
   def simple_form_submit(form, options = {}, &block)
-    actions = (controller.respond_to?(:effective_resource) ? controller.class : find_effective_resource).submits
+    actions = controller.try(:submits) || raise('controller must be an Effective::CrudController')
     actions = permitted_resource_actions(form.object, actions)
 
     submits = actions.map { |name, opts| form.button(:submit, name, opts.except(:action, :title, 'data-method')) }
@@ -38,7 +37,7 @@ module EffectiveResourcesHelper
 
   def render_resource_buttons(resource, atts = {}, &block)
     effective_resource = find_effective_resource
-    actions = (controller.respond_to?(:effective_resource) ? controller.class : effective_resource).buttons
+    actions = controller.try(:buttons) || raise('controller must be an Effective::CrudController')
 
     actions = if resource.kind_of?(Class)
       actions.select { |_, v| effective_resource.collection_get_actions.include?(v[:action]) }
@@ -301,4 +300,15 @@ module EffectiveResourcesHelper
     path || '/'
   end
 
+  def effective_translate(resource, attribute = nil)
+    EffectiveResources.et(resource, attribute)
+  end
+
+  def effective_translates(resource, attribute = nil)
+    EffectiveResources.ets(resource, attribute)
+  end
+
+  alias_method :et, :effective_translate
+  alias_method :ets, :effective_translates
+
 end

data/app/models/effective/resource.rb

@@ -8,6 +8,7 @@ module Effective
     include Effective::Resources::Instance
     include Effective::Resources::Forms
     include Effective::Resources::Generator
+    include Effective::Resources::I18n
     include Effective::Resources::Klass
     include Effective::Resources::Model
     include Effective::Resources::Naming
@@ -31,7 +32,7 @@ module Effective
     end
 
     def to_s
-      name
+      human_name
     end
 
   end

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

@@ -7,11 +7,11 @@ module Effective
       # This is the attributes as defined by ActiveRecord table
       # { :name => [:string], ... }
       def attributes
-        (klass_attributes.presence || model_attributes.presence)
+        klass_attributes.presence || model_attributes.presence
       end
 
       def primary_key_attribute
-        {klass.primary_key.to_sym => [:integer]}
+        { klass.primary_key.to_sym => [:integer] }
       end
 
       # The attributes for each belongs_to

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

@@ -54,11 +54,11 @@ module Effective
           end
 
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}".titleize] = { action: :index, default: true }
+            buttons["All #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}".titleize] = { action: :new, default: true }
+            buttons["New #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|
@@ -122,11 +122,11 @@ module Effective
       def resource_klass_actions
         {}.tap do |buttons|
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}".titleize] = { action: :index, default: true }
+            buttons["All #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}".titleize] = { action: :new, default: true }
+            buttons["New #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Effective
+  module Resources
+    module I18n
+
+      def human_name
+        if klass.respond_to?(:model_name)
+          klass.model_name.human
+        else
+          name.gsub('::', ' ').underscore.gsub('_', ' ')
+        end
+      end
+
+      def human_plural_name
+        if klass.respond_to?(:model_name)
+          klass.model_name.human.pluralize
+        else
+          name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
+        end
+      end
+
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Effective
         @model.read(&block)
 
         # If effective_developer is in live mode, this will cause it to refresh the class
-        ActiveSupport.run_load_hooks(:effective_resource, self)
+        # ActiveSupport.run_load_hooks(:effective_resource, self)
       end
 
       def model

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

@@ -63,13 +63,6 @@ module Effective
         @namespaces || []
       end
 
-      def human_name
-        name.gsub('::', ' ').underscore.gsub('_', ' ')
-      end
-
-      def human_plural_name
-        name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
-      end
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.12'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/lib/effective_resources.rb

@@ -178,4 +178,20 @@ module EffectiveResources
     end
   end
 
+  def self.et(resource, attribute = nil)
+    return I18n.t(resource) unless resource.respond_to?(:model_name)
+
+    if attribute.blank?
+      resource.model_name.human
+    elsif resource.respond_to?(:human_attribute_name)
+      resource.human_attribute_name(attribute)
+    else
+      resource.class.human_attribute_name(attribute)
+    end
+  end
+
+  def self.ets(resource, attribute = nil)
+    et(resource, attribute).pluralize
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,6 +182,7 @@ files:
 - app/models/effective/resources/controller.rb
 - app/models/effective/resources/forms.rb
 - app/models/effective/resources/generator.rb
+- app/models/effective/resources/i18n.rb
 - app/models/effective/resources/init.rb
 - app/models/effective/resources/instance.rb
 - app/models/effective/resources/klass.rb