cohort_scope 0.0.2 → 0.0.3

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Provides big_cohort, which widens by finding the constraint that eliminates the most records and removing it. Also provides strict_cohort, which widens by eliminating constraints in order.}
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/cohort_scope"
-    gem.authors = ["Seamus Abshere", "Andy Rossmeissl"]
+    gem.authors = ["Seamus Abshere", "Andy Rossmeissl", "Derek Kastner"]
     gem.add_dependency "activesupport", ">=3.0.0.beta2"
     gem.add_dependency "activerecord", ">=3.0.0.beta2"
     gem.add_development_dependency "shoulda", ">= 2.10.3"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/cohort_scope.rb

@@ -1,28 +1,41 @@
-require 'active_support'
 require 'active_record'
-require 'active_support/core_ext/module/delegation'
+require 'active_support'
+require 'active_support/version'
+%w{
+  active_support/core_ext/module/delegation
+}.each do |active_support_3_requirement|
+  require active_support_3_requirement
+end if ActiveSupport::VERSION::MAJOR == 3
 
 module ActiveRecord
+  class Base
+    def massive_unscoped
+      @massive_unscoped ||= MassiveRelation.new(self, arel_table)
+      finder_needs_type_condition? ? @massive_unscoped.where(type_condition) : @massive_unscoped
+    end
+  end
   module NamedScope
     module ClassMethods
-      # Initialize a MassiveScope, which, when inspected, does not generate a huge string.
+      # Work with a MassiveRelation, which, when inspected, does not generate a huge string.
       def massive_scoped(options = {}, &block)
         if options.present?
-          MassiveScope.init(self, options, &block)
+          scoped = current_scoped_methods ? massive_unscoped.merge(current_scoped_methods) : unscoped.clone
+          relation = scoped.apply_finder_options(options)
+          block_given? ? relation.extending(Module.new(&block)) : relation
         else
           raise "MassiveScopes should be created with options"
         end
       end
     end
-    class MassiveScope < Scope
-      # Don't try to output a massive string.
-      def inspect
-        "<Massive scope: #{count} members>"
-      end
-      # Don't try to put everything into json.
-      def to_json(*args)
-        { :members => count }.to_json
-      end
+  end
+  class MassiveRelation < Relation
+    # Don't try to output a massive string.
+    def inspect
+      "<Massive relation: #{count} members>"
+    end
+    # Don't try to put everything into json.
+    def to_json(*args)
+      { :members => count }.to_json
     end
   end
 end

metadata

@@ -5,17 +5,18 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seamus Abshere
 - Andy Rossmeissl
+- Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency