passive_columns 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bc2c892e3bb57a06b9e855c9df40d90a10c65483b87da66030ee5842c7bccc
-  data.tar.gz: 767c70daaab3f8c5da0e741ad7508321f5017f89eef153684b2b6af3b9c2f480
+  metadata.gz: 56f6f5fdf5c333ca2fe7ba55e3974b21b67662362a21848b1b31cf6216e080a1
+  data.tar.gz: adbcac3dfba991402e20dc7fc3d2a616498af1998ae4b0d5b4a1a9895254b2c4
 SHA512:
-  metadata.gz: 9b9c8d772223ca74da4b648a3450318194418f23ebaa9471f4a686fb05410eac903ce82ec64f193a86c54ea5f34c7770e63f45339710de7d04f9db69119163b9
-  data.tar.gz: '0489d8d23737e0e3d260c194ed4cbaeca0a37dfb956a63c7c1f889d148a8452291c652528ae5779c15b57e5a956c2d7d52d49d7212d092a6be5379ee1f1f80ef'
+  metadata.gz: 9ca11045bc3d47d290e6797c3b834eb4f1d8770ffd955c3be392b51c5d796bd2049c2ae7c849e85f189ce4e91524928cad8a5d55463fc36c082bc54c74c47aa8
+  data.tar.gz: df054d53f99a0e292292fe6935ba4dc3e2d707856372043468de0afc121065d9ca515ffb528d7292aba9a5b7f378114ac55b7d8b7e640268ceae897351c18cb1

data/README.md

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

data/lib/passive_columns/active_record_relation_extension.rb

@@ -5,19 +5,23 @@ module PassiveColumns
   # to automatically select all columns except passive columns if no columns are selected.
   module ActiveRecordRelationExtension
     def exec_main_query(**args)
-      _set_columns_except_passive_if_nothing_selected
+      if klass.try(:_passive_columns).present? && select_values.blank?
+        self.select_values = klass.column_names - klass._passive_columns
+      end
       super
     end
 
     def to_sql
-      _set_columns_except_passive_if_nothing_selected
-      super
-    end
+      return @to_sql unless @to_sql.nil?
 
-    def _set_columns_except_passive_if_nothing_selected
-      return nil if klass.try(:_passive_columns).blank? || select_values.any?
+      # @see ActiveRecord::QueryMethods::assert_mutability!
+      return super if @loaded || (defined?(@arel) && @arel)
 
-      self.select_values = klass.column_names - klass._passive_columns
+      if klass.try(:_passive_columns).present? && select_values.blank?
+        self.select_values = klass.column_names - klass._passive_columns
+      end
+
+      super
     end
   end
 end

data/lib/passive_columns/loader.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-# @!attribute [r] lazy_columns
-# @return [Array<Symbol>]
-# @!attribute [r] model
-# @return [LazyColumns]
 module PassiveColumns
   # Loader is a class helper that loads a column value from the database if it is not loaded yet.
   class Loader

data/lib/passive_columns/railtie.rb

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

data/lib/passive_columns/version.rb

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

data/lib/passive_columns.rb

@@ -85,7 +85,7 @@ module PassiveColumns
       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) }] + Array(opts[:if])) if passive_column.present?
+        opts[:if] = ([-> { attributes.key?(passive_column.first) }] + Array(opts[:if])) if passive_column.present?
       end
       super(name, *filter_list, opts, &block)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passive_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Dmitry Golovin