livelist-rails 0.0.7 → 0.0.8

data/lib/livelist/rails/active_record.rb

@@ -76,8 +76,26 @@ module Livelist
             end
           end
 
+          define_method "#{filter_slug}_counts_group_by" do
+            filter_slug
+          end
+
+          define_method "#{filter_slug}_join" do
+            scoped
+          end
+
+          define_method "#{filter_slug}_where" do |values|
+            where(model_name.to_s.tableize => { filter_slug => values })
+          end
+
           define_method "#{filter_slug}_filter_counts" do
-            @@filter_relation.group(filter_slug).count
+            query = scoped.except(:order)
+            @@filter_slugs.each do |slug|
+              query = query.send("#{slug}_join")
+              query = query.send("#{slug}_where", @@filter_params[slug]) unless slug.to_s == filter_slug
+            end
+            group_by = send("#{filter_slug}_counts_group_by")
+            query.group(group_by).count
           end
 
           define_method "#{filter_slug}_filter_option_slug" do |option|
@@ -135,7 +153,7 @@ module Livelist
           end
 
           define_method "#{filter_slug}_relation" do |values|
-            where(model_name.to_s.tableize => { filter_slug => values })
+            send("#{filter_slug}_join").send("#{filter_slug}_where", values)
           end
         end
       end

data/lib/livelist/rails/version.rb

@@ -1,6 +1,6 @@
 module Livelist
   module Rails
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
     LIVELIST_VERSION = '0.0.3'
     MUSTACHE_VERSION = 'db5f5ece0b6c87bbb2d0584010b97f8723dde69d'
     UNDERSCORE_VERSION = '1.2.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livelist-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12360240 !ruby/object:Gem::Requirement
+  requirement: &17388780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12360240
+  version_requirements: *17388780
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &12359820 !ruby/object:Gem::Requirement
+  requirement: &17388360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12359820
+  version_requirements: *17388360
 description: ! 'livelist-rails is a Rails 3.1 Engine/Extensiont incorporating the
   following javascript libraries: Mustache.js, underscore.js, jQuery and livelist.js,
   and providing ActiveRecord filtering extenstions.'