facet_for 0.0.5 → 0.0.6

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in facet_for.gemspec
 gemspec
+gem 'rake'

data/lib/facet_for/version.rb

@@ -1,3 +1,3 @@
 module FacetFor
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/facet_for.rb

@@ -153,9 +153,7 @@ module FacetFor
       when :not_null
         return label("#{@facet[:column_name]}_not_null",
                      "#{@facet[:column_name].to_s.humanize} Is Not Null?")
-      when :cont_any
-        return ''
-      when :cont
+      when :cont, :cont_any
         return label("#{@facet[:column_name]}_cont",
                      "#{@facet[:column_name].to_s.humanize} Contains")
       when :not_cont
@@ -212,10 +210,26 @@ module FacetFor
       when :cont, :not_cont, :start, :not_start, :end, :not_end, :gteq, :lteq
         facet_html << text_field
       when :cont_any
+        collection_type = :array
+        if @facet[:collection].first.class == 'String'
+          collection_type = :string
+        end
+
         @facet[:collection].each do |check|
           facet_html << "<div class=\"facet_input cont_any check_box\">"
-          facet_html << check_box(check)
-          facet_html << label(self.name_for("#{@facet[:column_name]}_#{@facet[:type].to_s}", true), check)
+
+          if collection_type == :array
+            facet_html << check_box(check[1])
+          else
+            facet_html << check_box(check)
+          end
+
+          if collection_type == :array
+            facet_html << label(self.name_for("#{@facet[:column_name]}_#{@facet[:type].to_s}", true), check[0])
+          else
+            facet_html << label(self.name_for("#{@facet[:column_name]}_#{@facet[:type].to_s}", true), check)
+          end
+
           facet_html << "</div>"
         end
 
@@ -275,7 +289,18 @@ module FacetFor
       name = "#{@facet[:column_name]}_eq"
       selected = @facet[:object].send(name)
 
-      select_tag self.name_for(name), options_from_collection_for_select(@facet[:collection], :id, :to_s, selected), :include_blank => true
+      if @facet[:collection].class == Array and
+          @facet[:collection].first.class == String
+
+        return select_tag self.name_for(name),
+        options_for_select(@facet[:collection], selected),
+        :include_blank => true
+      else
+        return select_tag self.name_for(name),
+        options_from_collection_for_select(@facet[:collection], :id, :to_s,
+                                           selected), :include_blank => true
+      end
+
     end
 
     def label(string_name, string_label = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facet_for
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &77892390 !ruby/object:Gem::Requirement
+  requirement: &75492170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77892390
+  version_requirements: *75492170
 description: Provides helpers for creating search forms with Ransack
 email:
 - jbarket@sleepunit.com
@@ -50,12 +50,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 625741645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 625741645
 requirements: []
 rubyforge_project: facet_for
 rubygems_version: 1.8.10