passive_columns 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c37d7d720dab3e13b2084d7f6277a35b1d99de88b75eae8ef67b89d67472172
-  data.tar.gz: 5ada8404f4509e694764d732892c2833d71c94c959c7ae45c080266781473e7e
+  metadata.gz: a9a4221690fe58e97942823926abe335c1480f4e2a60886d4020d5616fd65cdb
+  data.tar.gz: bee747bdd177f3e7f8471ed3150421ef4dfad35e9458513515daa34c72308bf3
 SHA512:
-  metadata.gz: b0ed4cbe6220e1752cb6f98e7b555f31bd178db3941f4a8c2e2d5fb022b3e00eb9abffc71a90cdb29f23fad14cc004e573850d51f9b18b1df3e0e05f4747d32e
-  data.tar.gz: c73cf064d995e5c9705f609319e4f0609616d346cc17d1a41a8f4efe98cd5cbd934008ca6c0b7a3226d9a9967323038b0bf0fcf9e33f9c5b6ac3d199f86635f2
+  metadata.gz: 2c74c6174d74f7075f34eceea98cb0ecf93fa637a4998580e9928b0cc9e3e731f59f1fbbdfff47b5e328ca12cce3143002a31c6ee475f7151f3b4321eff68e27
+  data.tar.gz: 4fd85df44dab117a1c032671b7d5b32bb3b4b60f3f73a6006eed17154e2de6b1593d424710e9df68d3855aea2578bacc8d35d80e69bb8bbd8d26164f2447580b

data/README.md

@@ -1,6 +1,6 @@
 # Passive Columns
 A gem that extends `Active Record` to retrieve columns from DB on demand.<br>
-Works with `Rails` >= 7 and `Ruby` >= 2.7
+Works with `Rails` >= 6.1 and `Ruby` >= 2.7
 
 ## Usage
 

data/lib/passive_columns/railtie.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 require 'passive_columns/active_record_relation_extension'
-require 'passive_columns/active_record_association_builder_extension'
 
 module PassiveColumns # :nodoc:
   class Railtie < Rails::Railtie # :nodoc:
     config.to_prepare do |_app|
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Relation.prepend ActiveRecordRelationExtension
-        ActiveRecord::Associations::Builder::Association.prepend ActiveRecordAssociationBuilderExtension
       end
     end
   end

data/lib/passive_columns/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PassiveColumns
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/passive_columns.rb

@@ -94,10 +94,12 @@ module PassiveColumns
       super(name, *filter_list, opts, &block)
     end
 
-    def cached_find_by_statement(key, &block)
-      cache = @find_by_statement_cache[connection.prepared_statements]
-      cache.compute_if_absent(key) do
-        ActiveRecord::StatementCache.create(connection) do |params|
+    def cached_find_by_statement(*args, &block)
+      con = args.size == 2 ? args[0] : connection
+      cache = @find_by_statement_cache[con.prepared_statements]
+
+      cache.compute_if_absent(args.last) do
+        ActiveRecord::StatementCache.create(con) do |params|
           relation = block.call params
           PassiveColumns.apply_select_scope_to(relation)
           relation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_columns
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Golovin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,7 +91,6 @@ files:
 - README.md
 - Rakefile
 - lib/passive_columns.rb
-- lib/passive_columns/active_record_association_builder_extension.rb
 - lib/passive_columns/active_record_relation_extension.rb
 - lib/passive_columns/loader.rb
 - lib/passive_columns/railtie.rb
@@ -115,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A gem that extends Active Record to retrieve columns from a db on demand

data/lib/passive_columns/active_record_association_builder_extension.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module PassiveColumns
-  # This module is used to extend the ActiveRecord::Associations::Builder::Association class
-  # to add a proc with default scope to the association if there is no proc defined.
-  module ActiveRecordAssociationBuilderExtension
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def create_reflection(*)
-        super.tap do |res|
-          next if res.polymorphic?
-          next unless _klass_has_passive_columns(res) && res.scope.nil?
-
-          default_relation = -> { unscoped }
-          res.instance_variable_set(:@scope, proc { instance_exec(&default_relation) })
-        end
-      end
-
-      # Check if the association class has passive columns
-      # @param [ActiveRecord::Reflection::AssociationReflection] res
-      def _klass_has_passive_columns(res)
-        res.klass.respond_to?(:_passive_columns)
-      rescue NameError
-        # If +config.eager_load!+ is disabled, an association class may not be loaded yet
-        # so we can't constantize to check if the class has passive columns.
-        # In this case, we assume the class has passive columns.
-        true
-      end
-    end
-  end
-end