association_count 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ5ZDdlZDIwY2MyMzE2NTQ4YzdjYjMyYjM2NGI1NWM0MWMwZWYyYg==
+    N2E5NTg0YWU2MjE2YzI1YjA3NjU0OWQwZGM4ZmUzMGMzNDIzYWQyZA==
   data.tar.gz: !binary |-
-    YjczMmM4NzM3OTE2Y2E0ODhiM2YzNzg0OWEyMGIwYTk0M2FhY2Y1OA==
+    MGUwM2E5ODQxMmE5MjU4NjBhODE1ZmY0M2I3NzNhZjFmYzAwNGE3Ng==
 SHA512:
   metadata.gz: !binary |-
-    NTJiNWQ2MDU0MTJjMmRmZGFlMjkzYWExMzdlYjUzZjI5ODY3NjNiYjhiYzQ1
-    YThmMzVlNjFjODVkNTQ0Mjc3YzZiOTlkZmQ2NjBhZjE3NzdlODk2OTNiZTli
-    ZWI2NmJmOGNjNDM5NThmMmExOTMzMzRjOWI3NjgxZjRiYjNjNDk=
+    NzQwZjczOTY0MDYxYTVlNzY1MTMyYWEwYWFhNmFmYzFhNmE2OTAzOTBmMzEz
+    MWM0Y2Q2MmQxNzkwM2E5NmI2YWYxNjliYzU2ZGI4NzY4MjY4ZjMxZjMyM2Zm
+    NmQ5MjE1ZjYyODg2M2U5NDI0ZWViM2Q1YjI4MjU4NTEzNzMxODY=
   data.tar.gz: !binary |-
-    ODcxZTg0YWZhOWE0MmQwODZmZTI3ZDA1YjNhZTExMjY0Y2VmNDA5MTRmZjBm
-    NjkwNWViNjdjYWI1M2RiNjRlNDMwMmEyN2Q5ZGU4OGEyMTNhY2FmNWUzMWU4
-    Y2QyMThjMGI3YmY4ZmMzN2FmODUzMzhlNjNjNmJiODExNDRhZjc=
+    ZDY4YTVlZTRjYjM3NzM3NTRkYzQzMzRkZDM5NzcxYjE1YmZhNjRjNzQzMzE0
+    YjNiZjU5M2YyYTM0YmRlZDkzNTE0OTExNzc0ZDZhM2I1ZDgwYWI3NjFhOWVl
+    YjhiYTAyMDFhNWZkZjZjODJmODEwY2IwMjc3NjFkM2M0YzQyM2U=

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+script: bundle exec rspec spec

data/README.md

@@ -1,6 +1,6 @@
-# AssociationCount
+# AssociationCount [![Build Status](https://travis-ci.org/trialbee/association_count.svg?branch=master)](https://travis-ci.org/trialbee/association_count)
 
-A small gem that allows association counts to be included in your base query.
+A small gem for activerecord that allows association counts to be included in your base query.
 
 ## Installation
 
@@ -35,6 +35,17 @@ foos = Foo.all.include_bar_count
 bar_counts = foos.map(&:bar_count) # only one SQL query executed
 ```
 
+This works for any `has_many` relationship even if it uses non standard foreign keys or is a `has_many :x, through: y`.
+
+By default the count will be distinct, if this is not desired use:
+
+```
+class Foo < ActiveRecord::Base
+  has_many  :bars
+  can_count :bars, distinct: false
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/association_count.gemspec

@@ -4,26 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'association_count/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "association_count"
+  spec.name          = 'association_count'
   spec.version       = AssociationCount::VERSION
-  spec.authors       = ["Albin Svensson", 'Jacob Burenstam']
-  spec.email         = ["albin.svensson@trialbee.com", 'jacob.burenstam@trialbee.com']
-  spec.summary       = %q{ A small gem that allows association counts to be included in your base query }
-  spec.homepage      = "https://github.com/trialbee/association_count"
-  spec.license       = "MIT"
+  spec.authors       = ['Albin Svensson', 'Jacob Burenstam']
+  spec.email         = ['albin.svensson@trialbee.com', 'jacob.burenstam@trialbee.com']
+  spec.summary       = 'A small gem for activerecord that allows association counts to be included in your base query'
+  spec.homepage      = 'https://github.com/trialbee/association_count'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler",      "~> 1.9"
-  spec.add_development_dependency "rake",         "~> 10.0"
-  spec.add_development_dependency 'rspec',        "~> 3.2"
-  spec.add_development_dependency "sqlite3-ruby", "~> 1.3"
-  spec.add_development_dependency 'simplecov',    "~> 0.7"
-  spec.add_development_dependency 'guard',        "~> 2.12"
-  spec.add_development_dependency 'guard-rspec',  "~> 4.5"
+  spec.add_development_dependency 'bundler',      '~> 1.5'
+  spec.add_development_dependency 'rake',         '~> 10.0'
+  spec.add_development_dependency 'rspec',        '~> 3.2'
+  spec.add_development_dependency 'sqlite3',      '~> 1.3'
+  spec.add_development_dependency 'simplecov',    '~> 0.7'
+  spec.add_development_dependency 'guard',        '~> 2.12'
+  spec.add_development_dependency 'guard-rspec',  '~> 4.5'
 
-  spec.add_dependency "activerecord", "~> 4.0"
+  spec.add_dependency 'activerecord', '~> 4.0'
 end

data/lib/association_count.rb

@@ -1,30 +1,43 @@
-require "association_count/version"
+require 'association_count/version'
 require 'active_record'
 
 ActiveRecord::Base.extend AssociationCount
 module AssociationCount
-  def association_count(counted_model)
-    proc do |base_model, counted_model|
-      table_name    = base_model.table_name
-      counted_table = counted_model.table_name
-      counted_name  = counted_table.singularize
-      
-      joins(counted_table.to_sym).
-      select("#{table_name}.*, COUNT(DISTINCT #{counted_table}.id) as #{counted_name}_count_raw").
-      group("#{table_name}.id")
-    end.call(self, counted_model)
+  def association_count(counted_model, distinct)
+    table_name    = self.table_name
+    counted_table = counted_model.table_name
+    counted_name  = counted_table.singularize
+    distinct_sql  = distinct ? 'DISTINCT' : ''
+
+    joins(counted_table.to_sym)
+      .select("#{table_name}.*, COUNT(#{distinct_sql} #{counted_table}.id) as #{counted_name}_count_raw")
+      .group("#{table_name}.id")
   end
 
-  def can_count(model_name)
+  def can_count(model_name, opts = {})
     model_name = model_name.to_s
-    raise 'No such reflection' unless reflection = reflections[model_name.to_s]
+    reflection = reflections[model_name]
+    fail "No such reflection: '#{model_name}'" unless reflection
+
+    options       = { distinct: true }.merge!(opts)
     singular_name = model_name.singularize
+
+    define_association_count_method(model_name, singular_name)
+    define_count_scope(singular_name, reflection, options[:distinct])
+  end
+
+  def define_association_count_method(model_name, singular_name)
     define_method "#{singular_name}_count" do
-      return send("#{singular_name}_count_raw") if self.respond_to?("#{singular_name}_count_raw")
+      raw_count_name = "#{singular_name}_count_raw"
+      return send(raw_count_name) if self.respond_to?(raw_count_name)
       send(model_name).count
     end
+  end
+
+  def define_count_scope(singular_name, reflection, distinct)
+    scope_name = "include_#{singular_name}_count"
     class_eval do
-      scope "include_#{singular_name}_count", -> { association_count(reflection.klass) }
+      scope scope_name, -> { association_count(reflection.klass, distinct) }
     end
   end
 end

data/lib/association_count/version.rb

@@ -1,3 +1,3 @@
 module AssociationCount
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: association_count
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Albin Svensson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -167,6 +167,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A small gem that allows association counts to be included in your base query
+summary: A small gem for activerecord that allows association counts to be included
+  in your base query
 test_files: []
 has_rdoc: