active_scaffold 3.6.15 → 3.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc7c6f7e057512476a4f93c0505622a34a97c81b6cbd75c5bb1b014a928ad65
-  data.tar.gz: c9e2bf9f2240b380b1ebd3f52007db921b88a3035aee3327fec779d74c43f0c6
+  metadata.gz: 9dfa34216419b18c65d503771afc1f0083561f5419963c858df2948b0c3e9ed2
+  data.tar.gz: c4f0d58b4dc6afee868718214fd725c2004898b903d90fd5b94b09133cea6294
 SHA512:
-  metadata.gz: 30377a392938156d9ce545bf18fe0cafebabd935fcd913d4ad28836f53a25cbde41bb7849542f08d6acebdcab9d0e39c8efbddc2d0fe10bf4a40c8af4cedf15e
-  data.tar.gz: 19602b41999bf34152f9a968c78aa36529794ca7d5ae17db43c55ae288f34b5ed5409923cd1e62ec7a8f5d97f781dd60cce8307c90291136303c3890e0c543e4
+  metadata.gz: bfc6d60cb5e2df8fbc367ca6854c173ad94b04bd4309e430ff9c61351ebfe17c3162e50f8c9e6409ad722b8e8298cca8f9da28f9ba0dcc2f3b51e64b114a4844
+  data.tar.gz: ae5b110172f4479df2c3456061a17e289ab222b3143135893c4866d4f3f04f74d1c873e07e71262c992c946450bdabe7f7b9457dd1b15bdbfa5ac2db1e9fa92f

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+= 3.6.17
+- Don't add includes or left joins for constrained columns, as they are ignored on sorting clause
+- Fix deprecation on cache counts with rails 5, and fix the queries for rails >= 5.1
+- Fix new for tableless models on rails 5.0
+
+= 3.6.16
+- Fix query on paper_trail action
+- Fix one? on tableless relation
+- Fix exists? on tableless relation
+- Fix getting conditions from association in the tableless relation
+
 = 3.6.15
 - Prevent firing 2 change events on jquery datetime pickers
 - Fix setting data options on columns for date and datetime pickers

data/lib/active_scaffold/actions/list.rb

@@ -83,6 +83,7 @@ module ActiveScaffold::Actions
 
     def set_includes_for_sorting(columns, sorting)
       sorting.each_column do |col|
+        next if sorting.constraint_columns.include? col.name
         next unless col.includes.present? && !columns.include?(col)
         if active_scaffold_config.model.connection.needs_order_expressions_in_select?
           active_scaffold_references << col.includes
@@ -176,7 +177,7 @@ module ActiveScaffold::Actions
       query = active_scaffold_config.model.where(active_scaffold_config.primary_key => records.map(&:id))
                                     .joins(column.name).group(active_scaffold_config.primary_key)
                                     .select("#{klass.quoted_table_name}.#{klass.quoted_primary_key}")
-      query = query.uniq if column.association.scope && klass.instance_exec(&column.association.scope).values[:distinct]
+      query = query.distinct if column.association.scope && klass.instance_exec(&column.association.scope).values[:distinct]
       query
     end
 

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -10,7 +10,7 @@ module ActiveScaffold::Actions
     end
 
     def deleted
-      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
+      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model.name)
       if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
         query = query.where_object(nested.child_association.foreign_key => nested.parent_id)
       end

data/lib/active_scaffold/tableless.rb

@@ -76,6 +76,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       super.tap do |scope|
         if klass < ActiveScaffold::Tableless
           class << scope; include RelationExtension; end
+          assoc_conditions = scope.proxy_association&.send(:association_scope)&.conditions
+          if assoc_conditions&.present?
+            scope.conditions.concat assoc_conditions.map { |c| c.is_a?(Hash) ? c[klass.table_name] || c : c }
+          end
         end
       end
     end
@@ -112,8 +116,6 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
   end
 
   module RelationExtension
-    attr_reader :conditions
-
     def initialize(klass, *)
       super
       @conditions ||= []
@@ -124,6 +126,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       super
     end
 
+    def conditions
+      @conditions ||= []
+    end
+
     def where(opts, *rest)
       if opts.present?
         opts = opts.with_indifferent_access if opts.is_a? Hash
@@ -131,6 +137,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       end
       self
     end
+    alias where! where
 
     def merge(rel)
       super.tap do |merged|
@@ -140,14 +147,13 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
 
     def except(*skips)
       super.tap do |new_relation|
-        new_relation.conditions = conditions unless skips.include? :where
+        unless new_relation.is_a?(RelationExtension)
+          class << new_relation; include RelationExtension; end
+        end
+        new_relation.conditions.concat conditions unless skips.include? :where
       end
     end
 
-    def to_a
-      @klass.find_all(self)
-    end
-
     def find_one(id)
       @klass.find_one(id, self) || raise(ActiveRecord::RecordNotFound)
     end
@@ -161,7 +167,14 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     end
 
     def exists?
-      limit(1).to_a.present?
+      size > 0
+    end
+
+    private
+    def exec_queries
+      @records = @klass.find_all(self)
+      @loaded = true
+      @records
     end
   end
 
@@ -203,15 +216,15 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       end
     end
   end
-
-  def self.columns_hash
-    if self < ActiveScaffold::Tableless
-      @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
-    else
-      super
-    end
-  end
   if Rails.version < '5.0' # 4.2.x
+    def self.columns_hash
+      if self < ActiveScaffold::Tableless
+        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
+      else
+        super
+      end
+    end
+
     def self.initialize_find_by_cache
       self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) } # rubocop:disable Rails/DynamicFindBy
     end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 15
+    PATCH = 17
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/misc/tableless_test.rb

@@ -27,8 +27,9 @@ class TablelessTest < MiniTest::Test
     assert Person.new.files.empty?
     @person = Person.new
     @person.save(validate: false)
-    assert @person.files.empty?
-    assert_equal [], @person.files.to_a
+    assert !@person.files.empty?
+    assert @person.files.all.exists?
+    assert_equal @person.id, @person.files.first.person_id
   end
 
   def test_tableless_assoc_with_dependent

data/test/mock_app/app/models/file_model.rb

@@ -6,6 +6,18 @@ class FileModel < ActiveScaffold::Tableless
   belongs_to :person
 
   def self.find_all(relation)
+    relation.conditions&.each&.with_index do |condition, i|
+      person_id =
+        case condition
+        when Hash
+          condition[:person_id]
+        when Arel::Nodes::Equality
+          if condition.left.name.to_sym == :person_id
+            relation.bind_values[i].present? ? relation.bind_values[i][1] : condition.right.first
+          end
+        end
+      return [new(person_id: person_id)] if person_id
+    end
     []
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.15
+  version: 3.6.17
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails