thinking-sphinx 3.2.0 → 3.3.0

data/spec/thinking_sphinx/wildcard_spec.rb

@@ -6,41 +6,46 @@ 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"
+      expect(ThinkingSphinx::Wildcard.call("foo/3")).to eq("*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}
+      expect(ThinkingSphinx::Wildcard.call(%q{"hello world"~3})).
+        to eq(%q{"hello world"~3})
     end
 
     it "treats slashes as a separator when starring" do
-      ThinkingSphinx::Wildcard.call("a\\/c").should == "*a*\\/*c*"
+      expect(ThinkingSphinx::Wildcard.call("a\\/c")).to eq("*a*\\/*c*")
     end
 
     it "separates escaping from the end of words" do
-      ThinkingSphinx::Wildcard.call("\\(913\\)").should == "\\(*913*\\)"
+      expect(ThinkingSphinx::Wildcard.call("\\(913\\)")).to eq("\\(*913*\\)")
     end
 
     it "ignores escaped slashes" do
-      ThinkingSphinx::Wildcard.call("\\/\\/pan").should == "\\/\\/*pan*"
+      expect(ThinkingSphinx::Wildcard.call("\\/\\/pan")).to eq("\\/\\/*pan*")
     end
 
     it "does not star manually provided field tags" do
-      ThinkingSphinx::Wildcard.call("@title pan").should == "@title *pan*"
+      expect(ThinkingSphinx::Wildcard.call("@title pan")).to eq("@title *pan*")
+    end
+
+    it 'does not star multiple field tags' do
+      expect(ThinkingSphinx::Wildcard.call("@title pan @tags food")).
+        to eq("@title *pan* @tags *food*")
     end
 
     it "does not star manually provided arrays of field tags" do
-      ThinkingSphinx::Wildcard.call("@(title, body) pan").
-        should == "@(title, body) *pan*"
+      expect(ThinkingSphinx::Wildcard.call("@(title, body) pan")).
+        to eq("@(title, body) *pan*")
     end
 
     it "handles nil queries" do
-      ThinkingSphinx::Wildcard.call(nil).should == ''
+      expect(ThinkingSphinx::Wildcard.call(nil)).to eq('')
     end
 
     it "handles unicode values" do
-      ThinkingSphinx::Wildcard.call('älytön').should == '*älytön*'
+      expect(ThinkingSphinx::Wildcard.call('älytön')).to eq('*älytön*')
     end
   end
 end

data/spec/thinking_sphinx_spec.rb

@@ -6,15 +6,15 @@ describe ThinkingSphinx do
       :options => {}) }
 
     before :each do
-      ThinkingSphinx::Search.stub :new => search
+      allow(ThinkingSphinx::Search).to receive_messages :new => search
     end
 
     it "returns the total entries of the search object" do
-      ThinkingSphinx.count.should == search.total_entries
+      expect(ThinkingSphinx.count).to eq(search.total_entries)
     end
 
     it "passes through the given query and options" do
-      ThinkingSphinx::Search.should_receive(:new).with('foo', :bar => :baz).
+      expect(ThinkingSphinx::Search).to receive(:new).with('foo', :bar => :baz).
         and_return(search)
 
       ThinkingSphinx.count('foo', :bar => :baz)
@@ -25,15 +25,15 @@ describe ThinkingSphinx do
     let(:search) { double('search') }
 
     before :each do
-      ThinkingSphinx::Search.stub :new => search
+      allow(ThinkingSphinx::Search).to receive_messages :new => search
     end
 
     it "returns a new search object" do
-      ThinkingSphinx.search.should == search
+      expect(ThinkingSphinx.search).to eq(search)
     end
 
     it "passes through the given query and options" do
-      ThinkingSphinx::Search.should_receive(:new).with('foo', :bar => :baz).
+      expect(ThinkingSphinx::Search).to receive(:new).with('foo', :bar => :baz).
         and_return(search)
 
       ThinkingSphinx.search('foo', :bar => :baz)

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.2.0'
+  s.version     = '3.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   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.11'
+  s.add_runtime_dependency 'riddle',       '>= 2.0.0'
 
   s.add_development_dependency 'appraisal',        '~> 1.0.2'
-  s.add_development_dependency 'combustion',       '~> 0.4.0'
+  s.add_development_dependency 'combustion',       '~> 0.5.4'
   s.add_development_dependency 'database_cleaner', '~> 1.2.0'
-  s.add_development_dependency 'rspec',            '~> 2.13.0'
+  s.add_development_dependency 'rspec',            '~> 3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.5.0
 description: An intelligent layer for ActiveRecord (via Rails and Sinatra) for the
   Sphinx full-text search tool.
 email:
@@ -171,6 +171,7 @@ files:
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -308,6 +309,7 @@ files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
+- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
@@ -450,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -460,6 +462,7 @@ test_files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
+- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb