passive_columns 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56f6f5fdf5c333ca2fe7ba55e3974b21b67662362a21848b1b31cf6216e080a1
-  data.tar.gz: adbcac3dfba991402e20dc7fc3d2a616498af1998ae4b0d5b4a1a9895254b2c4
+  metadata.gz: baf809905aa69dc2f9ee36bcb51c2c2187790c2d2455fdb0ba828546c260625f
+  data.tar.gz: 005e105b072004ef89f410d4470a760be689b589a9f767c6a907e31e7ffd9644
 SHA512:
-  metadata.gz: 9ca11045bc3d47d290e6797c3b834eb4f1d8770ffd955c3be392b51c5d796bd2049c2ae7c849e85f189ce4e91524928cad8a5d55463fc36c082bc54c74c47aa8
-  data.tar.gz: df054d53f99a0e292292fe6935ba4dc3e2d707856372043468de0afc121065d9ca515ffb528d7292aba9a5b7f378114ac55b7d8b7e640268ceae897351c18cb1
+  metadata.gz: 02f54e4528a456f37d07e6340bbc0aeb01c672db28002ad681d5394c8d4617f3bf50ae97b1eaaa13c1d4561712554e95d5612ec239fe0bf2f246db2316f2cf6c
+  data.tar.gz: 72b5738f265fdc05deb98defee7853fc37427ed8922e19f0e1911bffd9cbe20e48a5a62b49afc188096e6cb9a01c958b1b851f7a1fca709d2332ea10ad4c585f

data/README.md

@@ -66,6 +66,43 @@ user.name
 By the way, it uses the Rails' `.pick` method to get the value of the column under the hood
 
 
+### Important
+
+If you want `passive_columns` to skip validation rules specific to the columns you exclude.<br>
+(in case they were not retrieved / modified)
+```ruby
+validates :huge_article, presence: true
+# Will be transformed into:
+# validates :huge_article, presence: true, if: -> { attributes.key?('huge_article') }
+```
+
+You must declare validation rules for `passive_columns` separately
+```ruby
+class Page < ActiveRecord::Base
+  include PassiveColumns
+  passive_columns :huge_article # Declare columns above the validation rules.
+
+  validates :name, presence: true
+  # Validation rules transformation will work
+  validates :huge_article, presence: true # It works for a separate rule.
+  # -> the rule is transformed into:
+  # -> validates :huge_article, presence: true, if: -> { attributes.key?('huge_article') }
+end
+```
+
+```ruby
+class Page < ActiveRecord::Base
+  include PassiveColumns
+  passive_columns :huge_article # Declare columns above the validation rules.
+
+  # Validation rules transformation WON'T work
+  validates :name, :huge_article, presence: true # It doesn't work for combined rules.
+  # -> the rule remains the same:
+  # -> validates :name, :huge_article, presence: true
+end
+```
+
+
 ## Installation
 Add this line to your Gemfile:
 
@@ -123,13 +160,19 @@ One way to avoid this is to check for the presence of the attribute before valid
 validates :huge_article, presence: true, if: -> { attributes.key?('huge_article') }
 ```
 
-Unfortunately, boilerplate code is needed for such a simple task.
-You just wanted to exclude some columns and be able to manipulate a model without extra steps.
+Unfortunately, boilerplate code is needed for such a simple task. <br>
+But the only thing you wanted was to exclude some columns and be able to manipulate a model without extra steps.
+
+By the way, after doing those steps, you still cannot retrieve the column when you need it after loading the scoped model...
 
-`passive_columns` tries to solve this problem by allowing you to exclude columns from the selection 
-and also allows you to retrieve them on demand when needed.
+So, `passive_columns` tries to solve this problem by allowing you to exclude columns from the selection and also allowing you to retrieve them on demand when needed.
 
+---
 
+#### Inspiration
+There are similar gems that were relatively popular but are no longer supported. Let's give them the honor they deserve:
+- [lazy_columns](https://github.com/jorgemanrubia/lazy_columns)
+- [columns_on_demand](https://github.com/willbryant/columns_on_demand)
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/passive_columns/active_record_relation_extension.rb

@@ -4,11 +4,20 @@ module PassiveColumns
   # ActiveRecordRelationExtension is a module that extends ActiveRecord::Relation
   # to automatically select all columns except passive columns if no columns are selected.
   module ActiveRecordRelationExtension
-    def exec_main_query(**args)
-      if klass.try(:_passive_columns).present? && select_values.blank?
-        self.select_values = klass.column_names - klass._passive_columns
+    if ActiveRecord::VERSION::MAJOR >= 7
+      def exec_main_query(...)
+        if klass.try(:_passive_columns).present? && select_values.blank?
+          self.select_values = klass.column_names - klass._passive_columns
+        end
+        super
+      end
+    else
+      def exec_queries(...)
+        if klass.try(:_passive_columns).present? && select_values.blank?
+          self.select_values = klass.column_names - klass._passive_columns
+        end
+        super
       end
-      super
     end
 
     def to_sql

data/lib/passive_columns/loader.rb

@@ -5,7 +5,7 @@ module PassiveColumns
   class Loader
     attr_reader :passive_columns, :model
 
-    # @param [LazyColumns] model
+    # @param [ActiveRecord::Base] model
     # @param [Array<Symbol>] passive_columns
     def initialize(model, passive_columns)
       @model = model
@@ -26,7 +26,7 @@ module PassiveColumns
       value = pick_value(column)
       model[column] = value
       model.send(:clear_attribute_change, column)
-      value
+      model[column]
     end
 
     private
@@ -35,8 +35,16 @@ module PassiveColumns
       model.class.unscoped.where(identity_constraints).pick(column)
     end
 
-    def identity_constraints
-      @identity_constraints ||= model.send(:_query_constraints_hash)
+    if ActiveRecord::VERSION::MAJOR >= 7
+      def identity_constraints
+        @identity_constraints ||= model.send(:_query_constraints_hash)
+      end
+    else
+      def identity_constraints
+        @identity_constraints ||= {
+          model.instance_variable_get(:@primary_key) => model.id_in_database
+        }
+      end
     end
   end
 end

data/lib/passive_columns/version.rb

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

data/lib/passive_columns.rb

@@ -83,9 +83,13 @@ module PassiveColumns
     # Otherwise, the passive column will be retrieved from DB before validation itself.
     def set_callback(name, *filter_list, &block)
       opts = filter_list.extract_options!
-      if name == :validate && opts[:attributes]&.one?
-        passive_column = opts[:attributes].map(&:to_s) & _passive_columns
-        opts[:if] = ([-> { attributes.key?(passive_column.first) }] + Array(opts[:if])) if passive_column.present?
+
+      if name == :validate
+        attrs = opts[:attributes] || filter_list[0].try(:attributes)
+        if attrs&.one?
+          passive_column = attrs.map(&:to_s) & _passive_columns
+          opts[:if] = ([-> { attributes.key?(passive_column.first) }] + Array(opts[:if])) if passive_column.present?
+        end
       end
       super(name, *filter_list, opts, &block)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_columns
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Golovin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement