thinking-sphinx 3.0.6 → 3.1.0

data/spec/thinking_sphinx/configuration_spec.rb

@@ -90,11 +90,12 @@ describe ThinkingSphinx::Configuration do
     end
 
     it "uses app/indices in the Rails engines" do
-      engine = stub(:engine, { :paths => { 'app/indices' =>
-        stub(:path, { :existent => '/engine/app/indices' } )
-      } } )
+      engine = double :engine, { :paths => { 'app/indices' =>
+        double(:path, { :existent => '/engine/app/indices' } )
+      } }
+      engine_class = double :instance => engine
 
-      Rails::Engine::Railties.should_receive(:engines).and_return([ engine ])
+      Rails::Engine.should_receive(:subclasses).and_return([ engine_class ])
 
       config.index_paths.should include('/engine/app/indices')
     end

data/spec/thinking_sphinx/connection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ThinkingSphinx::Connection do
   describe '.take' do
     let(:pool)             { double 'pool' }
-    let(:connection)       { double 'connection' }
+    let(:connection)       { double 'connection', :base_error => StandardError }
     let(:error)            { ThinkingSphinx::QueryExecutionError.new 'failed' }
     let(:translated_error) { ThinkingSphinx::SphinxError.new }
 

data/spec/thinking_sphinx/deletion_spec.rb

@@ -4,8 +4,7 @@ describe ThinkingSphinx::Deletion do
   describe '.perform' do
     let(:connection) { double('connection', :execute => nil) }
     let(:index)      { double('index', :name => 'foo_core',
-      :document_id_for_key => 14, :type => 'plain') }
-    let(:instance)   { double('instance', :id => 7) }
+      :document_id_for_key => 14, :type => 'plain', :distributed? => false) }
 
     before :each do
       ThinkingSphinx::Connection.stub(:take).and_yield(connection)
@@ -14,30 +13,13 @@ describe ThinkingSphinx::Deletion do
 
     context 'index is SQL-backed' do
       it "updates the deleted flag to false" do
-        connection.should_receive(:execute).with('UPDATE STATEMENT')
+        connection.should_receive(:execute).with <<-SQL
+UPDATE foo_core
+SET sphinx_deleted = 1
+WHERE id IN (14)
+        SQL
 
-        ThinkingSphinx::Deletion.perform index, instance
-      end
-
-      it "builds the update query for the given index" do
-        Riddle::Query.should_receive(:update).
-          with('foo_core', anything, anything).and_return('')
-
-        ThinkingSphinx::Deletion.perform index, instance
-      end
-
-      it "builds the update query for the sphinx document id" do
-        Riddle::Query.should_receive(:update).
-          with(anything, 14, anything).and_return('')
-
-        ThinkingSphinx::Deletion.perform index, instance
-      end
-
-      it "builds the update query for setting sphinx_deleted to true" do
-        Riddle::Query.should_receive(:update).
-          with(anything, anything, :sphinx_deleted => true).and_return('')
-
-        ThinkingSphinx::Deletion.perform index, instance
+        ThinkingSphinx::Deletion.perform index, 7
       end
 
       it "doesn't care about Sphinx errors" do
@@ -45,7 +27,7 @@ describe ThinkingSphinx::Deletion do
           and_raise(ThinkingSphinx::ConnectionError.new(''))
 
         lambda {
-          ThinkingSphinx::Deletion.perform index, instance
+          ThinkingSphinx::Deletion.perform index, 7
         }.should_not raise_error
       end
     end
@@ -59,7 +41,7 @@ describe ThinkingSphinx::Deletion do
         connection.should_receive(:execute).
           with('DELETE FROM foo_core WHERE id = 14')
 
-        ThinkingSphinx::Deletion.perform index, instance
+        ThinkingSphinx::Deletion.perform index, 7
       end
 
       it "doesn't care about Sphinx errors" do
@@ -67,7 +49,7 @@ describe ThinkingSphinx::Deletion do
           and_raise(ThinkingSphinx::ConnectionError.new(''))
 
         lambda {
-          ThinkingSphinx::Deletion.perform index, instance
+          ThinkingSphinx::Deletion.perform index, 7
         }.should_not raise_error
       end
     end

data/spec/thinking_sphinx/excerpter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ThinkingSphinx::Excerpter do
   let(:excerpter)  { ThinkingSphinx::Excerpter.new('index', 'all words') }
   let(:connection) {
-    double('connection', :query => [{'snippet' => 'some highlighted words'}])
+    double('connection', :execute => [{'snippet' => 'some highlighted words'}])
   }
 
   before :each do
@@ -35,14 +35,14 @@ describe ThinkingSphinx::Excerpter do
     end
 
     it "sends the snippets call to Sphinx" do
-      connection.should_receive(:query).with('CALL SNIPPETS').
+      connection.should_receive(:execute).with('CALL SNIPPETS').
         and_return([{'snippet' => ''}])
 
       excerpter.excerpt!('all of the words')
     end
 
     it "returns the first value returned by Sphinx" do
-      connection.stub :query => [{'snippet' => 'some highlighted words'}]
+      connection.stub :execute => [{'snippet' => 'some highlighted words'}]
 
       excerpter.excerpt!('all of the words').should == 'some highlighted words'
     end

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -1,7 +1,4 @@
-module ThinkingSphinx; end
-
-require 'thinking_sphinx/facet_search'
-require 'thinking_sphinx/facet'
+require 'spec_helper'
 
 describe ThinkingSphinx::FacetSearch do
   let(:facet_search)  { ThinkingSphinx::FacetSearch.new '', {} }
@@ -118,6 +115,18 @@ describe ThinkingSphinx::FacetSearch do
           search.options[setting].should == 42
         }
       end
+
+      it "allows separate #{setting} and max_matches settings to support pagination" do
+        configuration.settings['max_matches'] = 500
+        facet_search = ThinkingSphinx::FacetSearch.new '', {setting => 10}
+
+        facet_search.populate
+
+        batch.searches.each do |search|
+          search.options[setting].should == 10
+          search.options[:max_matches].should == 500
+        end
+      end
     end
   end
 end

data/spec/thinking_sphinx/index_set_spec.rb

@@ -1,6 +1,7 @@
 module ThinkingSphinx; end
 
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/module/delegation'
 require 'thinking_sphinx/index_set'
 
 describe ThinkingSphinx::IndexSet do
@@ -29,10 +30,14 @@ describe ThinkingSphinx::IndexSet do
       set.to_a
     end
 
-    it "returns all indices when no models or indices are specified" do
-      article_core = double('index', :name => 'article_core')
-      user_core    = double('index', :name => 'user_core')
-      configuration.indices.replace [article_core, user_core]
+    it "returns all non-distributed indices when no models or indices are specified" do
+      article_core = double 'index', :name => 'article_core',
+        :distributed? => false
+      user_core    = double 'index', :name => 'user_core',
+        :distributed? => false
+      distributed  = double 'index', :name => 'user', :distributed? => true
+
+      configuration.indices.replace [article_core, user_core, distributed]
 
       set.to_a.should == [article_core, user_core]
     end

data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb

@@ -143,6 +143,14 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
 
         middleware.call [context]
       end
+
+      it "passes through SQL group options to the relation" do
+        search.options[:sql] = {:group => :column}
+
+        relation.should_receive(:group).with(:column).and_return(relation)
+
+        middleware.call [context]
+      end
     end
   end
 end

data/spec/thinking_sphinx/middlewares/geographer_spec.rb

@@ -26,7 +26,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
       end
 
       it "doesn't add anything if :geo is nil" do
-        sphinx_sql.should_not_receive(:values)
+        sphinx_sql.should_not_receive(:prepend_values)
 
         middleware.call [context]
       end
@@ -38,7 +38,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
       end
 
       it "adds the geodist function when given a :geo option" do
-        sphinx_sql.should_receive(:values).
+        sphinx_sql.should_receive(:prepend_values).
           with('GEODIST(0.1, 0.2, lat, lng) AS geodist').
           and_return(sphinx_sql)
 
@@ -46,7 +46,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
       end
 
       it "adds the distance pane" do
-        sphinx_sql.stub :values => sphinx_sql
+        sphinx_sql.stub :prepend_values => sphinx_sql
 
         middleware.call [context]
 
@@ -57,7 +57,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
         search.options[:latitude_attr]  = 'side_to_side'
         search.options[:longitude_attr] = 'up_or_down'
 
-        sphinx_sql.should_receive(:values).
+        sphinx_sql.should_receive(:prepend_values).
           with('GEODIST(0.1, 0.2, side_to_side, up_or_down) AS geodist').
           and_return(sphinx_sql)
 
@@ -68,7 +68,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
         context[:indices] << double('index',
           :unique_attribute_names => ['latitude'], :name => 'an_index')
 
-        sphinx_sql.should_receive(:values).
+        sphinx_sql.should_receive(:prepend_values).
           with('GEODIST(0.1, 0.2, latitude, lng) AS geodist').
           and_return(sphinx_sql)
 
@@ -79,7 +79,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
         context[:indices] << double('index',
           :unique_attribute_names => ['longitude'], :name => 'an_index')
 
-        sphinx_sql.should_receive(:values).
+        sphinx_sql.should_receive(:prepend_values).
           with('GEODIST(0.1, 0.2, lat, longitude) AS geodist').
           and_return(sphinx_sql)
 
@@ -89,7 +89,7 @@ describe ThinkingSphinx::Middlewares::Geographer do
       it "handles very small values" do
         search.options[:geo] = [0.0000001, 0.00000000002]
 
-        sphinx_sql.should_receive(:values).
+        sphinx_sql.should_receive(:prepend_values).
           with('GEODIST(0.0000001, 0.00000000002, lat, lng) AS geodist').
           and_return(sphinx_sql)
 

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -23,7 +23,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
     :offset => 0, :per_page => 5) }
   let(:index_set)     { [double(:name => 'article_core', :options => {})] }
   let(:sphinx_sql)    { double('sphinx_sql', :from => true, :offset => true,
-    :limit => true, :where => true, :matching => true) }
+    :limit => true, :where => true, :matching => true, :values => true) }
   let(:query)         { double('query') }
   let(:configuration) { double('configuration', :settings => {}) }
 
@@ -301,6 +301,22 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       middleware.call [context]
     end
 
+    it "adds the provided group-best count" do
+      search.options[:group_best] = 5
+
+      sphinx_sql.should_receive(:group_best).with(5).and_return(sphinx_sql)
+
+      middleware.call [context]
+    end
+
+    it "adds the provided having clause" do
+      search.options[:having] = 'foo > 1'
+
+      sphinx_sql.should_receive(:having).with('foo > 1').and_return(sphinx_sql)
+
+      middleware.call [context]
+    end
+
     it "uses any provided field weights" do
       search.options[:field_weights] = {:title => 3}
 

data/spec/thinking_sphinx/search/query_spec.rb

@@ -6,6 +6,10 @@ require 'active_support/core_ext/object/blank'
 require './lib/thinking_sphinx/search/query'
 
 describe ThinkingSphinx::Search::Query do
+  before :each do
+    stub_const 'ThinkingSphinx::Query', double(wildcard: '')
+  end
+
   describe '#to_s' do
     it "passes through the keyword as provided" do
       query = ThinkingSphinx::Search::Query.new 'pancakes'
@@ -26,15 +30,17 @@ describe ThinkingSphinx::Search::Query do
     end
 
     it "automatically stars keywords if requested" do
-      query = ThinkingSphinx::Search::Query.new 'cake', {}, true
+      ThinkingSphinx::Query.should_receive(:wildcard).with('cake', true).
+        and_return('*cake*')
 
-      query.to_s.should == '*cake*'
+      ThinkingSphinx::Search::Query.new('cake', {}, true).to_s
     end
 
     it "automatically stars condition keywords if requested" do
-      query = ThinkingSphinx::Search::Query.new '', {:title => 'pan'}, true
+      ThinkingSphinx::Query.should_receive(:wildcard).with('pan', true).
+        and_return('*pan*')
 
-      query.to_s.should == '@title *pan*'
+      ThinkingSphinx::Search::Query.new('', {:title => 'pan'}, true).to_s
     end
 
     it "does not star the sphinx_internal_class field keyword" do
@@ -44,49 +50,6 @@ describe ThinkingSphinx::Search::Query do
       query.to_s.should == '@sphinx_internal_class_name article'
     end
 
-    it "treats escapes as word characters" do
-      query = ThinkingSphinx::Search::Query.new '', {:title => 'sauce\\@pan'},
-        true
-
-      query.to_s.should == '@title *sauce\\@pan*'
-    end
-
-    it "does not star manually provided field tags" do
-      query = ThinkingSphinx::Search::Query.new "@title pan", {}, true
-
-      query.to_s.should == "@title *pan*"
-    end
-
-    it "does not star manually provided arrays of field tags" do
-      query = ThinkingSphinx::Search::Query.new "@(title, body) pan", {}, true
-
-      query.to_s.should == "@(title, body) *pan*"
-    end
-
-    it "stars keywords that begin with an escaped @" do
-      query = ThinkingSphinx::Search::Query.new "\\@pan", {}, true
-
-      query.to_s.should == "*\\@pan*"
-    end
-
-    it "ignores escaped slashes" do
-      query = ThinkingSphinx::Search::Query.new "\\/\\/pan", {}, true
-
-      query.to_s.should == "\\/\\/*pan*"
-    end
-
-    it "does not star quorum operators" do
-      query = ThinkingSphinx::Search::Query.new "foo/3", {}, true
-
-      query.to_s.should == "*foo*/3"
-    end
-
-    it "does not star proximity operators or quoted strings" do
-      query = ThinkingSphinx::Search::Query.new %q{"hello world"~3}, {}, true
-
-      query.to_s.should == %q{"hello world"~3}
-    end
-
     it "handles null values by removing them from the conditions hash" do
       query = ThinkingSphinx::Search::Query.new '', :title => nil
 
@@ -105,12 +68,6 @@ describe ThinkingSphinx::Search::Query do
       query.to_s.should == ''
     end
 
-    it "handles nil queries when starring" do
-      query = ThinkingSphinx::Search::Query.new nil, {}, true
-
-      query.to_s.should == ''
-    end
-
     it "allows mixing of blank and non-blank conditions" do
       query = ThinkingSphinx::Search::Query.new 'tasty', :title => 'pancakes',
         :ingredients => nil

data/spec/thinking_sphinx/wildcard_spec.rb

@@ -0,0 +1,41 @@
+module ThinkingSphinx; end
+
+require './lib/thinking_sphinx/wildcard'
+
+describe ThinkingSphinx::Wildcard do
+  describe '.call' do
+    it "does not star quorum operators" do
+      ThinkingSphinx::Wildcard.call("foo/3").should == "*foo*/3"
+    end
+
+    it "does not star proximity operators or quoted strings" do
+      ThinkingSphinx::Wildcard.call(%q{"hello world"~3}).
+        should == %q{"hello world"~3}
+    end
+
+    it "treats slashes as a separator when starring" do
+      ThinkingSphinx::Wildcard.call("a\\/c").should == "*a*\\/*c*"
+    end
+
+    it "separates escaping from the end of words" do
+      ThinkingSphinx::Wildcard.call("\\(913\\)").should == "\\(*913*\\)"
+    end
+
+    it "ignores escaped slashes" do
+      ThinkingSphinx::Wildcard.call("\\/\\/pan").should == "\\/\\/*pan*"
+    end
+
+    it "does not star manually provided field tags" do
+      ThinkingSphinx::Wildcard.call("@title pan").should == "@title *pan*"
+    end
+
+    it "does not star manually provided arrays of field tags" do
+      ThinkingSphinx::Wildcard.call("@(title, body) pan").
+        should == "@(title, body) *pan*"
+    end
+
+    it "handles nil queries" do
+      ThinkingSphinx::Wildcard.call(nil).should == ''
+    end
+  end
+end

data/thinking-sphinx.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.6'
+  s.version     = '3.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
-  s.homepage    = 'http://pat.github.com/ts/en'
+  s.homepage    = 'http://pat.github.io/thinking-sphinx/'
   s.summary     = 'A smart wrapper over Sphinx for ActiveRecord'
   s.description = %Q{An intelligent layer for ActiveRecord (via Rails and Sinatra) for the Sphinx full-text search tool.}
   s.license     = 'MIT'
@@ -23,12 +23,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activerecord', '>= 3.1.0'
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
+  s.add_runtime_dependency 'joiner',       '>= 0.2.0'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
   s.add_runtime_dependency 'innertube',    '>= 1.0.2'
-  s.add_runtime_dependency 'riddle',       '>= 1.5.9'
+  s.add_runtime_dependency 'riddle',       '>= 1.5.10'
 
-  s.add_development_dependency 'appraisal',        '~> 0.4.0'
+  s.add_development_dependency 'appraisal',        '~> 0.5.2'
   s.add_development_dependency 'combustion',       '~> 0.4.0'
-  s.add_development_dependency 'database_cleaner', '~> 0.7.1'
+  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
   s.add_development_dependency 'rspec',            '~> 2.13.0'
 end