thinking-sphinx 2.0.14 → 2.1.0

data/spec/thinking_sphinx/search_spec.rb

@@ -6,18 +6,19 @@ describe ThinkingSphinx::Search do
     @config = ThinkingSphinx::Configuration.instance
     @client = Riddle::Client.new
 
-    @config.stub!(:client => @client)
+    ThinkingSphinx::Connection.stub(:take).and_yield(@client)
+
     @client.stub!(:query => {:matches => [], :total_found => 41, :total => 41})
   end
 
   it "not request results from the client if not accessing items" do
-    @config.should_not_receive(:client)
+    ThinkingSphinx::Connection.should_not_receive(:take)
 
     ThinkingSphinx::Search.new.class
   end
 
   it "should request results if access is required" do
-    @config.should_receive(:client)
+    ThinkingSphinx::Connection.should_receive(:take).and_yield(@client)
 
     ThinkingSphinx::Search.new.first
   end
@@ -1433,19 +1434,6 @@ describe ThinkingSphinx::Search do
       @search.freeze.should be_a(ThinkingSphinx::Search)
     end
   end
-
-  describe '#client' do
-    let(:client) { Riddle::Client.new }
-    it "should respect the client in options" do
-      search = ThinkingSphinx::Search.new :client => client
-      search.client.should == client
-    end
-
-    it "should get a new client from the configuration singleton by default" do
-      ThinkingSphinx::Configuration.instance.stub!(:client => client)
-      ThinkingSphinx::Search.new.client.should == client
-    end
-  end
 end
 
 describe ThinkingSphinx::Search, "playing nice with Search model" do

metadata

@@ -1,208 +1,216 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thinking-sphinx
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 2.1.0
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 14
-  version: 2.0.14
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-02 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
-  version_requirements: *id001
-  name: activerecord
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
-        version: 1.5.3
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
   name: riddle
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
   name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: innertube
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  version_requirements: *id004
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
   name: appraisal
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  version_requirements: *id006
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  version_requirements: *id007
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
   name: faker
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  version_requirements: *id008
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  version_requirements: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id010
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  version_requirements: *id011
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :development
-description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+description: A concise and easy-to-use Ruby library that connects ActiveRecord to
+  the Sphinx search daemon, managing configuration, indexing and searching.
+email:
 - pat@freelancing-gods.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/cucumber/thinking_sphinx/external_world.rb
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
@@ -227,10 +235,13 @@ files:
 - lib/thinking_sphinx/bundled_search.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/connection.rb
 - lib/thinking_sphinx/context.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/deltas/delete_job.rb
+- lib/thinking_sphinx/deltas/index_job.rb
 - lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -250,7 +261,6 @@ files:
 - lib/thinking_sphinx/source/sql.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
-- lib/thinking_sphinx/version.rb
 - LICENCE
 - README.textile
 - HISTORY
@@ -362,6 +372,7 @@ files:
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb
 - spec/thinking_sphinx/core/string_spec.rb
@@ -377,44 +388,42 @@ files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: true
-homepage: http://pat.github.com/ts/en/
+homepage: http://pat.github.io/thinking-sphinx/
 licenses: []
+post_install_message: ! 'If you''re upgrading, you should read this:
+
+  http://pat.github.io/thinking-sphinx/upgrading.html
 
-post_install_message: |+
-  If you're upgrading, you should read this:
-  http://pat.github.com/ts/en/upgrading.html
-  
-rdoc_options: []
 
-require_paths: 
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1480797322099798226
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1480797322099798226
 requirements: []
-
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
-test_files: 
+test_files:
 - features/abstract_inheritance.feature
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
@@ -523,6 +532,7 @@ test_files:
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb
 - spec/thinking_sphinx/core/string_spec.rb
@@ -538,3 +548,4 @@ test_files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
+has_rdoc: