livelist-rails 0.0.14 → 0.0.15

data/lib/livelist/rails/active_record.rb

@@ -14,6 +14,8 @@ module Livelist
           :reference_criteria => options[:reference_criteria],
           :name               => options[:name],
           :model_name         => model_name,
+          :attribute          => options[:attribute],
+          :key_name           => options[:key_name],
           :slug               => slug
         )
       end
@@ -25,6 +27,7 @@ module Livelist
       def filter(params, options = {})
         filters.relation(scoped, params, options)
       end
+
     end
   end
 end

data/lib/livelist/rails/filter.rb

@@ -1,31 +1,37 @@
 require 'active_record'
+require 'active_support/inflector'
 require 'livelist/rails/filter_criteria'
 
 module Livelist
   module Rails
 
     class Filter
-      DEFAULT_FILTER_OPTIONS = {
-        :reference_criteria => nil
-      }
+      DEFAULT_FILTER_OPTIONS = { :reference_criteria => nil }
 
       attr_accessor :slug,
                     :name,
                     :key_name,
                     :model_name,
                     :model_class,
+                    :attribute,
                     :join,
                     :type,
+                    :criterion_label,
                     :criteria
 
       # slug should always be a symbol
       def initialize(options = {})
+        raise ArgumentError, 'slug option required' unless options[:slug]
+        raise ArgumentError, 'model_name option required' unless options[:model_name]
+
         @filter_collection = options[:filter_collection]
         @slug              = options[:slug].to_sym
         @name              = options[:name] || @slug.to_s.capitalize
         @model_name        = options[:model_name]
         @type              = options[:type] || initialize_type
         @key_name          = options[:key_name] || default_key_name
+        @attribute         = options[:attribute] || default_key_name
+        @criterion_label   = options[:criterion_label]
         @criteria          = FilterCriteria.new(
                                :filter => self,
                                :reference_criteria => options[:reference_criteria],
@@ -76,7 +82,7 @@ module Livelist
 
       def default_key_name
         case @type
-        when :association then :id
+        when :association then @attribute || :id
         when :attribute   then @slug
         end
       end
@@ -92,8 +98,12 @@ module Livelist
         @model_name.classify.constantize
       end
 
+      def filter_class
+        slug.to_s.classify.constantize
+      end
+
       def where(slug_params)
-        { table_name => { @key_name => slug_params } }
+        { table_name => { @attribute => slug_params } }
       end
 
       def as_json(params)

data/lib/livelist/rails/filter_criteria.rb

@@ -30,7 +30,7 @@ module Livelist
       def default_reference_criteria
         case @filter.type
         when :attribute then @filter.model_class.select("distinct #{@filter.slug}")
-        when :association then @filter.slug.to_s.classify.constantize.scoped
+        when :association then @filter.filter_class.scoped
         end
       end
 

data/lib/livelist/rails/filter_criterion.rb

@@ -9,14 +9,14 @@ module Livelist
                     :count,
                     :value,
                     :type,
-                    :name_key
+                    :label
 
       def initialize(options = {})
         @filter    = options[:filter]
         @criteria  = options[:criteria]
         @reference = options[:reference]
         @type      = infer_type
-        @name_key  = options[:name_key] || infer_name_key
+        @label     = @filter.criterion_label || infer_label
         @slug      = infer_slug
         @name      = infer_name
       end
@@ -48,7 +48,7 @@ module Livelist
         end
       end
 
-      def infer_name_key
+      def infer_label
         case @type
         when :scalar then nil
         when :hash then :name
@@ -71,8 +71,8 @@ module Livelist
       def infer_name
         case @type
         when :scalar then @reference
-        when :hash   then @reference[@name_key]
-        when :model  then @reference.send(@name_key)
+        when :hash   then @reference[@label]
+        when :model  then @reference.send(@label)
         end
       end
     end

data/lib/livelist/rails/version.rb

@@ -1,6 +1,6 @@
 module Livelist
   module Rails
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
     LIVELIST_VERSION = '0.0.9'
     MUSTACHE_VERSION = '0.4.2'
     UNDERSCORE_VERSION = '1.4.2'

data/spec/livelist/rails/filter_criterion_spec.rb

@@ -2,10 +2,26 @@ require 'spec_helper.rb'
 require File.expand_path('./lib/livelist/rails/filter_criterion.rb')
 
 describe Livelist::Rails::FilterCriterion do
-	subject { FilterCritereon.new }
+
+  let(:filter) { double(:filter, :criterion_label => nil) }
+  let(:criteria) { double(:criteria, :slug => :name) }
+  let(:reference) { {} }
+
+  subject do
+    Livelist::Rails::FilterCriterion.new(
+      :filter => filter,
+      :criteria => criteria,
+      :reference => reference
+    )
+  end
 
 	context :initialize do
+    its(:label) { should_not be_nil }
 
+    context 'when criterion_label is set on the filter' do
+      let(:filter) { double(:filter, :criterion_label => :label) }
+      its(:label) { should == :label }
+    end
 	end
 
 	context :selected? do

data/spec/livelist/rails/filter_spec.rb

@@ -2,10 +2,36 @@ require 'spec_helper.rb'
 require File.expand_path('./lib/livelist/rails/filter.rb')
 
 describe Livelist::Rails::Filter do
-	subject { Filter.new }
+
+  class MyModel; end
+
+  let(:options) do
+    {
+      :slug => :my_filter,
+      :model_name => :my_model
+    }
+  end
+  subject { Livelist::Rails::Filter.new(options) }
 
 	context :initialize do
 
+    its(:criterion_label) { should be_nil }
+
+    context 'when criterion_label option is set' do
+      before { options[:criterion_label] = :label }
+      its(:criterion_label) { should == :label }
+    end
+
+    context 'when slug option is not set' do
+      subject { Livelist::Rails::Filter.new }
+      it { -> { subject }.should raise_error ArgumentError, 'slug option required' }
+    end
+
+    context 'when model_name option is not set' do
+      subject { Livelist::Rails::Filter.new(:slug => :my_filter) }
+      it { -> { subject }.should raise_error ArgumentError, 'model_name option required' }
+    end
+
 	end
 
   context :group_by do

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@
 # loaded once.
 
 require 'simplecov'
+
 SimpleCov.start
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livelist-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: livelist-rails
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Rails Engine/Extension Incorporating Livelist.js