activerecord_extras 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536720ec06a36c7f84a80eed293abe6575e7b15f14d4271cd03599d5b77d46df
-  data.tar.gz: f6eb4c786a2603be566c8118fb2bb5c63db6767036ee7613b312cc4484358ead
+  metadata.gz: f55fba01009bad98653095ad9f8505617070666a46bd822c6794a486702f2031
+  data.tar.gz: 07b79c6a3a16b803e95cff57822240e09fcac28fee6d05c5609ffa9635611517
 SHA512:
-  metadata.gz: 0e535c604e0aae51eae0f50a0ec6d50f3cdec4f7e84c23577dafd694ea846f4a8b9e3a41d522fcdb23d446f77173fb2cc3f08b2535578242a100db73cc27644c
-  data.tar.gz: 42b322ee6698e950dac3c247e6cea2a1ae79c51b12ec88b010361b365660587040b67517703b51f6ea3ffe2d078435d02eb9ec4a89f94ea24e566791c748b612
+  metadata.gz: 70d4a7a37f70d44e6c3156ced212b974739c5d4ce61e3d875d760b518f6cd15d2bfd8dba591ab8ed9cd8a77e7587b214393ddf52aaba7435d42a94836e238938
+  data.tar.gz: 6f12f6d7a9334baae2a86778c0e632929a82b90561f0654fc801f278da4eaa0d572db82dc4dec1f6b69c0ab740136bd88a857e895d14d6a659045e3eeb2cf276

data/lib/active_record/extras/association_scopes.rb

@@ -14,21 +14,12 @@ module ActiveRecord
         def association_subquery(association_name, mode: :exists, &extra_conditions_block)
           reflection = reflections[association_name.to_s]
 
-          unless reflection
-            raise ArgumentError, "Unknown association: #{association_name}"
-          end
-
-          unless reflection.macro == :has_many
-            raise ArgumentError, "Only has_many associations are supported (got #{reflection.macro})"
-          end
+          raise ArgumentError, "Unknown association: #{association_name}" unless reflection
+          raise ArgumentError, "Only has_many associations are supported (got :#{reflection.macro})" unless reflection.macro == :has_many
 
           foreign_keys = Array(reflection.foreign_key)
           primary_keys = Array(reflection.active_record_primary_key)
 
-          unless foreign_keys.size == primary_keys.size
-            raise ArgumentError, "Mismatch in key counts: #{foreign_keys} vs #{primary_keys}"
-          end
-
           source_table = arel_table
           target_table = reflection.klass.arel_table
 
@@ -36,18 +27,24 @@ module ActiveRecord
             target_table[fk].eq(source_table[pk])
           end.reduce(&:and)
 
-          # Allow caller to modify the join condition via block
           if extra_conditions_block
-            new_conditions = extra_conditions_block.call(join_conditions, target_table)
-            join_conditions = new_conditions if new_conditions
+            join_conditions = extra_conditions_block.call(join_conditions, target_table) || join_conditions
           end
 
+          relation = reflection.klass.all
+
+          if reflection.scope
+            relation = relation.instance_exec(&reflection.scope)
+          end
+
+          relation = relation.where(join_conditions)
+
           case mode
           when :exists
-            target_table.project(Arel.sql("1")).where(join_conditions).exists
+            relation.select(Arel.sql("1")).arel.exists
           when :count
             Arel::Nodes::Grouping.new(
-              target_table.project(Arel.star.count).where(join_conditions)
+              relation.select(Arel.star.count).arel
             )
           else
             raise ArgumentError, "Unknown mode: #{mode.inspect} (expected :exists or :count)"

data/lib/active_record/extras/engine.rb

@@ -1,3 +1,5 @@
+require 'active_record/extras/association_scopes'
+
 module ActiveRecord
   module Extras
     class Engine < ::Rails::Engine

data/lib/active_record/extras/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Extras
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
     Version = VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_extras
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Till Schulte-Coerne