livelist-rails 0.0.9 → 0.0.10

data/app/assets/javascripts/livelist.coffee

@@ -75,7 +75,7 @@ class window.List extends Utilities
     $(@renderTo).html( listHTML )
     @removeFetchingIndication()
 
-window.LiveList.version = '0.0.4'
+window.LiveList.version = '0.0.5'
 
 class window.Filters extends Utilities
   constructor: (globalOptions, options = {}) ->
@@ -172,33 +172,31 @@ class window.Pagination extends Utilities
     @emptyListMessage = "<p>No #{@resourceName} matched your filter criteria</p>"
     @setOptions(options)
 
-    $("#{@renderTo} a").live('click', @handlePaginationLinkClick)
+    $("#{@renderTo} a").live( 'click', (event) -> event.preventDefault() )
+    $("#{@renderTo} li:not(.disabled) a").live('click', @handlePaginationLinkClick)
 
-  paginationTemplate: '''
+  template: '''
     {{#isEmpty}}
       {{{emptyListMessage}}}
     {{/isEmpty}}
     {{^isEmpty}}
-    {{#previousPage}}
-      <a href='{{urlPrefix}}?page={{previousPage}}' data-page='{{previousPage}}'>← Previous</a>
-    {{/previousPage}}
-    {{^previousPage}}
-      <span>← Previous</span>
-    {{/previousPage}}
-    {{#pages}}
-      {{#currentPage}}
-        <span>{{page}}</span>
-      {{/currentPage}}
-      {{^currentPage}}
-        <a href='{{urlPrefix}}?page={{page}}' data-page='{{page}}'>{{page}}</a>
-      {{/currentPage}}
-    {{/pages}}
-    {{#nextPage}}
-      <a href='{{urlPrefix}}?page={{nextPage}}' data-page='{{nextPage}}'>Next →</a>
-    {{/nextPage}}
-    {{^nextPage}}
-      <span>Next →</span>
-    {{/nextPage}}
+    <div class="pagination">
+      <ul>
+        <li class="{{^previousPage}}disabled{{/previousPage}}">
+          <a href='{{urlPrefix}}?page={{previousPage}}' data-page='{{previousPage}}'>← Previous</a>
+        </li>
+
+        {{#pages}}
+          <li class="{{#currentPage}}active disabled{{/currentPage}}">
+            <a href='{{urlPrefix}}?page={{page}}' data-page='{{page}}'>{{page}}</a>
+          </li>
+        {{/pages}}
+
+        <li class="{{^nextPage}}disabled{{/nextPage}}">
+          <a href='{{urlPrefix}}?page={{nextPage}}' data-page='{{nextPage}}'>Next →</a>
+        </li>
+      </ul>
+    </div>
     {{/isEmpty}}
   '''
 
@@ -225,7 +223,7 @@ class window.Pagination extends Utilities
 
   render: (data) ->
     @pagination = @paginationJSON(data.pagination)
-    paginationHTML = Mustache.to_html(@paginationTemplate, @pagination)
+    paginationHTML = Mustache.to_html(@template, @pagination)
     $(@renderTo).html( paginationHTML )
 
   handlePaginationLinkClick: (event) =>

data/app/assets/javascripts/livelist.js

@@ -125,7 +125,7 @@
 
   })(Utilities);
 
-  window.LiveList.version = '0.0.4';
+  window.LiveList.version = '0.0.5';
 
   window.Filters = (function(_super) {
 
@@ -232,10 +232,13 @@
       this.setOptions(globalOptions);
       this.emptyListMessage = "<p>No " + this.resourceName + " matched your filter criteria</p>";
       this.setOptions(options);
-      $("" + this.renderTo + " a").live('click', this.handlePaginationLinkClick);
+      $("" + this.renderTo + " a").live('click', function(event) {
+        return event.preventDefault();
+      });
+      $("" + this.renderTo + " li:not(.disabled) a").live('click', this.handlePaginationLinkClick);
     }
 
-    Pagination.prototype.paginationTemplate = '{{#isEmpty}}\n  {{{emptyListMessage}}}\n{{/isEmpty}}\n{{^isEmpty}}\n{{#previousPage}}\n  <a href=\'{{urlPrefix}}?page={{previousPage}}\' data-page=\'{{previousPage}}\'>← Previous</a>\n{{/previousPage}}\n{{^previousPage}}\n  <span>← Previous</span>\n{{/previousPage}}\n{{#pages}}\n  {{#currentPage}}\n    <span>{{page}}</span>\n  {{/currentPage}}\n  {{^currentPage}}\n    <a href=\'{{urlPrefix}}?page={{page}}\' data-page=\'{{page}}\'>{{page}}</a>\n  {{/currentPage}}\n{{/pages}}\n{{#nextPage}}\n  <a href=\'{{urlPrefix}}?page={{nextPage}}\' data-page=\'{{nextPage}}\'>Next →</a>\n{{/nextPage}}\n{{^nextPage}}\n  <span>Next →</span>\n{{/nextPage}}\n{{/isEmpty}}';
+    Pagination.prototype.template = '{{#isEmpty}}\n  {{{emptyListMessage}}}\n{{/isEmpty}}\n{{^isEmpty}}\n<div class="pagination">\n  <ul>\n    <li class="{{^previousPage}}disabled{{/previousPage}}">\n      <a href=\'{{urlPrefix}}?page={{previousPage}}\' data-page=\'{{previousPage}}\'>← Previous</a>\n    </li>\n\n    {{#pages}}\n      <li class="{{#currentPage}}active disabled{{/currentPage}}">\n        <a href=\'{{urlPrefix}}?page={{page}}\' data-page=\'{{page}}\'>{{page}}</a>\n      </li>\n    {{/pages}}\n\n    <li class="{{^nextPage}}disabled{{/nextPage}}">\n      <a href=\'{{urlPrefix}}?page={{nextPage}}\' data-page=\'{{nextPage}}\'>Next →</a>\n    </li>\n  </ul>\n</div>\n{{/isEmpty}}';
 
     Pagination.prototype.pagesJSON = function(currentPage, totalPages) {
       var firstPage, groupSize, lastPage, previousPage, _i, _results;
@@ -272,7 +275,7 @@
     Pagination.prototype.render = function(data) {
       var paginationHTML;
       this.pagination = this.paginationJSON(data.pagination);
-      paginationHTML = Mustache.to_html(this.paginationTemplate, this.pagination);
+      paginationHTML = Mustache.to_html(this.template, this.pagination);
       return $(this.renderTo).html(paginationHTML);
     };
 

data/app/assets/javascripts/livelist.min.js

@@ -1 +1 @@
-((function(){var a=function(a,b){return function(){return a.apply(b,arguments)}},b=Object.prototype.hasOwnProperty,c=function(a,c){function e(){this.constructor=a}for(var d in c)b.call(c,d)&&(a[d]=c[d]);return e.prototype=c.prototype,a.prototype=new e,a.__super__=c.prototype,a};window.Utilities=function(){function b(){this.setOptions=a(this.setOptions,this)}return b.prototype.setOptions=function(a,b){var c=this;return b==null&&(b=this),_.each(a,function(a,c){return b[c]=a})},b}(),window.LiveList=function(a){function b(a){this.globalOptions.listSelector=a.list.renderTo,this.globalOptions.eventName="livelist:"+a.global.resourceName,this.globalOptions.urlPrefix="/"+a.global.resourceName,this.setOptions(a.global,this.globalOptions),this.search=new Search(this.globalOptions,a.search),this.filters=new Filters(this.globalOptions,a.filters),this.pagination=new Pagination(this.globalOptions,a.pagination),this.list=new List(this.search,this.filters,this.pagination,this.globalOptions,a.list)}return c(b,a),b.prototype.globalOptions={data:null,resourceName:"items",resourceNameSingular:"item"},b}(Utilities),window.List=function(b){function d(b,c,d,e,f){var g,h=this;f==null&&(f={}),this.renderIndex=a(this.renderIndex,this),this.removeFetchingIndication=a(this.removeFetchingIndication,this),this.displayFetchingIndication=a(this.displayFetchingIndication,this),this.data=e.data,this.fetchRequest=null,this.search=b,this.filters=c,this.pagination=d,this.setOptions(e),this.listTemplate="{{#"+this.resourceName+"}}{{>"+this.resourceNameSingular+"}}{{/"+this.resourceName+"}}",this.listItemTemplate="<li>{{id}}</li>",this.fetchingIndicationClass="updating",this.setOptions(f),$(this.renderTo).bind(this.eventName,function(a,b){return h.fetch({presets:null,page:b!=null?b.page:void 0})}),g=this.filters.presets(),this.fetch({presets:g})}return c(d,b),d.prototype.displayFetchingIndication=function(){return $(this.renderTo).addClass(this.fetchingIndicationClass)},d.prototype.removeFetchingIndication=function(){return $(this.renderTo).removeClass(this.fetchingIndicationClass)},d.prototype.renderIndex=function(a,b,c){return this.data=a,this.render(),this.pagination.render(this.data),this.filters.render(this.data)},d.prototype.fetch=function(a){var b,c;return this.fetchRequest&&this.fetchRequest.abort(),c=this.search.searchTerm(),b={},b.filters=this.filters.setPresets(a.presets),c&&(b.q=c),a.page&&(b.page=a.page),this.fetchRequest=$.ajax({url:this.urlPrefix,dataType:"json",data:b,type:this.httpMethod,beforeSend:this.displayFetchingIndication,success:this.renderIndex})},d.prototype.render=function(){var a,b;return b={},b[this.resourceNameSingular]=this.listItemTemplate,a=Mustache.to_html(this.listTemplate,this.data,b),$(this.renderTo).html(a),this.removeFetchingIndication()},d}(Utilities),window.LiveList.version="0.0.4",window.Filters=function(b){function d(b,c){var d=this;c==null&&(c={}),this.handleAdvancedOptionsClick=a(this.handleAdvancedOptionsClick,this),this.setOptions(b),this.filters=c.presets?_.keys(c.presets):[],this.initializeCookies(),this.setOptions(c),$("input.filter_option",this.renderTo).live("change",function(){return $(d.listSelector).trigger(d.eventName)}),$(this.advancedOptionsToggleSelector).click(this.handleAdvancedOptionsClick)}return c(d,b),d.prototype.initializeCookies=function(){if(jQuery.cookie&&this.useCookies&&this.cookieName)return this.cookieName="livelist_filter_presets"},d.prototype.presets=function(){var a;return jQuery.cookie&&this.useCookies&&(a=jQuery.cookie(this.cookieName)),this.useCookies&&a?JSON.parse(a):this.presets},d.prototype.setPresets=function(a){var b;return b={},jQuery.isEmptyObject(a)?(b=this.selections(),jQuery.cookie&&this.setCookie()):b=a,b},d.prototype.setCookie=function(a){if(!jQuery.isEmptyObject(a))return jQuery.cookie(this.cookieName,JSON.stringify(a))},d.prototype.template="{{#filters}}\n<div class='filter'>\n  <h3>\n    {{name}}\n  </h3>\n  <ul id='{{filter_slug}}_filter_options'>\n    {{#options}}\n    <label>\n      <li>\n        <input {{#selected}}checked='checked'{{/selected}}\n               class='left filter_option'\n               id='filter_{{slug}}'\n               name='filters[]'\n               type='checkbox'\n               value='{{value}}' />\n        <div class='left filter_name'>{{name}}</div>\n        <div class='right filter_count'>{{count}}</div>\n        <div class='clear'></div>\n      </li>\n    </label>\n    {{/options}}\n  </ul>\n</div>\n{{/filters}}",d.prototype.selections=function(){var a,b=this;return a={},_.each(this.filters,function(b){return a[b]=_.pluck($("#"+b+"_filter_options input.filter_option:checked"),"value")}),a},d.prototype.noFiltersSelected=function(a){return _.all(a.filters,function(a){return _.all(a.options,function(a){return!a.selected})})},d.prototype.render=function(a){var b;this.filters=_.pluck(a.filters,"filter_slug"),b=Mustache.to_html(this.template,a),$(this.renderTo).html(b);if(this.noFiltersSelected(a)&&a[this.resourceName].length>0)return $('input[type="checkbox"]',this.renderTo).attr("checked","checked")},d.prototype.handleAdvancedOptionsClick=function(a){return a.preventDefault(),$(this.renderTo).slideToggle()},d}(Utilities),window.Pagination=function(b){function d(b,c){c==null&&(c={}),this.handlePaginationLinkClick=a(this.handlePaginationLinkClick,this),this.pagination=null,this.maxPages=30,this.setOptions(b),this.emptyListMessage="<p>No "+this.resourceName+" matched your filter criteria</p>",this.setOptions(c),$(""+this.renderTo+" a").live("click",this.handlePaginationLinkClick)}return c(d,b),d.prototype.paginationTemplate="{{#isEmpty}}\n  {{{emptyListMessage}}}\n{{/isEmpty}}\n{{^isEmpty}}\n{{#previousPage}}\n  <a href='{{urlPrefix}}?page={{previousPage}}' data-page='{{previousPage}}'>← Previous</a>\n{{/previousPage}}\n{{^previousPage}}\n  <span>← Previous</span>\n{{/previousPage}}\n{{#pages}}\n  {{#currentPage}}\n    <span>{{page}}</span>\n  {{/currentPage}}\n  {{^currentPage}}\n    <a href='{{urlPrefix}}?page={{page}}' data-page='{{page}}'>{{page}}</a>\n  {{/currentPage}}\n{{/pages}}\n{{#nextPage}}\n  <a href='{{urlPrefix}}?page={{nextPage}}' data-page='{{nextPage}}'>Next →</a>\n{{/nextPage}}\n{{^nextPage}}\n  <span>Next →</span>\n{{/nextPage}}\n{{/isEmpty}}",d.prototype.pagesJSON=function(a,b){var c,d,e,f,g,h;return d=this.maxPages/2,c=a<d?1:a-d,f=c+d*2-1,e=f>=b?b:f,_.map(function(){h=[];for(var a=c;c<=e?a<=e:a>=e;c<=e?a++:a--)h.push(a);return h}.apply(this),function(b){return{page:b,currentPage:function(){return a===b}}})},d.prototype.paginationJSON=function(a){return{isEmpty:a.total_pages===0,emptyListMessage:this.emptyListMessage,currentPage:a.current_page,nextPage:a.next_page,previousPage:a.previous_page,urlPrefix:this.urlPrefix,pages:this.pagesJSON(a.current_page,a.total_pages)}},d.prototype.render=function(a){var b;return this.pagination=this.paginationJSON(a.pagination),b=Mustache.to_html(this.paginationTemplate,this.pagination),$(this.renderTo).html(b)},d.prototype.handlePaginationLinkClick=function(a){return a.preventDefault(),$(this.listSelector).trigger(this.eventName,{page:$(a.target).data("page")})},d}(Utilities),window.Search=function(b){function d(b,c){var d=this;c==null&&(c={}),this.handleSearchFormSubmit=a(this.handleSearchFormSubmit,this),this.setOptions(b),this.setOptions(c),$(this.formSelector).submit(function(a){return d.handleSearchFormSubmit(a)})}return c(d,b),d.prototype.searchTerm=function(){var a;return a=$(this.searchTextInputSelector).val(),!a||a===""?null:a},d.prototype.handleSearchFormSubmit=function(a){return a.preventDefault(),$(this.listSelector).trigger(this.eventName)},d}(Utilities)})).call(this);
+((function(){var a=function(a,b){return function(){return a.apply(b,arguments)}},b=Object.prototype.hasOwnProperty,c=function(a,c){function e(){this.constructor=a}for(var d in c)b.call(c,d)&&(a[d]=c[d]);return e.prototype=c.prototype,a.prototype=new e,a.__super__=c.prototype,a};window.Utilities=function(){function b(){this.setOptions=a(this.setOptions,this)}return b.prototype.setOptions=function(a,b){var c=this;return b==null&&(b=this),_.each(a,function(a,c){return b[c]=a})},b}(),window.LiveList=function(a){function b(a){this.globalOptions.listSelector=a.list.renderTo,this.globalOptions.eventName="livelist:"+a.global.resourceName,this.globalOptions.urlPrefix="/"+a.global.resourceName,this.setOptions(a.global,this.globalOptions),this.search=new Search(this.globalOptions,a.search),this.filters=new Filters(this.globalOptions,a.filters),this.pagination=new Pagination(this.globalOptions,a.pagination),this.list=new List(this.search,this.filters,this.pagination,this.globalOptions,a.list)}return c(b,a),b.prototype.globalOptions={data:null,resourceName:"items",resourceNameSingular:"item"},b}(Utilities),window.List=function(b){function d(b,c,d,e,f){var g,h=this;f==null&&(f={}),this.renderIndex=a(this.renderIndex,this),this.removeFetchingIndication=a(this.removeFetchingIndication,this),this.displayFetchingIndication=a(this.displayFetchingIndication,this),this.data=e.data,this.fetchRequest=null,this.search=b,this.filters=c,this.pagination=d,this.setOptions(e),this.listTemplate="{{#"+this.resourceName+"}}{{>"+this.resourceNameSingular+"}}{{/"+this.resourceName+"}}",this.listItemTemplate="<li>{{id}}</li>",this.fetchingIndicationClass="updating",this.setOptions(f),$(this.renderTo).bind(this.eventName,function(a,b){return h.fetch({presets:null,page:b!=null?b.page:void 0})}),g=this.filters.presets(),this.fetch({presets:g})}return c(d,b),d.prototype.displayFetchingIndication=function(){return $(this.renderTo).addClass(this.fetchingIndicationClass)},d.prototype.removeFetchingIndication=function(){return $(this.renderTo).removeClass(this.fetchingIndicationClass)},d.prototype.renderIndex=function(a,b,c){return this.data=a,this.render(),this.pagination.render(this.data),this.filters.render(this.data)},d.prototype.fetch=function(a){var b,c;return this.fetchRequest&&this.fetchRequest.abort(),c=this.search.searchTerm(),b={},b.filters=this.filters.setPresets(a.presets),c&&(b.q=c),a.page&&(b.page=a.page),this.fetchRequest=$.ajax({url:this.urlPrefix,dataType:"json",data:b,type:this.httpMethod,beforeSend:this.displayFetchingIndication,success:this.renderIndex})},d.prototype.render=function(){var a,b;return b={},b[this.resourceNameSingular]=this.listItemTemplate,a=Mustache.to_html(this.listTemplate,this.data,b),$(this.renderTo).html(a),this.removeFetchingIndication()},d}(Utilities),window.LiveList.version="0.0.5",window.Filters=function(b){function d(b,c){var d=this;c==null&&(c={}),this.handleAdvancedOptionsClick=a(this.handleAdvancedOptionsClick,this),this.setOptions(b),this.filters=c.presets?_.keys(c.presets):[],this.initializeCookies(),this.setOptions(c),$("input.filter_option",this.renderTo).live("change",function(){return $(d.listSelector).trigger(d.eventName)}),$(this.advancedOptionsToggleSelector).click(this.handleAdvancedOptionsClick)}return c(d,b),d.prototype.initializeCookies=function(){if(jQuery.cookie&&this.useCookies&&this.cookieName)return this.cookieName="livelist_filter_presets"},d.prototype.presets=function(){var a;return jQuery.cookie&&this.useCookies&&(a=jQuery.cookie(this.cookieName)),this.useCookies&&a?JSON.parse(a):this.presets},d.prototype.setPresets=function(a){var b;return b={},jQuery.isEmptyObject(a)?(b=this.selections(),jQuery.cookie&&this.setCookie()):b=a,b},d.prototype.setCookie=function(a){if(!jQuery.isEmptyObject(a))return jQuery.cookie(this.cookieName,JSON.stringify(a))},d.prototype.template="{{#filters}}\n<div class='filter'>\n  <h3>\n    {{name}}\n  </h3>\n  <ul id='{{filter_slug}}_filter_options'>\n    {{#options}}\n    <label>\n      <li>\n        <input {{#selected}}checked='checked'{{/selected}}\n               class='left filter_option'\n               id='filter_{{slug}}'\n               name='filters[]'\n               type='checkbox'\n               value='{{value}}' />\n        <div class='left filter_name'>{{name}}</div>\n        <div class='right filter_count'>{{count}}</div>\n        <div class='clear'></div>\n      </li>\n    </label>\n    {{/options}}\n  </ul>\n</div>\n{{/filters}}",d.prototype.selections=function(){var a,b=this;return a={},_.each(this.filters,function(b){return a[b]=_.pluck($("#"+b+"_filter_options input.filter_option:checked"),"value")}),a},d.prototype.noFiltersSelected=function(a){return _.all(a.filters,function(a){return _.all(a.options,function(a){return!a.selected})})},d.prototype.render=function(a){var b;this.filters=_.pluck(a.filters,"filter_slug"),b=Mustache.to_html(this.template,a),$(this.renderTo).html(b);if(this.noFiltersSelected(a)&&a[this.resourceName].length>0)return $('input[type="checkbox"]',this.renderTo).attr("checked","checked")},d.prototype.handleAdvancedOptionsClick=function(a){return a.preventDefault(),$(this.renderTo).slideToggle()},d}(Utilities),window.Pagination=function(b){function d(b,c){c==null&&(c={}),this.handlePaginationLinkClick=a(this.handlePaginationLinkClick,this),this.pagination=null,this.maxPages=30,this.setOptions(b),this.emptyListMessage="<p>No "+this.resourceName+" matched your filter criteria</p>",this.setOptions(c),$(""+this.renderTo+" a").live("click",function(a){return a.preventDefault()}),$(""+this.renderTo+" li:not(.disabled) a").live("click",this.handlePaginationLinkClick)}return c(d,b),d.prototype.template="{{#isEmpty}}\n  {{{emptyListMessage}}}\n{{/isEmpty}}\n{{^isEmpty}}\n<div class=\"pagination\">\n  <ul>\n    <li class=\"{{^previousPage}}disabled{{/previousPage}}\">\n      <a href='{{urlPrefix}}?page={{previousPage}}' data-page='{{previousPage}}'>← Previous</a>\n    </li>\n\n    {{#pages}}\n      <li class=\"{{#currentPage}}active disabled{{/currentPage}}\">\n        <a href='{{urlPrefix}}?page={{page}}' data-page='{{page}}'>{{page}}</a>\n      </li>\n    {{/pages}}\n\n    <li class=\"{{^nextPage}}disabled{{/nextPage}}\">\n      <a href='{{urlPrefix}}?page={{nextPage}}' data-page='{{nextPage}}'>Next →</a>\n    </li>\n  </ul>\n</div>\n{{/isEmpty}}",d.prototype.pagesJSON=function(a,b){var c,d,e,f,g,h;return d=this.maxPages/2,c=a<d?1:a-d,f=c+d*2-1,e=f>=b?b:f,_.map(function(){h=[];for(var a=c;c<=e?a<=e:a>=e;c<=e?a++:a--)h.push(a);return h}.apply(this),function(b){return{page:b,currentPage:function(){return a===b}}})},d.prototype.paginationJSON=function(a){return{isEmpty:a.total_pages===0,emptyListMessage:this.emptyListMessage,currentPage:a.current_page,nextPage:a.next_page,previousPage:a.previous_page,urlPrefix:this.urlPrefix,pages:this.pagesJSON(a.current_page,a.total_pages)}},d.prototype.render=function(a){var b;return this.pagination=this.paginationJSON(a.pagination),b=Mustache.to_html(this.template,this.pagination),$(this.renderTo).html(b)},d.prototype.handlePaginationLinkClick=function(a){return a.preventDefault(),$(this.listSelector).trigger(this.eventName,{page:$(a.target).data("page")})},d}(Utilities),window.Search=function(b){function d(b,c){var d=this;c==null&&(c={}),this.handleSearchFormSubmit=a(this.handleSearchFormSubmit,this),this.setOptions(b),this.setOptions(c),$(this.formSelector).submit(function(a){return d.handleSearchFormSubmit(a)})}return c(d,b),d.prototype.searchTerm=function(){var a;return a=$(this.searchTextInputSelector).val(),!a||a===""?null:a},d.prototype.handleSearchFormSubmit=function(a){return a.preventDefault(),$(this.listSelector).trigger(this.eventName)},d}(Utilities)})).call(this);

data/lib/livelist/rails/active_record.rb

@@ -7,38 +7,68 @@ module Livelist
       @@filter_collections = {}
 
       def filter_for(filter_slug, options = {})
-        @@counts = {}
-
         @@filter_slugs << filter_slug unless @@filter_slugs.include?(filter_slug)
-        @@filter_collections[filter_slug] = options[:collection] || select("distinct #{filter_slug}").all
+        @@filter_collections[filter_slug] = options[:collection] || lambda { select("distinct #{filter_slug}") }
 
         define_class_methods(filter_slug)
 
         def filters_as_json(filter_params)
-          @@filter_params = filter_params || {}
-          @@filter_slugs.map do |filter|
+          @counts = {}
+          @filter_params = filter_params || {}
+          filters = @@filter_slugs.map do |filter|
             filter_options = send("#{filter}_filters", filter)
             send("#{filter}_filter", filter_options)
           end
         end
 
         def filter_relation(filter_params)
-          relation = scoped
+          query = scoped
           @@filter_slugs.each do |filter_slug|
             values = filter_params[filter_slug.to_s]
-            relation = relation.send("#{filter_slug}_relation", values) unless filter_params.empty?
+            query = query.send("#{filter_slug}_where", filter_collection(filter_slug))
+            query = query.send("#{filter_slug}_relation", values) unless filter_params.empty?
           end
-          relation
+          query
         end
 
         def filter(filter_params)
           filter_params ||= {}
-          @@filter_relation = filter_relation(filter_params)
+          @filter_relation = filter_relation(filter_params)
         end
 
         def filter_option_count(filter_slug, option)
-          @@counts[filter_slug] = send("#{filter_slug}_filter_counts") unless @@counts.has_key?(filter_slug)
-          @@counts[filter_slug][option.to_s] || 0
+          @counts[filter_slug] ||= send("#{filter_slug}_filter_counts")
+          @counts[filter_slug][option.to_s] || 0
+        end
+
+				def filter_collection(filter_slug)
+					collection = @@filter_collections[filter_slug.to_sym]
+          if collection.respond_to?(:call)
+            collection.call.map(&filter_slug.to_sym)
+          else
+            collection
+          end
+				end
+
+        def exclude_filter_relation?(filter_slug, slug)
+          @filter_params[filter_slug].nil? || (slug.to_s == filter_slug)
+        end
+
+        def counts_relation(filter_slug, slug)
+          query = scoped
+          query = query.send("#{slug}_join")
+          query = query.send("#{slug}_where", filter_collection(slug))
+          query = query.send("#{slug}_where", @filter_params[slug]) unless exclude_filter_relation?(filter_slug, slug)
+          query
+        end
+
+        def filter_slug_filter_counts(filter_slug)
+          query = scoped.except(:order)
+          @@filter_slugs.each do |slug|
+            query = query.counts_relation(filter_slug, slug)
+          end
+          group_by = send("#{filter_slug}_counts_group_by")
+          query.group(group_by).count
         end
       end
 
@@ -47,12 +77,22 @@ module Livelist
         metaclass = class << self; self; end
 
         metaclass.instance_eval do
-          define_method "#{filter_slug}_filter_name" do
-            filter_slug.capitalize
+          define_method("#{filter_slug}_filter_name") { filter_slug.capitalize }
+          define_method("#{filter_slug}_filter_slug") { filter_slug }
+          define_method("#{filter_slug}_counts_group_by") { filter_slug }
+          define_method("#{filter_slug}_join") { scoped }
+          define_method("#{filter_slug}_where") { |values| where(model_name.to_s.tableize => { filter_slug => values }) }
+          define_method("#{filter_slug}_filter_counts") { filter_slug_filter_counts(filter_slug) }
+          define_method("#{filter_slug}_filter_option_key_name") { new.respond_to?(filter_slug.to_sym) ? filter_slug.to_sym : :id }
+          define_method("#{filter_slug}_relation") { |values| send("#{filter_slug}_join").send("#{filter_slug}_where", values) }
+          define_method("#{filter_slug}_filter_option_count") { |option| filter_option_count(filter_slug, option) }
+
+          define_method("#{filter_slug}_filter_option_value") do |option|
+            [String, Integer].any?{|klass| option.kind_of?(klass)} ? option.to_s : option.send(:id).to_s
           end
 
-          define_method "#{filter_slug}_filter_slug" do
-            filter_slug
+          define_method("#{filter_slug}_filter_option_selected?") do |filter, option|
+            @filter_params[filter].nil? ? false : @filter_params[filter].include?(option.to_s)
           end
 
           define_method "#{filter_slug}_filter" do |options|
@@ -63,42 +103,18 @@ module Livelist
             }
           end
 
-          define_method "#{filter_slug}_filter_option_key_name" do
-            new.respond_to?(filter_slug.to_sym) ? filter_slug.to_sym : :id
-          end
-
           define_method "#{filter_slug}_filter_values" do
             key = send("#{filter_slug}_filter_option_key_name")
-            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)
+            collection = filter_collection(filter_slug)
+            if collection.any?{|object| object.kind_of?(Hash) && object.has_key?(key)}
+              collection.map{|object| object[key]}
+            elsif collection.any?{|object| object.respond_to?(key)}
+              collection.map(&key)
+            elsif collection.kind_of?(Array)
+              collection
             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
-            query = scoped.except(:order)
-            @@filter_slugs.each do |slug|
-              query = query.send("#{slug}_join")
-              query = query.send("#{slug}_where", @@filter_params[slug]) unless @@filter_params[filter_slug].nil? || (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|
             if [String, Integer].any?{|klass| option.kind_of?(klass)}
               option.to_s
@@ -108,30 +124,18 @@ module Livelist
           end
 
           define_method "#{filter_slug}_filter_option_name" do |option|
-            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}
+            collection = filter_collection(filter_slug)
+            if collection.any?{|object| object.kind_of?(Hash) && object.has_key?(:name)}
+              option_object = collection.detect{|object| object[:state] == option.to_s}
               option_object[:name]
-            elsif filter_collection.any?{|object| object.respond_to?(:name)}
-              option_object = filter_collection.detect{|object| object.send(:id).to_s == option.to_s}
+            elsif collection.any?{|object| object.respond_to?(:name)}
+              option_object = collection.detect{|object| object.send(:id).to_s == option.to_s}
               option_object.send(:name)
             else
               option.to_s
             end
           end
 
-          define_method "#{filter_slug}_filter_option_value" do |option|
-            if [String, Integer].any?{|klass| option.kind_of?(klass)}
-              option.to_s
-            else
-              option.send(:id).to_s
-            end
-          end
-
-          define_method "#{filter_slug}_filter_option_count" do |option|
-            filter_option_count(filter_slug, option)
-          end
-
           define_method "#{filter_slug}_filter_option" do |option, selected|
             {
               :slug     => send("#{filter_slug}_filter_option_slug", option),
@@ -142,20 +146,12 @@ module Livelist
             }
           end
 
-          define_method "#{filter_slug}_filter_option_selected?" do |filter, option|
-            @@filter_params[filter].nil? ? false : @@filter_params[filter].include?(option.to_s)
-          end
-
           define_method "#{filter_slug}_filters" do |filter|
             send("#{filter_slug}_filter_values").map do |option|
               selected = send("#{filter_slug}_filter_option_selected?", filter, option)
               send("#{filter_slug}_filter_option", option, selected)
             end
           end
-
-          define_method "#{filter_slug}_relation" do |values|
-            send("#{filter_slug}_join").send("#{filter_slug}_where", values)
-          end
         end
       end
     end

data/lib/livelist/rails/version.rb

@@ -1,7 +1,7 @@
 module Livelist
   module Rails
-    VERSION = '0.0.9'
-    LIVELIST_VERSION = '0.0.4'
+    VERSION = '0.0.10'
+    LIVELIST_VERSION = '0.0.5'
     MUSTACHE_VERSION = 'db5f5ece0b6c87bbb2d0584010b97f8723dde69d'
     UNDERSCORE_VERSION = '1.2.3'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livelist-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16423600 !ruby/object:Gem::Requirement
+  requirement: &19316400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16423600
+  version_requirements: *19316400
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &16423180 !ruby/object:Gem::Requirement
+  requirement: &19315980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16423180
+  version_requirements: *19315980
 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.'