thinking-sphinx 1.2.13 → 1.4.0

data/spec/thinking_sphinx_spec.rb

@@ -0,0 +1,204 @@
+require 'spec_helper'
+
+describe ThinkingSphinx do
+  describe '.context' do
+    it "should return a Context instance" do
+      ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
+    end
+    
+    it "should remember changes to the Context instance" do
+      models = ThinkingSphinx.context.indexed_models
+      
+      ThinkingSphinx.context.indexed_models.replace([:model])
+      ThinkingSphinx.context.indexed_models.should == [:model]
+      
+      ThinkingSphinx.context.indexed_models.replace(models)
+    end
+  end
+  
+  describe '.reset_context!' do
+    it "should remove the existing Context instance" do
+      existing = ThinkingSphinx.context
+      
+      ThinkingSphinx.reset_context!
+      ThinkingSphinx.context.should_not == existing
+      
+      Thread.current[:thinking_sphinx_context] = existing
+    end
+  end
+    
+  describe '.define_indexes?' do
+    it "should define indexes by default" do
+      ThinkingSphinx.define_indexes?.should be_true
+    end
+  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
+    end
+  end
+  
+  describe '.deltas_enabled?' do
+    it "should index deltas by default" do
+      ThinkingSphinx.deltas_enabled = nil
+      ThinkingSphinx.deltas_enabled?.should be_true
+    end
+  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
+    end
+  end
+  
+  describe '.updates_enabled?' do
+    it "should update indexes by default" do
+      ThinkingSphinx.updates_enabled = nil
+      ThinkingSphinx.updates_enabled?.should be_true
+    end
+  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
+    end
+  end
+  
+  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
+  
+    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
+    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__), '..')
+      ).to_s
+      
+      ThinkingSphinx.version.should == version
+    end
+  end
+  
+  describe "use_group_by_shortcut? method" do
+    before :each do
+      adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
+      unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
+        pending "No MySQL"
+        return
+      end
+      
+      @connection = stub('adapter',
+        :select_all => true,
+        :class      => ActiveRecord::ConnectionAdapters::MysqlAdapter,
+        :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'}
+      )
+      ::ActiveRecord::Base.stub!(
+        :connection => @connection
+      )
+      
+      Thread.current[:thinking_sphinx_use_group_by_shortcut] = nil
+    end
+    
+    it "should return true if no ONLY_FULL_GROUP_BY" do
+      @connection.stub!(
+        :select_all => {:a => "OTHER SETTINGS"}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_true
+    end
+  
+    it "should return true if NULL value" do
+      @connection.stub!(
+        :select_all => {:a => nil}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_true
+    end
+  
+    it "should return false if ONLY_FULL_GROUP_BY is set" do
+      @connection.stub!(
+        :select_all => {:a => "OTHER SETTINGS,ONLY_FULL_GROUP_BY,blah"}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_false
+    end
+    
+    it "should return false if ONLY_FULL_GROUP_BY is set in any of the values" do
+      @connection.stub!(
+        :select_all => {
+          :a => "OTHER SETTINGS",
+          :b => "ONLY_FULL_GROUP_BY"
+        }
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_false
+    end
+    
+    describe "if not using MySQL" do
+      before :each do
+        adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
+        unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
+          pending "No PostgreSQL"
+          return
+        end
+        
+        @connection = stub(adapter).as_null_object
+        @connection.stub!(
+          :select_all => true,
+          :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
+        )
+        ::ActiveRecord::Base.stub!(
+          :connection => @connection
+        )
+      end
+    
+      it "should return false" do
+        ThinkingSphinx.use_group_by_shortcut?.should be_false
+      end
+    
+      it "should not call select_all" do
+        @connection.should_not_receive(:select_all)
+        
+        ThinkingSphinx.use_group_by_shortcut?
+      end
+    end
+  end
+end

data/tasks/distribution.rb

@@ -1,10 +1,5 @@
-require 'yard'
-require 'jeweler'
-
 desc 'Generate documentation'
-YARD::Rake::YardocTask.new do |t|
-  # t.title = 'Thinking Sphinx - ActiveRecord Sphinx Plugin'
-end
+YARD::Rake::YardocTask.new
 
 Jeweler::Tasks.new do |gem|
   gem.name        = "thinking-sphinx"
@@ -22,32 +17,18 @@ Jeweler::Tasks.new do |gem|
     "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
-    "vendor/**/*",
-    "VERSION.yml"
+    "VERSION"
   ]
   gem.test_files = FileList[
-    "features/**/*",
+    "features/**/*.rb",
+    "features/**/*.feature",
+    "features/**/*.example.yml",
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 1.15.6'
-  
   gem.post_install_message = <<-MESSAGE
-With the release of Thinking Sphinx 1.1.18, there is one important change to
-note: previously, the default morphology for indexing was 'stem_en'. The new
-default is nil, to avoid any unexpected behavior. If you wish to keep the old
-value though, you will need to add the following settings to your
-config/sphinx.yml file:
-
-development:
-  morphology: stem_en
-test:
-  morphology: stem_en
-production:
-  morphology: stem_en
-
-To understand morphologies/stemmers better, visit the following link:
-http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+If you're upgrading, you should read this:
+http://freelancing-god.github.com/ts/en/upgrading.html
 
 MESSAGE
 end

data/tasks/testing.rb

@@ -1,12 +1,12 @@
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts << "-c"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
+task :spec => :check_dependencies
 
 desc "Run all feature-set configurations"
 task :features do |t|
@@ -26,38 +26,50 @@ namespace :features do
   
   add_task :mysql,      "Run feature-set against MySQL"
   add_task :postgresql, "Run feature-set against PostgreSQL"
-end
-
-desc "Generate RCov reports"
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = [
-    '--exclude', 'spec',
-    '--exclude', 'gems',
-    '--exclude', 'riddle',
-    '--exclude', 'ruby'
-  ]
+  
+  task :mysql      => :check_dependencies
+  task :postgresql => :check_dependencies
 end
 
 namespace :rcov do
+  desc "Generate RCov reports"
+  RSpec::Core::RakeTask.new(:rspec) do |t|
+    t.pattern = 'spec/**/*_spec.rb'
+    t.rcov = true
+    t.rcov_opts = [
+      '--exclude', 'spec',
+      '--exclude', 'gems',
+      '--exclude', 'riddle',
+      '--exclude', 'ruby',
+      '--aggregate coverage.data'
+    ]
+  end
+  
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
-      t.cucumber_opts = "--format pretty"
-      t.profile = name
+      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name}"
       t.rcov = true
       t.rcov_opts = [
         '--exclude', 'spec',
         '--exclude', 'gems',
         '--exclude', 'riddle',
-        '--exclude', 'features'
+        '--exclude', 'features',
+        '--aggregate coverage.data'
       ]
     end
   end
   
   add_task :mysql,      "Run feature-set against MySQL with rcov"
   add_task :postgresql, "Run feature-set against PostgreSQL with rcov"
+  
+  task :all do
+    rm 'coverage.data' if File.exist?('coverage.data')
+    rm 'rerun.txt'     if File.exist?('rerun.txt')
+    
+    Rake::Task['rcov:rspec'].invoke
+    Rake::Task['rcov:mysql'].invoke
+    Rake::Task['rcov:postgresql'].invoke
+  end
 end
 
 desc "Build cucumber.yml file"