facet_for 0.1.2 → 0.1.4

data/lib/facet_for.rb

@@ -106,6 +106,7 @@ module FacetFor
             @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"
+            @facet[:association_primary_key] = association.first.primary_key_column.name
 
           elsif association.first.macro == :belongs_to
 
@@ -114,6 +115,7 @@ module FacetFor
             @facet[:association_class] = association.first.klass
             @facet[:association_name] = association.first.name
             @facet[:column_name] = association.first.foreign_key
+            @facet[:association_primary_key] = association.first.primary_key_column.name
 
           end
 
@@ -127,8 +129,11 @@ 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_class].to_s.singularize.camelcase.constantize.find(m.send(clean_column))  }
+          unless @facet[:collection]
+            unique_objects = @facet[:model].unscoped.select("DISTINCT #{clean_column}").where("#{clean_column} IS NOT NULL").map { |x| x.send(clean_column) }.join(", ")
 
+            @facet[:collection] = @facet[:association_class].unscoped.where("#{@facet[:association_primary_key]} IN (#{unique_objects})")
+          end
         end
       else
 
@@ -343,11 +348,12 @@ module FacetFor
 
         return select_tag self.name_for(name),
         options_for_select(@facet[:collection], selected),
-        :include_blank => true
+        :include_blank => true, :class => @facet[:class]
       else
         return select_tag self.name_for(name),
         options_from_collection_for_select(@facet[:collection], :id, :to_s,
-                                           selected), :include_blank => true
+                                           selected), :include_blank => true,
+        :class => @facet[:class]
       end
 
     end
@@ -357,7 +363,7 @@ module FacetFor
     end
 
     def unique_value_collection
-      @facet[:collection] = @facet[:model].unscoped.select("DISTINCT #{clean_column}").where("#{clean_column} IS NOT NULL").map { |m| m.send(@facet[:column_name]) }
+      @facet[:collection] = @facet[:model].unscoped.select("DISTINCT #{clean_column}").where("#{clean_column} IS NOT NULL").map { |x| x.send(clean_column) }
     end
 
     def label(string_name, string_label = nil)

data/lib/facet_for/form_builder.rb

@@ -23,6 +23,8 @@ class ActionView::Helpers::FormBuilder
     facet[:column_name] = column
     facet[:column_type] = options[:column_type]
 
+    facet[:includes] = options[:includes]
+
     # This is the type of field we will render. If this isn't provided, we'll
     # determine this based on facet_column_type
 
@@ -41,6 +43,9 @@ class ActionView::Helpers::FormBuilder
     # Are we labeling it differently?
     facet[:label] = options[:label]
 
+    # How about adding a class?
+    facet[:class] = options[:class]
+
     @facet = FacetFor::Facet.new(facet)
 
     facet_html << @facet.render_facet

data/lib/facet_for/version.rb

@@ -1,3 +1,3 @@
 module FacetFor
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facet_for
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &69810510 !ruby/object:Gem::Requirement
+  requirement: &17945960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69810510
+  version_requirements: *17945960
 description: Provides helpers for creating search forms with Ransack
 email:
 - jbarket@sleepunit.com
@@ -50,21 +50,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -544917759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -544917759
 requirements: []
 rubyforge_project: facet_for
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides helpers for creating search forms with Ransack