warp-thinking-sphinx 1.2.12 → 1.3.10

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

@@ -504,4 +504,43 @@ describe ThinkingSphinx::Attribute do
       @statement.should match(/SELECT cricket_team_id, id FROM tags/)
     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
+  end
 end

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -0,0 +1,39 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::AutoVersion do
+  describe '.detect' do
+    before :each do
+      @controller = ThinkingSphinx::Configuration.instance.controller
+    end
+    
+    it "should require 0.9.8 if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/0.9.8')
+      
+      @controller.stub!(:sphinx_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')
+      
+      @controller.stub!(:sphinx_version => '0.9.9')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the detected version is something else" do
+      STDERR.should_receive(:puts)
+      
+      @controller.stub!(:sphinx_version => '0.9.7')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the version cannot be determined" do
+      STDERR.should_receive(:puts)
+      
+      @controller.stub!(:sphinx_version => nil)
+      ThinkingSphinx::AutoVersion.detect
+    end
+  end
+end

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

@@ -3,8 +3,8 @@ require 'spec/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
 
@@ -50,7 +50,8 @@ 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
         }
       }
 
@@ -129,65 +130,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 +147,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

data/spec/thinking_sphinx/context_spec.rb

@@ -0,0 +1,119 @@
+require 'spec/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.should_receive(:puts).with('Warning: Error loading a.rb')
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    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

data/spec/{lib/thinking_sphinx → thinking_sphinx}/index/builder_spec.rb

@@ -452,4 +452,28 @@ describe ThinkingSphinx::Index::Builder do
       @index.delta_object.should be_a_kind_of(ThinkingSphinx::Deltas::DefaultDelta)
     end
   end
+  
+  context 'index options' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        
+        set_property :index_exact_words => true
+      end
+    end
+    
+    it "should track the index_exact_words option to the index" do
+      @index.local_options[:index_exact_words].should be_true
+    end
+  end
+  
+  context 'with an explicit name' do
+    it "should set the index's name using the provided value" do
+      index = ThinkingSphinx::Index::Builder.generate(Person, 'custom') do
+        indexes first_name
+      end
+      
+      index.name.should == 'custom'
+    end
+  end
 end

data/spec/thinking_sphinx/index_spec.rb

@@ -0,0 +1,183 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Index do
+  describe "prefix_fields method" do
+    before :each do
+      @index = ThinkingSphinx::Index.new(Person)
+      
+      @field_a = stub('field', :prefixes => true)
+      @field_b = stub('field', :prefixes => false)
+      @field_c = stub('field', :prefixes => true)
+      
+      @index.stub!(:fields => [@field_a, @field_b, @field_c])
+    end
+    
+    it "should return fields that are flagged as prefixed" do
+      @index.prefix_fields.should include(@field_a)
+      @index.prefix_fields.should include(@field_c)
+    end
+    
+    it "should not return fields that aren't flagged as prefixed" do
+      @index.prefix_fields.should_not include(@field_b)
+    end
+  end
+  
+  describe "infix_fields method" do
+    before :each do
+      @index = ThinkingSphinx::Index.new(Person)
+      
+      @field_a = stub('field', :infixes => true)
+      @field_b = stub('field', :infixes => false)
+      @field_c = stub('field', :infixes => true)
+      
+      @index.stub!(:fields => [@field_a, @field_b, @field_c])
+    end
+    
+    it "should return fields that are flagged as infixed" do
+      @index.infix_fields.should include(@field_a)
+      @index.infix_fields.should include(@field_c)
+    end
+    
+    it "should not return fields that aren't flagged as infixed" do
+      @index.infix_fields.should_not include(@field_b)
+    end
+  end
+  
+  describe '.name_for' do
+    it "should return the model's name downcased" do
+      ThinkingSphinx::Index.name_for(Alpha).should == 'alpha'
+    end
+    
+    it "should separate words by underscores" do
+      ThinkingSphinx::Index.name_for(ActiveRecord).should == 'active_record'
+    end
+    
+    it "should separate namespaces by underscores" do
+      ThinkingSphinx::Index.name_for(ActiveRecord::Base).
+        should == 'active_record_base'
+    end
+  end
+  
+  describe '#name' do
+    it "should return the downcased name of the index's model" do
+      ThinkingSphinx::Index.new(Alpha).name.should == 'alpha'
+    end
+    
+    it "should return a custom name if one is set" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      index.name = 'custom'
+      index.name.should == 'custom'
+    end
+  end
+  
+  describe '#core_name' do
+    it "should take the index's name and append _core" do
+      ThinkingSphinx::Index.new(Alpha).core_name.should == 'alpha_core'
+    end
+  end
+  
+  describe '#delta_name' do
+    it "should take the index's name and append _delta" do
+      ThinkingSphinx::Index.new(Alpha).delta_name.should == 'alpha_delta'
+    end
+  end
+  
+  describe '#all_names' do
+    it "should return the core index name by default" do
+      ThinkingSphinx::Index.new(Alpha).all_names.should == ['alpha_core']
+    end
+    
+    it "should return both core and delta names if deltas are enabled" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      index.delta_object = stub('delta')
+      
+      index.all_names.should == ['alpha_core', 'alpha_delta']
+    end
+    
+    it "should respect custom names" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      index.name = 'custom'
+      
+      index.all_names.should == ['custom_core']
+    end
+    
+    it "should respect custom names when deltas are enabled" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      index.name = 'custom'
+      index.delta_object = stub('delta')
+      
+      index.all_names.should == ['custom_core', 'custom_delta']
+    end
+  end
+  
+  describe '#to_riddle' do
+    it "should return two Riddle indexes if deltas are disabled" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      
+      index.to_riddle(0).length.should == 2
+    end
+    
+    it "should return three Riddle indexes if deltas are enabled" do
+      index = ThinkingSphinx::Index.new(Beta)
+      index.delta_object = stub('delta')
+      
+      index.to_riddle(0).length.should == 3
+    end
+    
+    it "should include a distributed index" do
+      index = ThinkingSphinx::Index.new(Alpha)
+      
+      index.to_riddle(0).last.
+        should be_a(Riddle::Configuration::DistributedIndex)
+    end
+    
+    context 'core index' do
+      it "should use the core name" do
+        @index = ThinkingSphinx::Index.new(Alpha).to_riddle(0).first
+        @index.name.should == 'alpha_core'
+      end
+      
+      it "should not try to set disable_range on the index" do
+        ThinkingSphinx::Configuration.instance.
+          index_options[:disable_range] = true
+        
+        lambda {
+          @index = ThinkingSphinx::Index.new(Alpha).to_riddle(0).first
+        }.should_not raise_error(NoMethodError)
+      end
+    end
+    
+    context 'delta index' do
+      before :each do
+        index = ThinkingSphinx::Index.new(Beta)
+        index.delta_object = stub('delta')
+        @index = index.to_riddle(0)[1]
+      end
+      
+      it "should use the delta name" do
+        @index.name.should == 'beta_delta'
+      end
+    end
+    
+    context 'distributed index' do
+      it "should use the index's name" do
+        index = ThinkingSphinx::Index.new(Alpha)
+
+        index.to_riddle(0).last.name.should == 'alpha'
+      end
+      
+      it "should add the core index" do
+        index = ThinkingSphinx::Index.new(Alpha)
+
+        index.to_riddle(0).last.local_indexes.should include('alpha_core')
+      end
+      
+      it "should add the delta index if there is one" do
+        index = ThinkingSphinx::Index.new(Beta)
+        index.delta_object = stub('delta')
+
+        index.to_riddle(0).last.local_indexes.should include('beta_delta')
+      end
+    end
+  end
+end