cohort_scope 0.0.5 → 0.0.6

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/cohort_scope"
     gem.authors = ["Seamus Abshere", "Andy Rossmeissl", "Derek Kastner"]
-    gem.add_dependency "activesupport", ">=3.0.0.beta2"
-    gem.add_dependency "activerecord", ">=3.0.0.beta2"
+    gem.add_dependency "activesupport", ">=3.0.0.beta4"
+    gem.add_dependency "activerecord", ">=3.0.0.beta4"
     gem.add_development_dependency "shoulda", ">= 2.10.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/cohort_scope.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cohort_scope}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-07-13}
+  s.date = %q{2010-07-29}
   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 = [
@@ -43,17 +43,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
     else
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
   end
 end

data/lib/cohort_scope.rb

@@ -10,25 +10,23 @@ end if ActiveSupport::VERSION::MAJOR == 3
 module ActiveRecord
   class Relation
     def inspect_count_only!
-      @_inspect_count_only = true
+      @inspect_count_only = true
     end
     def inspect_count_only?
-      @_inspect_count_only == true
+      @inspect_count_only == true
     end
-    def as_json(*args)
-      inspect_count_only? ? { :members => count }.as_json : to_a.as_json
+    def as_json(*)
+      inspect_count_only? ? { :members => count } : super
     end
     def inspect
-      inspect_count_only? ? "<Massive ActiveRecord scope with #{count} members>" : to_a.inspect
+      inspect_count_only? ? "<Massive ActiveRecord scope with #{count} members>" : super
     end
   end
 end
 
 module CohortScope
-  def self.extended(base)
-    base.class_eval do
-      cattr_accessor :minimum_cohort_size, :instance_writer => false
-    end
+  def self.extended(klass)
+    klass.cattr_accessor :minimum_cohort_size, :instance_writer => false
   end
 
   # Find the biggest scope possible by removing constraints <b>in any order</b>.
@@ -66,7 +64,9 @@ module CohortScope
     raise RuntimeError, "You need to set #{name}.minimum_cohort_size = X" unless minimum_cohort_size.present?
     
     if constraints.values.none? # failing base case
-      return scoped.where(false)
+      empty_cohort = scoped.where 'false'
+      empty_cohort.inspect_count_only!
+      return empty_cohort
     end
     
     this_hash = _cohort_constraints constraints

data/test/test_cohort_scope.rb

@@ -6,11 +6,19 @@ 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
+  should "only show the count in the json representation" do
     cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
-    assert_nothing_raised do
-      cohort.to_json
-    end
+    assert_equal({ :members => 9 }.to_json, cohort.to_json)
+  end
+  
+  should "not mess with normal as_json" do
+    non_cohort = Citizen.all
+    assert_equal non_cohort.to_a.as_json, non_cohort.as_json
+  end
+  
+  should "not mess with normal inspect" do
+    non_cohort = Citizen.all
+    assert_equal non_cohort.to_a.inspect, non_cohort.inspect
   end
   
   should "inspect to a short string" do
@@ -51,6 +59,11 @@ class TestCohortScope < Test::Unit::TestCase
         Citizen.big_cohort ActiveSupport::OrderedHash.new
       }
     end
+    
+    should "result in a relation that has inspect_count_only set" do
+      cohort = Citizen.big_cohort :favorite_color => 'heliotrope'
+      assert cohort.inspect_count_only?
+    end
   end
   
   context "strict_cohort" do
@@ -91,5 +104,13 @@ class TestCohortScope < Test::Unit::TestCase
       cohort = Citizen.strict_cohort birthdate_matters_most
       assert_equal 9, cohort.count
     end
+    
+    should "result in a relation that has inspect_count_only set" do
+      ordered_attributes = ActiveSupport::OrderedHash.new
+      ordered_attributes[:favorite_color] = 'heliotrope'
+    
+      cohort = Citizen.strict_cohort ordered_attributes
+      assert cohort.inspect_count_only?
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cohort_scope
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -04:00
+date: 2010-07-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,13 +28,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230022
+        hash: 299253624
         segments: 
         - 3
         - 0
         - 0
-        - beta2
-        version: 3.0.0.beta2
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,13 +45,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230022
+        hash: 299253624
         segments: 
         - 3
         - 0
         - 0
-        - beta2
-        version: 3.0.0.beta2
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency