cohort_scope 0.2.0 → 0.2.1

data/lib/cohort_scope/cohort.rb

@@ -7,7 +7,7 @@ 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
-          empty_scope = active_record.scoped.where '1 = 2'
+          empty_scope = active_record.scoped.where Arel::Nodes::Equality.new(1,2)
           return new(empty_scope)
         end
 
@@ -49,6 +49,30 @@ module CohortScope
         super
       end
     end
+    
+    def where_value_nodes
+      __getobj__.instance_variable_get(:@where_values)
+    end
+    
+    def active_record
+      __getobj__.klass
+    end
+    
+    def +(other)
+      case other
+      when Cohort
+        combined_conditions = (where_value_nodes + other.where_value_nodes).inject(nil) do |memo, node|
+          if memo.nil?
+            node
+          else
+            memo.or(node)
+          end
+        end
+        Cohort.new active_record.where(combined_conditions)
+      else
+        super
+      end
+    end
 
     def inspect
       "<Cohort scope with #{count} members>"

data/lib/cohort_scope/version.rb

@@ -1,3 +1,3 @@
 module CohortScope
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/cohort_scope.rb

@@ -55,4 +55,12 @@ module CohortScope
     constraints = args
     StrictCohort.create self, constraints, (options[:minimum_cohort_size] || minimum_cohort_size)
   end
+  
+  module ActiveRecordRelationExt
+    def to_cohort
+      Cohort.new self
+    end
+  end
 end
+
+::ActiveRecord::Relation.send :include, ::CohortScope::ActiveRecordRelationExt

data/test/test_cohort_scope.rb

@@ -82,7 +82,26 @@ class TestCohortScope < Test::Unit::TestCase
     assert_kind_of Citizen, cohort.last
     assert_kind_of Citizen, cohort.where(:teeth => 31).first
   end
-    
+  
+  def test_011_combine_scopes_with_or
+    nobody = Citizen.big_cohort({:favorite_color => 'oaisdjaoisjd'}, :minimum_cohort_size => 1)
+    assert_equal 0, nobody.count
+    people_who_love_heliotrope_are_from_the_fifties = Citizen.big_cohort({:favorite_color => 'heliotrope'}, :minimum_cohort_size => 1)
+    assert_equal 1, people_who_love_heliotrope_are_from_the_fifties.count
+    assert people_who_love_heliotrope_are_from_the_fifties.none? { |c| @date_range.include? c.birthdate }
+    their_children_are_born_in_the_eighties = Citizen.big_cohort({:birthdate => @date_range}, :minimum_cohort_size => 1)
+    assert_equal 9, their_children_are_born_in_the_eighties.count
+    everybody = (people_who_love_heliotrope_are_from_the_fifties + their_children_are_born_in_the_eighties + nobody)
+    assert_kind_of CohortScope::Cohort, everybody
+    assert_equal 10, everybody.count
+  end
+  
+  def test_012_to_cohort
+    relation = Citizen.big_cohort({:favorite_color => 'heliotrope'}, :minimum_cohort_size => 1).where(:birthdate => @date_range)
+    assert_equal [], relation.as_json
+    assert_equal({ :members => 0 }, relation.to_cohort.as_json)
+  end
+  
   private
   
   def style

metadata

@@ -2,7 +2,7 @@
 name: cohort_scope
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -05:00
+date: 2011-06-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency