acts_as_sourceable 2.1.3 → 2.1.4

data/lib/acts_as_sourceable/acts_as_sourceable.rb

@@ -30,10 +30,14 @@ module ActsAsSourceable
         scope :sourced, where(options[:cache_column] => true)
         scope :unsourced, where(options[:cache_column] => false)
       elsif options[:through]
-        scope :sourced, joins(options[:through]).uniq
+        scope :sourced, joins(options[:through]).group("#{table_name}.#{primary_key}") do
+          include ActsAsSourceable::GroupScopeExtensions
+        end
         scope :unsourced, joins("LEFT OUTER JOIN (#{sourced.to_sql}) sourced ON sourced.id = #{table_name}.id").where("sourced.id IS NULL")
       else
-        scope :sourced, joins(:sourceable_registry_entries).uniq
+        scope :sourced, joins(:sourceable_registry_entries).group("#{table_name}.#{primary_key}") do
+          include ActsAsSourceable::GroupScopeExtensions
+        end
         scope :unsourced, joins("LEFT OUTER JOIN (#{ActsAsSourceable::RegistryEntry.select('sourceable_id AS id').where(:sourceable_type => self).to_sql}) sourced ON sourced.id = #{table_name}.id").where("sourced.id IS NULL")
       end
 
@@ -83,6 +87,13 @@ module ActsAsSourceable
     end
   end
 
+  module GroupScopeExtensions
+    # Extension for scopes where we're grouping but want to be able to call count
+    def count
+      connection.select_value("SELECT count(1) FROM (#{to_sql}) AS count_all").to_i
+    end
+  end
+
   module ClassMethods
     def acts_like_sourceable?
       true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_sourceable
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Allows the RRN to perform garbage collection on categories that are no
   longer referenced.