facet_for 0.0.7 → 0.0.8

data/lib/facet_for/version.rb

@@ -1,3 +1,3 @@
 module FacetFor
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/facet_for.rb

@@ -214,6 +214,11 @@ module FacetFor
         facet_html << text_field
       when :cont_any
         collection_type = :array
+
+        if @facet[:collection].nil?
+          @facet[:collection] = unique_value_collection
+        end
+
         if @facet[:collection].first.class == 'String'
           collection_type = :string
         end
@@ -277,14 +282,42 @@ module FacetFor
 
     def check_box(value = "1")
       name = "#{@facet[:column_name]}_#{@facet[:type]}"
-      return check_box_tag(self.name_for(name, true), value, check_box_checked(value))
+
+
+
+      if @facet[:type] == :cont_any
+        check_box_label =  label_tag(self.name_for(name, true),
+                                     value.to_s.humanize)
+        check_box_name = self.name_for(name, true)
+      else
+
+        label_value = @facet[:column_name].to_s.humanize
+
+        case @facet[:type]
+        when :false
+          label_value = "Is Not #{label_value}"
+        when :null
+          label_value += "Is Null"
+        when :not_null
+          label_value += "Is Not Null"
+        end
+
+        check_box_label =  label_tag(self.name_for(name, true), label_value)
+        check_box_name = self.name_for(name, false)
+      end
+
+      check_box_tag(check_box_name, value, check_box_checked(value)) + check_box_label
     end
 
     def check_box_checked(value = "1")
       name = "#{@facet[:column_name]}_#{@facet[:type]}"
       selected = @facet[:object].send(name)
 
-      return (!selected.nil? and selected.include?(value))
+      if @facet[:type] == :cont_any
+        return (!selected.nil? and selected.include?(value))
+      else
+        return selected
+      end
 
     end
 
@@ -292,6 +325,16 @@ module FacetFor
       name = "#{@facet[:column_name]}_eq"
       selected = @facet[:object].send(name)
 
+      # @facet[:collection] should be set if we've given it a valid
+      # association, or passed in a collection by hand.
+      #
+      # this assumes that we want to see all unique values from the database
+      # for the given column
+
+      if @facet[:collection].nil?
+        @facet[:collection] = unique_value_collection
+      end
+
       if @facet[:collection].class == Array and
           @facet[:collection].first.class == String
 
@@ -306,6 +349,10 @@ module FacetFor
 
     end
 
+    def unique_value_collection
+      @facet[:collection] = @facet[:model].select("DISTINCT #{@facet[:column_name]}").where("#{@facet[:column_name]} IS NOT NULL").map { |m| m.send(@facet[:column_name]) }
+    end
+
     def label(string_name, string_label = nil)
       display_label = string_label || string_name.humanize
       label_tag self.name_for(string_name), display_label

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facet_for
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &72114110 !ruby/object:Gem::Requirement
+  requirement: &78616160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72114110
+  version_requirements: *78616160
 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: -223193421
+      hash: -507125603
 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: -223193421
+      hash: -507125603
 requirements: []
 rubyforge_project: facet_for
 rubygems_version: 1.8.10