thinking-sphinx 1.3.4 → 1.3.6

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
 

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

@@ -466,4 +466,14 @@ describe ThinkingSphinx::Index::Builder 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,177 @@
+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
+      before :each do
+        @index = ThinkingSphinx::Index.new(Alpha).to_riddle(0).first
+      end
+      
+      it "should use the core name" do
+        @index.name.should == 'alpha_core'
+      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

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

@@ -302,6 +302,23 @@ describe ThinkingSphinx::Search do
         @client.match_mode.should == :extended2
       end
     end
+
+    describe 'sphinx_select' do
+      it "should default to *" do
+        ThinkingSphinx::Search.new.first
+        
+        @client.select.should == "*"
+      end
+      
+      it "should get set on the client if specified" do
+        ThinkingSphinx::Search.new('general',
+          :sphinx_select => "*, foo as bar"
+        ).first
+        
+        @client.select.should == "*, foo as bar"
+      end
+
+    end
     
     describe 'pagination' do
       it "should set the limit using per_page" do
@@ -834,6 +851,14 @@ describe ThinkingSphinx::Search do
       
       ThinkingSphinx::Search.new.total_pages.should == 2
     end
+    
+    it "should return 0 if there is no index and therefore no results" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => nil, :total => nil
+      })
+      
+      ThinkingSphinx::Search.new.total_pages.should == 0
+    end
   end
   
   describe '#next_page' do
@@ -860,6 +885,14 @@ describe ThinkingSphinx::Search do
     it "should return the total number of results, not just the amount on the page" do
       ThinkingSphinx::Search.new.total_entries.should == 41
     end
+    
+    it "should return 0 if there is no index and therefore no results" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => nil
+      })
+      
+      ThinkingSphinx::Search.new.total_entries.should == 0
+    end
   end
   
   describe '#offset' do

data/spec/{lib/thinking_sphinx_spec.rb → thinking_sphinx_spec.rb}

@@ -1,76 +1,90 @@
 require 'spec/spec_helper'
 
 describe ThinkingSphinx do
-  it "should define indexes by default" do
-    ThinkingSphinx.define_indexes?.should be_true
+  describe '.define_indexes?' do
+    it "should define indexes by default" do
+      ThinkingSphinx.define_indexes?.should be_true
+    end
   end
   
-  it "should disable index definition" do
-    ThinkingSphinx.define_indexes = false
-    ThinkingSphinx.define_indexes?.should be_false
-  end
+  describe '.define_indexes=' do
+    it "should disable index definition" do
+      ThinkingSphinx.define_indexes = false
+      ThinkingSphinx.define_indexes?.should be_false
+    end
   
-  it "should enable index definition" do
-    ThinkingSphinx.define_indexes = false
-    ThinkingSphinx.define_indexes?.should be_false
-    ThinkingSphinx.define_indexes = true
-    ThinkingSphinx.define_indexes?.should be_true
+    it "should enable index definition" do
+      ThinkingSphinx.define_indexes = false
+      ThinkingSphinx.define_indexes?.should be_false
+      ThinkingSphinx.define_indexes = true
+      ThinkingSphinx.define_indexes?.should be_true
+    end
   end
   
-  it "should index deltas by default" do
-    ThinkingSphinx.deltas_enabled = nil
-    ThinkingSphinx.deltas_enabled?.should be_true
+  describe '.deltas_enabled?' do
+    it "should index deltas by default" do
+      ThinkingSphinx.deltas_enabled = nil
+      ThinkingSphinx.deltas_enabled?.should be_true
+    end
   end
   
-  it "should disable delta indexing" do
-    ThinkingSphinx.deltas_enabled = false
-    ThinkingSphinx.deltas_enabled?.should be_false
-  end
+  describe '.deltas_enabled=' do
+    it "should disable delta indexing" do
+      ThinkingSphinx.deltas_enabled = false
+      ThinkingSphinx.deltas_enabled?.should be_false
+    end
   
-  it "should enable delta indexing" do
-    ThinkingSphinx.deltas_enabled = false
-    ThinkingSphinx.deltas_enabled?.should be_false
-    ThinkingSphinx.deltas_enabled = true
-    ThinkingSphinx.deltas_enabled?.should be_true
+    it "should enable delta indexing" do
+      ThinkingSphinx.deltas_enabled = false
+      ThinkingSphinx.deltas_enabled?.should be_false
+      ThinkingSphinx.deltas_enabled = true
+      ThinkingSphinx.deltas_enabled?.should be_true
+    end
   end
   
-  it "should update indexes by default" do
-    ThinkingSphinx.updates_enabled = nil
-    ThinkingSphinx.updates_enabled?.should be_true
+  describe '.updates_enabled?' do
+    it "should update indexes by default" do
+      ThinkingSphinx.updates_enabled = nil
+      ThinkingSphinx.updates_enabled?.should be_true
+    end
   end
   
-  it "should disable index updating" do
-    ThinkingSphinx.updates_enabled = false
-    ThinkingSphinx.updates_enabled?.should be_false
-  end
+  describe '.updates_enabled=' do
+    it "should disable index updating" do
+      ThinkingSphinx.updates_enabled = false
+      ThinkingSphinx.updates_enabled?.should be_false
+    end
   
-  it "should enable index updating" do
-    ThinkingSphinx.updates_enabled = false
-    ThinkingSphinx.updates_enabled?.should be_false
-    ThinkingSphinx.updates_enabled = true
-    ThinkingSphinx.updates_enabled?.should be_true
+    it "should enable index updating" do
+      ThinkingSphinx.updates_enabled = false
+      ThinkingSphinx.updates_enabled?.should be_false
+      ThinkingSphinx.updates_enabled = true
+      ThinkingSphinx.updates_enabled?.should be_true
+    end
   end
   
-  it "should always say Sphinx is running if flagged as being on a remote machine" do
-    ThinkingSphinx.remote_sphinx = true
-    ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
+  describe '.sphinx_running?' do
+    it "should always say Sphinx is running if flagged as being on a remote machine" do
+      ThinkingSphinx.remote_sphinx = true
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
     
-    ThinkingSphinx.sphinx_running?.should be_true
-  end
+      ThinkingSphinx.sphinx_running?.should be_true
+    end
   
-  it "should actually pay attention to Sphinx if not on a remote machine" do
-    ThinkingSphinx.remote_sphinx = false
-    ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
-    ThinkingSphinx.sphinx_running?.should be_false
+    it "should actually pay attention to Sphinx if not on a remote machine" do
+      ThinkingSphinx.remote_sphinx = false
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
+      ThinkingSphinx.sphinx_running?.should be_false
     
-    ThinkingSphinx.stub!(:sphinx_running_by_pid? => true)
-    ThinkingSphinx.sphinx_running?.should be_true
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => true)
+      ThinkingSphinx.sphinx_running?.should be_true
+    end
   end
   
   describe '.version' do
     it "should return the version from the stored YAML file" do
       version = Jeweler::VersionHelper.new(
-        File.join(File.dirname(__FILE__), '../..')
+        File.join(File.dirname(__FILE__), '..')
       ).to_s
       
       ThinkingSphinx.version.should == version
@@ -94,9 +108,7 @@ describe ThinkingSphinx do
         :connection => @connection
       )
       
-      ThinkingSphinx.module_eval do
-        class_variable_set :@@use_group_by_shortcut, nil
-      end
+      Thread.current[:thinking_sphinx_use_group_by_shortcut] = nil
     end
     
     it "should return true if no ONLY_FULL_GROUP_BY" do

data/tasks/distribution.rb

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
     "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
-    "VERSION.yml"
+    "VERSION"
   ]
   gem.test_files = FileList[
     "features/**/*",
@@ -28,8 +28,8 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
-  gem.add_dependency 'riddle',       '>= 1.0.1'
-  gem.add_dependency 'after_commit', '>= 1.0.2'
+  gem.add_dependency 'riddle',       '>= 1.0.2'
+  gem.add_dependency 'after_commit', '>= 1.0.5'
   
   gem.post_install_message = <<-MESSAGE
 If you're upgrading, you should read this: