oedipus 0.0.14 → 0.0.15

data/README.md

@@ -381,6 +381,17 @@ results = sphinx[:articles].multi_search(
 # }
 ```
 
+## Disconnecting from Sphinx
+
+Oedipus will automatically close connections that are idle, so you don't,
+generally speaking, need to close connections manually. However, before
+forking children, for example, it is important to dispose of any open
+resources to avoid sharing resources across processes.  To do this:
+
+``` ruby
+Oedipus.connections.each { |key, conn| conn.close }
+```
+
 ## Running the specs
 
 There are both unit tests and integration tests in the specs/ directory.  By default they

data/lib/oedipus/connection.rb

@@ -102,6 +102,14 @@ module Oedipus
       @pool.acquire { |conn| conn.execute(sql, *bind_values) }
     end
 
+    # Disconnect from the remote host.
+    #
+    # There is no need to explicitly re-connect after invoking this;
+    # connections are re-established as needed.
+    def close
+      @pool.dispose
+    end
+
     private
 
     def assert_valid_pool

data/lib/oedipus/connection/pool.rb

@@ -70,6 +70,30 @@ module Oedipus
         release(instance)
       end
 
+      # Dispose all connections in the pool.
+      #
+      # Waits until all connections have finished processing current queries
+      # and then releases them.
+      def dispose
+        begin
+          @lock.synchronize do
+            while instance = @available.pop
+              instance.close
+            end
+
+            @condition.wait(@lock) if @used.size > 0
+          end
+        end until empty?
+      end
+
+      # Returns true if the pool is currently empty.
+      #
+      # @return [Boolean]
+      #   true if no connections are pooled, false otherwise
+      def empty?
+        @lock.synchronize { @used.size == 0 && @available.size == 0 }
+      end
+
       private
 
       def release(instance)

data/lib/oedipus/version.rb

@@ -8,5 +8,5 @@
 ##
 
 module Oedipus
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/integration/connection_spec.rb

@@ -152,4 +152,12 @@ describe Oedipus::Connection do
       conn.execute("REPLACE INTO posts_rt (id, title, state, body) VALUES (?, 'question?', 'other?', ?)", 1, 'a' * 2_000_000)
     end
   end
+
+  describe "#close" do
+    before(:each) { conn.close }
+
+    it "disposes the internal pool" do
+      conn.instance_variable_get(:@pool).should be_empty
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12537160 !ruby/object:Gem::Requirement
+  requirement: &20925980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12537160
+  version_requirements: *20925980
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &12535680 !ruby/object:Gem::Requirement
+  requirement: &20925400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12535680
+  version_requirements: *20925400
 description: ! "== Sphinx 2 Comes to Ruby\n\nOedipus brings full support for Sphinx
   2 to Ruby:\n\n  - real-time indexes (insert, replace, update, delete)\n  - faceted
   search (variations on a base query)\n  - multi-queries (multiple queries executed
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1945313164651030981
+      hash: 1288054359540287220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1945313164651030981
+      hash: 1288054359540287220
 requirements: []
 rubyforge_project: oedipus
 rubygems_version: 1.8.11