cohort_scope 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/cohort_scope.rb

@@ -8,34 +8,18 @@ require 'active_support/version'
 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
+  class Relation
+    def inspect_count_only!
+      @_inspect_count_only = true
     end
-  end
-  module NamedScope
-    module ClassMethods
-      # Work with a MassiveRelation, which, when inspected, does not generate a huge string.
-      def massive_scoped(options = {}, &block)
-        if options.present?
-          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
+    def inspect_count_only?
+      @_inspect_count_only == true
     end
-  end
-  class MassiveRelation < Relation
-    # Don't try to output a massive string.
-    def inspect
-      "<Massive relation: #{count} members>"
+    def as_json(*args)
+      inspect_count_only? ? { :members => count }.as_json : to_a.as_json
     end
-    # Don't try to put everything into json.
-    def to_json(*args)
-      { :members => count }.to_json
+    def inspect
+      inspect_count_only? ? "<Massive ActiveRecord scope with #{count} members>" : to_a.inspect
     end
   end
 end
@@ -51,7 +35,7 @@ module CohortScope
   # Returns an empty scope if it can't meet the minimum scope size.
   def big_cohort(constraints = {}, custom_minimum_cohort_size = nil)
     raise ArgumentError, "You can't give a big_cohort an OrderedHash; do you want strict_cohort?" if constraints.is_a?(ActiveSupport::OrderedHash)
-    _cohort_massive_scope constraints, custom_minimum_cohort_size
+    _cohort_scope constraints, custom_minimum_cohort_size
   end
 
   # Find the first acceptable scope by removing constraints <b>in strict order</b>, starting with the last constraint.
@@ -72,27 +56,29 @@ module CohortScope
   # In other words, this would never return a scope that was constrained on birthdate but not on favorite_color.
   def strict_cohort(constraints, custom_minimum_cohort_size = nil)
     raise ArgumentError, "You need to give strict_cohort an OrderedHash" unless constraints.is_a?(ActiveSupport::OrderedHash)
-    _cohort_massive_scope constraints, custom_minimum_cohort_size
+    _cohort_scope constraints, custom_minimum_cohort_size
   end
 
   protected
 
   # Recursively look for a scope that meets the constraints and is at least <tt>minimum_cohort_size</tt>.
-  def _cohort_massive_scope(constraints, custom_minimum_cohort_size)
+  def _cohort_scope(constraints, custom_minimum_cohort_size)
     raise RuntimeError, "You need to set #{name}.minimum_cohort_size = X" unless minimum_cohort_size.present?
     
     if constraints.values.none? # failing base case
-      return massive_scoped(:conditions => 'false')
+      return scoped.where('false')
     end
     
     this_hash = _cohort_constraints constraints
-    this_count = scoped(this_hash).count
+    this_count = scoped.where(this_hash).count
     
     if this_count >= (custom_minimum_cohort_size || minimum_cohort_size) # successful base case
-      massive_scoped this_hash
+      cohort = scoped.where this_hash
     else
-      _cohort_massive_scope _cohort_reduce_constraints(constraints), custom_minimum_cohort_size
+      cohort = _cohort_scope _cohort_reduce_constraints(constraints), custom_minimum_cohort_size
     end
+    cohort.inspect_count_only!
+    cohort
   end
   
   # Sanitize constraints by
@@ -110,7 +96,7 @@ module CohortScope
       memo.merge! condition if condition.is_a? Hash
       memo
     end
-    { :conditions => conditions }
+    conditions
   end
   
   # Convert constraints that are provided as ActiveRecord::Base objects into their corresponding integer primary keys.
@@ -152,7 +138,7 @@ module CohortScope
     losing_key = nil
     constraints.keys.each do |key|
       test_constraints = constraints.except(key)
-      count_after_removal = scoped(_cohort_constraints(test_constraints)).count
+      count_after_removal = scoped.where(_cohort_constraints(test_constraints)).count
       if highest_count_after_removal.nil? or count_after_removal > highest_count_after_removal
         highest_count_after_removal = count_after_removal
         losing_key = key

data/test/helper.rb

@@ -11,7 +11,7 @@ require 'cohort_scope'
 class Test::Unit::TestCase
 end
 
-$logger = Logger.new STDOUT #'test/test.log'
+$logger = Logger.new 'test/test.log' #STDOUT
 ActiveSupport::Notifications.subscribe do |*args|
   event = ActiveSupport::Notifications::Event.new(*args)
   $logger.debug "#{event.payload[:name]} (#{event.duration}) #{event.payload[:sql]}"
@@ -21,7 +21,7 @@ ActiveRecord::Base.establish_connection(
   'adapter' => 'mysql',
   'database' => 'cohort_scope_test',
   'username' => 'root',
-  'password' => ''
+  'password' => 'password'
 )
 
 ActiveRecord::Schema.define(:version => 20090819143429) do

data/test/test_cohort_scope.rb

@@ -6,6 +6,18 @@ class TestCohortScope < Test::Unit::TestCase
     @date_range = (Date.parse('1980-01-01')..Date.parse('1990-01-01'))
   end
 
+  should "not raise on to_json" do
+    cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
+    assert_nothing_raised do
+      cohort.to_json
+    end
+  end
+  
+  should "inspect to a short string" do
+    cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
+    assert_equal "<Massive ActiveRecord scope with 9 members>", cohort.inspect
+  end
+
   should "raise if no minimum_cohort_size is specified" do
     Citizen.minimum_cohort_size = nil
     assert_raises(RuntimeError) {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-05-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency