livelist-rails 0.0.4 → 0.0.5

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')

data/app/assets/javascripts/livelist.coffee

@@ -34,8 +34,14 @@ class window.List extends Utilities
     @fetchingIndicationClass = 'updating'
     @setOptions(options)
 
-    $(@renderTo).bind(@eventName, (event, params) => @fetch(filterPresets: null, page: params?.page))
-    @fetch(filterPresets: @filters.presets)
+    $(@renderTo).bind(@eventName, (event, params) => @fetch(presets: null, page: params?.page))
+
+    cookie = jQuery.cookie(@filters.cookieName) if jQuery.cookie && @filters.useCookies
+    if @filters.useCookies && cookie
+      presets = JSON.parse(cookie)
+    else
+      presets = @filters.presets
+    @fetch(presets: presets)
 
   displayFetchingIndication: => $(@renderTo).addClass(@fetchingIndicationClass)
   removeFetchingIndication:  => $(@renderTo).removeClass(@fetchingIndicationClass)
@@ -47,14 +53,23 @@ class window.List extends Utilities
     @filters.filters = _.pluck( @data.filters, 'filter_slug' )
     @filters.render(@data)
 
+  selections: ->
+    filters = {}
+    _.each( @filters.filters, (filter) => filters[filter] = @filters.filterSelections( filter ) )
+    filters
+
   fetch: (options) ->
     @fetchRequest.abort() if @fetchRequest
     searchTerm = @search.searchTerm()
     params = { filters: {} }
-    if options.filterPresets?.length > 0
-      params.filters = options.filterPresets
+
+    if jQuery.isEmptyObject(options.presets)
+      params.filters = @selections()
+      if jQuery.cookie && not jQuery.isEmptyObject(params.filters)
+        jQuery.cookie(@filters.cookieName, JSON.stringify(params.filters))
     else
-      _.each( @filters.filters, (filter) => params.filters[filter] = @filters.filterSelections( filter ) )
+      params.filters = options.presets
+
     if searchTerm then params.q = searchTerm
     if options.page then params.page = options.page
     @fetchRequest = $.ajax(
@@ -72,10 +87,13 @@ class window.List extends Utilities
     $(@renderTo).html( Mustache.to_html(@listTemplate, @data, partials) )
     @removeFetchingIndication()
 
+window.LiveList.version = '0.0.3'
+
 class window.Filters extends Utilities
   constructor: (globalOptions, options = {}) ->
     @setOptions(globalOptions)
     @filters = if options.presets then _.keys(options.presets) else []
+    unless @filters.cookieName then @filters.cookieName = 'livelist_filter_presets'
     @setOptions(options)
     $('input.filter_option', @renderTo).live( 'change', => $(@listSelector).trigger(@eventName) )
     $(@advancedOptionsToggleSelector).click(@handleAdvancedOptionsClick)
@@ -110,7 +128,18 @@ class window.Filters extends Utilities
   filterValues:     (filter) -> _.pluck( $(".#{filter}_filter_input"), 'value' )
   filterSelections: (filter) -> _.pluck( $("##{filter}_filter_options input.filter_option:checked"), 'value' )
 
-  render: (data) -> $(@renderTo).html( Mustache.to_html(@filtersTemplate, data) )
+  noFiltersSelected: (data) ->
+    _.all( data.filters, (filter) ->
+      _.all( filter.options, (option) ->
+        not option.selected
+      )
+    )
+
+  render: (data) ->
+    $(@renderTo).html( Mustache.to_html(@filtersTemplate, data) )
+    if @noFiltersSelected(data) && data[@resourceName].length > 0
+      $('input[type="checkbox"]', @renderTo).attr('checked', 'checked')
+
 
   handleAdvancedOptionsClick: (event) =>
     event.preventDefault()

data/app/assets/javascripts/livelist.js

@@ -51,7 +51,8 @@
     __extends(List, _super);
 
     function List(search, filters, pagination, globalOptions, options) {
-      var _this = this;
+      var cookie, presets,
+        _this = this;
       if (options == null) options = {};
       this.renderIndex = __bind(this.renderIndex, this);
       this.removeFetchingIndication = __bind(this.removeFetchingIndication, this);
@@ -68,12 +69,20 @@
       this.setOptions(options);
       $(this.renderTo).bind(this.eventName, function(event, params) {
         return _this.fetch({
-          filterPresets: null,
+          presets: null,
           page: params != null ? params.page : void 0
         });
       });
+      if (jQuery.cookie && this.filters.useCookies) {
+        cookie = jQuery.cookie(this.filters.cookieName);
+      }
+      if (this.filters.useCookies && cookie) {
+        presets = JSON.parse(cookie);
+      } else {
+        presets = this.filters.presets;
+      }
       this.fetch({
-        filterPresets: this.filters.presets
+        presets: presets
       });
     }
 
@@ -93,20 +102,30 @@
       return this.filters.render(this.data);
     };
 
-    List.prototype.fetch = function(options) {
-      var params, searchTerm, _ref,
+    List.prototype.selections = function() {
+      var filters,
         _this = this;
+      filters = {};
+      _.each(this.filters.filters, function(filter) {
+        return filters[filter] = _this.filters.filterSelections(filter);
+      });
+      return filters;
+    };
+
+    List.prototype.fetch = function(options) {
+      var params, searchTerm;
       if (this.fetchRequest) this.fetchRequest.abort();
       searchTerm = this.search.searchTerm();
       params = {
         filters: {}
       };
-      if (((_ref = options.filterPresets) != null ? _ref.length : void 0) > 0) {
-        params.filters = options.filterPresets;
+      if (jQuery.isEmptyObject(options.presets)) {
+        params.filters = this.selections();
+        if (jQuery.cookie && !jQuery.isEmptyObject(params.filters)) {
+          jQuery.cookie(this.filters.cookieName, JSON.stringify(params.filters));
+        }
       } else {
-        _.each(this.filters.filters, function(filter) {
-          return params.filters[filter] = _this.filters.filterSelections(filter);
-        });
+        params.filters = options.presets;
       }
       if (searchTerm) params.q = searchTerm;
       if (options.page) params.page = options.page;
@@ -132,6 +151,8 @@
 
   })(Utilities);
 
+  window.LiveList.version = '0.0.3';
+
   window.Filters = (function(_super) {
 
     __extends(Filters, _super);
@@ -142,6 +163,9 @@
       this.handleAdvancedOptionsClick = __bind(this.handleAdvancedOptionsClick, this);
       this.setOptions(globalOptions);
       this.filters = options.presets ? _.keys(options.presets) : [];
+      if (!this.filters.cookieName) {
+        this.filters.cookieName = 'livelist_filter_presets';
+      }
       this.setOptions(options);
       $('input.filter_option', this.renderTo).live('change', function() {
         return $(_this.listSelector).trigger(_this.eventName);
@@ -159,8 +183,19 @@
       return _.pluck($("#" + filter + "_filter_options input.filter_option:checked"), 'value');
     };
 
+    Filters.prototype.noFiltersSelected = function(data) {
+      return _.all(data.filters, function(filter) {
+        return _.all(filter.options, function(option) {
+          return !option.selected;
+        });
+      });
+    };
+
     Filters.prototype.render = function(data) {
-      return $(this.renderTo).html(Mustache.to_html(this.filtersTemplate, data));
+      $(this.renderTo).html(Mustache.to_html(this.filtersTemplate, data));
+      if (this.noFiltersSelected(data) && data[this.resourceName].length > 0) {
+        return $('input[type="checkbox"]', this.renderTo).attr('checked', 'checked');
+      }
     };
 
     Filters.prototype.handleAdvancedOptionsClick = function(event) {

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=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 g.fetch({filterPresets:null,page:b!=null?b.page:void 0})}),this.fetch({filterPresets:this.filters.presets})}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.filters=_.pluck(this.data.filters,"filter_slug"),this.filters.render(this.data)},d.prototype.fetch=function(a){var b,c,d,e=this;return this.fetchRequest&&this.fetchRequest.abort(),c=this.search.searchTerm(),b={filters:{}},((d=a.filterPresets)!=null?d.length:void 0)>0?b.filters=a.filterPresets:_.each(this.filters.filters,function(a){return b.filters[a]=e.filters.filterSelections(a)}),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;return a={},a[this.resourceNameSingular]=this.listItemTemplate,$(this.renderTo).html(Mustache.to_html(this.listTemplate,this.data,a)),this.removeFetchingIndication()},d}(Utilities),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.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.filtersTemplate="{{#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.filterValues=function(a){return _.pluck($("."+a+"_filter_input"),"value")},d.prototype.filterSelections=function(a){return _.pluck($("#"+a+"_filter_options input.filter_option:checked"),"value")},d.prototype.render=function(a){return $(this.renderTo).html(Mustache.to_html(this.filtersTemplate,a))},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){return this.pagination=this.paginationJSON(a.pagination),$(this.renderTo).html(Mustache.to_html(this.paginationTemplate,this.pagination))},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,i=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 i.fetch({presets:null,page:b!=null?b.page:void 0})}),jQuery.cookie&&this.filters.useCookies&&(g=jQuery.cookie(this.filters.cookieName)),this.filters.useCookies&&g?h=JSON.parse(g):h=this.filters.presets,this.fetch({presets:h})}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.filters=_.pluck(this.data.filters,"filter_slug"),this.filters.render(this.data)},d.prototype.selections=function(){var a,b=this;return a={},_.each(this.filters.filters,function(c){return a[c]=b.filters.filterSelections(c)}),a},d.prototype.fetch=function(a){var b,c;return this.fetchRequest&&this.fetchRequest.abort(),c=this.search.searchTerm(),b={filters:{}},jQuery.isEmptyObject(a.presets)?(b.filters=this.selections(),jQuery.cookie&&!jQuery.isEmptyObject(b.filters)&&jQuery.cookie(this.filters.cookieName,JSON.stringify(b.filters))):b.filters=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;return a={},a[this.resourceNameSingular]=this.listItemTemplate,$(this.renderTo).html(Mustache.to_html(this.listTemplate,this.data,a)),this.removeFetchingIndication()},d}(Utilities),window.LiveList.version="0.0.3",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.filters.cookieName||(this.filters.cookieName="livelist_filter_presets"),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.filtersTemplate="{{#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.filterValues=function(a){return _.pluck($("."+a+"_filter_input"),"value")},d.prototype.filterSelections=function(a){return _.pluck($("#"+a+"_filter_options input.filter_option:checked"),"value")},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){$(this.renderTo).html(Mustache.to_html(this.filtersTemplate,a));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){return this.pagination=this.paginationJSON(a.pagination),$(this.renderTo).html(Mustache.to_html(this.paginationTemplate,this.pagination))},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

@@ -27,8 +27,22 @@ 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_option_objects" do
+              select("distinct #{filter_slug}").all
+            end
+
             define_method "#{filter_slug}_filter_values" do
-              select("distinct #{filter_slug}").map(&filter_slug.to_sym)
+              key = send("#{filter_slug}_filter_option_key_name")
+              option_objects = send("#{filter_slug}_filter_option_objects")
+              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)
+              end
             end
 
             define_method "#{filter_slug}_filter_counts" do
@@ -36,36 +50,58 @@ module Livelist
             end
 
             define_method "#{filter_slug}_filter_option_slug" do |option|
-              option.to_s
+              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_name" do |option|
-              option.to_s.capitalize
+              option_objects = send("#{filter_slug}_filter_option_objects")
+              if option_objects.any?{|object| object.kind_of?(Hash) && object.has_key?(:name)}
+                option_object = option_objects.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}
+                option_object.send(:name)
+              else
+                option.to_s
+              end
             end
 
             define_method "#{filter_slug}_filter_option_value" do |option|
-              option.to_s
+              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|
               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]
+              class_variable_get(:"@@#{filter_slug}_filter_counts")[option.to_s] || 0
             end
 
             define_method "#{filter_slug}_filter_option" do |option, selected|
+              option_slug  = send("#{filter_slug}_filter_option_slug", option)
+              option_name  = send("#{filter_slug}_filter_option_name", option)
+              option_value = send("#{filter_slug}_filter_option_value", option)
+              option_count = send("#{filter_slug}_filter_option_count", option)
+
               {
-                :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),
+                :slug     => option_slug,
+                :name     => option_name,
+                :value    => option_value,
+                :count    => option_count,
                 :selected => selected
               }
             end
 
             define_method "#{filter_slug}_filter_option_selected?" do |filter_params, option|
-              filter_params.nil? ? true : filter_params.include?(option)
+              filter_params.nil? ? false : filter_params.include?(option.to_s)
             end
 
             define_method "#{filter_slug}_filters" do |filter_params|

data/lib/livelist/rails/railtie.rb

@@ -12,9 +12,8 @@ module Livelist
 
       if ::Rails.version < "3.1.0"
         config.before_configuration do
-          if ::Rails.root.join("public/javascripts/livelist.min.js").exist? ||
-             %W(production staging).include?(::Rails.env)
-            livelist_filename = 'livelist-min'
+          if %W(production staging).include?(::Rails.env)
+            livelist_filename = 'livelist.min'
           else
             livelist_filename = 'livelist'
           end

data/lib/livelist/rails/version.rb

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

data/livelist-rails.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "activerecord"
+  #s.add_runtime_dependency "rest-client"
 end

data/spec/livelist/rails/active_record_spec.rb

@@ -0,0 +1,211 @@
+require 'spec_helper.rb'
+require File.expand_path('./lib/livelist/rails/active_record.rb')
+
+describe Livelist::Rails::ActiveRecord do
+  class User
+    extend Livelist::Rails::ActiveRecord
+    filters :status, :state
+  end
+
+	subject { User }
+
+	context :filter_name do
+		it { subject.should respond_to(:state_filter_name) }
+		it { subject.should respond_to(:status_filter_name) }
+
+    it { subject.state_filter_name.should == 'State' }
+	end
+
+	context :filter_slug do
+		it { subject.should respond_to(:state_filter_slug) }
+		it { subject.should respond_to(:status_filter_slug) }
+
+    it { subject.state_filter_slug.should == 'state' }
+	end
+
+	context :filter do
+    let(:options) do
+      [{
+        :slug => 'virginia',
+        :name => 'Virginia',
+        :value => 'virginia',
+        :count => 1,
+        :selected => true
+      }]
+    end
+
+		it { subject.should respond_to(:state_filter) }
+		it { subject.should respond_to(:status_filter) }
+
+    it 'should be a hash with the proper keys/values' do
+      subject.should_receive(:state_filter_slug).and_return('state')
+      subject.should_receive(:state_filter_name).and_return('State')
+      subject.state_filter(options).should == {
+        :filter_slug => 'state',
+        :name => 'State',
+        :options => options
+      }
+    end
+	end
+
+	context :filter_values do
+    let(:values) do
+      [
+        double('Object', :state => 'Virginia'),
+        double('Object', :state => 'South Carolina')
+      ]
+    end
+
+		it { subject.should respond_to(:state_filter_values) }
+		it { subject.should respond_to(:status_filter_values) }
+
+    it 'should return a mapped list of values' do
+      subject.should_receive(:select).and_return(values)
+      subject.state_filter_values.should == ['Virginia', 'South Carolina']
+    end
+	end
+
+	context :filter_counts do
+		it { subject.should respond_to(:state_filter_counts) }
+		it { subject.should respond_to(:status_filter_counts) }
+
+    it 'should be tested' do
+      pending
+    end
+	end
+
+	context :filter_option_slug do
+    let(:option) { 'virginia' }
+
+		it { subject.should respond_to(:state_filter_option_slug) }
+		it { subject.should respond_to(:status_filter_option_slug) }
+
+    it { subject.state_filter_option_slug(option).should == 'virginia' }
+	end
+
+	context :filter_option_name do
+    let(:option) { 'virginia' }
+
+		it { subject.should respond_to(:state_filter_option_name) }
+		it { subject.should respond_to(:status_filter_option_name) }
+
+    it { subject.state_filter_option_name(option).should == 'Virginia' }
+	end
+
+	context :filter_option_value do
+    let(:option) { 'virginia' }
+
+		it { subject.should respond_to(:state_filter_option_count) }
+		it { subject.should respond_to(:status_filter_option_count) }
+
+    it { subject.state_filter_option_value(option).should == 'virginia' }
+	end
+
+	context :filter_option_count do
+    let(:option) { 'Virginia' }
+    let(:state_filter_counts) { { 'Virginia' => 1, 'South Carolina' => 2 } }
+
+		it { subject.should respond_to(:state_filter_option_count) }
+		it { subject.should respond_to(:status_filter_option_count) }
+
+    it 'option argument should be converted to a string' do
+      state_filter_counts['1'] = 3
+      subject.should_receive(:state_filter_counts).and_return(state_filter_counts)
+      subject.state_filter_option_count(1).should == 3
+    end
+
+    it 'should be the proper count for the option' do
+      subject.should_receive(:state_filter_counts).and_return(state_filter_counts)
+      subject.state_filter_option_count(option).should == 1
+    end
+
+    it 'should be 0 if the value for the option is nil' do
+      subject.should_receive(:state_filter_counts).and_return(state_filter_counts)
+      subject.state_filter_option_count('West Virginia').should == 0
+    end
+
+    it 'should cache the counts when the method is first called' do
+      pending
+      #subject.should_receive(:state_filter_counts).exactly(1).times.and_return(state_filter_counts)
+      #subject.state_filter_option_count(option)
+      #subject.state_filter_option_count('South Carolina')
+    end
+	end
+
+	context :filter_option do
+    let(:option) { 'virginia' }
+    let(:selected) { true }
+
+		it { subject.should respond_to(:state_filter_option) }
+		it { subject.should respond_to(:status_filter_option) }
+
+    it 'should be a properly formatted hash' do
+      subject.should_receive(:state_filter_option_slug).and_return('virginia')
+      subject.should_receive(:state_filter_option_name).and_return('Virginia')
+      subject.should_receive(:state_filter_option_value).and_return('virginia')
+      subject.should_receive(:state_filter_option_count).and_return(1)
+      subject.state_filter_option(option, selected).should == {
+        :slug => 'virginia',
+        :name => 'Virginia',
+        :value => 'virginia',
+        :count => 1,
+        :selected => true
+      }
+    end
+	end
+
+	context :filter_option_selected? do
+    let(:option) { 'Virginia' }
+    let(:filter_params) { ['Virginia', 'South Carolina'] }
+
+		it { subject.should respond_to(:state_filter_option_selected?) }
+		it { subject.should respond_to(:status_filter_option_selected?) }
+
+    it 'should be true if the option is included in the filter params' do
+      subject.state_filter_option_selected?(filter_params, option).should be_true
+    end
+
+    it 'should be true if filter params is nil' do
+      subject.state_filter_option_selected?(nil, option).should be_true
+    end
+
+    it 'should be false if the option is not included in the filter params' do
+      subject.state_filter_option_selected?(['West Virginia'], option).should be_false
+    end
+	end
+
+	context :filters do
+		it { subject.should respond_to(:state_filters) }
+		it { subject.should respond_to(:status_filters) }
+
+    it 'should be tested' do
+      pending
+    end
+	end
+
+	context :relation do
+		it { subject.should respond_to(:state_relation) }
+		it { subject.should respond_to(:status_relation) }
+
+    it 'should be tested' do
+      pending
+    end
+	end
+
+	context :filters_as_json do
+		it { subject.should respond_to(:filters_as_json) }
+
+    it 'should be tested' do
+      pending
+    end
+	end
+
+	context :filter do
+		it { subject.should respond_to(:filter) }
+
+    it 'should be tested' do
+      pending
+    end
+	end
+
+end

data/spec/livelist/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rspec'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper.rb"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livelist-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
-dependencies: []
+date: 2012-01-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &22782620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22782620
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &22782200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22782200
 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.'
@@ -21,6 +43,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -37,6 +60,9 @@ files:
 - lib/livelist/rails/railtie.rb
 - lib/livelist/rails/version.rb
 - livelist-rails.gemspec
+- spec/livelist/rails/active_record_spec.rb
+- spec/livelist/spec_helper.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -57,8 +83,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: livelist-rails
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Rails Engine/Extension Incorporating Livelist.js
-test_files: []
+test_files:
+- spec/livelist/rails/active_record_spec.rb
+- spec/livelist/spec_helper.rb
+- spec/spec_helper.rb