hawkerb-thinking-sphinx 1.3.15 → 1.3.16

data/README.textile

@@ -1,5 +1,9 @@
 h1. Slightly modified version of Thinking Sphinx
 
+h2. Performance improvements
+
+This version uses MySQL ORDER BY FIELD(id,..) instruction to sort results returned by sphinx without using Ruby. It also means, that it will be incompatible with DBMS not supporting FIELD function.
+
 h2. Removed automated includes
 
 I this version, all of your models which use TS must manually include ThinkingSphinx modules. Example:
@@ -20,6 +24,20 @@ end
 
 Because of that, it is a lot easier to override default sphinx methods.
 
+h2. Default behaviour in tests
+
+One of the reason to create this fork is to ensure that Thinking Sphinx will behave in same way on both production and test enviroment.
+
+h2. Extended overrides in sphinx.yml
+
+In sphinx.yml you can use:
+
+development:
+  place_delta_0:
+    sql_query_pre: [ 'SET NAMES utf8' ]
+
+to add an option which is specific only to single section of sphinx configuration file.
+
 h1. Thinking Sphinx
 
 h2. Usage

data/VERSION

@@ -1 +1 @@
-1.3.15
+1.3.16

data/lib/thinking_sphinx/configuration.rb

@@ -67,7 +67,7 @@ module ThinkingSphinx
     attr_accessor :searchd_file_path, :allow_star, :database_yml_file,
       :app_root, :model_directories, :delayed_job_priority
     
-    attr_accessor :source_options, :index_options
+    attr_accessor :source_options, :index_options, :section_options
     
     attr_reader :environment, :configuration, :controller
     
@@ -110,6 +110,7 @@ module ThinkingSphinx
       self.delayed_job_priority = 0
       
       self.source_options  = {}
+      self.section_options  = {}
       self.index_options   = {
         :charset_type => "utf-8"
       }
@@ -141,7 +142,7 @@ module ThinkingSphinx
       ThinkingSphinx.context.indexed_models.each do |model|
         model = model.constantize
         model.define_indexes
-        @configuration.indexes.concat model.to_riddle
+        @configuration.indexes.concat merge_with_section_options!(model.to_riddle)
       end
       
       open(file_path, "w") do |file|
@@ -254,12 +255,16 @@ module ThinkingSphinx
       
       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
+
+        if value.is_a?(Hash)
+          self.section_options[key] = value
+        else
+          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
       end unless conf.nil?
       
       self.bin_path += '/' unless self.bin_path.blank?
@@ -278,5 +283,18 @@ module ThinkingSphinx
         send("#{key}=", value) if self.respond_to?("#{key}")
       end
     end
+
+    def merge_with_section_options!(indexes)
+      indexes.each do |index|
+        if nested_values = section_options[index.name]
+          nested_values.each_pair {|key, val| index.send(:"#{key}=",val) }
+        end
+
+        if index.respond_to?(:sources)
+          merge_with_section_options!(index.sources)
+        end
+      end
+      indexes
+    end
   end
 end

data/lib/thinking_sphinx/search.rb

@@ -669,7 +669,7 @@ MSG
         :conditions => {klass.primary_key_for_sphinx.to_sym => ids},
         :include    => (options[:include] || index_options[:include]),
         :select     => (options[:select]  || index_options[:select]),
-        :order      => (options[:sql_order] || index_options[:sql_order])
+        :order      => (options[:sql_order] || index_options[:sql_order] || "FIELD(id, #{ids.join(',') })")
       ) : []
 
       # Raise an exception if we find records in Sphinx but not in the DB, so
@@ -682,13 +682,7 @@ MSG
 
       # if the user has specified an SQL order, return the collection
       # without rearranging it into the Sphinx order
-      return instances if (options[:sql_order] || index_options[:sql_order])
-
-      ids.collect { |obj_id|
-        instances.detect do |obj|
-          obj.primary_key_for_sphinx == obj_id
-        end
-      }
+      return instances
     end
     
     # Group results by class and call #find(:all) once for each group to reduce

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hawkerb-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.15
+  version: 1.3.16
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency