thinking-sphinx 1.5.0 → 2.0.0.rc1

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

@@ -18,7 +18,7 @@ Person.create :gender => "male", :first_name => "Peter", :middle_initial => "C",
 Person.create :gender => "female", :first_name => "Hollie", :middle_initial => "C", :last_name => "Hunter", :street_address => "34 Cornish Street", :city => "Kensington", :state => "VIC", :postcode => "3031", :email => "Hollie.C.Hunter@mailinator.com", :birthday => "1954/2/16 00:00:00"
 Person.create :gender => "male", :first_name => "Jonathan", :middle_initial => "C", :last_name => "Turner", :street_address => "2 Kopkes Road", :city => "Carngham", :state => "VIC", :postcode => "3351", :email => "Jonathan.C.Turner@trashymail.com", :birthday => "1963/8/26 00:00:00"
 Person.create :gender => "female", :first_name => "Kate", :middle_initial => "S", :last_name => "Doyle", :street_address => "42 Gregory Way", :city => "Mungalup", :state => "WA", :postcode => "6225", :email => "Kate.S.Doyle@mailinator.com", :birthday => "1974/1/5 00:00:00"
-Person.create :gender => "male", :first_name => "Harley", :middle_initial => "M", :last_name => "abbott", :street_address => "39 Faulkner Street", :city => "Tilbuster", :state => "NSW", :postcode => "2350", :email => "Harley.M.Abbott@trashymail.com", :birthday => "1953/10/4 00:00:00"
+Person.create :gender => "male", :first_name => "Harley", :middle_initial => "M", :last_name => "Abbott", :street_address => "39 Faulkner Street", :city => "Tilbuster", :state => "NSW", :postcode => "2350", :email => "Harley.M.Abbott@trashymail.com", :birthday => "1953/10/4 00:00:00"
 Person.create :gender => "male", :first_name => "Morgan", :middle_initial => "E", :last_name => "Iqbal", :street_address => "64 Carlisle Street", :city => "Dysart", :state => "VIC", :postcode => "3660", :email => "Morgan.E.Iqbal@spambob.com", :birthday => "1954/7/6 00:00:00"
 Person.create :gender => "female", :first_name => "Phoebe", :middle_initial => "T", :last_name => "Wells", :street_address => "10 Mnimbah Road", :city => "Eccleston", :state => "NSW", :postcode => "2311", :email => "Phoebe.T.Wells@trashymail.com", :birthday => "1949/5/27 00:00:00"
 Person.create :gender => "male", :first_name => "Finley", :middle_initial => "I", :last_name => "Martin", :street_address => "15 Thomas Lane", :city => "Epping", :state => "VIC", :postcode => "3076", :email => "Finley.I.Martin@dodgit.com", :birthday => "1983/3/12 00:00:00"

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

@@ -1,9 +1,5 @@
 post = Post.create(
-  :subject => "Hello World",
-  :content => "Um Text",
-  :id => 1,
-  :category_id => 1,
-  :keywords_file => (File.dirname(__FILE__) + '/post_keywords.txt')
+  :subject => "Hello World", :content => "Um Text", :id => 1, :category_id => 1
 )
 
 post.authors << Author.find(:first)

data/features/thinking_sphinx/db/migrations/create_posts.rb

@@ -2,5 +2,4 @@ ActiveRecord::Base.connection.create_table :posts, :force => true do |t|
   t.column :subject, :string,  :null => false
   t.column :content, :text
   t.column :category_id, :integer, :null => false
-  t.column :keywords_file, :string
 end

data/features/thinking_sphinx/models/alpha.rb

@@ -14,7 +14,6 @@ class Alpha < ActiveRecord::Base
     
     has value, created_at, created_on
     has cost, :facet => true
-    has active
     
     set_property :field_weights => {'alternative_name' => 10}
     

data/features/thinking_sphinx/models/beta.rb

@@ -2,11 +2,6 @@ class Beta < ActiveRecord::Base
   define_index do
     indexes :name, :sortable => true, :facet => true
     has value
-  end
-  
-  define_index 'secondary_beta' do
-    indexes :name, :sortable => true, :facet => true
-    has value
     
     set_property :delta => true
   end

data/features/thinking_sphinx/models/developer.rb

@@ -9,13 +9,8 @@ class Developer < ActiveRecord::Base
     indexes country,                      :facet => true
     indexes state,                        :facet => true
     indexes tags.text,  :as => :tags,     :facet => true
-    
     has age,                              :facet => true
     has tags(:id),      :as => :tag_ids,  :facet => true
-    has state,          :as => :state_wordcount, :type => :wordcount
-    
-    facet "LOWER(city)", :as => :city, :type => :string, :value => :city
-    
-    group_by 'city'
+    facet city
   end
 end

data/features/thinking_sphinx/models/music.rb

@@ -2,9 +2,7 @@ class Music < Medium
   set_table_name 'music'
   
   define_index do
-    indexes artist, :with => :attribute
-    indexes track
-    indexes album, :with => :wordcount
+    indexes artist, track, album
     indexes genre(:name), :as => :genre
   end
 end

data/features/thinking_sphinx/models/person.rb

@@ -1,7 +1,6 @@
 class Person < ActiveRecord::Base
   define_index do
-    indexes first_name, :sortable => true
-    indexes last_name,  :sortable => :insensitive
+    indexes first_name, last_name, :sortable => true
     
     has [first_name, middle_initial, last_name], :as => :name_sort
     has birthday

data/features/thinking_sphinx/models/post.rb

@@ -11,7 +11,6 @@ class Post < ActiveRecord::Base
     indexes tags.text, :as => :tags
     indexes comments.content, :as => :comments
     indexes authors.name, :as => :authors
-    indexes keywords_file, :as => :keywords, :file => true
     
     has comments(:id), :as => :comment_ids, :source => :ranged_query,
       :facet => true

data/lib/cucumber/thinking_sphinx/external_world.rb

@@ -1,12 +1,8 @@
 require 'thinking_sphinx/test'
 
-module Cucumber
-  module ThinkingSphinx
-    class ExternalWorld
-      def initialize(suppress_delta_output = true)
-        ::ThinkingSphinx::Test.init
-        ::ThinkingSphinx::Test.start_with_autostop
-      end
-    end
+class Cucumber::ThinkingSphinx::ExternalWorld
+  def initialize(suppress_delta_output = true)
+    ::ThinkingSphinx::Test.init
+    ::ThinkingSphinx::Test.start_with_autostop
   end
 end

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -7,7 +7,7 @@ module Cucumber
         :models_directory, :fixtures_directory, :database_file
       attr_accessor :adapter, :database, :username,
         :password, :host
-
+      
       def initialize
         pwd = Dir.pwd
         @temporary_directory  = "#{pwd}/tmp"
@@ -15,64 +15,55 @@ module Cucumber
         @models_directory     = "#{pwd}/features/thinking_sphinx/models"
         @fixtures_directory   = "#{pwd}/features/thinking_sphinx/db/fixtures"
         @database_file        = "#{pwd}/features/thinking_sphinx/database.yml"
-
-        @adapter  = (ENV['DATABASE'] || 'mysql')
+        
+        @adapter  = ENV['DATABASE'] || 'mysql'
         @database = 'thinking_sphinx'
-        @username = ENV['USER']
+        @username = 'thinking_sphinx'
+        # @password = 'thinking_sphinx'
         @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
         make_temporary_directory
-
+        
         configure_cleanup
         configure_thinking_sphinx
         configure_active_record
-
+        
         prepare_data
         setup_sphinx
-
+        
         self
       end
-
+      
       def configure_database
         ActiveRecord::Base.establish_connection database_settings
         self
       end
-
+      
       private
-
+      
       def config
         @config ||= ::ThinkingSphinx::Configuration.instance
       end
-
+      
       def make_temporary_directory
         FileUtils.mkdir_p temporary_directory
         Dir["#{temporary_directory}/*"].each do |file|
           FileUtils.rm_rf file
         end
       end
-
+      
       def configure_thinking_sphinx
         config.config_file        = "#{temporary_directory}/sphinx.conf"
         config.searchd_log_file   = "#{temporary_directory}/searchd.log"
         config.query_log_file     = "#{temporary_directory}/searchd.query.log"
         config.pid_file           = "#{temporary_directory}/searchd.pid"
         config.searchd_file_path  = "#{temporary_directory}/indexes/"
-
+        
         ::ThinkingSphinx.suppress_delta_output = true
       end
-
+      
       def configure_cleanup
         Kernel.at_exit do
           ::ThinkingSphinx::Configuration.instance.controller.stop
@@ -80,13 +71,13 @@ module Cucumber
           ActiveRecord::Base.logger.close
         end
       end
-
+      
       def yaml_database_settings
         return {} unless File.exist?(@database_file)
-
+        
         YAML.load open(@database_file)
       end
-
+      
       def database_settings
         {
           'adapter'  => @adapter,
@@ -96,37 +87,37 @@ module Cucumber
           'host'     => @host
         }.merge yaml_database_settings
       end
-
+      
       def configure_active_record
         ActiveRecord::Base.logger = Logger.new(
           open("#{temporary_directory}/active_record.log", "a")
         )
-
+        
         ActiveRecord::Base.connection.class.send(
           :include, Cucumber::ThinkingSphinx::SqlLogger
         )
       end
-
+      
       def prepare_data
         ::ThinkingSphinx.deltas_enabled = false
-
+        
         load_files migrations_directory
         load_files models_directory
         load_files fixtures_directory
-
+        
         ::ThinkingSphinx.deltas_enabled = true
       end
-
+      
       def load_files(path)
         files = Dir["#{path}/*.rb"].sort!
         files.each do |file|
           require file.gsub(/\.rb$/, '')
         end
       end
-
+      
       def setup_sphinx
         FileUtils.mkdir_p config.searchd_file_path
-
+        
         config.build
         config.controller.index
         config.controller.start

data/lib/thinking_sphinx.rb

@@ -1,19 +1,15 @@
-require 'thread'
 require 'active_record'
-require 'after_commit'
-require 'innertube'
 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'
 require 'thinking_sphinx/association'
 require 'thinking_sphinx/attribute'
-require 'thinking_sphinx/bundled_search'
 require 'thinking_sphinx/configuration'
-require 'thinking_sphinx/connection'
 require 'thinking_sphinx/context'
 require 'thinking_sphinx/excerpter'
 require 'thinking_sphinx/facet'
@@ -23,7 +19,6 @@ require 'thinking_sphinx/field'
 require 'thinking_sphinx/index'
 require 'thinking_sphinx/join'
 require 'thinking_sphinx/source'
-require 'thinking_sphinx/rails_additions'
 require 'thinking_sphinx/search'
 require 'thinking_sphinx/search_methods'
 require 'thinking_sphinx/deltas'
@@ -32,15 +27,9 @@ require 'thinking_sphinx/adapters/abstract_adapter'
 require 'thinking_sphinx/adapters/mysql_adapter'
 require 'thinking_sphinx/adapters/postgresql_adapter'
 
-ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
-
-Merb::Plugins.add_rakefiles(
-  File.join(File.dirname(__FILE__), "thinking_sphinx", "tasks")
-) if defined?(Merb)
+require 'thinking_sphinx/railtie'
 
 module ThinkingSphinx
-  mattr_accessor :database_adapter
-
   # A ConnectionError will get thrown when a connection to Sphinx can't be
   # made.
   class ConnectionError < StandardError
@@ -54,60 +43,54 @@ module ThinkingSphinx
       self.ids = ids
     end
   end
-
-  # A SphinxError occurs when Sphinx responds with an error due to problematic
-  # queries or indexes.
-  class SphinxError < RuntimeError
-    attr_accessor :results
-    def initialize(message = nil, results = nil)
-      super(message)
-      self.results = results
-    end
-  end
-
+  
+  # The current version of Thinking Sphinx.
+  # 
+  # @return [String] The version number as a string
+  # 
+  def self.version
+    open(File.join(File.dirname(__FILE__), '../VERSION')) { |f|
+      f.read.strip
+    }
+  end
+  
   # 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
-  @@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
-
+  @@sphinx_mutex = Mutex.new
+  @@context      = nil
+  
   def self.context
     if @@context.nil?
-      mutex.synchronize do
+      @@sphinx_mutex.synchronize do
         if @@context.nil?
           @@context = ThinkingSphinx::Context.new
           @@context.prepare
         end
       end
     end
-
+    
     @@context
   end
-
-  def self.reset_context!(context = nil)
-    mutex.synchronize do
-      @@context = context
+  
+  def self.reset_context!
+    @@sphinx_mutex.synchronize do
+      @@context = nil
     end
   end
 
-  def self.unique_id_expression(adapter, offset = nil)
-    "* #{adapter.cast_to_int context.indexed_models.size} + #{offset || 0}"
+  def self.unique_id_expression(offset = nil)
+    "* #{context.indexed_models.size} + #{offset || 0}"
   end
 
   # Check if index definition is disabled.
   #
   def self.define_indexes?
-    @@define_indexes
+    if Thread.current[:thinking_sphinx_define_indexes].nil?
+      Thread.current[:thinking_sphinx_define_indexes] = true
+    end
+    
+    Thread.current[:thinking_sphinx_define_indexes]
   end
 
   # Enable/disable indexes - you may want to do this while migrating data.
@@ -115,70 +98,40 @@ module ThinkingSphinx
   #   ThinkingSphinx.define_indexes = false
   #
   def self.define_indexes=(value)
-    mutex.synchronize do
-      @@define_indexes = value
-    end
+    Thread.current[:thinking_sphinx_define_indexes] = value
   end
 
-  # Check if delta indexing is enabled/disabled.
+  # Check if delta indexing is enabled.
   #
   def self.deltas_enabled?
-    if @@deltas_enabled.nil?
-      mutex.synchronize do
-        if @@deltas_enabled.nil?
-          @@deltas_enabled = (
-            ThinkingSphinx::Configuration.environment != "test"
-          )
-        end
-      end
+    if Thread.current[:thinking_sphinx_deltas_enabled].nil?
+      Thread.current[:thinking_sphinx_deltas_enabled] = (
+        ThinkingSphinx::Configuration.environment != "test"
+      )
     end
-
-    @@deltas_enabled && !deltas_suspended?
+    
+    Thread.current[:thinking_sphinx_deltas_enabled]
   end
 
-  # Enable/disable delta indexing.
+  # Enable/disable all delta indexing.
   #
   #   ThinkingSphinx.deltas_enabled = false
   #
   def self.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
+    Thread.current[:thinking_sphinx_deltas_enabled] = value
   end
 
   # Check if updates are enabled. True by default, unless within the test
   # environment.
   #
   def self.updates_enabled?
-    if @@updates_enabled.nil?
-      mutex.synchronize do
-        if @@updates_enabled.nil?
-          @@updates_enabled = (
-            ThinkingSphinx::Configuration.environment != "test"
-          )
-        end
-      end
+    if Thread.current[:thinking_sphinx_updates_enabled].nil?
+      Thread.current[:thinking_sphinx_updates_enabled] = (
+        ThinkingSphinx::Configuration.environment != "test"
+      )
     end
-
-    @@updates_enabled
+    
+    Thread.current[:thinking_sphinx_updates_enabled]
   end
 
   # Enable/disable updates to Sphinx
@@ -186,53 +139,37 @@ module ThinkingSphinx
   #   ThinkingSphinx.updates_enabled = false
   #
   def self.updates_enabled=(value)
-    mutex.synchronize do
-      @@updates_enabled = value
-    end
+    Thread.current[:thinking_sphinx_updates_enabled] = value
   end
 
   def self.suppress_delta_output?
-    @@suppress_delta_output
+    Thread.current[:thinking_sphinx_suppress_delta_output] ||= false
   end
 
   def self.suppress_delta_output=(value)
-    mutex.synchronize do
-      @@suppress_delta_output = value
-    end
+    Thread.current[:thinking_sphinx_suppress_delta_output] = value
   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 @@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
-
-    @@use_group_by_shortcut
-  end
-
-  def self.reset_use_group_by_shortcut
-    mutex.synchronize do
-      @@use_group_by_shortcut = nil
+    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? }
+      )
     end
+    
+    Thread.current[:thinking_sphinx_use_group_by_shortcut]
   end
 
   # An indication of whether Sphinx is running on a remote machine instead of
   # the same machine.
   #
   def self.remote_sphinx?
-    @@remote_sphinx
+    Thread.current[:thinking_sphinx_remote_sphinx] ||= false
   end
 
   # Tells Thinking Sphinx that Sphinx is running on a different machine, and
@@ -244,9 +181,7 @@ module ThinkingSphinx
   #   ThinkingSphinx.remote_sphinx = true
   #
   def self.remote_sphinx=(value)
-    mutex.synchronize do
-      @@remote_sphinx = value
-    end
+    Thread.current[:thinking_sphinx_remote_sphinx] = value
   end
 
   # Check if Sphinx is running. If remote_sphinx is set to true (indicating
@@ -290,18 +225,11 @@ module ThinkingSphinx
 
   def self.mysql?
     ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlAdapter" ||
-    ::ActiveRecord::Base.connection.class.name.demodulize == "Mysql2Adapter" ||
     ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlplusAdapter" || (
       jruby? && ::ActiveRecord::Base.connection.config[:adapter] == "jdbcmysql"
     )
   end
-
-  def self.before_index_hooks
-    @before_index_hooks
-  end
-
-  @before_index_hooks = []
-
+  
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end