thinking-sphinx 1.4.7 → 1.4.8

data/README.textile

@@ -15,11 +15,11 @@ To quickly see if your system is ready to run the thinking sphinx specs, run the
 To get the spec suite running, you will need to install the ginger gem:
 
 <pre><code>sudo gem install ginger --source http://gemcutter.org</code></pre>
-  
+
 Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install. Bluecloth is required for some of the yard documentation.
 
 <pre>
-  sudo gem install bluecloth cucumber yard jeweler rspec 
+  sudo gem install bluecloth cucumber yard jeweler rspec
 </pre>
 
 Then set up your database:
@@ -28,7 +28,7 @@ Then set up your database:
   cp spec/fixtures/database.yml.default spec/fixtures/database.yml &&
   mysqladmin -u root create thinking_sphinx
 </pre>
-  
+
 This last step can be done automatically by the contribute.rb script if all dependencies are met.
 
 Make sure you don't have another Sphinx daemon (searchd) running. If you do, quit it with "rake ts:stop"
@@ -197,3 +197,8 @@ Since I first released this library, there's been quite a few people who have su
 * Rémi Prévost
 * Justin Tanner
 * Josh Goebel
+* Ngan Pham
+* Martin Gordon
+* Aaron Gibralter
+* Pete Deffendol
+* Tony Pitale

data/features/attribute_transformation.feature

@@ -2,19 +2,19 @@ Feature: Handle not-quite-supported column types as attributes
   In order for Thinking Sphinx to be more understanding with model structures
   The plugin
   Should be able to use translatable columns as attributes
-  
+
   Scenario: Decimals as floats
     Given Sphinx is running
     And I am searching on alphas
     When I filter between 1.0 and 3.0 on cost
     Then I should get 2 results
-  
+
   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
+    When I filter between 1 and 3 days ago on created_on by date
     Then I should get 2 results
-  
+
   Scenario: Timestamps as Datetimes
     Given Sphinx is running
     And I am searching on alphas

data/features/step_definitions/common_steps.rb

@@ -95,9 +95,13 @@ When /^I filter between ([\d\.]+) and ([\d\.]+) on (\w+)$/ do |first, last, attr
   end
 end
 
-When /^I filter between (\d+) and (\d+) days ago on (\w+)$/ do |last, first, attribute|
+When /^I filter between (\d+) and (\d+) days ago on (\w+)(?: by (date))?$/ do |last, first, attribute, by_date|
   @results = nil
-  @with[attribute.to_sym] = first.to_i.days.ago..last.to_i.days.ago
+
+  first, last = first.to_i.days.ago, last.to_i.days.ago
+  first, last = first.to_date, last.to_date if by_date
+
+  @with[attribute.to_sym] = first..last
 end
 
 When /^I filter by (\w+) between (\d+) and (\d+)$/ do |attribute, first, last|

data/lib/thinking_sphinx/active_record.rb

@@ -29,7 +29,7 @@ module ThinkingSphinx
                 @sphinx_primary_key_attribute ||
                 superclass.primary_key_for_sphinx
               else
-                primary_key
+                primary_key || 'id'
               end
             end
           end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -20,7 +20,11 @@ module ThinkingSphinx
     end
 
     def group_concatenate(clause, separator = ' ')
-      "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      if connection.raw_connection.server_version >= 80400
+        "array_to_string(array_agg(COALESCE(#{clause}, '0')), '#{separator}')"
+      else
+        "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      end
     end
 
     def cast_to_string(clause)
@@ -105,7 +109,11 @@ module ThinkingSphinx
     end
 
     def create_array_accum_function
-      if connection.raw_connection.respond_to?(:server_version) && connection.raw_connection.server_version > 80200
+      if connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version >= 80400
+        return
+      elsif connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version > 80200
         execute <<-SQL
           CREATE AGGREGATE array_accum (anyelement)
           (

data/lib/thinking_sphinx/attribute.rb

@@ -22,10 +22,6 @@ module ThinkingSphinx
       :wordcount => :sql_attr_str2wordcount
     }
 
-    if Riddle.loaded_version.to_i > 1
-      SphinxTypeMappings[:string] = :sql_attr_string
-    end
-
     # To create a new attribute, you'll need to pass in either a single Column
     # or an array of them, and some (optional) options.
     #

data/lib/thinking_sphinx/configuration.rb

@@ -4,7 +4,7 @@ require 'singleton'
 module ThinkingSphinx
   # This class both keeps track of the configuration settings for Sphinx and
   # also generates the resulting file for Sphinx to use.
-  # 
+  #
   # Here are the default settings, relative to RAILS_ROOT where relevant:
   #
   # config file::           config/#{environment}.sphinx.conf
@@ -39,17 +39,17 @@ module ThinkingSphinx
   # searchd_binary_name, indexer_binary_name.
   #
   # I think you've got the idea.
-  # 
+  #
   # Each setting in the YAML file is optional - so only put in the ones you
   # want to change.
   #
   # Keep in mind, if for some particular reason you're using a version of
   # Sphinx older than 0.9.8 r871 (that's prior to the proper 0.9.8 release),
   # don't set allow_star to true.
-  # 
+  #
   class Configuration
     include Singleton
-    
+
     SourceOptions = Riddle::Configuration::SQLSource.settings.map { |setting|
       setting.to_s
     } - %w( type sql_query_pre sql_query sql_joined_field sql_file_field
@@ -61,29 +61,29 @@ module ThinkingSphinx
       setting.to_s
     } - %w( source prefix_fields infix_fields )
     CustomOptions = %w( disable_range use_64_bit )
-    
+
     attr_accessor :searchd_file_path, :allow_star, :app_root,
       :model_directories, :delayed_job_priority, :indexed_models, :use_64_bit,
-      :touched_reindex_file, :stop_timeout, :version
-    
+      :touched_reindex_file, :stop_timeout, :version, :shuffle
+
     attr_accessor :source_options, :index_options
-    
+
     attr_reader :configuration, :controller
-    
+
     @@environment = nil
-    
+
     # Load in the configuration settings - this will look for config/sphinx.yml
     # and parse it according to the current environment.
-    # 
+    #
     def initialize(app_root = Dir.pwd)
       self.reset
     end
-    
+
     def self.configure(&block)
       yield instance
       instance.reset(instance.app_root)
     end
-    
+
     def reset(custom_app_root=nil)
       if custom_app_root
         self.app_root = custom_app_root
@@ -93,15 +93,15 @@ module ThinkingSphinx
         self.app_root   = RAILS_ROOT                 if defined?(RAILS_ROOT)
         self.app_root ||= app_root
       end
-      
+
       @configuration = Riddle::Configuration.new
       @configuration.searchd.pid_file   = "#{self.app_root}/log/searchd.#{environment}.pid"
       @configuration.searchd.log        = "#{self.app_root}/log/searchd.log"
       @configuration.searchd.query_log  = "#{self.app_root}/log/searchd.query.log"
-      
+
       @controller = Riddle::Controller.new @configuration,
         "#{self.app_root}/config/#{environment}.sphinx.conf"
-      
+
       self.address              = "127.0.0.1"
       self.port                 = 9312
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
@@ -111,19 +111,24 @@ module ThinkingSphinx
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
       self.delayed_job_priority = 0
       self.indexed_models       = []
-      
+      self.shuffle              = true
+
       self.source_options  = {}
       self.index_options   = {
         :charset_type => "utf-8"
       }
-      
+
       self.version = nil
       parse_config
       self.version ||= @controller.sphinx_version
-      
+
+      ThinkingSphinx::Attribute::SphinxTypeMappings.merge!(
+        :string => :sql_attr_string
+      ) if Riddle.loaded_version.to_i > 1
+
       self
     end
-    
+
     def self.environment
       @@environment ||= if defined?(Merb)
         Merb.environment
@@ -135,127 +140,127 @@ module ThinkingSphinx
         ENV['RAILS_ENV'] || 'development'
       end
     end
-    
+
     def self.reset_environment
       ThinkingSphinx.mutex.synchronize do
         @@environment = nil
       end
     end
-    
+
     def environment
       self.class.environment
     end
-    
+
     def generate
       @configuration.indexes.clear
-      
+
       ThinkingSphinx.context.indexed_models.each do |model|
         model = model.constantize
         model.define_indexes
         @configuration.indexes.concat model.to_riddle
-        
+
         enforce_common_attribute_types
       end
     end
-    
+
     # Generate the config file for Sphinx by using all the settings defined and
     # looping through all the models with indexes to build the relevant
     # indexer and searchd configuration, and sources and indexes details.
     #
     def build(file_path=nil)
       file_path ||= "#{self.config_file}"
-      
+
       generate
-      
+
       open(file_path, "w") do |file|
         file.write @configuration.render
       end
     end
-    
+
     def address
       @address
     end
-    
+
     def address=(address)
       @address = address
       @configuration.searchd.address = address
     end
-    
+
     def port
       @port
     end
-    
+
     def port=(port)
       @port = port
       @configuration.searchd.port = port
     end
-    
+
     def pid_file
       @configuration.searchd.pid_file
     end
-    
+
     def pid_file=(pid_file)
       @configuration.searchd.pid_file = pid_file
     end
-    
+
     def searchd_log_file
       @configuration.searchd.log
     end
-    
+
     def searchd_log_file=(file)
       @configuration.searchd.log = file
     end
-    
+
     def query_log_file
       @configuration.searchd.query_log
     end
-    
+
     def query_log_file=(file)
       @configuration.searchd.query_log = file
     end
-    
+
     def config_file
       @controller.path
     end
-    
+
     def config_file=(file)
       @controller.path = file
     end
-    
+
     def bin_path
       @controller.bin_path
     end
-    
+
     def bin_path=(path)
       @controller.bin_path = path
     end
-    
+
     def searchd_binary_name
       @controller.searchd_binary_name
     end
-    
+
     def searchd_binary_name=(name)
       @controller.searchd_binary_name = name
     end
-    
+
     def indexer_binary_name
       @controller.indexer_binary_name
     end
-    
+
     def indexer_binary_name=(name)
       @controller.indexer_binary_name = name
     end
-    
+
     attr_accessor :timeout
 
     def client
-      client = Riddle::Client.new address, port,
+      client = Riddle::Client.new shuffled_addresses, port,
         configuration.searchd.client_key
       client.max_matches = configuration.searchd.max_matches || 1000
       client.timeout = timeout || 0
       client
     end
-    
+
     def models_by_crc
       @models_by_crc ||= begin
         ThinkingSphinx.context.indexed_models.inject({}) do |hash, model|
@@ -274,34 +279,34 @@ module ThinkingSphinx
     end
 
     private
-    
+
     # Parse the config/sphinx.yml file - if it exists - then use the attribute
     # accessors to set the appropriate values. Nothing too clever.
-    # 
+    #
     def parse_config
       path = "#{app_root}/config/sphinx.yml"
       return unless File.exists?(path)
-      
+
       conf = YAML::load(ERB.new(IO.read(path)).result)[environment]
-      
+
       conf.each do |key,value|
         self.send("#{key}=", value) if self.respond_to?("#{key}=")
-        
+
         set_sphinx_setting self.source_options, key, value, SourceOptions
         set_sphinx_setting self.index_options,  key, value, IndexOptions
         set_sphinx_setting self.index_options,  key, value, CustomOptions
         set_sphinx_setting @configuration.searchd, key, value
         set_sphinx_setting @configuration.indexer, key, value
       end unless conf.nil?
-      
+
       self.bin_path += '/' unless self.bin_path.blank?
-      
+
       if self.allow_star
         self.index_options[:enable_star]    = true
         self.index_options[:min_prefix_len] = 1
       end
     end
-    
+
     def set_sphinx_setting(object, key, value, allowed = {})
       if object.is_a?(Hash)
         object[key.to_sym] = value if allowed.include?(key.to_s)
@@ -310,26 +315,37 @@ module ThinkingSphinx
         send("#{key}=", value) if self.respond_to?("#{key}")
       end
     end
-    
+
     def enforce_common_attribute_types
       sql_indexes = configuration.indexes.reject { |index|
         index.is_a? Riddle::Configuration::DistributedIndex
       }
-      
+
       return unless sql_indexes.any? { |index|
         index.sources.any? { |source|
           source.sql_attr_bigint.include? :sphinx_internal_id
         }
       }
-      
+
       sql_indexes.each { |index|
         index.sources.each { |source|
           next if source.sql_attr_bigint.include? :sphinx_internal_id
-          
+
           source.sql_attr_bigint << :sphinx_internal_id
           source.sql_attr_uint.delete :sphinx_internal_id
         }
       }
     end
+
+    def shuffled_addresses
+      return address unless shuffle
+
+      addresses = Array(address)
+      if addresses.respond_to?(:shuffle)
+        addresses.shuffle
+      else
+        address.sort_by { rand }
+      end
+    end
   end
 end