dase 3.2.4 → 3.2.5

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - rbx-19mode
+  #- jruby-19mode # JRuby in 1.9 mode
+
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec
+

data/README.md

@@ -1,4 +1,4 @@
-# Dase
+[![Build Status](https://secure.travis-ci.org/vovayartsev/dase.png)](http://travis-ci.org/vovayartsev/dase)
 
 ## Overview
 
@@ -16,22 +16,19 @@ Calling 'includes_count_of(:articles)' on a relation object adds 'articles_count
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your Rails 3.2.x application's Gemfile:
 
-    gem 'dase', "~> 3.2.0"
-
-### Note on version numbers
-
-Dase version number correlates with the Active Record's versions number,
-which it has been tested with.
-E.g. the latest 3.2.* version of Dase will play nicely with the latest 3.2.* version of Active Record.
-Since it's a sort of a "hack", make sure you specified the version number for "dase" gem in your Gemfile.
+    gem 'dase', "~> 3.2.4"
 
 ## Usage
 
 ### Basic usage:
 
 ```
+  class Author
+    has_many :articles
+  end
+  
   Author.includes_count_of(:articles).find_each do |author|
     puts "#{author.name} has #{author.articles_count} articles published"
   end
@@ -46,15 +43,17 @@ Author.includes_count_of(:articles, :conditions => {:year => 2012})   # counts o
 
 ### Using scope merging
 ```
-scope = Article.where(:year => 2012)
-Author.includes_count_of(:articles, :only => scope)   # counts only articles in year 2012
-```
+class Article
+  belongs_to :author
+  scope this_year, lambda { where(:year => 2012) }
+end 
 
-### Using block syntax
-```
-Author.includes_count_of(:articles){ where(:year => 2012) }        # in the block, 'self' is a Relation instance
-Author.includes_count_of(:articles){ |scope| scope.where(:year => 2012) }   # 'self' is the same inside and outside the block
+results = Author.includes_count_of(:articles, :only => Article.this_year)   
+results.first.articles_count  # => # number of articles of given Author for year 2012 only
 ```
+This is achieved by merging the association scope with the scope provided as ":only => ..." option. 
+No additional checks are performed, and providing the association of proper type is solely your responsibility.
+
 
 ### Renaming counter column
 ```
@@ -62,10 +61,25 @@ sites = WebSite.includes_count_of(:users, :conditions => {:role => 'admin'}, :as
 sites.each { |site| puts "Site #{site.url} has #{site.admins_count} admin users" }
 ```
 
+## Compatibility
+
+### Rails versions
 
-### Known problems
+This gem is for Rails 3.2.x . Earlier versions are not supported.
 
-Dase doesn't support polymorphism.
+Note: the Dase gem version number correlates with the Active Record's versions number,
+which it has been tested with.
+E.g. the latest 3.2.* version of Dase will play nicely with the latest 3.2.* version of Active Record.
+Since dase gem is a sort of a "hack", make sure you specified the version number for "dase" gem in your Gemfile.
+
+### Polymorphic associations and HasManyThrough associations
+
+Polymorphic associations and HasManyThrough associations support should work, but it is not tested quite well.
+Bug reports and pull requests are very welcome.
+
+### jRuby support
+
+Not yet
 
 ## How it works
 
@@ -77,9 +91,6 @@ Here's a pseudo-code that gives an idea on how it works internally
   end
 ```
 
-
-
-
 ## Name origin
 
 The gem is named by the german mathematician [Johann Dase](http://en.wikipedia.org/wiki/Zacharias_Dase),

data/dase.gemspec

@@ -14,11 +14,19 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently}
   gem.homepage      = "https://github.com/vovayartsev/dase"
 
-  gem.add_runtime_dependency "activerecord", "~> 3.2.0"
   gem.add_runtime_dependency "activesupport", "~> 3.2.0"
   gem.add_development_dependency 'shoulda'
-  gem.add_development_dependency 'sqlite3', '~> 1.3.3'
-  gem.add_development_dependency 'debugger'
+  
+  if defined? JRUBY_VERSION
+    gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem.add_runtime_dependency "activerecord", "~> 3.2.0"
+    gem.add_development_dependency 'sqlite3', '~> 1.3.3'
+  end
+
+  # gem.add_development_dependency 'debugger'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec-core'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/dase/mp_active_record_relation.rb

@@ -14,9 +14,10 @@ module Dase
       relation.dase_values ||= {}
       #options[:proc] = block if block
       args.each do |arg|
-        options[:association] = arg.to_sym
-        options[:as] = (options[:as] || "#{arg}_count").to_sym
-        relation.dase_values[options[:as]] = options
+        opts = options.clone
+        opts[:association] = arg.to_sym
+        opts[:as] = (opts[:as] || "#{arg}_count").to_sym
+        relation.dase_values[opts[:as]] = opts
       end
       relation
     end

data/lib/dase/version.rb

@@ -1,3 +1,3 @@
 module Dase
-  VERSION = "3.2.4"
+  VERSION = "3.2.5"
 end

data/test/test_dase.rb

@@ -50,7 +50,7 @@ class TestBase < Test::Unit::TestCase
     end
 
     should "count books for year 1990" do
-      traditional_counts = Author.order(:name).map { |a| a.books.where(year: 1990).count }
+      traditional_counts = Author.order(:name).map { |a| a.books.where(:year => 1990).count }
       dase_counts = Author.includes_count_of(:books, :conditions => {:year => 1990}).order(:name).map { |a| a.books_count }
       # the order is: Bobby, Joe, Teddy - due to order(:name)
       true_counts = [1, 2, 0] # see books.yml
@@ -94,5 +94,11 @@ class TestBase < Test::Unit::TestCase
       compare_counts(traditional_counts, dase_counts, true_counts)
     end
 
+    should 'support multiple arguments' do
+      joe = Author.includes_count_of(:books, :old_books).where(:name => 'Joe').first
+      assert_equal 3, joe.books_count, "Invalid books_count"
+      assert_equal 2, joe.old_books_count, "Invalid old_books_count"
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dase
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70360982006260 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70173173459420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70360982006260
+  version_requirements: *70173173459420
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70360982005420 !ruby/object:Gem::Requirement
+  name: shoulda
+  requirement: &70173173458740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70173173458740
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70173173458200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +43,32 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70360982005420
+  version_requirements: *70173173458200
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70360982004720 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70173173457620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70360982004720
+  version_requirements: *70173173457620
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70360982003420 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70173173457020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360982003420
+  version_requirements: *70173173457020
 - !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: &70360982001620 !ruby/object:Gem::Requirement
+  name: rspec-core
+  requirement: &70173173456380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360982001620
+  version_requirements: *70173173456380
 description: ! "Dase gem creates includes_count_of method in ActiveRecord::Relation\n
   \                        to count associated records efficiently. See examples at
   https://github.com/vovayartsev/dase\n                      "
@@ -76,6 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md