active_scaffold 3.7.12 → 4.0.0.rc1

data/lib/active_scaffold/data_structures/actions.rb

@@ -16,8 +16,8 @@ class ActiveScaffold::DataStructures::Actions
   end
   alias << add
 
-  def each
-    @set.each { |item| yield item }
+  def each(&block)
+    @set.each(&block)
   end
 
   def include?(val)
@@ -40,6 +40,6 @@ class ActiveScaffold::DataStructures::Actions
 
   # called during clone or dup. makes the clone/dup deeper.
   def initialize_copy(from)
-    @set = from.instance_variable_get('@set').clone
+    @set = from.instance_variable_get(:@set).clone
   end
 end

data/lib/active_scaffold/data_structures/association/abstract.rb

@@ -3,7 +3,9 @@ module ActiveScaffold::DataStructures::Association
     def initialize(association)
       @association = association
     end
+
     attr_writer :reverse
+
     delegate :name, :foreign_key, :==, to: :@association
 
     def allow_join?
@@ -99,10 +101,8 @@ module ActiveScaffold::DataStructures::Association
     end
 
     def reverse(klass = nil)
-      unless polymorphic? || defined?(@reverse)
-        @reverse ||= inverse || get_reverse&.name
-      end
-      @reverse || (get_reverse(klass)&.name unless klass.nil?)
+      @reverse ||= inverse || get_reverse&.name unless polymorphic?
+      @reverse || get_reverse(klass)&.name
     end
 
     def inverse_for?(klass)
@@ -121,6 +121,10 @@ module ActiveScaffold::DataStructures::Association
       self.class.new(assoc) if assoc
     end
 
+    def cache_count?
+      collection? && !ActiveScaffold::OrmChecks.tableless?(klass) && !reverse_association&.counter_cache
+    end
+
     protected
 
     def reflect_on_association(name)

data/lib/active_scaffold/data_structures/association/active_mongoid.rb

@@ -2,6 +2,7 @@ module ActiveScaffold::DataStructures::Association
   class ActiveMongoid < Mongoid
     def self.reflect_on_all_associations(klass)
       return [] unless klass.respond_to? :am_relations
+
       klass.am_relations.values
     end
 

data/lib/active_scaffold/data_structures/association/active_record.rb

@@ -59,14 +59,11 @@ module ActiveScaffold::DataStructures::Association
       true
     end
 
-    def counter_cache_hack?
-      belongs_to? && counter_cache && Rails.version < '6.0'
-    end
-
     protected
 
     def scope_values
       return {} unless @association.scope
+
       @scope_values ||= @association.klass.instance_exec(&@association.scope).values
     rescue StandardError => e
       message = "Error evaluating scope for #{@association.name} in #{@association.klass.name}:"