livelist-rails 0.0.6 → 0.0.7

data/lib/livelist/rails/active_record.rb

@@ -3,15 +3,16 @@ require 'active_record'
 module Livelist
   module Rails
     module ActiveRecord
+      @@filter_slugs = []
+      @@filter_collections = {}
 
-      def filters(*filter_slugs)
-        @@filter_slugs = filter_slugs
+      def filter_for(filter_slug, options = {})
         @@counts = {}
-        @@option_objects = {}
 
-        @@filter_slugs.each do |filter_slug|
-          define_class_methods(filter_slug)
-        end
+        @@filter_slugs << filter_slug unless @@filter_slugs.include?(filter_slug)
+        @@filter_collections[filter_slug] = options[:collection] || select("distinct #{filter_slug}").all
+
+        define_class_methods(filter_slug)
 
         def filters_as_json(filter_params)
           @@filter_params = filter_params || {}
@@ -38,11 +39,6 @@ module Livelist
           @@counts[filter_slug] = send("#{filter_slug}_filter_counts") unless @@counts.has_key?(filter_slug)
           @@counts[filter_slug][option.to_s] || 0
         end
-
-        def cached_option_objects(filter_slug)
-          @@option_objects[filter_slug] = send("#{filter_slug}_filter_option_objects") unless @@option_objects.has_key?(filter_slug)
-          @@option_objects[filter_slug]
-        end
       end
 
       def define_class_methods(filter_slug)
@@ -70,26 +66,17 @@ module Livelist
             new.respond_to?(filter_slug.to_sym) ? filter_slug.to_sym : :id
           end
 
-          define_method "#{filter_slug}_filter_option_objects" do
-            select("distinct #{filter_slug}").all
-          end
-
           define_method "#{filter_slug}_filter_values" do
             key = send("#{filter_slug}_filter_option_key_name")
-            option_objects = cached_option_objects(filter_slug)
-            if option_objects.any?{|object| object.kind_of?(Hash) && object.has_key?(key)}
-              option_objects.map{|object| object[key]}
-            elsif option_objects.any?{|object| object.respond_to?(key)}
-              option_objects.map(&key)
+            filter_collection = @@filter_collections[filter_slug.to_sym]
+            if filter_collection.any?{|object| object.kind_of?(Hash) && object.has_key?(key)}
+              filter_collection.map{|object| object[key]}
+            elsif filter_collection.any?{|object| object.respond_to?(key)}
+              filter_collection.map(&key)
             end
           end
 
           define_method "#{filter_slug}_filter_counts" do
-            ::Rails.logger.error "*"*100
-            ::Rails.logger.error "*"*100
-            ::Rails.logger.error "*"*100
-            ::Rails.logger.error group(filter_slug).count.inspect
-            ::Rails.logger.error @@filter_relation.group(filter_slug).count.inspect
             @@filter_relation.group(filter_slug).count
           end
 
@@ -102,12 +89,12 @@ module Livelist
           end
 
           define_method "#{filter_slug}_filter_option_name" do |option|
-            option_objects = cached_option_objects(filter_slug)
-            if option_objects.any?{|object| object.kind_of?(Hash) && object.has_key?(:name)}
-              option_object = option_objects.detect{|object| object[:state] == option.to_s}
+            filter_collection = @@filter_collections[filter_slug.to_sym]
+            if filter_collection.any?{|object| object.kind_of?(Hash) && object.has_key?(:name)}
+              option_object = filter_collection.detect{|object| object[:state] == option.to_s}
               option_object[:name]
-            elsif option_objects.any?{|object| object.respond_to?(:name)}
-              option_object = option_objects.detect{|object| object.send(:id).to_s == option.to_s}
+            elsif filter_collection.any?{|object| object.respond_to?(:name)}
+              option_object = filter_collection.detect{|object| object.send(:id).to_s == option.to_s}
               option_object.send(:name)
             else
               option.to_s

data/lib/livelist/rails/version.rb

@@ -1,6 +1,6 @@
 module Livelist
   module Rails
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
     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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14627060 !ruby/object:Gem::Requirement
+  requirement: &12360240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14627060
+  version_requirements: *12360240
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &14626640 !ruby/object:Gem::Requirement
+  requirement: &12359820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14626640
+  version_requirements: *12359820
 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.'