facet_for 0.1.0 → 0.1.1

data/README.md

@@ -2,7 +2,7 @@
 
 facet_for is a collection of FormBuilder helpers that speed up the process of creating complex search forms with [Ransack](http://github.com/ernie/ransack).
 
-For many searches, it can be as simple as:
+For many searches, it can be as simple as adding this inside your ```search_form_for```:
 
 ```ruby
 <%= f.facet_for(:field_name) -%>
@@ -39,17 +39,21 @@ Most of the Ransack predicates are supported:
 
 As well as several special cases and meta-predicates specific to facet_for:
 
-#### Collections
+#### Between
+
+By default, when passing a ```date``` or ```datetime``` column to facet_for, it will use the ```:type => :between``` predicate.
 
-* Collection - ```:type => :collection```
+Rather than generating a single field, ```:type => :between``` creates one ```:type => :lte``` and one ```:type => :gte``` field with a single label. This makes searching ranges of dates or numbers painless.
+
+#### Collections
 
-By default, when passing a ```has_many``` or ```belongs_to``` association into facet_for, it will choose the ```:collection``` predicate. This produces a ```collection_select``` with the unique options for that association.
+By default, when passing a ```has_many``` or ```belongs_to``` association into facet_for, it will choose the ```:type => :collection``` predicate. This produces a ```collection_select``` with the unique options for that association.
 
 When using ```:type => :collection``` on a column in the database, rather than an association, it defaults to all unique options.
 
 To pass specific options, use ```:collection => []``` to pass an array of options. This may either be a flat array of strings (eg ```['Blue', 'Red', 'Green']), a flat array of objects (```SomeModel.all```), or a nested array of name and value pairs.
 
-* Contains Any - ```:type => :cont_any```
+#### Contains Any
 
 ```:type => :cont_any``` behaves in a nearly identical manner to ```:type => :collection```, except that the collection is rendered as a series of check boxes rather than a ```collection_select```.
 

data/lib/facet_for.rb

@@ -14,7 +14,9 @@ module FacetFor
                 ['Between', :between],
                 ['Is Null', :null],
                 ['Is Not Null', :not_null],
-                ['Collection', :collection]
+                ['Collection', :collection],
+                ['Is True', :true],
+                ['Is False', :false]
                ]
 
   def self.predicates
@@ -101,6 +103,7 @@ module FacetFor
             # Ransack will then look at the _id column for the associated model.
             # This won't work properly on models with nonstandard id column
             # names. That's a problem, but whatevs for the time being.
+            @facet[:association_class]  = association.first.klass
             @facet[:association_name] = "#{association.first.plural_name}"
             @facet[:column_name] = "#{association.first.plural_name}_id"
             @facet[:clean_column_name] = "#{association.first.name.to_s.singularize}_id"
@@ -109,7 +112,7 @@ module FacetFor
 
             # If we're dealing with belongs_to, we can assume we just want
             # to look at the foreign key on the current model. Much simpler.
-
+            @facet[:association_class] = association.first.klass
             @facet[:association_name] = association.first.name
             @facet[:column_name] = association.first.foreign_key
 
@@ -125,7 +128,7 @@ module FacetFor
           # based on this association. We only want to use distinct values.
           # This could probably be cleaner, but it works.
 
-          @facet[:collection] = @facet[:model].unscoped.joins(@facet[:association_name].to_sym).select("DISTINCT #{clean_column}").where("#{clean_column} IS NOT NULL").map { |m| @facet[:association_name].to_s.singularize.camelcase.constantize.find(m.send(clean_column))  }
+          @facet[:collection] = @facet[:model].unscoped.joins(@facet[:association_name].to_sym).select("DISTINCT #{clean_column}").where("#{clean_column} IS NOT NULL").map { |m| @facet[:association_class].to_s.singularize.camelcase.constantize.find(m.send(clean_column))  }
 
         end
       else

data/lib/facet_for/version.rb

@@ -1,3 +1,3 @@
 module FacetFor
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facet_for
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &84788010 !ruby/object:Gem::Requirement
+  requirement: &76306010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84788010
+  version_requirements: *76306010
 description: Provides helpers for creating search forms with Ransack
 email:
 - jbarket@sleepunit.com
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 432141005
+      hash: -827318161
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 432141005
+      hash: -827318161
 requirements: []
 rubyforge_project: facet_for
 rubygems_version: 1.8.10