thinking-sphinx 1.4.14 → 1.5.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
@@ -1418,19 +1419,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 14
-  version: 1.4.14
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,29 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-02 00:00:00 +11:00
+date: 2013-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 1
         segments: 
+        - 2
         - 1
-        - 15
-        - 6
-        version: 1.15.6
+        version: "2.1"
   version_requirements: *id001
   name: activerecord
   prerelease: false
@@ -64,18 +55,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15
         segments: 
         - 1
         - 5
-        - 3
-        version: 1.5.3
+        - 6
+        version: 1.5.6
   version_requirements: *id003
   name: riddle
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  version_requirements: *id004
+  name: innertube
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -86,12 +93,12 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  version_requirements: *id004
+  version_requirements: *id005
   name: appraisal
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -102,12 +109,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id005
+  version_requirements: *id006
   name: cucumber
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -118,12 +125,12 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  version_requirements: *id006
+  version_requirements: *id007
   name: faker
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,12 +141,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  version_requirements: *id007
+  version_requirements: *id008
   name: rake
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -150,12 +157,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id008
+  version_requirements: *id009
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -166,12 +173,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id009
+  version_requirements: *id010
   name: will_paginate
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,7 +189,7 @@ dependencies:
         - 7
         - 2
         version: 0.7.2
-  version_requirements: *id010
+  version_requirements: *id011
   name: yard
   prerelease: false
   type: :development
@@ -216,10 +223,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
@@ -238,11 +248,8 @@ files:
 - lib/thinking_sphinx/source/sql.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
-- lib/thinking_sphinx/version.rb
-- rails/init.rb
 - LICENCE
 - README.textile
-- tasks/rails.rake
 - features/abstract_inheritance.feature
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
@@ -350,6 +357,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
@@ -367,12 +375,12 @@ files:
 - 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.com/ts/en/upgrading.html
+  http://pat.github.io/thinking-sphinx/upgrading.html
   
 rdoc_options: []
 
@@ -511,6 +519,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

data/lib/thinking_sphinx/version.rb

@@ -1,3 +0,0 @@
-module ThinkingSphinx
-  Version = '1.4.14'
-end

data/rails/init.rb

@@ -1,16 +0,0 @@
-Dir[File.join(File.dirname(__FILE__), '../vendor/*/lib')].each do |path|
-  $LOAD_PATH.unshift path
-end
-
-require 'thinking_sphinx'
-require 'action_controller/dispatcher'
-
-ActionController::Dispatcher.to_prepare :thinking_sphinx do
-  # Force internationalisation to be loaded.
-  if Rails::VERSION::STRING.to_f > 2.2
-    I18n.backend.reload!
-    I18n.backend.available_locales
-  elsif Rails::VERSION::STRING.to_f > 2.1
-    I18n.backend.load_translations(*I18n.load_path)
-  end
-end

data/tasks/rails.rake

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../lib/thinking_sphinx/tasks')