thinking-sphinx 2.0.3 → 2.0.4

data/README.textile

@@ -203,3 +203,8 @@ Since I first released this library, there's been quite a few people who have su
 * George Anderson
 * Greg Weber
 * Javier Ramírez
+* Patrick Tulskie
+* Konstantin Shabanov
+* Clemens Kofler
+* Ryan Mohr
+* Alex Chee

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/features/support/env.rb

@@ -19,4 +19,9 @@ require "thinking_sphinx"
 
 ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
 
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.plural /^(.*)beta$/i, '\1betas'
+  inflect.singular /^(.*)betas$/i, '\1beta'
+end
+
 world.setup

data/features/thinking_sphinx/models/developer.rb

@@ -17,15 +17,4 @@ class Developer < ActiveRecord::Base
     
     group_by 'city'
   end
-  
-  define_index 'alternate' do
-    indexes "'foo'",     :as => :foo
-    
-    has age,                              :facet => true
-    has tags(:id),       :as => :tag_ids,  :facet => true
-    
-    facet "LOWER(city)", :as => :city, :type => :string, :value => :city
-    
-    group_by 'city'
-  end
 end

data/lib/thinking_sphinx.rb

@@ -4,7 +4,6 @@ require 'yaml'
 require 'riddle'
 
 require 'thinking_sphinx/auto_version'
-require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'
 require 'thinking_sphinx/property'
 require 'thinking_sphinx/active_record'
@@ -71,12 +70,22 @@ module ThinkingSphinx
   # The collection of indexed models. Keep in mind that Rails lazily loads
   # its classes, so this may not actually be populated with _all_ the models
   # that have Sphinx indexes.
-  @@sphinx_mutex = Mutex.new
-  @@context      = nil
+  @@sphinx_mutex          = Mutex.new
+  @@context               = nil
+  @@define_indexes        = true
+  @@deltas_enabled        = nil
+  @@updates_enabled       = nil
+  @@suppress_delta_output = false
+  @@remote_sphinx         = false
+  @@use_group_by_shortcut = nil
+  
+  def self.mutex
+    @@sphinx_mutex
+  end
   
   def self.context
     if @@context.nil?
-      @@sphinx_mutex.synchronize do
+      mutex.synchronize do
         if @@context.nil?
           @@context = ThinkingSphinx::Context.new
           @@context.prepare
@@ -87,9 +96,9 @@ module ThinkingSphinx
     @@context
   end
   
-  def self.reset_context!
-    @@sphinx_mutex.synchronize do
-      @@context = nil
+  def self.reset_context!(context = nil)
+    mutex.synchronize do
+      @@context = context
     end
   end
 
@@ -100,11 +109,7 @@ module ThinkingSphinx
   # Check if index definition is disabled.
   #
   def self.define_indexes?
-    if Thread.current[:thinking_sphinx_define_indexes].nil?
-      Thread.current[:thinking_sphinx_define_indexes] = true
-    end
-    
-    Thread.current[:thinking_sphinx_define_indexes]
+    @@define_indexes
   end
 
   # Enable/disable indexes - you may want to do this while migrating data.
@@ -112,40 +117,70 @@ module ThinkingSphinx
   #   ThinkingSphinx.define_indexes = false
   #
   def self.define_indexes=(value)
-    Thread.current[:thinking_sphinx_define_indexes] = value
+    mutex.synchronize do
+      @@define_indexes = value
+    end
   end
-
-  # Check if delta indexing is enabled.
+  
+  # Check if delta indexing is enabled/disabled.
   #
   def self.deltas_enabled?
-    if Thread.current[:thinking_sphinx_deltas_enabled].nil?
-      Thread.current[:thinking_sphinx_deltas_enabled] = (
-        ThinkingSphinx::Configuration.environment != "test"
-      )
+    if @@deltas_enabled.nil?
+      mutex.synchronize do
+        if @@deltas_enabled.nil?
+          @@deltas_enabled = (
+            ThinkingSphinx::Configuration.environment != "test"
+          )
+        end
+      end
     end
     
-    Thread.current[:thinking_sphinx_deltas_enabled]
+    @@deltas_enabled && !deltas_suspended?
   end
-
-  # Enable/disable all delta indexing.
+  
+  # Enable/disable delta indexing.
   #
   #   ThinkingSphinx.deltas_enabled = false
   #
   def self.deltas_enabled=(value)
-    Thread.current[:thinking_sphinx_deltas_enabled] = value
+    mutex.synchronize do
+      @@deltas_enabled = value
+    end
+  end
+
+  # Check if delta indexing is suspended.
+  #
+  def self.deltas_suspended?
+    if Thread.current[:thinking_sphinx_deltas_suspended].nil?
+      Thread.current[:thinking_sphinx_deltas_suspended] = false
+    end
+    
+    Thread.current[:thinking_sphinx_deltas_suspended]
+  end
+
+  # Suspend/resume delta indexing.
+  #
+  #   ThinkingSphinx.deltas_suspended = false
+  #
+  def self.deltas_suspended=(value)
+    Thread.current[:thinking_sphinx_deltas_suspended] = value
   end
 
   # Check if updates are enabled. True by default, unless within the test
   # environment.
   #
   def self.updates_enabled?
-    if Thread.current[:thinking_sphinx_updates_enabled].nil?
-      Thread.current[:thinking_sphinx_updates_enabled] = (
-        ThinkingSphinx::Configuration.environment != "test"
-      )
+    if @@updates_enabled.nil?
+      mutex.synchronize do
+        if @@updates_enabled.nil?
+          @@updates_enabled = (
+            ThinkingSphinx::Configuration.environment != "test"
+          )
+        end
+      end
     end
     
-    Thread.current[:thinking_sphinx_updates_enabled]
+    @@updates_enabled
   end
 
   # Enable/disable updates to Sphinx
@@ -153,37 +188,53 @@ module ThinkingSphinx
   #   ThinkingSphinx.updates_enabled = false
   #
   def self.updates_enabled=(value)
-    Thread.current[:thinking_sphinx_updates_enabled] = value
+    mutex.synchronize do
+      @@updates_enabled = value
+    end
   end
 
   def self.suppress_delta_output?
-    Thread.current[:thinking_sphinx_suppress_delta_output] ||= false
+    @@suppress_delta_output
   end
 
   def self.suppress_delta_output=(value)
-    Thread.current[:thinking_sphinx_suppress_delta_output] = value
+    mutex.synchronize do
+      @@suppress_delta_output = value
+    end
   end
   
   # Checks to see if MySQL will allow simplistic GROUP BY statements. If not,
   # or if not using MySQL, this will return false.
   #
   def self.use_group_by_shortcut?
-    if Thread.current[:thinking_sphinx_use_group_by_shortcut].nil?
-      Thread.current[:thinking_sphinx_use_group_by_shortcut] = !!(
-        mysql? && ::ActiveRecord::Base.connection.select_all(
-          "SELECT @@global.sql_mode, @@session.sql_mode;"
-        ).all? { |key,value| value.nil? || value[/ONLY_FULL_GROUP_BY/].nil? }
-      )
+    if @@use_group_by_shortcut.nil?
+      mutex.synchronize do
+        if @@use_group_by_shortcut.nil?
+          @@use_group_by_shortcut = !!(
+            mysql? && ::ActiveRecord::Base.connection.select_all(
+              "SELECT @@global.sql_mode, @@session.sql_mode;"
+            ).all? { |key, value|
+              value.nil? || value[/ONLY_FULL_GROUP_BY/].nil?
+            }
+          )
+        end
+      end
     end
     
-    Thread.current[:thinking_sphinx_use_group_by_shortcut]
+    @@use_group_by_shortcut
+  end
+  
+  def self.reset_use_group_by_shortcut
+    mutex.synchronize do
+      @@use_group_by_shortcut = nil
+    end
   end
 
   # An indication of whether Sphinx is running on a remote machine instead of
   # the same machine.
   #
   def self.remote_sphinx?
-    Thread.current[:thinking_sphinx_remote_sphinx] ||= false
+    @@remote_sphinx
   end
 
   # Tells Thinking Sphinx that Sphinx is running on a different machine, and
@@ -195,7 +246,9 @@ module ThinkingSphinx
   #   ThinkingSphinx.remote_sphinx = true
   #
   def self.remote_sphinx=(value)
-    Thread.current[:thinking_sphinx_remote_sphinx] = value
+    mutex.synchronize do
+      @@remote_sphinx = value
+    end
   end
 
   # Check if Sphinx is running. If remote_sphinx is set to true (indicating
@@ -246,5 +299,3 @@ module ThinkingSphinx
   
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end
-
-ThinkingSphinx::AutoVersion.detect

data/lib/thinking_sphinx/active_record.rb

@@ -25,10 +25,13 @@ module ThinkingSphinx
           end
           
           def primary_key_for_sphinx
-            if custom_primary_key_for_sphinx?
-              @sphinx_primary_key_attribute || superclass.primary_key_for_sphinx
-            else
-              primary_key
+            @primary_key_for_sphinx ||= begin
+              if custom_primary_key_for_sphinx?
+                @sphinx_primary_key_attribute ||
+                superclass.primary_key_for_sphinx
+              else
+                primary_key
+              end
             end
           end
           
@@ -39,6 +42,10 @@ module ThinkingSphinx
             ) || !@sphinx_primary_key_attribute.nil?
           end
           
+          def clear_primary_key_for_sphinx
+            @primary_key_for_sphinx = nil
+          end
+          
           def sphinx_index_options
             sphinx_indexes.last.options
           end
@@ -265,33 +272,6 @@ module ThinkingSphinx
           index eldest_indexed_ancestor
       end
       
-      # Temporarily disable delta indexing inside a block, then perform a single
-      # rebuild of index at the end.
-      #
-      # Useful when performing updates to batches of models to prevent
-      # the delta index being rebuilt after each individual update.
-      #
-      # In the following example, the delta index will only be rebuilt once,
-      # not 10 times.
-      #
-      #   SomeModel.suspended_delta do
-      #     10.times do
-      #       SomeModel.create( ... )
-      #     end
-      #   end
-      #
-      def suspended_delta(reindex_after = true, &block)
-        define_indexes
-        original_setting = ThinkingSphinx.deltas_enabled?
-        ThinkingSphinx.deltas_enabled = false
-        begin
-          yield
-        ensure
-          ThinkingSphinx.deltas_enabled = original_setting
-          self.index_delta if reindex_after
-        end
-      end
-      
       private
             
       def local_sphinx_indexes

data/lib/thinking_sphinx/active_record/delta.rb

@@ -22,6 +22,33 @@ module ThinkingSphinx
             def delta_objects
               self.sphinx_indexes.collect(&:delta_object).compact
             end
+            
+            # Temporarily disable delta indexing inside a block, then perform a
+            # single rebuild of index at the end.
+            #
+            # Useful when performing updates to batches of models to prevent
+            # the delta index being rebuilt after each individual update.
+            #
+            # In the following example, the delta index will only be rebuilt
+            # once, not 10 times.
+            #
+            #   SomeModel.suspended_delta do
+            #     10.times do
+            #       SomeModel.create( ... )
+            #     end
+            #   end
+            #
+            def suspended_delta(reindex_after = true, &block)
+              define_indexes
+              original_setting = ThinkingSphinx.deltas_suspended?
+              ThinkingSphinx.deltas_suspended = true
+              begin
+                yield
+              ensure
+                ThinkingSphinx.deltas_suspended = original_setting
+                self.index_delta if reindex_after
+              end
+            end
           end
           
           def toggled_delta?

data/lib/thinking_sphinx/auto_version.rb

@@ -5,22 +5,33 @@ module ThinkingSphinx
       case version
       when '0.9.8', '0.9.9'
         require "riddle/#{version}"
-      when '1.10-beta', '1.10-id64-beta', '1.10-dev'
+      when /1.10/
         require 'riddle/1.10'
+      when /2.0.1/
+        require 'riddle/2.0.1'
       else
-        unless version.nil? or version.empty?
-          STDERR.puts "Unsupported version: #{version}"
-        end
-        STDERR.puts %Q{
+        documentation_link = %Q{
+For more information, read the documentation:
+http://freelancing-god.github.com/ts/en/advanced_config.html          
+}
+
+        if version.nil? || version.empty?
+          STDERR.puts %Q{
 Sphinx cannot be found on your system. You may need to configure the following
 settings in your config/sphinx.yml file:
   * bin_path
   * searchd_binary_name
   * indexer_binary_name
 
-For more information, read the documentation:
-http://freelancing-god.github.com/ts/en/advanced_config.html
+#{documentation_link}
+}
+        else
+          STDERR.puts %Q{
+Unsupported version: #{version}
+
+#{documentation_link}
 }
+        end
       end
     end
   end

data/lib/thinking_sphinx/configuration.rb

@@ -72,7 +72,9 @@ module ThinkingSphinx
     attr_accessor :version
 
     attr_reader :environment, :configuration, :controller
-
+    
+    @@environment = nil
+    
     # Load in the configuration settings - this will look for config/sphinx.yml
     # and parse it according to the current environment.
     #
@@ -89,9 +91,10 @@ module ThinkingSphinx
       if custom_app_root
         self.app_root = custom_app_root
       else
-        self.app_root = Rails.root if defined?(Rails)
-        self.app_root = Merb.root if defined?(Merb)
-        self.app_root ||= Dir.pwd
+        self.app_root   = Rails.root                 if defined?(Rails)
+        self.app_root   = Merb.root                  if defined?(Merb)
+        self.app_root   = Sinatra::Application.root  if defined?(Sinatra)
+        self.app_root ||= app_root
       end
 
       @configuration = Riddle::Configuration.new
@@ -125,15 +128,27 @@ module ThinkingSphinx
     end
 
     def self.environment
-      Thread.current[:thinking_sphinx_environment] ||= begin
-        if defined?(Merb)
-          Merb.environment
-        elsif defined?(Rails)
-          Rails.env
-        else
-          ENV['RAILS_ENV'] || 'development'
+      if @@environment.nil?
+        ThinkingSphinx.mutex.synchronize do
+          @@environment ||= if defined?(Merb)
+            Merb.environment
+          elsif defined?(Sinatra)
+            Sinatra::Application.environment.to_s
+          elsif defined?(Rails)
+            Rails.env
+          else
+            ENV['RAILS_ENV'] || 'development'
+          end
         end
       end
+      
+      @@environment
+    end
+    
+    def self.reset_environment
+      ThinkingSphinx.mutex.synchronize do
+        @@environment = nil
+      end
     end
 
     def environment
@@ -243,7 +258,8 @@ module ThinkingSphinx
     attr_accessor :timeout
     
     def client
-      client = Riddle::Client.new address, port
+      client = Riddle::Client.new address, port,
+        configuration.searchd.client_key
       client.max_matches = configuration.searchd.max_matches || 1000
       client.timeout = timeout || 0
       client