freelancing-god-thinking-sphinx 1.1.12 → 1.1.14

data/README.textile

@@ -124,3 +124,4 @@ Since I first released this library, there's been quite a few people who have su
 * Mark Lane
 * Eric Lindvall
 * Lawrence Pit
+* Mike Bailey

data/lib/thinking_sphinx.rb

@@ -18,6 +18,7 @@ require 'thinking_sphinx/class_facet'
 require 'thinking_sphinx/facet_collection'
 require 'thinking_sphinx/field'
 require 'thinking_sphinx/index'
+require 'thinking_sphinx/source'
 require 'thinking_sphinx/rails_additions'
 require 'thinking_sphinx/search'
 require 'thinking_sphinx/deltas'
@@ -36,7 +37,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 12
+    Tiny  = 14
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/active_record.rb

@@ -66,7 +66,7 @@ module ThinkingSphinx
             return unless ThinkingSphinx.define_indexes?
             
             self.sphinx_indexes ||= []
-            index = Index.new(self, &block)
+            index = ThinkingSphinx::Index::Builder.generate(self, &block)
             
             self.sphinx_indexes << index
             unless ThinkingSphinx.indexed_models.include?(self.name)
@@ -151,7 +151,9 @@ module ThinkingSphinx
             self.sphinx_indexes.select { |ts_index|
               ts_index.model == self
             }.each_with_index do |ts_index, i|
-              index.sources << ts_index.to_riddle_for_core(offset, i)
+              index.sources += ts_index.sources.collect { |source|
+                source.to_riddle_for_core(offset, i)
+              }
             end
             
             index
@@ -163,7 +165,9 @@ module ThinkingSphinx
             index.path = File.join(ThinkingSphinx::Configuration.instance.searchd_file_path, index.name)
             
             self.sphinx_indexes.each_with_index do |ts_index, i|
-              index.sources << ts_index.to_riddle_for_delta(offset, i) if ts_index.delta?
+              index.sources += ts_index.sources.collect { |source|
+                source.to_riddle_for_delta(offset, i)
+              } if ts_index.delta?
             end
             
             index

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -11,7 +11,7 @@ module ThinkingSphinx
     
     def concatenate(clause, separator = ' ')
       clause.split(', ').collect { |field|
-        "COALESCE(CAST(#{field} as varchar), '')"
+        field[/COALESCE/] ? field : "COALESCE(CAST(#{field} as varchar), '')"
       }.join(" || '#{separator}' || ")
     end
     

data/lib/thinking_sphinx/attribute.rb

@@ -9,7 +9,7 @@ module ThinkingSphinx
   # associations. Which can get messy. Use Index.link!, it really helps.
   # 
   class Attribute < ThinkingSphinx::Property
-    attr_accessor :source
+    attr_accessor :query_source
     
     # To create a new attribute, you'll need to pass in either a single Column
     # or an array of them, and some (optional) options.
@@ -67,15 +67,17 @@ module ThinkingSphinx
     # If you're creating attributes for latitude and longitude, don't forget
     # that Sphinx expects these values to be in radians.
     #  
-    def initialize(columns, options = {})
+    def initialize(source, columns, options = {})
       super
       
-      @type     = options[:type]
-      @source   = options[:source]
-      @crc      = options[:crc]
+      @type           = options[:type]
+      @query_source   = options[:source]
+      @crc            = options[:crc]
       
-      @type   ||= :multi    unless @source.nil?
-      @type     = :integer  if @type == :string && @crc
+      @type         ||= :multi    unless @query_source.nil?
+      @type           = :integer  if @type == :string && @crc
+      
+      source.attributes << self
     end
     
     # Get the part of the SELECT clause related to this attribute. Don't forget
@@ -88,16 +90,16 @@ module ThinkingSphinx
       return nil unless include_as_association?
       
       clause = @columns.collect { |column|
-        column_with_prefix(column)
+        part = column_with_prefix(column)
+        type == :string ? adapter.convert_nulls(part) : part
       }.join(', ')
       
-      separator = all_ints? ? ',' : ' '
+      separator = all_ints? || @crc ? ',' : ' '
       
-      clause = adapter.concatenate(clause, separator)       if concat_ws?
-      clause = adapter.group_concatenate(clause, separator) if is_many?
       clause = adapter.cast_to_datetime(clause)             if type == :datetime
-      clause = adapter.convert_nulls(clause)                if type == :string
       clause = adapter.crc(clause)                          if @crc
+      clause = adapter.concatenate(clause, separator)       if concat_ws?
+      clause = adapter.group_concatenate(clause, separator) if is_many?
       
       "#{clause} AS #{quote_column(unique_name)}"
     end
@@ -114,7 +116,7 @@ module ThinkingSphinx
     end
     
     def include_as_association?
-      ! (type == :multi && (source == :query || source == :ranged_query))
+      ! (type == :multi && (query_source == :query || query_source == :ranged_query))
     end
     
     # Returns the configuration value that should be used for
@@ -168,12 +170,23 @@ module ThinkingSphinx
       object.send(column.__name)
     end
     
+    def all_ints?
+      @columns.all? { |col|
+        klasses = @associations[col].empty? ? [@model] :
+          @associations[col].collect { |assoc| assoc.reflection.klass }
+        klasses.all? { |klass|
+          column = klass.columns.detect { |column| column.name == col.__name.to_s }
+          !column.nil? && column.type == :integer
+        }
+      }
+    end
+    
     private
     
     def source_value(offset)
       if is_string?
-        "#{source.to_s.dasherize}; #{columns.first.__name}"
-      elsif source == :ranged_query
+        "#{query_source.to_s.dasherize}; #{columns.first.__name}"
+      elsif query_source == :ranged_query
         "ranged-query; #{query offset} #{query_clause}; #{range_query}"
       else
         "query; #{query offset}"
@@ -223,17 +236,6 @@ FROM #{quote_table_name assoc.table}
       concat_ws? && all_ints?
     end
         
-    def all_ints?
-      @columns.all? { |col|
-        klasses = @associations[col].empty? ? [@model] :
-          @associations[col].collect { |assoc| assoc.reflection.klass }
-        klasses.all? { |klass|
-          column = klass.columns.detect { |column| column.name == col.__name.to_s }
-          !column.nil? && column.type == :integer
-        }
-      }
-    end
-    
     def type_from_database
       klass = @associations.values.flatten.first ? 
         @associations.values.flatten.first.reflection.klass : @model
@@ -254,9 +256,10 @@ FROM #{quote_table_name assoc.table}
       else
         raise <<-MESSAGE
 
-Cannot automatically map column type #{type_from_db} to an equivalent Sphinx
-type (integer, float, boolean, datetime, string as ordinal). You could try to
-explicitly convert the column's value in your define_index block:
+Cannot automatically map attribute #{unique_name} in #{@model.name} to an
+equivalent Sphinx type (integer, float, boolean, datetime, string as ordinal).
+You could try to explicitly convert the column's value in your define_index
+block:
   has "CAST(column AS INT)", :type => :integer, :as => :column
         MESSAGE
       end

data/lib/thinking_sphinx/deltas.rb

@@ -4,20 +4,23 @@ require 'thinking_sphinx/deltas/datetime_delta'
 
 module ThinkingSphinx
   module Deltas
-    def self.parse(index, options)
-      delta_option = options.delete(:delta)
+    def self.parse(index)
+      delta_option = index.local_options.delete(:delta)
       case delta_option
       when TrueClass, :default
-        DefaultDelta.new index, options
+        DefaultDelta.new index, index.local_options
       when :delayed
-        DelayedDelta.new index, options
+        DelayedDelta.new index, index.local_options
       when :datetime
-        DatetimeDelta.new index, options
+        DatetimeDelta.new index, index.local_options
       when FalseClass, nil
         nil
       else
+        if delta_option.is_a?(String)
+          delta_option = Kernel.const_get(delta_option)
+        end
         if delta_option.ancestors.include?(ThinkingSphinx::Deltas::DefaultDelta)
-          delta_option.new index, options
+          delta_option.new index, index.local_options
         else
           raise "Unknown delta type"
         end

data/lib/thinking_sphinx/deltas/datetime_delta.rb

@@ -39,7 +39,7 @@ module ThinkingSphinx
       
       def clause(model, toggled)
         if toggled
-          "#{model.quoted_table_name}.#{@index.quote_column(@column.to_s)}" +
+          "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
           " > #{adapter.time_difference(@threshold)}"
         else
           nil

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -39,12 +39,12 @@ module ThinkingSphinx
       
       def reset_query(model)
         "UPDATE #{model.quoted_table_name} SET " +
-        "#{@index.quote_column(@column.to_s)} = #{adapter.boolean(false)} " +
-        "WHERE #{@index.quote_column(@column.to_s)} = #{adapter.boolean(true)}"
+        "#{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(false)} " +
+        "WHERE #{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(true)}"
       end
       
       def clause(model, toggled)
-        "#{model.quoted_table_name}.#{@index.quote_column(@column.to_s)}" +
+        "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
         " = #{adapter.boolean(toggled)}"
       end
       

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -1,80 +1,82 @@
-namespace :thinking_sphinx do
-  namespace :install do
-    desc "Install Sphinx by source"
-    task :sphinx do
-      with_postgres = false
-      run "which pg_config" do |channel, stream, data|
-        with_postgres = !(data.nil? || data == "")
-      end
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :thinking_sphinx do
+    namespace :install do
+      desc "Install Sphinx by source"
+      task :sphinx do
+        with_postgres = false
+        run "which pg_config" do |channel, stream, data|
+          with_postgres = !(data.nil? || data == "")
+        end
       
-      args = []
-      if with_postgres
-        run "pg_config --pkgincludedir" do |channel, stream, data|
-          args << "--with-pgsql=#{data}"
+        args = []
+        if with_postgres
+          run "pg_config --pkgincludedir" do |channel, stream, data|
+            args << "--with-pgsql=#{data}"
+          end
         end
-      end
       
-      commands = <<-CMD
-      wget -q http://www.sphinxsearch.com/downloads/sphinx-0.9.8.1.tar.gz >> sphinx.log
-      tar xzvf sphinx-0.9.8.1.tar.gz
-      cd sphinx-0.9.8.1
-      ./configure #{args.join(" ")}
-      make
-      sudo make install
-      rm -rf sphinx-0.9.8.1 sphinx-0.9.8.1.tar.gz
-      CMD
-      run commands.split(/\n\s+/).join(" && ")
-    end
+        commands = <<-CMD
+        wget -q http://www.sphinxsearch.com/downloads/sphinx-0.9.8.1.tar.gz >> sphinx.log
+        tar xzvf sphinx-0.9.8.1.tar.gz
+        cd sphinx-0.9.8.1
+        ./configure #{args.join(" ")}
+        make
+        sudo make install
+        rm -rf sphinx-0.9.8.1 sphinx-0.9.8.1.tar.gz
+        CMD
+        run commands.split(/\n\s+/).join(" && ")
+      end
     
-    desc "Install Thinking Sphinx as a gem from GitHub"
-    task :ts do
-      sudo "gem install freelancing-god-thinking-sphinx --source http://gems.github.com"
+      desc "Install Thinking Sphinx as a gem from GitHub"
+      task :ts do
+        sudo "gem install freelancing-god-thinking-sphinx --source http://gems.github.com"
+      end
     end
-  end
   
-  desc "Generate the Sphinx configuration file"
-  task :configure do
-    rake "thinking_sphinx:configure"
-  end
+    desc "Generate the Sphinx configuration file"
+    task :configure do
+      rake "thinking_sphinx:configure"
+    end
   
-  desc "Index data"
-  task :index do
-    rake "thinking_sphinx:index"
-  end
+    desc "Index data"
+    task :index do
+      rake "thinking_sphinx:index"
+    end
   
-  desc "Start the Sphinx daemon"
-  task :start do
-    configure
-    rake "thinking_sphinx:start"
-  end
+    desc "Start the Sphinx daemon"
+    task :start do
+      configure
+      rake "thinking_sphinx:start"
+    end
   
-  desc "Stop the Sphinx daemon"
-  task :stop do
-    configure
-    rake "thinking_sphinx:stop"
-  end
+    desc "Stop the Sphinx daemon"
+    task :stop do
+      configure
+      rake "thinking_sphinx:stop"
+    end
   
-  desc "Stop and then start the Sphinx daemon"
-  task :restart do
-    stop
-    start
-  end
+    desc "Stop and then start the Sphinx daemon"
+    task :restart do
+      stop
+      start
+    end
   
-  desc "Stop, re-index and then start the Sphinx daemon"
-  task :rebuild do
-    stop
-    index
-    start
-  end
+    desc "Stop, re-index and then start the Sphinx daemon"
+    task :rebuild do
+      stop
+      index
+      start
+    end
   
-  desc "Add the shared folder for sphinx files for the production environment"
-  task :shared_sphinx_folder, :roles => :web do
-    sudo "mkdir -p #{shared_path}/db/sphinx/production"
-  end
+    desc "Add the shared folder for sphinx files for the production environment"
+    task :shared_sphinx_folder, :roles => :web do
+      sudo "mkdir -p #{shared_path}/db/sphinx/production"
+    end
 
-  def rake(*tasks)
-    tasks.each do |t|
-      run "cd #{current_path} && rake #{t} RAILS_ENV=production"
+    def rake(*tasks)
+      tasks.each do |t|
+        run "cd #{current_path} && rake #{t} RAILS_ENV=production"
+      end
     end
   end
 end

data/lib/thinking_sphinx/facet.rb

@@ -1,11 +1,11 @@
 module ThinkingSphinx
   class Facet
-    attr_reader :reference
+    attr_reader :property
     
-    def initialize(reference)
-      @reference = reference
+    def initialize(property)
+      @property = property
       
-      if reference.columns.length != 1
+      if property.columns.length != 1
         raise "Can't translate Facets on multiple-column field or attribute"
       end
     end
@@ -19,29 +19,62 @@ module ThinkingSphinx
       end
     end
     
-    def name
-      reference.unique_name
-    end
-
     def self.attribute_name_for(name)
       name.to_s == 'class' ? 'class_crc' : "#{name}_facet"
     end
     
+    def self.attribute_name_from_value(name, value)
+      case value
+      when String
+        attribute_name_for(name)
+      when Array
+        if value.all? { |val| val.is_a?(Integer) }
+          name
+        else
+          attribute_name_for(name)
+        end
+      else
+        name
+      end
+    end
+    
+    def self.translate?(property)
+      return true if property.is_a?(Field)
+      
+      case property.type
+      when :string
+        true
+      when :integer, :boolean, :datetime, :float
+        false
+      when :multi
+        !property.all_ints?
+      end
+    end
+    
+    def name
+      property.unique_name
+    end
+    
     def attribute_name
-      # @attribute_name ||= case @reference
-      # when Attribute
-      #   @reference.unique_name.to_s
-      # when Field
-      @attribute_name ||= @reference.unique_name.to_s + "_facet"
-      # end
+      if translate?
+        Facet.attribute_name_for(@property.unique_name)
+      else
+        @property.unique_name.to_s
+      end
+    end
+    
+    def translate?
+      Facet.translate?(@property)
+    end
+    
+    def type
+      @property.is_a?(Field) ? :string : @property.type
     end
     
     def value(object, attribute_value)
-      return translate(object, attribute_value) if @reference.is_a?(Field)
+      return translate(object, attribute_value) if translate?
       
-      case @reference.type
-      when :string
-        translate(object, attribute_value)
+      case @property.type
       when :datetime
         Time.at(attribute_value)
       when :boolean
@@ -61,11 +94,15 @@ module ThinkingSphinx
       column.__stack.each { |method|
         object = object.send(method)
       }
-      object.send(column.__name)
+      if object.is_a?(Array)
+        object.collect { |item| item.send(column.__name) }
+      else
+        object.send(column.__name)
+      end
     end
     
     def column
-      @reference.columns.first
+      @property.columns.first
     end
   end
 end