cohort_scope 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/cohort_scope.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cohort_scope}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl", "Derek Kastner"]
-  s.date = %q{2010-10-29}
+  s.date = %q{2011-02-01}
   s.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.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -38,9 +38,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Provides cohorts (in the form of ActiveRecord scopes) that dynamically widen until they contain a certain number of records.}
   s.test_files = [
-    "test/test_cohort.rb",
-     "test/test_cohort_scope.rb",
-     "test/helper.rb"
+    "test/helper.rb",
+     "test/test_cohort.rb",
+     "test/test_cohort_scope.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/cohort_scope/cohort.rb

@@ -50,16 +50,16 @@ module CohortScope
       #
       # For example, :car => <#Car> might get translated into :car_id => 44 or :car_type => 44 if :foreign_key option is given.
       def association_foreign_key(model, name)
-        @_cohort_association_foreign_keys ||= {}
-        return @_cohort_association_foreign_keys[name] if @_cohort_association_foreign_keys.has_key? name
+        @association_foreign_key ||= {}
+        return @association_foreign_key[name] if @association_foreign_key.has_key? name
         association = model.reflect_on_association name
         raise "there is no association #{name.inspect} on #{model}" if association.nil?
         raise "can't use cohort scope on :through associations (#{self.name} #{name})" if association.options.has_key? :through
         foreign_key = association.instance_variable_get(:@options)[:foreign_key]
         if !foreign_key.blank?
-          @_cohort_association_foreign_keys[name] = foreign_key
+          @association_foreign_key[name] = foreign_key
         else
-          @_cohort_association_foreign_keys[name] = association.primary_key_name
+          @association_foreign_key[name] = association.primary_key_name
         end
       end
       
@@ -80,14 +80,25 @@ module CohortScope
     end
 
     def initialize(obj)
+      super
       @_ch_obj = obj
     end
     def __getobj__
       @_ch_obj
     end
 
-    def as_json(*)
-      { :members => count }
+    # sabshere 2/1/11 overriding as_json per usual doesn't seem to work
+    def to_json(*)
+      { :members => count }.to_json
+    end
+
+    # sabshere 2/1/11 ActiveRecord does this for #any? but not for #none?
+    def none?(&blk)
+      if block_given?
+        to_a.none? &blk
+      else
+        super
+      end
     end
 
     def inspect

data/test/test_cohort_scope.rb

@@ -6,6 +6,25 @@ class TestCohortScope < Test::Unit::TestCase
     @date_range = (Date.parse('1980-01-01')..Date.parse('1990-01-01'))
   end
 
+  should "properly use blocks" do
+    cohort = Citizen.big_cohort(:birthdate => @date_range)
+    assert cohort.all? { |c| true }
+    assert cohort.any? { |c| true }
+    assert !cohort.none? { |c| true }
+  end
+
+  should "actually run blocks" do
+    assert_raises(RuntimeError, 'A') do
+      Citizen.big_cohort(:birthdate => @date_range).all? { |c| raise 'A' }
+    end
+    assert_raises(RuntimeError, 'B') do
+      Citizen.big_cohort(:birthdate => @date_range).any? { |c| raise 'B' }
+    end
+    assert_raises(RuntimeError, 'C') do
+      Citizen.big_cohort(:birthdate => @date_range).none? { |c| raise 'C' }
+    end
+  end
+
   should "only show the count in the json representation" do
     cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
     assert_equal({ :members => 9 }.to_json, cohort.to_json)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cohort_scope
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -04:00
+date: 2011-02-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 299253624
         segments: 
         - 3
         - 0
@@ -43,6 +45,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 299253624
         segments: 
         - 3
         - 0
@@ -59,6 +62,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 10
@@ -74,6 +78,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -117,6 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -125,6 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -136,6 +143,6 @@ signing_key:
 specification_version: 3
 summary: Provides cohorts (in the form of ActiveRecord scopes) that dynamically widen until they contain a certain number of records.
 test_files: 
+- test/helper.rb
 - test/test_cohort.rb
 - test/test_cohort_scope.rb
-- test/helper.rb