eac_rails_utils 0.23.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ab91f74f6a656bab19d9e3fa4205943442f4c43a706b6c38bb37e1cb8cf580
-  data.tar.gz: 552cac7832c619d0f7a6e7f31025b695fdaecd3ce70eb22c2835ba2483b6d4b6
+  metadata.gz: 37d81790aad3527689a15e70896e071c3b774059fb137f6667ffb752d282a5d8
+  data.tar.gz: 1f59bb6c219f6097ac000bc5912b659e8046c261bf7a4b5cd5c69e7c45d7b1c9
 SHA512:
-  metadata.gz: 68233af01e090a2e474bac06f735a373fc976016f25dbc998cc612ae972517f530375e755b1716ab95cb0ec974ade30a4393abe99e0a546d817630ec45d30f7e
-  data.tar.gz: 12460dced27d15eaf70d5e8248cb1c57f7a6c65fb57173017c9a9bb6dfc983c3ba4c765ce3cd04979cf46f1420156c765757e3807e4f0dc02edadcd0486aae32
+  metadata.gz: 563bf50cb087e260e139f1c6ea3fd91d097286b181804df6783e52b83f83820a7540fa6e5f873a75290609945cce074dbed181733049ad4370e73e0f0ac9d7ee
+  data.tar.gz: 4286edfb6b487ba5e5a85a747b29a6346aca7299f025135ee7f1205dd57cb7fb02bcc2081b6d01a214f3de6b3de28fa3efd6f1a0e20f8296fd3efb51426f6ed2

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

@@ -45,7 +45,7 @@ module EacRailsUtils
       private
 
       def node_value(node, subpath)
-        return node if subpath.empty?
+        node if subpath.empty?
       end
     end
   end

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

@@ -22,7 +22,7 @@ module EacRailsUtils
 
         # @return [Hash]
         def tag_attributes
-          column.value_cell_attributes.map { |k, v| [k, tag_attribute_value(v)] }.to_h
+          column.value_cell_attributes.map { |k, v| [k, tag_attribute_value(v)] }.to_h # rubocop:disable Style/HashTransformValues, Style/MapToHash
         end
       end
     end

data/app/helpers/eac_rails_utils/menus_helper.rb

@@ -12,7 +12,7 @@ module EacRailsUtils
 
       id = SecureRandom.hex(5)
       GuiBuilder.new(self).build(entries, id: id, class: 'jMenu') <<
-        javascript_tag("$(document).ready(function(){$('\##{id}').jMenu();});")
+        javascript_tag("$(document).ready(function(){$('##{id}').jMenu();});")
     end
 
     def bootstrap_dropdown_menu(entries, options = {})

data/app/helpers/eac_rails_utils/open_graph_protocol_helper.rb

@@ -39,7 +39,7 @@ module EacRailsUtils
       def children_tags
         view.capture do
           view.concat tag
-          @children.values.each do |child| # rubocop:disable Rails/HelperInstanceVariable
+          @children.values.each do |child| # rubocop:disable Rails/HelperInstanceVariable, Style/HashEachMethods
             view.concat(child.children_tags)
             view.concat("\n")
           end
@@ -59,7 +59,7 @@ module EacRailsUtils
       attr_reader :parent, :suffix
 
       def initialize(view, parent, suffix)
-        super view
+        super(view)
         @parent = parent # rubocop:disable Rails/HelperInstanceVariable
         @suffix = suffix # rubocop:disable Rails/HelperInstanceVariable
       end

data/config/initializers/json.rb

@@ -3,9 +3,9 @@
 def patch_json?
   require 'json'
 
-  ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7') &&
-    ::Gem::Version.new(JSON::VERSION) < ::Gem::Version.new('2')
-rescue ::LoadError
+  Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7') &&
+    Gem::Version.new(JSON::VERSION) < Gem::Version.new('2')
+rescue LoadError
   false
 end
 

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

@@ -1,23 +1,23 @@
-module ActiveRecord::Associations::Builder
+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)
+    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 + [:active_model,
-                 :target_ids] - [:through, :dependent, :source, :source_type, :counter_cache, :as]
+        super + %i[active_model
+                   target_ids] - %i[through dependent source source_type counter_cache as]
       end
 
       def self.define_callbacks(model, reflection)
-        if AR_CALLBACK_METHODS.all? { |meth| self.respond_to?(meth) }
-          super
-        end
+        return unless AR_CALLBACK_METHODS.all? { |meth| respond_to?(meth) }
+
+        super
       end
     else
       def valid_options
-        super + [:active_model,
-                 :target_ids] - [:through, :dependent, :source, :source_type, :counter_cache, :as]
+        super + %i[active_model
+                   target_ids] - %i[through dependent source source_type counter_cache as]
       end
     end
   end

data/lib/active_record/associations/has_many_for_active_model_association.rb

@@ -1,4 +1,4 @@
-module ActiveRecord::Associations
+module ActiveRecord::Associations # rubocop:disable Style/ClassAndModuleChildren, Style/FrozenStringLiteralComment
   class HasManyForActiveModelAssociation < HasManyAssociation
     # remove conditions: owner.new_record?, foreign_key_present?
     def find_target?

data/lib/activemodel/associations.rb

@@ -1,15 +1,13 @@
-require "active_model"
-require "active_record"
-require "active_support"
-require "eac_rails_utils/models/tableless_associations"
-require "eac_rails_utils/models/tableless_associations/hooks"
+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"
+  require 'rails'
 rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
-if defined?(Rails)
-  require "eac_rails_utils/models/tableless_associations/railtie"
-end
+require 'eac_rails_utils/models/tableless_associations/railtie' if defined?(Rails)

data/lib/eac_rails_utils/models/fetch_errors.rb

@@ -10,7 +10,7 @@ module EacRailsUtils
       # Um array de colunas pode ser passado em options[:skip] de colunas em record que não
       # terão suas falhas adicionadas.
       def fetch_record_errors(record, options = {})
-        record.errors.keys.each do |column| # rubocop:disable Rails/DeprecatedActiveModelErrorsMethods
+        record.errors.keys.each do |column| # rubocop:disable Rails/DeprecatedActiveModelErrorsMethods, Style/HashEachMethods
           fetch_column_errors(record, column, column, options)
         end
       end
@@ -83,7 +83,7 @@ module EacRailsUtils
         b = ''
         errors.messages.each do |field, messages|
           b += ' / ' if b != ''
-          b += field.to_s + ': ' + messages.to_s
+          b += field.to_s + ': ' + messages.to_s # rubocop:disable Style/StringConcatenation
         end
         b
       end

data/lib/eac_rails_utils/models/tableless/build_attributes.rb

@@ -32,7 +32,7 @@ module EacRailsUtils
           m = /\A(.+)\(([0-9]+)(.)\)\z/.match(key)
           return unless m
 
-          ::OpenStruct.new(key: m[1], index: m[2].to_i - 1, converter: array_value_converter(m[3]))
+          ::OpenStruct.new(key: m[1], index: m[2].to_i - 1, converter: array_value_converter(m[3])) # rubocop:disable Style/OpenStructUse
         end
 
         def array_value_set(array_attr, value)

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

@@ -50,7 +50,9 @@ module EacRailsUtils
           # Build a list of candidates to search for
           def compute_type_candidates(type_name)
             candidates = []
-            name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
+            name.scan(/::|$/) do
+              candidates.unshift "#{::Regexp.last_match.pre_match}::#{type_name}"
+            end
             candidates << type_name
           end
 

data/lib/eac_rails_utils/models/tableless_associations.rb

@@ -43,7 +43,7 @@ module EacRailsUtils
           ActiveRecord::Reflection.add_reflection self, name, reflection
 
           mixin = generated_association_methods
-          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
           def #{options[:target_ids]}=(other_ids)
             @#{options[:target_ids]} = other_ids
             association(:#{name}).reset

data/lib/eac_rails_utils/patches/active_model.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub __FILE__
+EacRubyUtils.require_sub __FILE__

data/lib/eac_rails_utils/patches/active_model_associations.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'activemodel/associations'
-require 'eac_rails_utils/patches/rails_4'
 require 'eac_rails_utils/patches/rails_5_2'
 
 module EacRailsUtils
@@ -10,18 +9,9 @@ module EacRailsUtils
       module Hooks
         class << self
           def init
-            init_rails_4 if ::EacRailsUtils::Patches::Rails4.enabled?
             init_rails_5_2 if ::EacRailsUtils::Patches::Rails52.enabled?
           end
 
-          def init_rails_4 # rubocop:disable Naming/VariableNumber
-            ActiveSupport.on_load(:active_record) do
-              ActiveRecord::Associations::AssociationScope.prepend(
-                ::EacRailsUtils::Patches::Rails4::ActiveRecordAssociationsAssociationScope
-              )
-            end
-          end
-
           def init_rails_5_2 # rubocop:disable Naming/VariableNumber
             rails_5_2_fix_activemodel_associations_methods
           end

data/lib/eac_rails_utils/patches/numeric.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub __FILE__
+EacRubyUtils.require_sub __FILE__

data/lib/eac_rails_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.2
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -99,6 +99,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,6 +109,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 
 email: 
 executables: []
@@ -202,8 +208,6 @@ files:
 - lib/eac_rails_utils/patches/application.rb
 - lib/eac_rails_utils/patches/numeric.rb
 - lib/eac_rails_utils/patches/numeric/number_helper.rb
-- lib/eac_rails_utils/patches/rails_4.rb
-- lib/eac_rails_utils/patches/rails_4/active_record_associations_association_scope.rb
 - lib/eac_rails_utils/patches/rails_5_2.rb
 - lib/eac_rails_utils/patches/rails_5_2/active_model_association_method_fix.rb
 - lib/eac_rails_utils/rspec.rb

data/lib/eac_rails_utils/patches/rails_4/active_record_associations_association_scope.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'activemodel/associations'
-
-module EacRailsUtils
-  module Patches
-    module Rails4
-      module ActiveRecordAssociationsAssociationScope
-        def add_constraints(scope, owner, association_klass, *extra_args)
-          if extra_args.any?
-            refl = extra_args.first
-            if refl.options[:active_model]
-              target_ids = refl.options[:target_ids]
-              return scope.where(id: owner[target_ids])
-            end
-          end
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/eac_rails_utils/patches/rails_4.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_rails_utils/models/tableless_associations/hooks'
-require 'eac_ruby_utils/require_sub'
-
-module EacRailsUtils
-  module Patches
-    module Rails4
-      ::EacRubyUtils.require_sub __FILE__
-
-      class << self
-        def enabled?
-          ::Rails.version < '5'
-        end
-      end
-    end
-  end
-end