livelist-rails 0.0.3 → 0.0.4

data/app/assets/javascripts/livelist-rails.js

@@ -1,3 +1,3 @@
 //= require mustache
-//= require underscore
+//= require underscore-min
 //= require livelist

data/lib/livelist/rails/active_record.rb

@@ -7,6 +7,7 @@ module Livelist
       def filters(*filter_slugs)
         @@filter_slugs = filter_slugs
         @@filter_slugs.each do |filter_slug|
+          filter_slug = filter_slug.to_s
           metaclass = class << self; self; end
 
           metaclass.instance_eval do
@@ -26,34 +27,56 @@ module Livelist
               }
             end
 
-            define_method "#{filter_slug}_filter_options" do
-              select("distinct #{filter_slug}").map(&filter_slug)
+            define_method "#{filter_slug}_filter_values" do
+              select("distinct #{filter_slug}").map(&filter_slug.to_sym)
             end
 
             define_method "#{filter_slug}_filter_counts" do
               group(filter_slug).count
             end
 
-            define_method "#{filter_slug}_filter_option" do |state, selected|
+            define_method "#{filter_slug}_filter_option_slug" do |option|
+              option.to_s
+            end
+
+            define_method "#{filter_slug}_filter_option_name" do |option|
+              option.to_s.capitalize
+            end
+
+            define_method "#{filter_slug}_filter_option_value" do |option|
+              option.to_s
+            end
+
+            define_method "#{filter_slug}_filter_option_count" do |option|
+              unless class_variables.include?("@@#{filter_slug}_filter_counts")
+                class_variable_set(:"@@#{filter_slug}_filter_counts", send("#{filter_slug}_filter_counts"))
+              end
+              class_variable_get(:"@@#{filter_slug}_filter_counts")[option]
+            end
+
+            define_method "#{filter_slug}_filter_option" do |option, selected|
               {
-                :slug => state,
-                :name => state.capitalize,
-                :value => state,
-                :count => @counts[state],
+                :slug => send("#{filter_slug}_filter_option_slug", option),
+                :name => send("#{filter_slug}_filter_option_name", option),
+                :value => send("#{filter_slug}_filter_option_value", option),
+                :count => send("#{filter_slug}_filter_option_count", option),
                 :selected => selected
               }
             end
 
+            define_method "#{filter_slug}_filter_option_selected?" do |filter_params, option|
+              filter_params.nil? ? true : filter_params.include?(option)
+            end
+
             define_method "#{filter_slug}_filters" do |filter_params|
-              @counts = send("#{filter_slug}_filter_counts")
-              send("#{filter_slug}_filter_options").map do |option|
-                selected = filter_params.nil? ? true : filter_params.include?(option)
+              send("#{filter_slug}_filter_values").map do |option|
+                selected = send("#{filter_slug}_filter_option_selected?", filter_params, option)
                 send("#{filter_slug}_filter_option", option, selected)
               end
             end
 
             define_method "#{filter_slug}_relation" do |values|
-              where(filter_slug => values)
+              where(model_name.to_s.tableize => { filter_slug => values })
             end
           end
         end
@@ -61,7 +84,8 @@ module Livelist
         def self.filters_as_json(filter_params)
           filter_params ||= {}
           @@filter_slugs.map do |filter|
-            send("#{filter}_filter", send("#{filter}_filters", filter_params[filter]))
+            filter_options = send("#{filter}_filters", filter_params[filter])
+            send("#{filter}_filter", filter_options)
           end
         end
 

data/lib/livelist/rails/version.rb

@@ -1,6 +1,6 @@
 module Livelist
   module Rails
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
     LIVELIST_VERSION = '0.0.1'
     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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-20 00:00:00.000000000Z
 dependencies: []
 description: ! 'livelist-rails is a Rails 3.1 Engine/Extensiont incorporating the
   following javascript libraries: Mustache.js, underscore.js, jQuery and livelist.js,
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: livelist-rails
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Rails Engine/Extension Incorporating Livelist.js