thinking-sphinx 1.4.11 → 1.4.12

data/README.textile

@@ -204,3 +204,8 @@ Since I first released this library, there's been quite a few people who have su
 * Tony Pitale
 * Kenn Ejima
 * Matthew Barnett
+* Ilia Lobsanov
+* Andrew Hunter
+* Simon Hürlimann
+* Nathan Smith
+* Cedric Maion

data/features/attribute_transformation.feature

@@ -12,11 +12,11 @@ Feature: Handle not-quite-supported column types as attributes
   Scenario: Dates as Datetimes
     Given Sphinx is running
     And I am searching on alphas
-    When I filter between 1 and 3 days ago on created_on by date
-    Then I should get 2 results
+    When I filter between 2 and 4 days ago on created_on by date
+    Then I should get 3 results
 
   Scenario: Timestamps as Datetimes
     Given Sphinx is running
     And I am searching on alphas
-    When I filter between 1 and 3 days ago on created_at
-    Then I should get 2 results
+    When I filter between 2 and 4 days ago on created_at
+    Then I should get 2 results

data/features/thinking_sphinx/db/fixtures/alphas.rb

@@ -1,10 +1,8 @@
-Alpha.create :name => "one",    :value =>  1, :cost =>  1.51, :created_on =>  1.day.ago.to_date, :created_at =>  1.day.ago
-Alpha.create :name => "two",    :value =>  2, :cost =>  2.52, :created_on =>  2.day.ago.to_date, :created_at =>  2.day.ago
-Alpha.create :name => "three",  :value =>  3, :cost =>  3.53, :created_on =>  3.day.ago.to_date, :created_at =>  3.day.ago
-Alpha.create :name => "four",   :value =>  4, :cost =>  4.54, :created_on =>  4.day.ago.to_date, :created_at =>  4.day.ago
-Alpha.create :name => "five",   :value =>  5, :cost =>  5.55, :created_on =>  5.day.ago.to_date, :created_at =>  5.day.ago
-Alpha.create :name => "six",    :value =>  6, :cost =>  6.56, :created_on =>  6.day.ago.to_date, :created_at =>  6.day.ago
-Alpha.create :name => "seven",  :value =>  7, :cost =>  7.57, :created_on =>  7.day.ago.to_date, :created_at =>  7.day.ago
-Alpha.create :name => "eight",  :value =>  8, :cost =>  8.58, :created_on =>  8.day.ago.to_date, :created_at =>  8.day.ago
-Alpha.create :name => "nine",   :value =>  9, :cost =>  9.59, :created_on =>  9.day.ago.to_date, :created_at =>  9.day.ago
-Alpha.create :name => "ten",    :value => 10, :cost => 10.50, :created_on => 10.day.ago.to_date, :created_at => 10.day.ago
+%w(
+  one two three four five six seven eight nine ten
+).each_with_index do |number, index|
+  value = index + 1
+  cost  = value.to_f + 0.5 + (value * 0.01)
+  Alpha.create :name => number, :value => value, :cost => cost,
+    :created_on => value.days.ago.to_date, :created_at => value.days.ago
+end

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -16,11 +16,20 @@ module Cucumber
         @fixtures_directory   = "#{pwd}/features/thinking_sphinx/db/fixtures"
         @database_file        = "#{pwd}/features/thinking_sphinx/database.yml"
 
-        @adapter  = (ENV['DATABASE'] || 'mysql').gsub /^mysql$/, 'mysql2'
+        @adapter  = (ENV['DATABASE'] || 'mysql')
         @database = 'thinking_sphinx'
-        @username = @adapter[/mysql/] ? 'root' : 'postgres'
-        # @password = 'thinking_sphinx'
+        @username = ENV['USER']
         @host     = 'localhost'
+
+        if ActiveRecord.constants.include?('VERSION')
+          @adapter = @adapter.gsub /^mysql$/, 'mysql2'
+        end
+
+        if @adapter[/mysql/]
+          @username = 'root'
+        elsif ENV['TRAVIS']
+          @username = 'postgres'
+        end
       end
 
       def setup

data/lib/thinking_sphinx/active_record.rb

@@ -17,7 +17,7 @@ module ThinkingSphinx
         extend ThinkingSphinx::ActiveRecord::ClassMethods
 
         class << self
-          attr_accessor :sphinx_index_blocks
+          attr_accessor :sphinx_index_blocks, :sphinx_types
 
           def set_sphinx_primary_key(attribute)
             @sphinx_primary_key_attribute = attribute
@@ -49,6 +49,10 @@ module ThinkingSphinx
             sphinx_indexes.last.options
           end
 
+          def set_sphinx_types(types)
+            @sphinx_types = types
+          end
+
           # Generate a unique CRC value for the model's name, to use to
           # determine which Sphinx documents belong to which AR records.
           #

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -20,7 +20,7 @@ module ThinkingSphinx
     end
 
     def group_concatenate(clause, separator = ' ')
-      if connection.raw_connection.server_version >= 80400
+      if server_version >= 80400
         "array_to_string(array_agg(COALESCE(#{clause}, '0')), '#{separator}')"
       else
         "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
@@ -109,11 +109,9 @@ module ThinkingSphinx
     end
 
     def create_array_accum_function
-      if connection.raw_connection.respond_to?(:server_version) &&
-        connection.raw_connection.server_version >= 80400
+      if server_version >= 80400
         return
-      elsif connection.raw_connection.respond_to?(:server_version) &&
-        connection.raw_connection.server_version > 80200
+      elsif server_version > 80200
         execute <<-SQL
           CREATE AGGREGATE array_accum (anyelement)
           (
@@ -175,5 +173,16 @@ module ThinkingSphinx
       SQL
       execute function, true
     end
+
+    def server_version
+      if RUBY_PLATFORM == 'java'
+        (connection.raw_connection.connection.server_major_version * 10000) +
+        (connection.raw_connection.connection.server_minor_version * 100)
+      elsif connection.raw_connection.respond_to?(:server_version)
+        connection.raw_connection.server_version
+      else
+        0
+      end
+    end
   end
 end

data/lib/thinking_sphinx/attribute.rb

@@ -269,7 +269,7 @@ WHERE #{@source.index.delta_object.clause(model, true)})
     end
 
     def end_association_for_mva
-      @association_for_mva ||= associations[columns.first].detect { |assoc|
+      @association_for_mva ||= associations[columns.first.__stack].detect { |assoc|
         assoc.has_column?(columns.first.__name)
       }
     end
@@ -358,8 +358,8 @@ block:
 
     def all_of_type?(*column_types)
       @columns.all? { |col|
-        klasses = @associations[col].empty? ? [@model] :
-          @associations[col].collect { |assoc| assoc.reflection.klass }
+        klasses = @associations[col.__stack].empty? ? [@model] :
+          @associations[col.__stack].collect { |assoc| assoc.reflection.klass }
         klasses.all? { |klass|
           column = klass.columns.detect { |column| column.name == col.__name.to_s }
           !column.nil? && column_types.include?(column.type)

data/lib/thinking_sphinx/auto_version.rb

@@ -7,9 +7,9 @@ module ThinkingSphinx
         require "riddle/#{version}"
       when /1.10/
         require 'riddle/1.10'
-      when /2.0.\d/
+      when /2.0.[12]/
         require 'riddle/2.0.1'
-      when /2.1.\d/
+      when /2.0.3/, /2.0.4/, /2.1.\d/
         require 'riddle/2.1.0'
       else
         documentation_link = %Q{

data/lib/thinking_sphinx/configuration.rb

@@ -195,6 +195,14 @@ module ThinkingSphinx
       @configuration.searchd.port = port
     end
 
+    def use_socket=(use_socket)
+      if use_socket
+        socket = "#{app_root}/tmp/sockets/searchd.#{self.environment}.sock"
+        @configuration.searchd.listen = socket
+        self.address = socket
+      end
+    end
+
     def pid_file
       @configuration.searchd.pid_file
     end

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -92,7 +92,7 @@ DESC
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake, "rake")
       tasks.each do |t|
-        run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; #{rake} RAILS_ENV=#{rails_env} #{t}"
+        run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; if [ -f Rakefile ]; then #{rake} RAILS_ENV=#{rails_env} #{t}; fi;"
       end
     end
   end

data/lib/thinking_sphinx/facet.rb

@@ -1,11 +1,11 @@
 module ThinkingSphinx
   class Facet
     attr_reader :property, :value_source
-    
+
     def initialize(property, value_source = nil)
       @property     = property
       @value_source = value_source
-      
+
       if property.columns.length != 1
         raise "Can't translate Facets on multiple-column field or attribute"
       end
@@ -20,11 +20,11 @@ module ThinkingSphinx
         facet.to_s.gsub(/(_facet|_crc)$/,'').to_sym
       end
     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
@@ -39,10 +39,10 @@ module ThinkingSphinx
         name
       end
     end
-    
+
     def self.translate?(property)
       return true if property.is_a?(Field)
-      
+
       case property.type
       when :string
         true
@@ -52,11 +52,11 @@ module ThinkingSphinx
         !property.all_ints?
       end
     end
-    
+
     def name
       property.unique_name
     end
-    
+
     def attribute_name
       if translate?
         Facet.attribute_name_for(@property.unique_name)
@@ -64,23 +64,23 @@ module ThinkingSphinx
         @property.unique_name.to_s
       end
     end
-    
+
     def translate?
       Facet.translate?(@property)
     end
-    
+
     def type
       @property.is_a?(Field) ? :string : @property.type
     end
-    
+
     def float?
       @property.type == :float
     end
-    
+
     def value(object, attribute_hash)
       attribute_value = attribute_hash['@groupby']
       return translate(object, attribute_value) if translate? || float?
-      
+
       case @property.type
       when :datetime
         Time.at(attribute_value)
@@ -90,13 +90,13 @@ module ThinkingSphinx
         attribute_value
       end
     end
-    
+
     def to_s
       name
     end
-    
+
     private
-    
+
     def translate(object, attribute_value)
       objects = source_objects(object)
       return if objects.blank?
@@ -107,20 +107,20 @@ module ThinkingSphinx
         result && result.to_crc32 == attribute_value
       }
 
-      object.try(method)
+      object ? object.send(method) : nil
     end
-    
+
     def source_objects(object)
       column.__stack.each { |method|
         object = Array(object).collect { |item|
           item.send(method)
         }.flatten.compact
-        
+
         return nil if object.empty?
       }
       Array(object)
     end
-    
+
     def column
       @property.columns.first
     end

data/lib/thinking_sphinx/index.rb

@@ -3,7 +3,7 @@ require 'thinking_sphinx/index/faux_column'
 
 module ThinkingSphinx
   class Index
-    attr_accessor :name, :model, :sources, :delta_object
+    attr_accessor :name, :model, :sources, :delta_object, :additional_indices
 
     # 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
@@ -25,6 +25,7 @@ module ThinkingSphinx
       @sources      = []
       @options      = {}
       @delta_object = nil
+      @additional_indices = []
     end
 
     def fields
@@ -132,6 +133,7 @@ module ThinkingSphinx
     def to_riddle_for_distributed
       index = Riddle::Configuration::DistributedIndex.new name
       index.local_indices << core_name
+      index.local_indices += additional_indices
       index.local_indices.unshift delta_name if delta?
       index
     end

data/lib/thinking_sphinx/index/builder.rb

@@ -52,6 +52,11 @@ module ThinkingSphinx
         self.instance_eval &block
       end
 
+      def use_local_indices(*indexes)
+        @index.additional_indices += indexes.map {|index_name| "#{index_name.to_s}_core"}
+      end
+      alias_method :use_local_index, :use_local_indices
+
       # This is how you add fields - the strings Sphinx looks at - to your
       # index. Technically, to use this method, you need to pass in some
       # columns and options - but there's some neat method_missing stuff

data/lib/thinking_sphinx/property.rb

@@ -1,7 +1,7 @@
 module ThinkingSphinx
   class Property
     attr_accessor :alias, :columns, :associations, :model, :faceted, :admin
-    
+
     def initialize(source, columns, options = {})
       @source       = source
       @model        = source.model
@@ -9,27 +9,27 @@ module ThinkingSphinx
       @associations = {}
 
       raise "Cannot define a field or attribute in #{source.model.name} with no columns. Maybe you are trying to index a field with a reserved name (id, name). You can fix this error by using a symbol rather than a bare name (:id instead of id)." if @columns.empty? || @columns.any? { |column| !column.respond_to?(:__stack) }
-      
+
       @alias        = options[:as]
       @faceted      = options[:facet]
       @admin        = options[:admin]
       @sortable     = options[:sortable] || false
       @value_source = options[:value]
-      
+
       @alias    = @alias.to_sym unless @alias.blank?
-      
+
       @columns.each { |col|
-        @associations[col] = association_stack(col.__stack.clone).each { |assoc|
+        @associations[col.__stack] = association_stack(col.__stack.clone).each { |assoc|
           assoc.join_to(source.base)
         }
       }
     end
-    
+
     # Returns the unique name of the attribute - which is either the alias of
     # the attribute, or the name of the only column - if there is only one. If
     # there isn't, there should be an alias. Else things probably won't work.
     # Consider yourself warned.
-    # 
+    #
     def unique_name
       if @columns.length == 1
         @alias || @columns.first.__name
@@ -37,19 +37,19 @@ module ThinkingSphinx
         @alias
       end
     end
-    
+
     def to_facet
       return nil unless @faceted
-      
+
       ThinkingSphinx::Facet.new(self, @value_source)
     end
-    
+
     # Get the part of the GROUP BY clause related to this attribute - if one is
     # needed. If not, all you'll get back is nil. The latter will happen if
     # there isn't actually a real column to get data from, or if there's
     # multiple data values (read: a has_many or has_and_belongs_to_many
     # association).
-    # 
+    #
     def to_group_sql
       case
       when is_many?, is_string?, ThinkingSphinx.use_group_by_shortcut?
@@ -60,126 +60,128 @@ module ThinkingSphinx
         }
       end
     end
-    
+
     def changed?(instance)
       return true if is_string? || @columns.any? { |col| !col.__stack.empty? }
-      
+
       !@columns.all? { |col|
         instance.respond_to?("#{col.__name.to_s}_changed?") &&
         !instance.send("#{col.__name.to_s}_changed?")
       }
     end
-    
+
     def admin?
       admin
     end
-    
+
     def public?
       !admin
     end
-    
+
     def available?
       columns.any? { |column| column_available?(column) }
     end
-    
+
     private
-    
+
     # Could there be more than one value related to the parent record? If so,
     # then this will return true. If not, false. It's that simple.
-    # 
+    #
     def is_many?
       associations.values.flatten.any? { |assoc| assoc.is_many? }
     end
-    
+
     # Returns true if any of the columns are string values, instead of database
     # column references.
     def is_string?
       columns.all? { |col| col.is_string? }
     end
-    
+
     def adapter
       @adapter ||= @model.sphinx_database_adapter
     end
-    
+
     def quote_with_table(table, column)
       "#{quote_table_name(table)}.#{quote_column(column)}"
     end
-    
+
     def quote_column(column)
       @model.connection.quote_column_name(column)
     end
-    
+
     def quote_table_name(table_name)
       @model.connection.quote_table_name(table_name)
     end
-    
+
     # Indication of whether the columns should be concatenated with a space
     # between each value. True if there's either multiple sources or multiple
     # associations.
-    # 
+    #
     def concat_ws?
       multiple_associations? || @columns.length > 1
     end
-        
+
     # Checks whether any column requires multiple associations (which only
     # happens for polymorphic situations).
-    # 
+    #
     def multiple_associations?
-      associations.any? { |col,assocs| assocs.length > 1 }
+      associations.values.any? { |assocs| assocs.length > 1 }
     end
-    
+
     # Builds a column reference tied to the appropriate associations. This
     # dives into the associations hash and their corresponding joins to
     # figure out how to correctly reference a column in SQL.
-    # 
+    #
     def column_with_prefix(column)
       return nil unless column_available?(column)
-      
+
       if column.is_string?
         column.__name
       elsif column.__stack.empty?
         "#{@model.quoted_table_name}.#{quote_column(column.__name)}"
       else
-        associations[column].collect { |assoc|
+        associations[column.__stack].collect { |assoc|
           assoc.has_column?(column.__name) ?
           "#{quote_with_table(assoc.join.aliased_table_name, column.__name)}" :
           nil
         }.compact
       end
     end
-    
+
     def columns_with_prefixes
       @columns.collect { |column|
         column_with_prefix column
       }.flatten.compact
     end
-    
+
     def column_available?(column)
       if column.is_string?
         true
       elsif column.__stack.empty?
         @model.column_names.include?(column.__name.to_s)
       else
-        associations[column].any? { |assoc| assoc.has_column?(column.__name) }
+        associations[column.__stack].any? { |assoc|
+          assoc.has_column?(column.__name)
+        }
       end
     end
-    
+
     # 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