acts_as_sourceable 2.1.6 → 2.2.2

data/lib/acts_as_sourceable/acts_as_sourceable.rb

@@ -30,10 +30,10 @@ module ActsAsSourceable
         scope :sourced,   lambda { where(options[:cache_column] => true) }
         scope :unsourced, lambda { where(options[:cache_column] => false) }
       elsif options[:through]
-        scope :sourced,   lambda { joins(options[:through]).group("#{table_name}.#{primary_key}") } do include ActsAsSourceable::GroupScopeExtensions; end
+        scope :sourced,   lambda { from(unscoped.joins(options[:through]).group("#{table_name}.#{primary_key}"), table_name) }
         scope :unsourced, lambda { joins("LEFT OUTER JOIN (#{sourced.to_sql}) sourced ON sourced.id = #{table_name}.id").where("sourced.id IS NULL") }
       else
-        scope :sourced,   lambda { joins(:sourceable_registry_entries).group("#{table_name}.#{primary_key}") } do include ActsAsSourceable::GroupScopeExtensions; end
+        scope :sourced,   lambda { from(unscoped.joins(:sourceable_registry_entries).group("#{table_name}.#{primary_key}"), table_name) }
         scope :unsourced, lambda { 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
 
@@ -51,53 +51,36 @@ module ActsAsSourceable
       else
         scope :orphaned, lambda { unsourced }
       end
-
-      # ACTIVE RELATION SETUP
-      ActiveRecord::Relation.send(:include, ActsAsSourceable::ActiveRelationMethods)
-
-      # Delegate the relation methods to the relation so we can call Klass.unsourced (do this in the metaclass because all these methods are class level)
-      class << self
-        delegate :add_sources, :add_source, :remove_source, :remove_sources, :unsource, :to => :scoped
-      end
     end
   end
-  
-  module ActiveRelationMethods
+
+  module ClassMethods
+    def acts_like_sourceable?
+      true
+    end
+
     def remove_sources(*sources)
-      scoping { @klass.find_each{|record| record.remove_sources(*sources) } }
+      find_each{|record| record.remove_sources(*sources) }
     end
     alias_method :remove_source, :remove_sources
 
     def add_sources(*sources)
-      scoping { @klass.find_each{|record| record.add_sources(*sources) } }
+      find_each{|record| record.add_sources(*sources) }
     end
     alias_method :add_source, :add_sources
-    
+
     def unsource
       # OPTIMIZATION: it's faster to only set the cache column to false if it is true instead of setting all to false indiscriminately
-      scoping { @klass.where(@klass.acts_as_sourceable_options[:cache_column] => true).update_all("#{acts_as_sourceable_options[:cache_column]} = false") } if @klass.acts_as_sourceable_options[:cache_column]
-      scoping { ActsAsSourceable::RegistryEntry.where("sourceable_type = ? AND sourceable_id IN (#{@klass.select("#{@klass.table_name}.id").to_sql})", @klass.name).delete_all }
+      where(acts_as_sourceable_options[:cache_column] => true).update_all(acts_as_sourceable_options[:cache_column] => false) if acts_as_sourceable_options[:cache_column]
+      ActsAsSourceable::RegistryEntry.where(:sourceable_type => self.name, :sourceable_id => self.all).delete_all
     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
-    end    
-  end
-
   module InstanceMethods
     def acts_like_sourceable?
       true
     end
-        
+
     def sourced?
       if acts_as_sourceable_options[:cache_column]
         self[acts_as_sourceable_options[:cache_column]]
@@ -133,13 +116,13 @@ module ActsAsSourceable
       update_sourceable_cache_column(false) if self.sourceable_registry_entries.empty?
     end
     alias_method :remove_source, :remove_sources
-    
+
     private
 
     def source_scope(source)
       ActsAsSourceable::RegistryEntry.where(:sourceable_type => self.class.name, :sourceable_id => self.id, :source_type => source.class, :source_id => source.id)
     end
- 
+
     def update_sourceable_cache_column(value = nil)
       return unless acts_as_sourceable_options[:cache_column] # Update via sql because we don't need callbacks and validations called
 
@@ -182,4 +165,4 @@ module ActsAsSourceable
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_sourceable
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
-dependencies: []
+date: 2013-09-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Allows the RRN to perform garbage collection on categories that are no
   longer referenced.
 email: technical@rrnpilot.org
@@ -24,25 +41,26 @@ files:
 - README.md
 homepage: http://github.com/rrn/acts_as_sourceable
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: perform garbage collection on categories that are no longer referenced
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cbea8083a7e55b7564806fdb3b45949ba6f3ecf0
-  data.tar.gz: 769945cd32379edd5fb48cde928313261dd55fe8
-SHA512:
-  metadata.gz: e0fff5cc8519cda5dbd5b9a1735edfc27b223a344680a3374538847988043561bfe59520f055f9f4a390926f027b000f03ae0d93e516661b55f67e8d4775b20a
-  data.tar.gz: 4be367a71ea15eb1ec0a1636ce2ff04baf1c1384bdce5645613c63530b482a31c5d22c65c61039935ab08873a3c878496598c31fc2f3e83b73324711c2f1fa41