cohort_scope 0.2.1 → 0.2.2

data/cohort_scope.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "activerecord", "~> 3.0"
+  s.add_runtime_dependency "activesupport", '>=3'
+  s.add_runtime_dependency "activerecord", '>=3'
   s.add_development_dependency 'test-unit'
-  s.add_development_dependency 'mysql'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'rake'
   # s.add_development_dependency 'ruby-debug'
 end

data/lib/cohort_scope/cohort.rb

@@ -2,13 +2,13 @@ require 'delegate'
 
 module CohortScope
   class Cohort < ::Delegator
-
     class << self
       # 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 Arel::Nodes::Equality.new(1,2)
-          return new(empty_scope)
+          impossible_cohort = new(active_record.scoped.where(IMPOSSIBLE_CONDITION))
+          impossible_cohort.impossible!
+          return impossible_cohort
         end
 
         constrained_scope = active_record.scoped.where CohortScope.conditions_for(constraints)
@@ -20,6 +20,8 @@ module CohortScope
         end
       end
     end
+    
+    IMPOSSIBLE_CONDITION = ::Arel::Nodes::Equality.new(1,2)
 
     def initialize(obj)
       super
@@ -40,9 +42,23 @@ module CohortScope
     def as_json(*)
       { :members => count }
     end
+    
+    def impossible!
+      @impossible = true
+    end
+    
+    def impossible?
+      @impossible == true
+    end
+    
+    def any?
+      return false if impossible?
+      super
+    end
 
     # sabshere 2/1/11 ActiveRecord does this for #any? but not for #none?
     def none?(&blk)
+      return true if impossible?
       if block_given?
         to_a.none? &blk
       else
@@ -75,7 +91,7 @@ module CohortScope
     end
 
     def inspect
-      "<Cohort scope with #{count} members>"
+      "#<#{self.class.name} with #{count} members>"
     end
   end
 end

data/lib/cohort_scope/version.rb

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

data/lib/cohort_scope.rb

@@ -1,17 +1,11 @@
 require 'active_record'
+require 'active_support/core_ext'
 
-require 'active_support'
-require 'active_support/version'
-if ActiveSupport::VERSION::MAJOR == 3
-  require 'active_support/json'
-  require 'active_support/core_ext/hash'
-end
+require 'cohort_scope/cohort'
+require 'cohort_scope/big_cohort'
+require 'cohort_scope/strict_cohort'
 
 module CohortScope
-  autoload :Cohort, 'cohort_scope/cohort'
-  autoload :BigCohort, 'cohort_scope/big_cohort'
-  autoload :StrictCohort, 'cohort_scope/strict_cohort'
-  
   def self.extended(klass)
     klass.class_eval do
       class << self

data/test/helper.rb

@@ -10,10 +10,10 @@ class Test::Unit::TestCase
 end
 
 # require 'logger'
-# ActiveRecord::Base.logger = Logger.new($stderr)
+# ActiveRecord::Base.logger = Logger.new($stdout)
 
 ActiveRecord::Base.establish_connection(
-  'adapter' => 'mysql',
+  'adapter' => 'mysql2',
   'database' => 'test_cohort_scope',
   'username' => 'root',
   'password' => 'password'
@@ -64,7 +64,7 @@ end
   [ '1985-03-02', nil, 27 ],
   [ '1982-05-01', nil, 28 ]
 ].each do |birthdate, favorite_color, teeth|
-  Citizen.create! :birthdate => birthdate, :favorite_color => favorite_color, :teeth => teeth
+  c = Citizen.new; c.birthdate = birthdate; c.favorite_color = favorite_color; c.teeth = teeth; c.save!
 end
 
 class Period < ActiveRecord::Base
@@ -97,13 +97,13 @@ class Resident < ActiveRecord::Base
   belongs_to :house
 end
 
-p1 = Period.create! :name => 'arts and crafts'
-p2 = Period.create! :name => 'victorian'
-Style.create! :period => p1, :name => 'classical revival'
-Style.create! :period => p1, :name => 'gothic'
-Style.create! :period => p1, :name => 'art deco'
-Style.create! :period => p2, :name => 'stick-eastlake'
-Style.create! :period => p2, :name => 'queen anne'
+p1 = Period.new; p1.name = 'arts and crafts'; p1.save!
+p2 = Period.new; p2.name = 'victorian'; p2.save!
+s1 = Style.new; s1.period = p1; s1.name = 'classical revival'; s1.save!
+s2 = Style.new; s2.period = p1; s2.name = 'gothic'; s2.save!
+s3 = Style.new; s3.period = p1; s3.name = 'art deco'; s3.save!
+s4 = Style.new; s4.period = p2; s4.name = 'stick-eastlake'; s4.save!
+s5 = Style.new; s5.period = p2; s5.name = 'queen anne'; s5.save!
 h1 = House.create! :period => p1, :address => '123 Maple', :storeys => 1
 h2 = House.create! :period => p1, :address => '223 Walnut', :storeys => 2
 h3 = House.create! :period => p2, :address => '323 Pine', :storeys => 2

data/test/test_cohort_scope.rb

@@ -28,10 +28,9 @@ class TestCohortScope < Test::Unit::TestCase
   end
   
   # should this even work in theory?
-  def test_002b_simplified_joins
-    flunk
-    assert_equal 3, Style.big_cohort(:houses => [house1]).length
-  end
+  # def test_002b_simplified_joins
+  #   assert_equal 3, Style.big_cohort(:houses => [house1]).length
+  # end
 
   def test_003_redefine_any_query_method
     cohort = Citizen.big_cohort(:birthdate => @date_range)
@@ -69,7 +68,7 @@ class TestCohortScope < Test::Unit::TestCase
   
   def test_008_short_inspect
     cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
-    assert_equal "<Cohort scope with 9 members>", cohort.inspect
+    assert_equal "#<CohortScope::BigCohort with 9 members>", cohort.inspect
   end
   
   def test_009_not_reveal_itself_in_to_hash

metadata

@@ -1,74 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cohort_scope
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 - Andy Rossmeissl
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-03 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154898880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154898880
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2154898100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2154898100
+- !ruby/object:Gem::Dependency
   name: test-unit
+  requirement: &2154897700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154897700
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &2154891040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154891040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2154890620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-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.
-email: 
+  prerelease: false
+  version_requirements: *2154890620
+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.
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -85,36 +93,34 @@ files:
 - test/test_big_cohort.rb
 - test/test_cohort_scope.rb
 - test/test_strict_cohort.rb
-has_rdoc: true
 homepage: https://github.com/seamusabshere/cohort_scope
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cohort_scope
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 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: 
+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_big_cohort.rb
 - test/test_cohort_scope.rb
 - test/test_strict_cohort.rb
+has_rdoc: