eac_rails_utils 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10597063c9780ca174f0236d4bb7a87af4b5702d0617b84406ebf613afe7a822
-  data.tar.gz: befada54dbc901d1d2e43d33606f1a3219fd288cf3a8d52178495e337fe4d8de
+  metadata.gz: 0b5ed5306142ed06d984e58c9e16e743eeb1553e0aeb71d20b0a74eedb184edb
+  data.tar.gz: 47b1a51b701dc1edcba208f0d67104e5b72cdfc64c147c734bf8c7578b302377
 SHA512:
-  metadata.gz: 205e2134c2f1d5b5770dff69c1ec55b87fc454a563dc0e1c01623341d9b2d6701b81f502a01efcf3772bccbef45a6405ea4040bf295d2f851874fa094a2069fe
-  data.tar.gz: d90285c437b1ad93874601d4077e1c1d86c3df012348860523a8bb70ae33c395fbc0cb23b0089cef75e3bc4255d59c8d3329bec4ca4004266bcae513fd12c676
+  metadata.gz: ed95ae67b0db7fea40dd3524f23dc1673b59b49a7058d76624f5094f541908997ebde03869c4f348dd31b743a4b6b8a94467388a5daa4895333ba326e9ba3a53
+  data.tar.gz: 98bf0813f2b764a5d5148afda0c024de7110b66f70322aec8e1a45fd4df2e9f3266541d46b8af59384a2d6856fe0901ca8d183cae7b16bea14bd717ca1914606

data/app/helpers/eac_rails_utils/data_table_helper/data_table.rb

@@ -5,11 +5,16 @@ require 'eac_ruby_utils/core_ext'
 module EacRailsUtils
   module DataTableHelper
     class DataTable
+      CONTAINER_CSS_CLASS = %w[table-responsive].freeze
+      TABLE_CSS_CLASSES = %w[table table-striped].freeze
+
       common_constructor :view, :dataset, :setup_block, block_arg: true
 
       def output
-        view.content_tag(:table, id: id) do
-          head << body
+        view.content_tag(:div, class: CONTAINER_CSS_CLASS) do
+          view.content_tag(:table, id: id, class: TABLE_CSS_CLASSES) do
+            head << body
+          end
         end << script
       end
 
@@ -40,9 +45,9 @@ module EacRailsUtils
       def script
         view.javascript_tag <<~JS_CODE
           $(document).ready(function () {
-            $('##{id}').DataTable({
-              paging: #{setup.paging ? 'true' : 'false'} # rubocop:disable Rails/HelperInstanceVariable
-                  });
+              $('##{id}').DataTable({
+                  paging: #{setup.paging ? 'true' : 'false'} # rubocop:disable Rails/HelperInstanceVariable
+                });
             });
         JS_CODE
       end

data/app/helpers/eac_rails_utils/links_helper/object_link.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module LinksHelper
+    # @param object [Object]
+    # @param options [Hash] All the values are passed to the link_to method with except of:
+    #   * :action : argument +action+ for the method +object_path+.
+    #   * :blank_value : text used when +object+ is blank.
+    #   * :confirm_translation: translation key for attribute +data.confirm+.
+    #   * :name : argument +name+ for the method +link_to+.
+    #   * :title_translation: translation key for attribute +title+.
+    # @return [ActiveSupport::SafeBuffer] The link or the blank_sign.
+    class ObjectLink
+      acts_as_instance_method
+      common_constructor :view, :object, :options, default: [{}]
+
+      NON_LINK_TO_OPTIONS = %i[action blank_value confirm_translation name title_translation].freeze
+
+      # @return [ActiveSupport::SafeBuffer]
+      def result
+        view.value_or_sign(object, blank_value) do |value|
+          view.link_to name, view.object_path(value, action), link_to_options
+        end
+      end
+
+      # @return [String, nil]
+      def action
+        options[:action]
+      end
+
+      # @return [String, nil]
+      def blank_value
+        options[:blank_value]
+      end
+
+      # @return [String, nil]
+      def confirm
+        options[:confirm_translation].if_present do |v|
+          ::I18n.t(v, label: object.to_s)
+        end
+      end
+
+      # @return [String, nil]
+      def name
+        options[:name] || object.to_s
+      end
+
+      # @return [String, nil]
+      def title
+        options[:title_translation].if_present do |v|
+          ::I18n.t(v, label: object.to_s)
+        end
+      end
+
+      protected
+
+      def apply_confirm(options)
+        confirm.if_present do |v|
+          options[:data] ||= {}
+          options[:data][:confirm] = v
+        end
+      end
+
+      def apply_title(options)
+        title.if_present do |v|
+          options[:title] = v
+        end
+      end
+
+      # @return [Hash]
+      def link_to_options
+        %w[confirm title].each_with_object(options.except(*NON_LINK_TO_OPTIONS)) do |e, a|
+          send("apply_#{e}", a)
+        end
+      end
+    end
+  end
+end

data/app/helpers/eac_rails_utils/links_helper/object_path.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module LinksHelper
+    class ObjectPath
+      acts_as_instance_method
+      common_constructor :view, :object, :action, default: [nil]
+
+      def result
+        current_class = object_class(object)
+        tried_paths = []
+        while current_class
+          path = object_path_by_class(current_class, action)
+          return view.send(path, object) if view.respond_to?(path)
+
+          tried_paths << path
+          current_class = current_class.superclass
+        end
+        raise "Path not found for {object: #{object.class}, action: \"#{action}\"}" \
+              "(Tried: #{tried_paths})"
+      end
+
+      protected
+
+      def object_path_by_class(klass, action)
+        path = "#{klass.name.underscore.tr('/', '_')}_url"
+        path = "#{action}_#{path}" if action.present?
+        path
+      end
+
+      def object_class(object)
+        return object.entity_class if object.respond_to?(:entity_class)
+        return object.__getobj__.class if object.respond_to?(:__getobj__)
+
+        object.class
+      end
+    end
+  end
+end

data/app/helpers/eac_rails_utils/links_helper.rb

@@ -2,20 +2,37 @@
 
 module EacRailsUtils
   module LinksHelper
+    LINK_OPTIONS = { target: '_blank' }.freeze
+    SHORT_LINK_OPTIONS = LINK_OPTIONS.merge(name: '').freeze
+    DETAIL_LINK_OPTIONS = LINK_OPTIONS.merge(action: 'detail')
+    SHORT_DELETE_LINK_OPTIONS = SHORT_LINK_OPTIONS.merge(
+      action: '', class: 'delete_link', method: :delete,
+      title_translation: 'eac_rails_utils.links.delete_object',
+      confirm_translation: 'eac_rails_utils.links.delete_confirm'
+    ).freeze
+    SHORT_EDIT_LINK_OPTIONS = SHORT_LINK_OPTIONS.merge(
+      action: 'edit', class: 'edit_link', title_translation: 'eac_rails_utils.links.edit_object'
+    ).freeze
+    SHORT_DETAIL_SHOW_LINK_OPTIONS = SHORT_LINK_OPTIONS.merge(
+      class: 'show_link', title_translation: 'eac_rails_utils.links.show_object'
+    ).freeze
+    SHORT_DETAIL_LINK_OPTIONS = SHORT_DETAIL_SHOW_LINK_OPTIONS.merge(action: 'detail')
+    SHORT_SHOW_LINK_OPTIONS = SHORT_DETAIL_SHOW_LINK_OPTIONS.merge(action: '')
+    SHOW_LINK_OPTIONS = LINK_OPTIONS.merge(action: '')
+
+    # @param object [Object]
+    # @param options [Hash]
+    # @return [ActiveSupport::SafeBuffer]
+    def detail_link(object, **options)
+      object_link object, DETAIL_LINK_OPTIONS.merge(options)
+    end
+
     def short_delete_link(object)
-      short_object_link object, '', class: 'delete_link', method: :delete, target: '_blank',
-                                    title: ::I18n.t('eac_rails_utils.links.delete_object',
-                                                    label: object.to_s),
-                                    data: {
-                                      confirm: ::I18n.t('eac_rails_utils.links.delete_confirm',
-                                                        label: object.to_s)
-                                    }
+      object_link object, SHORT_DELETE_LINK_OPTIONS
     end
 
     def short_edit_link(object)
-      short_object_link object, 'edit', class: 'edit_link', target: '_blank',
-                                        title: ::I18n.t('eac_rails_utils.links.edit_object',
-                                                        label: object.to_s)
+      object_link object, SHORT_EDIT_LINK_OPTIONS
     end
 
     def short_goto_link(url)
@@ -27,53 +44,20 @@ module EacRailsUtils
     end
 
     def short_show_link(object)
-      short_detail_show_link(object, false)
+      object_link object, SHORT_SHOW_LINK_OPTIONS
     end
 
     def short_detail_link(object)
-      short_detail_show_link(object, true)
-    end
-
-    def object_path(object, action = nil)
-      current_class = object_class(object)
-      tried_paths = []
-      while current_class
-        path = object_path_by_class(current_class, action)
-        return send(path, object) if respond_to?(path)
-
-        tried_paths << path
-        current_class = current_class.superclass
-      end
-      raise "Path not found for {object: #{object.class}, action: \"#{action}\"}" \
-            "(Tried: #{tried_paths})"
-    end
-
-    private
-
-    def short_detail_show_link(object, detail)
-      short_object_link object,
-                        detail ? 'detail' : nil,
-                        class: 'show_link', target: '_blank',
-                        title: ::I18n.t('eac_rails_utils.links.show_object', label: object.to_s)
+      object_link object, SHORT_DETAIL_LINK_OPTIONS
     end
 
-    def short_object_link(object, action = nil, options = {})
-      value_or_sign(object, '') do |value|
-        link_to '', object_path(value, action), options
-      end
+    # @param object [Object]
+    # @param options [Hash]
+    # @return [ActiveSupport::SafeBuffer]
+    def show_link(object, **options)
+      object_link object, SHOW_LINK_OPTIONS.merge(options)
     end
 
-    def object_path_by_class(klass, action)
-      path = "#{klass.name.underscore.tr('/', '_')}_url"
-      path = "#{action}_#{path}" if action.present?
-      path
-    end
-
-    def object_class(object)
-      return object.entity_class if object.respond_to?(:entity_class)
-      return object.__getobj__.class if object.respond_to?(:__getobj__)
-
-      object.class
-    end
+    require_sub __FILE__, require_mode: :kernel
   end
 end

data/lib/eac_rails_utils/models/tableless_associations/has_many_for_active_model.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'active_record/associations/builder/has_many'
+
+module EacRailsUtils
+  module Models
+    module TablelessAssociations
+      class HasManyForActiveModel < ::ActiveRecord::Associations::Builder::HasMany
+        if ActiveRecord.version >= Gem::Version.new('5.0.0.beta')
+          AR_CALLBACK_METHODS = %i[define_callback before_validation after_validation before_save
+                                   after_save before_update after_update].freeze
+
+          def self.valid_options(_options)
+            super + %i[active_model
+                       target_ids] - %i[through dependent source source_type counter_cache as]
+          end
+
+          def self.define_callbacks(model, reflection)
+            return unless AR_CALLBACK_METHODS.all? { |meth| respond_to?(meth) }
+
+            super
+          end
+        else
+          def valid_options
+            super + %i[active_model
+                       target_ids] - %i[through dependent source source_type counter_cache as]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/models/tableless_associations/has_many_for_active_model_association.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module Models
+    module TablelessAssociations
+      class HasManyForActiveModelAssociation < ActiveRecord::Associations::HasManyAssociation
+        # remove conditions: owner.new_record?, foreign_key_present?
+        def find_target?
+          !loaded? && klass
+        end
+
+        # no dependent action
+        def null_scope?
+          false
+        end
+
+        # not support counter_cache
+        def empty?
+          if loaded?
+            size.zero?
+          else
+            @target.blank? && !scope.exists?
+          end
+        end
+
+        # full replace simplely
+        def replace(other_array) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          original_target = load_target.dup
+          other_array.each { |val| raise_on_type_mismatch!(val) }
+          target_ids = reflection.options[:target_ids]
+          owner[target_ids] = other_array.map(&:id)
+
+          old_records = original_target - other_array
+          old_records.each do |record|
+            @target.delete(record)
+          end
+
+          other_array.each do |record|
+            if (index = @target.index(record))
+              @target[index] = record
+            else
+              @target << record
+            end
+          end
+        end
+
+        # no need transaction
+        def concat(*records) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          load_target
+          flatten_records = records.flatten
+          flatten_records.each { |val| raise_on_type_mismatch!(val) }
+          target_ids = reflection.options[:target_ids]
+          owner[target_ids] ||= []
+          owner[target_ids].concat(flatten_records.map(&:id))
+
+          flatten_records.each do |record|
+            if (index = @target.index(record))
+              @target[index] = record
+            else
+              @target << record
+            end
+          end
+
+          target
+        end
+
+        private
+
+        def get_records # rubocop:disable Naming/AccessorMethodName
+          return scope.to_a if reflection.scope_chain.any?(&:any?)
+
+          target_ids = reflection.options[:target_ids]
+          klass.where(id: owner[target_ids]).to_a
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/models/tableless_associations/override_methods.rb

@@ -97,7 +97,9 @@ module EacRailsUtils
         def association_by_reflection(name)
           reflection = self.class.reflect_on_association(name)
           if reflection.options[:active_model]
-            ::ActiveRecord::Associations::HasManyForActiveModelAssociation.new(self, reflection)
+            ::EacRailsUtils::Models::TablelessAssociations::HasManyForActiveModelAssociation.new(
+              self, reflection
+            )
           else
             reflection.association_class.new(self, reflection)
           end

data/lib/eac_rails_utils/models/tableless_associations.rb

@@ -4,8 +4,8 @@ require 'eac_rails_utils/models/tableless_associations/initialize_extension'
 require 'eac_rails_utils/models/tableless_associations/active_record_reflection'
 require 'eac_rails_utils/models/tableless_associations/autosave_association'
 require 'eac_rails_utils/models/tableless_associations/override_methods'
-require 'active_record/associations/builder/has_many_for_active_model'
-require 'active_record/associations/has_many_for_active_model_association'
+require 'eac_rails_utils/models/tableless_associations/has_many_for_active_model'
+require 'eac_rails_utils/models/tableless_associations/has_many_for_active_model_association'
 require 'active_support/core_ext/module'
 
 module EacRailsUtils
@@ -38,7 +38,7 @@ module EacRailsUtils
             scope = nil
           end
 
-          reflection = ActiveRecord::Associations::Builder::HasManyForActiveModel
+          reflection = EacRailsUtils::Models::TablelessAssociations::HasManyForActiveModel
                          .build(self, name, scope, options, &extension)
           ActiveRecord::Reflection.add_reflection self, name, reflection
 

data/lib/eac_rails_utils/patches/active_model_associations.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'activemodel/associations'
 require 'eac_rails_utils/patches/rails_5_2'
 
 module EacRailsUtils

data/lib/eac_rails_utils/patches/rails_5_2/active_model_association_method_fix.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'activemodel/associations'
+require 'eac_rails_utils/models/tableless_associations'
+require 'eac_rails_utils/models/tableless_associations/hooks'
 require 'eac_ruby_utils/core_ext'
 
 module EacRailsUtils

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.24.0'
+  VERSION = '0.25.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.122'
+        version: '0.123'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.122'
+        version: '0.123'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,8 @@ files:
 - app/helpers/eac_rails_utils/data_table_helper/setup.rb
 - app/helpers/eac_rails_utils/formatter_helper.rb
 - app/helpers/eac_rails_utils/links_helper.rb
+- app/helpers/eac_rails_utils/links_helper/object_link.rb
+- app/helpers/eac_rails_utils/links_helper/object_path.rb
 - app/helpers/eac_rails_utils/menus_helper.rb
 - app/helpers/eac_rails_utils/menus_helper/bootstrap_gui_builder.rb
 - app/helpers/eac_rails_utils/menus_helper/data_builder.rb
@@ -172,9 +174,6 @@ files:
 - config/initializers/json.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
-- lib/active_record/associations/builder/has_many_for_active_model.rb
-- lib/active_record/associations/has_many_for_active_model_association.rb
-- lib/activemodel/associations.rb
 - lib/eac_rails_utils.rb
 - lib/eac_rails_utils/engine.rb
 - lib/eac_rails_utils/engine_helper.rb
@@ -194,6 +193,8 @@ files:
 - lib/eac_rails_utils/models/tableless_associations/active_record_reflection.rb
 - lib/eac_rails_utils/models/tableless_associations/association_scope_extension.rb
 - lib/eac_rails_utils/models/tableless_associations/autosave_association.rb
+- lib/eac_rails_utils/models/tableless_associations/has_many_for_active_model.rb
+- lib/eac_rails_utils/models/tableless_associations/has_many_for_active_model_association.rb
 - lib/eac_rails_utils/models/tableless_associations/hooks.rb
 - lib/eac_rails_utils/models/tableless_associations/initialize_extension.rb
 - lib/eac_rails_utils/models/tableless_associations/override_methods.rb

data/lib/active_record/associations/builder/has_many_for_active_model.rb

@@ -1,24 +0,0 @@
-module ActiveRecord::Associations::Builder # rubocop:disable Style/ClassAndModuleChildren, Style/FrozenStringLiteralComment
-  class HasManyForActiveModel < HasMany
-    if ActiveRecord.version >= Gem::Version.new('5.0.0.beta')
-      AR_CALLBACK_METHODS = %i[define_callback before_validation after_validation before_save
-                               after_save before_update after_update].freeze
-
-      def self.valid_options(_options)
-        super + %i[active_model
-                   target_ids] - %i[through dependent source source_type counter_cache as]
-      end
-
-      def self.define_callbacks(model, reflection)
-        return unless AR_CALLBACK_METHODS.all? { |meth| respond_to?(meth) }
-
-        super
-      end
-    else
-      def valid_options
-        super + %i[active_model
-                   target_ids] - %i[through dependent source source_type counter_cache as]
-      end
-    end
-  end
-end

data/lib/active_record/associations/has_many_for_active_model_association.rb

@@ -1,72 +0,0 @@
-module ActiveRecord::Associations # rubocop:disable Style/ClassAndModuleChildren, Style/FrozenStringLiteralComment
-  class HasManyForActiveModelAssociation < HasManyAssociation
-    # remove conditions: owner.new_record?, foreign_key_present?
-    def find_target?
-      !loaded? && klass
-    end
-
-    # no dependent action
-    def null_scope?
-      false
-    end
-
-    # not support counter_cache
-    def empty?
-      if loaded?
-        size.zero?
-      else
-        @target.blank? && !scope.exists?
-      end
-    end
-
-    # full replace simplely
-    def replace(other_array) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      original_target = load_target.dup
-      other_array.each { |val| raise_on_type_mismatch!(val) }
-      target_ids = reflection.options[:target_ids]
-      owner[target_ids] = other_array.map(&:id)
-
-      old_records = original_target - other_array
-      old_records.each do |record|
-        @target.delete(record)
-      end
-
-      other_array.each do |record|
-        if (index = @target.index(record))
-          @target[index] = record
-        else
-          @target << record
-        end
-      end
-    end
-
-    # no need transaction
-    def concat(*records) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      load_target
-      flatten_records = records.flatten
-      flatten_records.each { |val| raise_on_type_mismatch!(val) }
-      target_ids = reflection.options[:target_ids]
-      owner[target_ids] ||= []
-      owner[target_ids].concat(flatten_records.map(&:id))
-
-      flatten_records.each do |record|
-        if (index = @target.index(record))
-          @target[index] = record
-        else
-          @target << record
-        end
-      end
-
-      target
-    end
-
-    private
-
-    def get_records # rubocop:disable Naming/AccessorMethodName
-      return scope.to_a if reflection.scope_chain.any?(&:any?)
-
-      target_ids = reflection.options[:target_ids]
-      klass.where(id: owner[target_ids]).to_a
-    end
-  end
-end

data/lib/activemodel/associations.rb

@@ -1,13 +0,0 @@
-require 'active_model' # rubocop:disable Style/FrozenStringLiteralComment
-require 'active_record'
-require 'active_support'
-require 'eac_rails_utils/models/tableless_associations'
-require 'eac_rails_utils/models/tableless_associations/hooks'
-
-# Load Railtie
-begin
-  require 'rails'
-rescue LoadError # rubocop:disable Lint/SuppressedException
-end
-
-require 'eac_rails_utils/models/tableless_associations/railtie' if defined?(Rails)