warp-thinking-sphinx 1.3.10 → 1.3.11

data/VERSION

@@ -1 +1 @@
-1.3.10
+1.3.11

data/lib/thinking_sphinx/facet_search.rb

@@ -1,48 +1,48 @@
 module ThinkingSphinx
   class FacetSearch < Hash
     attr_accessor :args, :options
-    
+
     def initialize(*args)
       ThinkingSphinx.context.define_indexes
-      
+
       @options      = args.extract_options!
       @args         = args
-      
+
       set_default_options
-      
+
       populate
     end
-    
+
     def for(hash = {})
       for_options = {:with => {}}.merge(options)
-      
+
       hash.each do |key, value|
         attrib = ThinkingSphinx::Facet.attribute_name_from_value(key, value)
         for_options[:with][attrib] = underlying_value key, value
       end
-      
+
       ThinkingSphinx.search *(args + [for_options])
     end
-    
+
     def facet_names
       @facet_names ||= begin
         names = options[:all_facets] ?
           facet_names_for_all_classes : facet_names_common_to_all_classes
-        
+
         names.delete "class_crc" unless options[:class_facet]
         names
       end
     end
-    
+
     private
-    
+
     def set_default_options
       options[:all_facets]  ||= false
       if options[:class_facet].nil?
         options[:class_facet] = ((options[:classes] || []).length != 1)
       end
     end
-    
+
     def populate
       facet_names.each do |name|
         search_options = facet_search_options.merge(:group_by => name)
@@ -51,11 +51,11 @@ module ThinkingSphinx
         )
       end
     end
-    
+
     def facet_search_options
       config = ThinkingSphinx::Configuration.instance
       max    = config.configuration.searchd.max_matches || 1000
-      
+
       options.merge(
         :group_function => :attr,
         :limit          => max,
@@ -63,7 +63,7 @@ module ThinkingSphinx
         :page           => 1
       )
     end
-    
+
     def facet_classes
       (
         options[:classes] || ThinkingSphinx.context.indexed_models.collect { |model|
@@ -71,7 +71,7 @@ module ThinkingSphinx
         }
       ).select { |klass| klass.sphinx_facets.any? }
     end
-    
+
     def all_facets
       facet_classes.collect { |klass|
         klass.sphinx_facets
@@ -79,7 +79,7 @@ module ThinkingSphinx
         options[:facets].blank? || Array(options[:facets]).include?(facet.name)
       }
     end
-    
+
     def facet_names_for_all_classes
       all_facets.group_by { |facet|
         facet.name
@@ -90,7 +90,7 @@ module ThinkingSphinx
         facets.first.attribute_name
       }
     end
-    
+
     def facet_names_common_to_all_classes
       facet_names_for_all_classes.select { |name|
         facet_classes.all? { |klass|
@@ -100,24 +100,24 @@ module ThinkingSphinx
         }
       }
     end
-    
+
     def add_from_results(facet, results)
       name = ThinkingSphinx::Facet.name_for(facet)
-      
+
       self[name]  ||= {}
-      
+
       return if results.empty?
-      
+
       facet = facet_from_object(results.first, facet) if facet.is_a?(String)
-      
+
       results.each_with_groupby_and_count { |result, group, count|
         facet_value = facet.value(result, group)
-        
+
         self[name][facet_value] ||= 0
         self[name][facet_value]  += count
       }
     end
-    
+
     def underlying_value(key, value)
       case value
       when Array
@@ -128,9 +128,9 @@ module ThinkingSphinx
         value
       end
     end
-    
+
     def facet_from_object(object, name)
-      object.sphinx_facets.detect { |facet| facet.attribute_name == name }
+      object.class.source_of_sphinx_index.sphinx_facets.detect { |facet| facet.attribute_name == name }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warp-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 +08:00
+date: 2009-12-12 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency