cohort_scope 0.2.2 → 0.2.3

data/lib/cohort_scope/cohort.rb

@@ -6,15 +6,17 @@ module CohortScope
       # Recursively look for a scope that meets the constraints and is at least <tt>minimum_cohort_size</tt>.
       def create(active_record, constraints, minimum_cohort_size)
         if constraints.none? # failing base case
-          impossible_cohort = new(active_record.scoped.where(IMPOSSIBLE_CONDITION))
-          impossible_cohort.impossible!
-          return impossible_cohort
+          cohort = new active_record.scoped.where(IMPOSSIBLE_CONDITION)
+          cohort.count = 0
+          return cohort
         end
 
         constrained_scope = active_record.scoped.where CohortScope.conditions_for(constraints)
 
-        if constrained_scope.count >= minimum_cohort_size
-          new constrained_scope
+        if (count = constrained_scope.count) >= minimum_cohort_size
+          cohort = new constrained_scope
+          cohort.count = count
+          cohort
         else
           create active_record, reduce_constraints(active_record, constraints), minimum_cohort_size
         end
@@ -34,6 +36,14 @@ module CohortScope
       @_ch_obj = obj
     end
 
+    def count=(int)
+      @count = int
+    end
+    
+    def count
+      @count ||= super
+    end
+
     # sabshere 2/1/11 overriding as_json per usual doesn't seem to work
     def to_json(*)
       as_json.to_json
@@ -43,23 +53,21 @@ module CohortScope
       { :members => count }
     end
     
-    def impossible!
-      @impossible = true
+    def empty?
+      count == 0
     end
-    
-    def impossible?
-      @impossible == true
-    end
-    
+        
     def any?
-      return false if impossible?
+      return false if count == 0
+      return true if !block_given? and count > 0
       super
     end
 
-    # sabshere 2/1/11 ActiveRecord does this for #any? but not for #none?
     def none?(&blk)
-      return true if impossible?
+      return true if count == 0
+      return false if !block_given? and count > 0
       if block_given?
+        # sabshere 2/1/11 ActiveRecord does this for #any? but not for #none?
         to_a.none? &blk
       else
         super

data/lib/cohort_scope/version.rb

@@ -1,3 +1,3 @@
 module CohortScope
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/test_cohort_scope.rb

@@ -101,6 +101,20 @@ class TestCohortScope < Test::Unit::TestCase
     assert_equal({ :members => 0 }, relation.to_cohort.as_json)
   end
   
+  def test_013_count_is_forced
+    cohort = Citizen.big_cohort(:birthdate => @date_range)
+
+    cohort.count = 0
+    assert !cohort.any?
+    assert cohort.none?
+    assert cohort.empty?
+
+    cohort.count = 1
+    assert cohort.any?
+    assert !cohort.none?
+    assert !cohort.empty?
+  end
+  
   private
   
   def style

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cohort_scope
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154898880 !ruby/object:Gem::Requirement
+  requirement: &2152803180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2154898880
+  version_requirements: *2152803180
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2154898100 !ruby/object:Gem::Requirement
+  requirement: &2152802420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2154898100
+  version_requirements: *2152802420
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2154897700 !ruby/object:Gem::Requirement
+  requirement: &2152801900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154897700
+  version_requirements: *2152801900
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2154891040 !ruby/object:Gem::Requirement
+  requirement: &2152801240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154891040
+  version_requirements: *2152801240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154890620 !ruby/object:Gem::Requirement
+  requirement: &2152800640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154890620
+  version_requirements: *2152800640
 description: 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.
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cohort_scope
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides cohorts (in the form of ActiveRecord scopes) that dynamically widen