thinking-sphinx 1.2.13 → 1.4.0

data/lib/thinking_sphinx/facet_search.rb

@@ -3,6 +3,8 @@ module ThinkingSphinx
     attr_accessor :args, :options
     
     def initialize(*args)
+      ThinkingSphinx.context.define_indexes
+      
       @options      = args.extract_options!
       @args         = args
       
@@ -42,29 +44,27 @@ module ThinkingSphinx
     end
     
     def populate
-      facet_names.each do |name|
-        search_options = facet_search_options.merge(:group_by => name)
-        add_from_results name, ThinkingSphinx.search(
-          *(args + [search_options])
-        )
-      end
+      ThinkingSphinx::Search.bundle_searches(facet_names) { |sphinx, name|
+        sphinx.search *(args + [facet_search_options(name)])
+      }.each_with_index { |search, index|
+        add_from_results facet_names[index], search
+      }
     end
     
-    def facet_search_options
-      config = ThinkingSphinx::Configuration.instance
-      max    = config.configuration.searchd.max_matches || 1000
-      
+    def facet_search_options(facet_name)
       options.merge(
         :group_function => :attr,
-        :limit          => max,
-        :max_matches    => max,
-        :page           => 1
+        :limit          => max_matches,
+        :max_matches    => max_matches,
+        :page           => 1,
+        :group_by       => facet_name,
+        :ids_only       => !translate?(facet_name)
       )
     end
     
     def facet_classes
       (
-        options[:classes] || ThinkingSphinx.indexed_models.collect { |model|
+        options[:classes] || ThinkingSphinx.context.indexed_models.collect { |model|
           model.constantize
         }
       ).select { |klass| klass.sphinx_facets.any? }
@@ -99,21 +99,34 @@ module ThinkingSphinx
       }
     end
     
-    def add_from_results(facet, results)
-      name = ThinkingSphinx::Facet.name_for(facet)
+    def translate?(name)
+      facet = facet_from_name(name)
+      facet.translate? || facet.float?
+    end
+    
+    def config
+      ThinkingSphinx::Configuration.instance
+    end
+    
+    def max_matches
+      @max_matches ||= config.configuration.searchd.max_matches || 1000
+    end
+    
+    # example: facet = country_facet; name = :country
+    def add_from_results(facet, search)
+      name  = ThinkingSphinx::Facet.name_for(facet)
+      facet = facet_from_name(facet)
       
       self[name]  ||= {}
       
-      return if results.empty?
+      return if search.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)
+      search.each_with_match do |result, match|
+        facet_value = facet.value(result, match[:attributes])
         
         self[name][facet_value] ||= 0
-        self[name][facet_value]  += count
-      }
+        self[name][facet_value]  += match[:attributes]["@count"]
+      end
     end
     
     def underlying_value(key, value)
@@ -128,7 +141,24 @@ module ThinkingSphinx
     end
     
     def facet_from_object(object, name)
-      object.sphinx_facets.detect { |facet| facet.attribute_name == name }
+      facet = nil
+      klass = object.class
+      
+      while klass != ::ActiveRecord::Base && facet.nil?
+        facet = klass.sphinx_facets.detect { |facet|
+          facet.attribute_name == name
+        }
+        klass = klass.superclass
+      end
+      
+      facet
+    end
+    
+    def facet_from_name(name)
+      name = ThinkingSphinx::Facet.name_for(name)
+      all_facets.detect { |facet|
+        facet.name == name
+      }
     end
   end
 end

data/lib/thinking_sphinx/field.rb

@@ -69,14 +69,12 @@ module ThinkingSphinx
     # multiple data values (has_many or has_and_belongs_to_many associations).
     # 
     def to_select_sql
-      clause = @columns.collect { |column|
-        column_with_prefix(column)
-      }.join(', ')
+      clause = columns_with_prefixes.join(', ')
       
       clause = adapter.concatenate(clause)       if concat_ws?
       clause = adapter.group_concatenate(clause) if is_many?
       
-      "#{adapter.cast_to_string clause } AS #{quote_column(unique_name)}"
+      "#{clause} AS #{quote_column(unique_name)}"
     end
   end
 end

data/lib/thinking_sphinx/index/builder.rb

@@ -20,9 +20,9 @@ module ThinkingSphinx
         }
       }
       
-      def self.generate(model, &block)
+      def self.generate(model, name = nil, &block)
         index  = ThinkingSphinx::Index.new(model)
-        model.sphinx_facets ||= []
+        index.name = name unless name.nil?
         
         Builder.new(index, &block) if block_given?
         
@@ -32,15 +32,11 @@ module ThinkingSphinx
       
       def initialize(index, &block)
         @index  = index
-        @source = ThinkingSphinx::Source.new(@index)
-        @index.sources << @source
         @explicit_source = false
         
         self.instance_eval &block
         
-        if @index.sources.any? { |source|
-          source.fields.length == 0
-        }
+        if no_fields?
           raise "At least one field is necessary for an index"
         end
       end
@@ -105,7 +101,7 @@ module ThinkingSphinx
       def indexes(*args)
         options = args.extract_options!
         args.each do |columns|
-          field = Field.new(@source, FauxColumn.coerce(columns), options)
+          field = Field.new(source, FauxColumn.coerce(columns), options)
           
           add_sort_attribute  field, options   if field.sortable
           add_facet_attribute field, options   if field.faceted
@@ -123,13 +119,13 @@ module ThinkingSphinx
       # database.
       # 
       # Attributes are limited to the following types: integers, floats,
-      # datetimes (converted to timestamps), booleans and strings. Don't
-      # forget that Sphinx converts string attributes to integers, which are
-      # useful for sorting, but that's about it.
+      # datetimes (converted to timestamps), booleans, strings and MVAs
+      # (:multi). Don't forget that Sphinx converts string attributes to
+      # integers, which are useful for sorting, but that's about it.
       # 
-      # You can also have a collection of integers for multi-value attributes
-      # (MVAs). Generally these would be through a has_many relationship,
-      # like in this example:
+      # Collection of integers are known as multi-value attributes (MVAs).
+      # Generally these would be through a has_many relationship, like in this
+      # example:
       # 
       #   has posts(:id), :as => :post_ids
       # 
@@ -151,7 +147,7 @@ module ThinkingSphinx
       def has(*args)
         options = args.extract_options!
         args.each do |columns|
-          attribute = Attribute.new(@source, FauxColumn.coerce(columns), options)
+          attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
           
           add_facet_attribute attribute, options if attribute.faceted
         end
@@ -162,12 +158,18 @@ module ThinkingSphinx
         options[:facet] = true
         
         args.each do |columns|
-          attribute = Attribute.new(@source, FauxColumn.coerce(columns), options)
+          attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
           
           add_facet_attribute attribute, options
         end
       end
       
+      def join(*args)
+        args.each do |association|
+          Join.new(source, association)
+        end
+      end
+      
       # Use this method to add some manual SQL conditions for your index
       # request. You can pass in as many strings as you like, they'll get
       # joined together with ANDs later on.
@@ -176,7 +178,7 @@ module ThinkingSphinx
       #   where "parent_type = 'Article'", "created_at < NOW()"
       # 
       def where(*args)
-        @source.conditions += args
+        source.conditions += args
       end
       
       # Use this method to add some manual SQL strings to the GROUP BY
@@ -186,7 +188,7 @@ module ThinkingSphinx
       #   group_by "lat", "lng"
       # 
       def group_by(*args)
-        @source.groupings += args
+        source.groupings += args
       end
       
       # This is what to use to set properties on the index. Chief amongst
@@ -251,10 +253,18 @@ module ThinkingSphinx
       
       private
       
+      def source
+        @source ||= begin
+          source = ThinkingSphinx::Source.new(@index)
+          @index.sources << source
+          source
+        end
+      end
+      
       def set_single_property(key, value)
         source_options = ThinkingSphinx::Configuration::SourceOptions
         if source_options.include?(key.to_s)
-          @source.options.merge! key => value
+          source.options.merge! key => value
         else
           @index.local_options.merge!  key => value
         end
@@ -272,7 +282,7 @@ module ThinkingSphinx
       def add_internal_attribute(property, options, suffix, crc = false)
         return unless ThinkingSphinx::Facet.translate?(property)
         
-        Attribute.new(@source,
+        Attribute.new(source,
           property.columns.collect { |col| col.clone },
           options.merge(
             :type => property.is_a?(Field) ? :string : options[:type],
@@ -281,6 +291,12 @@ module ThinkingSphinx
           ).except(:facet)
         )
       end
+      
+      def no_fields?
+        @index.sources.empty? || @index.sources.any? { |source|
+          source.fields.length == 0
+        }
+      end
     end
   end
 end

data/lib/thinking_sphinx/index/faux_column.rb

@@ -42,6 +42,10 @@ module ThinkingSphinx
         @stack
       end
       
+      def __path
+        @stack + [@name]
+      end
+      
       # Returns true if the stack is empty *and* if the name is a string -
       # which is an indication that of raw SQL, as opposed to a value from a
       # table's column.
@@ -50,6 +54,10 @@ module ThinkingSphinx
         @name.is_a?(String) && @stack.empty?
       end
       
+      def to_ary
+        [self]
+      end
+      
       # This handles any 'invalid' method calls and sets them as the name,
       # and pushing the previous name into the stack. The object returns
       # itself.

data/lib/thinking_sphinx/index.rb

@@ -2,14 +2,8 @@ require 'thinking_sphinx/index/builder'
 require 'thinking_sphinx/index/faux_column'
 
 module ThinkingSphinx
-  # The Index class is a ruby representation of a Sphinx source (not a Sphinx
-  # index - yes, I know it's a little confusing. You'll manage). This is
-  # another 'internal' Thinking Sphinx class - if you're using it directly,
-  # you either know what you're doing, or messing with things beyond your ken.
-  # Enjoy.
-  # 
   class Index
-    attr_accessor :model, :sources, :delta_object
+    attr_accessor :name, :model, :sources, :delta_object
     
     # Create a new index instance by passing in the model it is tied to, and
     # a block to build it with (optional but recommended). For documentation
@@ -26,6 +20,7 @@ module ThinkingSphinx
     #   end
     #
     def initialize(model, &block)
+      @name         = self.class.name_for model
       @model        = model
       @sources      = []
       @options      = {}
@@ -40,8 +35,19 @@ module ThinkingSphinx
       @sources.collect { |source| source.attributes }.flatten
     end
     
-    def name
-      self.class.name_for @model
+    def core_name
+      "#{name}_core"
+    end
+    
+    def delta_name
+      "#{name}_delta"
+    end
+    
+    def all_names
+      names  = [core_name]
+      names << delta_name if delta?
+      
+      names
     end
     
     def self.name_for(model)
@@ -61,7 +67,7 @@ module ThinkingSphinx
     end
     
     def options
-      all_index_options = ThinkingSphinx::Configuration.instance.index_options.clone
+      all_index_options = config.index_options.clone
       @options.keys.select { |key|
         ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) ||
         ThinkingSphinx::Configuration::CustomOptions.include?(key.to_s)
@@ -73,6 +79,12 @@ module ThinkingSphinx
       !@delta_object.nil?
     end
     
+    def to_riddle(offset)
+      indexes = [to_riddle_for_core(offset)]
+      indexes << to_riddle_for_delta(offset) if delta?
+      indexes << to_riddle_for_distributed
+    end
+    
     private
     
     def adapter
@@ -83,17 +95,63 @@ module ThinkingSphinx
       options[:charset_type] == "utf-8"
     end
     
-    # Does all the magic with the block provided to the base #initialize.
-    # Creates a new class subclassed from Builder, and evaluates the block
-    # on it, then pulls all relevant settings - fields, attributes, conditions,
-    # properties - into the new index.
-    # 
-    def initialize_from_builder(&block)
-      #
-    end
-    
     def sql_query_pre_for_delta
       [""]
     end
+    
+    def config
+      @config ||= ThinkingSphinx::Configuration.instance
+    end
+    
+    def to_riddle_for_core(offset)
+      index = Riddle::Configuration::Index.new core_name
+      index.path = File.join config.searchd_file_path, index.name
+      
+      set_configuration_options_for_indexes index
+      set_field_settings_for_indexes        index
+      
+      sources.each_with_index do |source, i|
+        index.sources << source.to_riddle_for_core(offset, i)
+      end
+      
+      index
+    end
+    
+    def to_riddle_for_delta(offset)
+      index = Riddle::Configuration::Index.new delta_name
+      index.parent = core_name
+      index.path = File.join config.searchd_file_path, index.name
+      
+      sources.each_with_index do |source, i|
+        index.sources << source.to_riddle_for_delta(offset, i)
+      end
+      
+      index
+    end
+    
+    def to_riddle_for_distributed
+      index = Riddle::Configuration::DistributedIndex.new name
+      index.local_indexes << core_name
+      index.local_indexes.unshift delta_name if delta?
+      index
+    end
+    
+    def set_configuration_options_for_indexes(index)
+      config.index_options.each do |key, value|
+        method = "#{key}=".to_sym
+        index.send(method, value) if index.respond_to?(method)
+      end
+      
+      options.each do |key, value|
+        index.send("#{key}=".to_sym, value) if ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) && !value.nil?
+      end
+    end
+    
+    def set_field_settings_for_indexes(index)
+      field_names = lambda { |field| field.unique_name.to_s }
+      
+      index.prefix_field_names += prefix_fields.collect(&field_names)
+      index.infix_field_names  += infix_fields.collect(&field_names)
+    end
   end
 end

data/lib/thinking_sphinx/join.rb

@@ -0,0 +1,37 @@
+module ThinkingSphinx
+  class Join
+    attr_accessor :source, :column, :associations
+    
+    def initialize(source, column)
+      @source = source
+      @column = column
+      
+      @associations = association_stack(column.__path.clone).each { |assoc|
+        assoc.join_to(source.base)
+      }
+      
+      source.joins << self
+    end
+    
+    private
+    
+    # Gets a stack of associations for a specific path.
+    # 
+    def association_stack(path, parent = nil)
+      assocs = []
+      
+      if parent.nil?
+        assocs = @source.association(path.shift)
+      else
+        assocs = parent.children(path.shift)
+      end
+      
+      until path.empty?
+        point  = path.shift
+        assocs = assocs.collect { |assoc| assoc.children(point) }.flatten
+      end
+      
+      assocs
+    end
+  end
+end

data/lib/thinking_sphinx/property.rb

@@ -13,6 +13,7 @@ module ThinkingSphinx
       @alias    = options[:as]
       @faceted  = options[:facet]
       @admin    = options[:admin]
+      @sortable = options[:sortable] || false
       
       @alias    = @alias.to_sym unless @alias.blank?
       
@@ -136,10 +137,16 @@ module ThinkingSphinx
           assoc.has_column?(column.__name) ?
           "#{quote_with_table(assoc.join.aliased_table_name, column.__name)}" :
           nil
-        }.compact.join(', ')
+        }.compact
       end
     end
     
+    def columns_with_prefixes
+      @columns.collect { |column|
+        column_with_prefix column
+      }.flatten
+    end
+    
     # Gets a stack of associations for a specific path.
     # 
     def association_stack(path, parent = nil)
@@ -159,4 +166,4 @@ module ThinkingSphinx
       assocs
     end
   end
-end
+end

data/lib/thinking_sphinx/rails_additions.rb

@@ -136,8 +136,8 @@ Class.extend(
 ) unless Class.respond_to?(:cattr_reader)
 
 module ThinkingSphinx
-  module MetaClass
-    def metaclass
+  module SingletonClass
+    def singleton_class
       class << self
         self
       end
@@ -145,6 +145,6 @@ module ThinkingSphinx
   end
 end
 
-unless Object.new.respond_to?(:metaclass)
-  Object.send(:include, ThinkingSphinx::MetaClass)
+unless Object.new.respond_to?(:singleton_class)
+  Object.send(:include, ThinkingSphinx::SingletonClass)
 end