cohort_scope 0.1.3 → 0.1.4

data/.gitignore

@@ -19,3 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+Gemfile.lock
+test/test.log

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cohort_scope.gemspec
+gemspec

data/Rakefile

@@ -1,25 +1,7 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "cohort_scope"
-    gem.summary = %Q{Provides cohorts (in the form of ActiveRecord scopes) that dynamically widen until they contain a certain number of records.}
-    gem.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.}
-    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.beta4"
-    gem.add_dependency "activerecord", ">=3.0.0.beta4"
-    gem.add_development_dependency "shoulda", ">= 2.10.3"
-    gem.add_development_dependency 'sqlite3-ruby'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -28,28 +10,16 @@ Rake::TestTask.new(:test) do |test|
 end
 
 begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
+  require 'rake/rdoctask'
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = 'cohort_scope'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+   puts "Rdoc is not available"
 end
 
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cohort_scope #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/cohort_scope.gemspec

@@ -1,68 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cohort_scope/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{cohort_scope}
-  s.version = "0.1.3"
+  s.name        = "cohort_scope"
+  s.version     = CohortScope::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seamus Abshere", "Andy Rossmeissl", "Derek Kastner"]
+  s.email       = ["seamus@abshere.net"]
+  s.homepage    = "https://github.com/seamusabshere/cohort_scope"
+  s.summary     = %Q{Provides cohorts (in the form of ActiveRecord scopes) that dynamically widen until they contain a certain number of records.}
+  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.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{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 = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "cohort_scope.gemspec",
-     "lib/cohort_scope.rb",
-     "lib/cohort_scope/big_cohort.rb",
-     "lib/cohort_scope/cohort.rb",
-     "lib/cohort_scope/strict_cohort.rb",
-     "test/helper.rb",
-     "test/test_cohort.rb",
-     "test/test_cohort_scope.rb"
-  ]
-  s.homepage = %q{http://github.com/seamusabshere/cohort_scope}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  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/helper.rb",
-     "test/test_cohort.rb",
-     "test/test_cohort_scope.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "cohort_scope"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-    else
-      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"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    end
-  else
-    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"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "activesupport", ">=3.0.0.beta4"
+  s.add_dependency "activerecord", ">=3.0.0.beta4"
+  s.add_development_dependency "shoulda", ">= 2.10.3"
+  s.add_development_dependency 'sqlite3-ruby'
 end
-

data/lib/cohort_scope/cohort.rb

@@ -92,7 +92,11 @@ module CohortScope
 
     # sabshere 2/1/11 overriding as_json per usual doesn't seem to work
     def to_json(*)
-      { :members => count }.to_json
+      as_json.to_json
+    end
+    
+    def as_json(*)
+      { :members => count }
     end
 
     # sabshere 2/1/11 ActiveRecord does this for #any? but not for #none?

data/lib/cohort_scope/version.rb

@@ -0,0 +1,3 @@
+module CohortScope
+  VERSION = '0.1.4'
+end

data/lib/cohort_scope.rb

@@ -4,6 +4,7 @@ require 'active_support/version'
 
 require 'active_support/core_ext/module/delegation' if ActiveSupport::VERSION::MAJOR == 3
 
+require 'cohort_scope/version'
 require 'cohort_scope/cohort'
 require 'cohort_scope/big_cohort'
 require 'cohort_scope/strict_cohort'

data/test/helper.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 require 'test/unit'
 require 'shoulda'
 require 'logger'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cohort_scope'
 
 class Test::Unit::TestCase

data/test/test_cohort_scope.rb

@@ -44,6 +44,11 @@ class TestCohortScope < Test::Unit::TestCase
     cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
     assert_equal "<Massive ActiveRecord scope with 9 members>", cohort.inspect
   end
+  
+  should "not get fooled into revealing all of its members by a parent's #to_hash" do
+    cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'
+    assert_equal '{"c":{"members":9}}', { :c => cohort }.to_hash.to_json
+  end
 
   should "retain the scope's original behavior" do
     cohort = Citizen.big_cohort :birthdate => @date_range, :favorite_color => 'heliotrope'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cohort_scope
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -06:00
+date: 2011-02-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,36 +85,37 @@ dependencies:
   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: seamus@abshere.net
+email: 
+- seamus@abshere.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - cohort_scope.gemspec
 - lib/cohort_scope.rb
 - lib/cohort_scope/big_cohort.rb
 - lib/cohort_scope/cohort.rb
 - lib/cohort_scope/strict_cohort.rb
+- lib/cohort_scope/version.rb
 - test/helper.rb
 - test/test_cohort.rb
 - test/test_cohort_scope.rb
 has_rdoc: true
-homepage: http://github.com/seamusabshere/cohort_scope
+homepage: https://github.com/seamusabshere/cohort_scope
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: cohort_scope
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/VERSION

@@ -1 +0,0 @@
-0.1.3