thinking-sphinx 1.2.13 → 1.4.0

data/spec/thinking_sphinx/adapters/abstract_adapter_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::AbstractAdapter do
+  describe '.detect' do
+    let(:model) { stub('model') }
+    
+    it "returns a MysqlAdapter object for :mysql" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :mysql)
+      
+      adapter = ThinkingSphinx::AbstractAdapter.detect(model)
+      adapter.should be_a(ThinkingSphinx::MysqlAdapter)
+    end
+    
+    it "returns a PostgreSQLAdapter object for :postgresql" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :postgresql)
+      
+      adapter = ThinkingSphinx::AbstractAdapter.detect(model)
+      adapter.should be_a(ThinkingSphinx::PostgreSQLAdapter)
+    end
+    
+    it "raises an exception for other responses" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :sqlite)
+      
+      lambda {
+        ThinkingSphinx::AbstractAdapter.detect(model)
+      }.should raise_error
+    end
+  end
+  
+  describe '.adapter_for_model' do
+    let(:model) { stub('model') }
+    
+    after :each do
+      ThinkingSphinx.database_adapter = nil
+    end
+    
+    it "translates strings to symbols" do
+      ThinkingSphinx.database_adapter = 'foo'
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :foo
+    end
+    
+    it "passes through symbols unchanged" do
+      ThinkingSphinx.database_adapter = :bar
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :bar
+    end
+    
+    it "returns standard_adapter_for_model if database_adapter is not set" do
+      ThinkingSphinx.database_adapter = nil
+      ThinkingSphinx::AbstractAdapter.stub!(:standard_adapter_for_model => :baz)
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :baz
+    end
+    
+    it "calls the lambda and returns it if one is provided" do
+      ThinkingSphinx.database_adapter = lambda { |model| :foo }
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :foo
+    end
+  end
+  
+  describe '.standard_adapter_for_model' do
+    let(:klass)      { stub('connection class') }
+    let(:connection) { stub('connection', :class => klass) }
+    let(:model)      { stub('model', :connection => connection) }
+    
+    it "translates a normal MySQL adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::MysqlAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a MySQL plus adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::MysqlplusAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a MySQL2 adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::Mysql2Adapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a NullDB adapter to MySQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::NullDBAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a normal PostgreSQL adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :postgresql
+    end
+    
+    it "translates a JDBC MySQL adapter to MySQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcmysql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a JDBC PostgreSQL adapter to PostgreSQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcpostgresql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :postgresql
+    end
+    
+    it "returns other JDBC adapters without translation" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcmssql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == 'jdbcmssql'
+    end
+    
+    it "returns other unknown adapters without translation" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::FooAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == 'ActiveRecord::ConnectionAdapters::FooAdapter'
+    end
+  end
+end

data/spec/{lib/thinking_sphinx → thinking_sphinx}/association_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Association do
   describe '.children' do

data/spec/{lib/thinking_sphinx → thinking_sphinx}/attribute_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Attribute do
   before :each do
@@ -47,47 +47,6 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe '#column_with_prefix' do
-    before :each do
-      @attribute = ThinkingSphinx::Attribute.new @source, [
-        ThinkingSphinx::Index::FauxColumn.new(:col_name)
-      ]
-      @attribute.columns.each { |col| @attribute.associations[col] = [] }
-      @attribute.model = Person
-      
-      @first_join   = Object.new
-      @first_join.stub!(:aliased_table_name => "tabular")
-      @second_join  = Object.new
-      @second_join.stub!(:aliased_table_name => "data")
-      
-      @first_assoc  = ThinkingSphinx::Association.new nil, nil
-      @first_assoc.stub!(:join => @first_join, :has_column? => true)
-      @second_assoc = ThinkingSphinx::Association.new nil, nil
-      @second_assoc.stub!(:join => @second_join, :has_column? => true)
-    end
-    
-    it "should return the column name if the column is a string" do
-      @attribute.columns = [ThinkingSphinx::Index::FauxColumn.new("string")]
-      @attribute.send(:column_with_prefix, @attribute.columns.first).should == "string"
-    end
-    
-    it "should return the column with model's table prefix if there's no associations for the column" do
-      @attribute.send(:column_with_prefix, @attribute.columns.first).should == "`people`.`col_name`"
-    end
-    
-    it "should return the column with its join table prefix if an association exists" do
-      column = @attribute.columns.first
-      @attribute.associations[column] = [@first_assoc]
-      @attribute.send(:column_with_prefix, column).should == "`tabular`.`col_name`"
-    end
-    
-    it "should return multiple columns concatenated if more than one association exists" do
-      column = @attribute.columns.first
-      @attribute.associations[column] = [@first_assoc, @second_assoc]
-      @attribute.send(:column_with_prefix, column).should == "`tabular`.`col_name`, `data`.`col_name`"
-    end
-  end
-  
   describe '#to_select_sql' do
     it "should convert a mixture of dates and datetimes to timestamps" do
       attribute = ThinkingSphinx::Attribute.new(@source,
@@ -99,6 +58,16 @@ describe ThinkingSphinx::Attribute do
       
       attribute.to_select_sql.should == "CONCAT_WS(',', UNIX_TIMESTAMP(`friendships`.`created_at`), UNIX_TIMESTAMP(`friendships`.`created_on`)) AS `times`"
     end
+    
+    it "should handle columns which don't exist for polymorphic joins" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:team, :name),
+          ThinkingSphinx::Index::FauxColumn.new(:team, :league) ],
+        :as => :team
+      )
+      
+      attribute.to_select_sql.should == "CONCAT_WS(' ', IFNULL(`cricket_teams`.`name`, ''), IFNULL(`football_teams`.`name`, ''), IFNULL(`football_teams`.`league`, '')) AS `team`"
+    end
   end
   
   describe '#is_many?' do
@@ -183,15 +152,15 @@ describe ThinkingSphinx::Attribute do
     
     it "should return the column type from the database if not :multi or more than one association" do
       @column.send(:instance_variable_set, :@name, "birthday")
-      @attribute.send(:type).should == :datetime
+      @attribute.type.should == :datetime
       
       @attribute.send(:instance_variable_set, :@type, nil)
       @column.send(:instance_variable_set, :@name, "first_name")
-      @attribute.send(:type).should == :string
+      @attribute.type.should == :string
       
       @attribute.send(:instance_variable_set, :@type, nil)
       @column.send(:instance_variable_set, :@name, "id")
-      @attribute.send(:type).should == :integer
+      @attribute.type.should == :integer
     end
     
     it "should return :multi if the columns return multiple datetimes" do
@@ -200,6 +169,15 @@ describe ThinkingSphinx::Attribute do
       
       @attribute.type.should == :multi
     end
+    
+    it "should return :bigint for 64bit integers" do
+      Person.columns.detect { |col|
+        col.name == 'id'
+      }.stub!(:sql_type => 'BIGINT(20)')
+      @column.send(:instance_variable_set, :@name, 'id')
+      
+      @attribute.type.should == :bigint
+    end
   end
   
   describe '#all_ints?' do
@@ -504,4 +482,67 @@ describe ThinkingSphinx::Attribute do
       @statement.should match(/SELECT cricket_team_id, id FROM tags/)
     end
   end
-end
+  
+  describe '#live_value' do
+    before :each do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [], :__name => "col_name")
+      ]
+      @instance = stub('model')
+    end
+    
+    it "should translate boolean values to integers" do
+      @instance.stub!(:col_name => true)
+      @attribute.live_value(@instance).should == 1
+      
+      @instance.stub!(:col_name => false)
+      @attribute.live_value(@instance).should == 0
+    end
+    
+    it "should translate timestamps to integers" do
+      now = Time.now
+      @instance.stub!(:col_name => now)
+      @attribute.live_value(@instance).should == now.to_i
+    end
+    
+    it "should translate dates to timestamp integers" do
+      today = Date.today
+      @instance.stub!(:col_name => today)
+      @attribute.live_value(@instance).should == today.to_time.to_i
+    end
+    
+    it "should translate nils to 0" do
+      @instance.stub!(:col_name => nil)
+      @attribute.live_value(@instance).should == 0
+    end
+    
+    it "should return integers as integers" do
+      @instance.stub!(:col_name => 42)
+      @attribute.live_value(@instance).should == 42
+    end
+    
+    it "should handle nils in the association chain" do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [:assoc_name], :__name => :id)
+      ]
+      @instance.stub!(:assoc_name => nil)
+      @attribute.live_value(@instance).should == 0
+    end
+    
+    it "should handle association chains" do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [:assoc_name], :__name => :id)
+      ]
+      @instance.stub!(:assoc_name => stub('object', :id => 42))
+      @attribute.live_value(@instance).should == 42
+    end
+    
+    it "should translate crc strings to their integer values" do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [], :__name => "col_name")
+      ], :crc => true, :type => :string
+      @instance.stub!(:col_name => 'foo')
+      @attribute.live_value(@instance).should == 'foo'.to_crc32
+    end
+  end
+end

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::AutoVersion do
+  describe '.detect' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+    end
+    
+    it "should require 0.9.8 if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/0.9.8')
+      
+      @config.stub!(:version => '0.9.8')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should require 0.9.9 if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/0.9.9')
+      
+      @config.stub!(:version => '0.9.9')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should require 1.10-beta if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/1.10')
+      
+      @config.stub!(:version => '1.10-beta')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the detected version is something else" do
+      STDERR.should_receive(:puts)
+      
+      @config.stub!(:version => '0.9.7')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the version cannot be determined" do
+      STDERR.should_receive(:puts)
+      
+      @config.stub!(:version => nil)
+      ThinkingSphinx::AutoVersion.detect
+    end
+  end
+end

data/spec/{lib/thinking_sphinx → thinking_sphinx}/configuration_spec.rb

@@ -1,10 +1,10 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Configuration do
   describe "environment class method" do
     before :each do
-      ThinkingSphinx::Configuration.send(:class_variable_set, :@@environment, nil)
-
+      Thread.current[:thinking_sphinx_environment] = nil
+      
       ENV["RAILS_ENV"] = nil
     end
 
@@ -17,7 +17,15 @@ describe ThinkingSphinx::Configuration do
       Merb.stub!(:environment => "merb_production")
       ThinkingSphinx::Configuration.environment.should == "merb_production"
 
-      Object.send(:remove_const, :Merb)
+      Object.send :remove_const, :Merb
+    end
+    
+    it "should use RAILS_ENV if set" do
+      RAILS_ENV = 'global_rails'
+      
+      ThinkingSphinx::Configuration.environment.should == 'global_rails'
+      
+      Object.send :remove_const, :RAILS_ENV
     end
 
     it "should use the Rails environment value if set" do
@@ -29,6 +37,34 @@ describe ThinkingSphinx::Configuration do
       ThinkingSphinx::Configuration.environment.should == "development"
     end
   end
+  
+  describe '#version' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.reset
+    end
+    
+    it "should use the given version from sphinx.yml if there is one" do
+      open("#{RAILS_ROOT}/config/sphinx.yml", "w") do |f|
+        f.write  YAML.dump({'development' => {'version' => '0.9.7'}})
+      end
+      @config.reset
+      
+      @config.version.should == '0.9.7'
+      
+      FileUtils.rm "#{RAILS_ROOT}/config/sphinx.yml"
+    end
+    
+    it "should detect the version from Riddle otherwise" do
+      controller = @config.controller
+      controller.stub!(:sphinx_version => '0.9.6')
+      
+      Riddle::Controller.stub!(:new => controller)
+      @config.reset
+      
+      @config.version.should == '0.9.6'
+    end
+  end
 
   describe "parse_config method" do
     before :each do
@@ -50,7 +86,9 @@ describe ThinkingSphinx::Configuration do
           "charset_table"     => "table",
           "ignore_chars"      => "e",
           "searchd_binary_name" => "sphinx-searchd",
-          "indexer_binary_name" => "sphinx-indexer"
+          "indexer_binary_name" => "sphinx-indexer",
+          "index_exact_words" => true,
+          "indexed_models"    => ['Alpha', 'Beta']
         }
       }
 
@@ -80,6 +118,8 @@ describe ThinkingSphinx::Configuration do
         config.app_root = "/here/somewhere"
       end
       ThinkingSphinx::Configuration.instance.app_root.should == "/here/somewhere"
+      
+      ThinkingSphinx::Configuration.instance.reset
     end
   end
 
@@ -129,65 +169,11 @@ describe ThinkingSphinx::Configuration do
     end
   end
 
-  describe "#load_models" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.instance
-      @config.model_directories = ['']
-
-      @file_name        = 'a.rb'
-      @model_name_lower = 'a'
-      @class_name       = 'A'
-
-      @file_name.stub!(:gsub).and_return(@model_name_lower)
-      @model_name_lower.stub!(:camelize).and_return(@class_name)
-      Dir.stub(:[]).and_return([@file_name])
-    end
-
-    it "should load the files by guessing the file name" do
-      @class_name.should_receive(:constantize).and_return(true)
-
-      @config.load_models
-    end
-
-    it "should not raise errors if the model name is nil" do
-      @file_name.stub!(:gsub).and_return(nil)
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should not raise errors if the file name does not represent a class name" do
-      @class_name.should_receive(:constantize).and_raise(NameError)
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should retry if the first pass fails and contains a directory" do
-      @model_name_lower.stub!(:gsub!).and_return(true, nil)
-      @class_name.stub(:constantize).and_raise(LoadError)
-      @model_name_lower.should_receive(:camelize).twice
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should catch database errors with a warning" do
-      @class_name.should_receive(:constantize).and_raise(Mysql::Error)
-      @config.should_receive(:puts).with('Warning: Error loading a.rb')
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-  end
-
   it "should insert set index options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
+    
     ThinkingSphinx::Configuration::IndexOptions.each do |option|
+      config.reset
       config.index_options[option.to_sym] = "something"
       config.build
 
@@ -200,15 +186,34 @@ describe ThinkingSphinx::Configuration do
 
   it "should insert set source options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
+    config.reset
+    
+    config.source_options[:sql_query_pre] = ["something"]
     ThinkingSphinx::Configuration::SourceOptions.each do |option|
-      config.source_options[option.to_sym] = "something"
+      config.source_options[option.to_sym] ||= "something"
       config.build
 
       file = open(config.config_file) { |f| f.read }
       file.should match(/#{option}\s+= something/)
 
-      config.source_options[option.to_sym] = nil
+      config.source_options.delete option.to_sym
     end
+    
+    config.source_options[:sql_query_pre] = nil  
+  end
+  
+  it "should not blow away delta or utf options if sql pre is specified in config" do
+    config = ThinkingSphinx::Configuration.instance
+    config.reset
+    
+    config.source_options[:sql_query_pre] = ["a pre query"]
+    config.build
+    file = open(config.config_file) { |f| f.read }
+    
+    file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = UPDATE `\w+` SET `delta` = 0 WHERE `delta` = 1/im)
+    file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = \n/im)
+    
+    config.source_options[:sql_query_pre] = nil
   end
 
   it "should set any explicit prefixed or infixed fields" do
@@ -232,6 +237,7 @@ describe ThinkingSphinx::Configuration do
       @config.address     = 'domain.url'
       @config.port        = 3333
       @config.configuration.searchd.max_matches = 100
+      @config.timeout = 1
     end
     
     it "should return an instance of Riddle::Client" do
@@ -249,6 +255,10 @@ describe ThinkingSphinx::Configuration do
     it "should use the configuration max matches" do
       @config.client.max_matches.should == 100
     end
+
+    it "should use the configuration timeout" do
+      @config.client.timeout.should == 1
+    end
   end
   
   describe '#models_by_crc' do

data/spec/thinking_sphinx/context_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::Context do
+  before :each do
+    @context = ThinkingSphinx::Context.new
+  end
+  
+  describe '#prepare' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.model_directories = ['']
+
+      @file_name        = 'a.rb'
+      @model_name_lower = 'a'
+      @class_name       = 'A'
+
+      @file_name.stub!(:gsub).and_return(@model_name_lower)
+      @model_name_lower.stub!(:camelize).and_return(@class_name)
+      Dir.stub(:[]).and_return([@file_name])
+    end
+
+    it "should load the files by guessing the file name" do
+      @class_name.should_receive(:constantize).and_return(true)
+
+      @context.prepare
+    end
+
+    it "should not raise errors if the model name is nil" do
+      @file_name.stub!(:gsub).and_return(nil)
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should not raise errors if the file name does not represent a class name" do
+      @class_name.should_receive(:constantize).and_raise(NameError)
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should retry if the first pass fails and contains a directory" do
+      @model_name_lower.stub!(:gsub!).and_return(true, nil)
+      @class_name.stub(:constantize).and_raise(LoadError)
+      @model_name_lower.should_receive(:camelize).twice
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should catch database errors with a warning" do
+      @class_name.should_receive(:constantize).and_raise(Mysql::Error)
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
+      
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+    
+    it "should not load models if they're explicitly set in the configuration" do
+      @config.indexed_models = ['Alpha', 'Beta']
+      @context.prepare
+      
+      @context.indexed_models.should == ['Alpha', 'Beta']
+    end
+  end
+  
+  describe '#define_indexes' do
+    it "should call define_indexes on all known indexed models" do
+      @context.stub!(:indexed_models => ['Alpha', 'Beta'])
+      Alpha.should_receive(:define_indexes)
+      Beta.should_receive(:define_indexes)
+      
+      @context.define_indexes
+    end
+  end
+  
+  describe '#add_indexed_model' do
+    before :each do
+      @context.indexed_models.clear
+    end
+    
+    it "should add the model to the collection" do
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+    
+    it "should not duplicate models in the collection" do
+      @context.add_indexed_model 'Alpha'
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+    
+    it "should keep the collection in alphabetical order" do
+      @context.add_indexed_model 'Beta'
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha', 'Beta']
+    end
+    
+    it "should translate classes to their names" do
+      @context.add_indexed_model Alpha
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+  end
+  
+  describe '#superclass_indexed_models' do
+    it "should return indexed model names" do
+      @context.stub!(:indexed_models => ['Alpha', 'Beta'])
+      
+      @context.superclass_indexed_models.should == ['Alpha', 'Beta']
+    end
+    
+    it "should not include classes which have indexed superclasses" do
+      @context.stub!(:indexed_models => ['Parent', 'Person'])
+      
+      @context.superclass_indexed_models.should == ['Person']
+    end
+  end
+end