acts-as-joinable 0.1.3 → 0.1.4

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "acts-as-joinable"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.1.3"
+  s.version           = "0.1.4"
   s.summary           = "ActsAsJoinable: DRYing up Many-to-Many Relationships in ActiveRecord"
   s.homepage          = "http://github.com/viatropos/acts-as-joinable"
   s.email             = "lancejpollard@gmail.com"

data/lib/acts-as-joinable.rb

@@ -1,3 +1,4 @@
+# https://rails.lighthouseapp.com/projects/8994/tickets/5182-activerecordcalculations-returns-incorrect-data-when-grouping-by-multiple-fields
 module ActsAsJoinable
   
   def self.models
@@ -44,6 +45,15 @@ module ActsAsJoinable
       end
     end
     
+    # Group.count_joins(:as => :parent, :conditions)
+    def count_joins(options = {})
+      relationship  = options.delete(:as) || :parent
+      conditions    = options[:conditions] || {}
+      conditions["#{relationship.to_s}_type".to_sym] = ([self.name] + (self.send(:subclasses) - self.included_modules).map(&:name)).flatten.uniq
+      group         = options[:group] || "#{relationship}_id"
+      ActsAsJoinable::Relationship.count(:conditions => conditions, :group => group)
+    end
+    
     def acts_as_joinable
       acts_as_joinable_on
     end

data/lib/acts_as_joinable/active_record_patch.rb

@@ -79,6 +79,7 @@ module ActiveRecord
       
       # Construct attributes for associate pointing to owner.
       def construct_owner_attributes(reflection)
+        puts "construct_owner_attributes #{@owner.class.name}"
         if as = reflection.options[:as]
           { "#{as}_id" => @owner.id,
             "#{as}_type" => @owner.class.name.to_s }
@@ -101,11 +102,12 @@ module ActiveRecord
 
       # Associate attributes pointing to owner, quoted.
       def construct_quoted_owner_attributes(reflection)
+        
         if as = reflection.options[:as]
-          { "#{as}_id" => owner_quoted_id,
-            "#{as}_type" => reflection.klass.quote_value(
-              @owner.class.name.to_s,
-              reflection.klass.columns_hash["#{as}_type"]) }
+          types = [@owner.class.name.to_s, @owner.class.base_class.name.to_s].map do |clazz|
+            reflection.klass.quote_value(clazz, reflection.klass.columns_hash["#{as}_type"])
+          end
+          { "#{as}_id" => owner_quoted_id, "#{as}_type" => types }
         elsif reflection.macro == :belongs_to
           { reflection.klass.primary_key => @owner[reflection.primary_key_name] }
         else
@@ -119,6 +121,7 @@ module ActiveRecord
           reflection_primary_key = @reflection.klass.primary_key
           source_primary_key     = @reflection.source_reflection.primary_key_name
           if @reflection.options[:source_type]
+            puts "@reflection.options[:source_type]"
             polymorphic_join = construct_polymorphic_sql(
               @reflection.through_reflection.quoted_table_name,
               "#{@reflection.source_reflection.options[:foreign_type]}",
@@ -139,26 +142,30 @@ module ActiveRecord
           end
         end
         
-        "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
+        result = "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
           @reflection.through_reflection.quoted_table_name,
           @reflection.quoted_table_name, reflection_primary_key,
           @reflection.through_reflection.quoted_table_name, source_primary_key,
           polymorphic_join
         ]
+        
+        puts "RESULT #{result}"
+        
+        result
       end
     end
     
     class HasManyAssociation < AssociationCollection
       protected
       def construct_polymorphic_sql(table_name, attribute, clazz = @owner.class)
-        condition = []
         clazz = clazz.to_s.constantize unless clazz.is_a?(Class)
         ancestor_classes = (clazz.ancestors.reverse - clazz.included_modules).uniq + clazz.send(:subclasses)
+        in_tree = []
         while ancestor = ancestor_classes.pop
           break if ancestor == clazz.base_class.superclass
-          condition << "#{table_name}.#{attribute} = #{clazz.quote_value(ancestor.name)}"
+          in_tree << clazz.quote_value(ancestor.name)          
         end
-        condition.join(" OR ")
+        "#{table_name}.#{attribute} IN (#{in_tree.join(',')})"
       end
       
       # added support for STI with polymorphism
@@ -174,10 +181,11 @@ module ActiveRecord
             @finder_sql << " AND (#{polymorphic_conditions})"
             @finder_sql << " AND (#{conditions})" if conditions
           else
+            puts "PRIMARY #{@reflection.quoted_table_name}.#{@reflection.primary_key_name}"
             @finder_sql = "#{@reflection.quoted_table_name}.#{@reflection.primary_key_name} = #{owner_quoted_id}"
             @finder_sql << " AND (#{conditions})" if conditions
         end
-
+        
         if @reflection.options[:counter_sql]
           @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
         elsif @reflection.options[:finder_sql]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -05:00
 default_executable: 
 dependencies: []