cohort_scope 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/cohort_scope.rb

@@ -36,9 +36,9 @@ module CohortScope
 
   # Find the biggest scope possible by removing constraints <b>in any order</b>.
   # Returns an empty scope if it can't meet the minimum scope size.
-  def big_cohort(constraints)
+  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
+    _cohort_massive_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.
@@ -57,15 +57,15 @@ module CohortScope
   #
   # If the original constraints don't meet the minimum scope size, then the only constraint that can be removed is birthdate.
   # In other words, this would never return a scope that was constrained on birthdate but not on favorite_color.
-  def strict_cohort(constraints)
+  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
+    _cohort_massive_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)
+  def _cohort_massive_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
@@ -75,10 +75,10 @@ module CohortScope
     this_hash = _cohort_constraints constraints
     this_count = scoped(this_hash).count
     
-    if this_count >= minimum_cohort_size # successful base case
+    if this_count >= (custom_minimum_cohort_size || minimum_cohort_size) # successful base case
       massive_scoped this_hash
     else
-      _cohort_massive_scope _cohort_reduce_constraints(constraints)
+      _cohort_massive_scope _cohort_reduce_constraints(constraints), custom_minimum_cohort_size
     end
   end
   

data/test/test_cohort_scope.rb

@@ -9,10 +9,10 @@ class TestCohortScope < Test::Unit::TestCase
   should "raise if no minimum_cohort_size is specified" do
     Citizen.minimum_cohort_size = nil
     assert_raises(RuntimeError) {
-      cohort = Citizen.big_cohort Hash.new
+      Citizen.big_cohort Hash.new
     }
     assert_raises(RuntimeError) {
-      cohort = Citizen.strict_cohort ActiveSupport::OrderedHash.new
+      Citizen.strict_cohort ActiveSupport::OrderedHash.new
     }
   end
 
@@ -21,6 +21,11 @@ class TestCohortScope < Test::Unit::TestCase
       cohort = Citizen.big_cohort :favorite_color => 'heliotrope'
       assert_equal 0, cohort.count
     end
+    
+    should "take minimum_cohort_size as an optional argument" do
+      cohort = Citizen.big_cohort({:favorite_color => 'heliotrope'}, 0)
+      assert_equal 1, cohort.count
+    end
   
     should "seek a cohort of maximum size" do
       cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
@@ -31,7 +36,7 @@ class TestCohortScope < Test::Unit::TestCase
     
     should "raise if an OrderedHash is given to big_cohort" do
       assert_raises(ArgumentError) {
-        cohort = Citizen.big_cohort ActiveSupport::OrderedHash.new
+        Citizen.big_cohort ActiveSupport::OrderedHash.new
       }
     end
   end
@@ -39,11 +44,19 @@ class TestCohortScope < Test::Unit::TestCase
   context "strict_cohort" do
     should "raise if a non-OrderedHash is given to strict_cohort" do
       assert_raises(ArgumentError) {
-        cohort = Citizen.strict_cohort Hash.new
+        Citizen.strict_cohort Hash.new
       }
     end
+    
+    should "take minimum_cohort_size as an optional argument" do
+      ordered_attributes = ActiveSupport::OrderedHash.new
+      ordered_attributes[:favorite_color] = 'heliotrope'
+    
+      cohort = Citizen.strict_cohort ordered_attributes, 0
+      assert_equal 1, cohort.count
+    end
   
-    should "return an empty (strict) cohort if it can't find one that meets size requirements" do
+    should "return an empty cohort if it can't find one that meets size requirements" do
       ordered_attributes = ActiveSupport::OrderedHash.new
       ordered_attributes[:favorite_color] = 'heliotrope'
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Seamus Abshere