em-pg-client 0.3.2 → 0.3.3

data/spec/em_synchrony_client_autoreconnect.rb

@@ -168,6 +168,54 @@ describe 'em-synchrony-pg autoreconnect with on_autoreconnect' do
     EM.stop
   end
 
+  it "should execute on_connect before on_autoreconnect after server restart" do
+    @client.on_connect.should be_nil
+    run_on_connect = false
+    @client.on_connect = proc do |client, is_async, is_reset|
+      client.should be_an_instance_of PG::EM::Client
+      is_async.should be_true
+      is_reset.should be_true
+      client.query('SELECT pg_database_size(current_database());') {
+        run_on_connect = true
+      }
+    end
+    @client.on_autoreconnect = proc do |client, ex|
+      run_on_connect.should be_true
+      @on_autoreconnect.call(client, ex)
+    end
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    @tested_proc.call
+    EM.stop
+  end
+
+  it "should skip on_autoreconnect when on_connect failed after server restart" do
+    run_on_connect = false
+    run_on_autoreconnect = false
+    @client.on_connect = proc do |client, is_async, is_reset|
+      client.should be_an_instance_of PG::EM::Client
+      is_async.should be_true
+      is_reset.should be_true
+      begin
+        client.query('SELLECT 1;')
+      ensure
+        run_on_connect = true
+      end
+    end
+    @client.on_autoreconnect = proc do |client, ex|
+      run_on_autoreconnect = true
+    end
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    expect do
+      @client.exec_prepared('get_db_size')
+    end.to raise_error PG::SyntaxError
+    @client.status.should be PG::CONNECTION_OK
+    run_on_connect.should be_true
+    run_on_autoreconnect.should be_false
+    EM.stop
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.exec_prepared('get_db_size') do |result|

data/spec/pg_em_client_options.rb

@@ -21,6 +21,7 @@ describe 'em-pg-client options' do
                                 :@async_autoreconnect => true,
                                 :@connect_timeout => 10,
                                 :@query_timeout=>1,
+                                :@on_connect=>nil,
                                 :@on_autoreconnect=>nil,
                                 :@async_command_aborted=>false} }
 
@@ -78,7 +79,7 @@ describe 'em-pg-client options' do
     end.to raise_error(ArgumentError, /must respond to/)
 
     expect do
-      subject.parse_async_options [on_autoreconnect: Object.new]
+      subject.parse_async_options ['on_autoreconnect' => Object.new]
     end.to raise_error(ArgumentError, /must respond to/)
 
     options = subject.parse_async_options [on_autoreconnect: callback]
@@ -86,10 +87,47 @@ describe 'em-pg-client options' do
     options[:@on_autoreconnect].should be callback
   end
 
+  it "should set only callable on_connect" do
+    expect do
+      subject.parse_async_options [on_connect: true]
+    end.to raise_error(ArgumentError, /must respond to/)
+
+    expect do
+      subject.parse_async_options ['on_connect' => Object.new]
+    end.to raise_error(ArgumentError, /must respond to/)
+
+    options = subject.parse_async_options [on_connect: callback]
+    options.should be_an_instance_of Hash
+    options[:@on_connect].should be callback
+  end
+
   it "should raise error with obsolete argument" do
     expect do
       subject.parse_async_options [on_reconnect: true]
     end.to raise_error ArgumentError
   end
 
+  it "should set on_* options with a writer or a block" do
+    async_args = subject.parse_async_options([])
+    client = subject.allocate
+    client.instance_eval {
+      async_args.each {|k, v| instance_variable_set(k, v) }
+    }
+    client.should be_an_instance_of subject
+    client.on_connect.should be_nil
+    client.on_autoreconnect.should be_nil
+    client.on_connect = callback
+    client.on_connect.should be callback
+    client.on_autoreconnect = callback
+    client.on_autoreconnect.should be callback
+    client.on_connect = nil
+    client.on_connect.should be_nil
+    client.on_autoreconnect = nil
+    client.on_autoreconnect.should be_nil
+    client.on_connect(&callback).should be callback
+    client.on_connect.should be callback
+    client.on_autoreconnect(&callback).should be callback
+    client.on_autoreconnect.should be callback
+  end
+
 end

data/spec/pg_em_connection_pool.rb

@@ -19,6 +19,7 @@ describe PG::EM::ConnectionPool do
   let(:pgerror)      { PG::Error.new }
   let(:fooerror)     { RuntimeError.new 'foo' }
   let(:timeout)      { 10 }
+  let(:hook)         { proc {|c| }}
 
   it "should allocate one connection" do
     client.should_receive(:new).with({}).once.and_return(client.allocate)
@@ -60,6 +61,8 @@ describe PG::EM::ConnectionPool do
       client.allocate.tap do |conn|
         conn.should_receive(:connect_timeout=).with(timeout).once
         conn.should_receive(:query_timeout=).with(timeout).once
+        conn.should_receive(:on_autoreconnect=).with(hook).twice
+        conn.should_receive(:on_connect=).with(hook).twice
         conn.should_receive(:finish).once
       end
     end.exactly(3)
@@ -87,6 +90,12 @@ describe PG::EM::ConnectionPool do
           pool.allocated.length.should eq 2
           pool.connect_timeout = timeout
           pool.query_timeout = timeout
+          pool.on_connect = hook
+          pool.on_connect.should be hook
+          pool.on_connect(&hook)
+          pool.on_autoreconnect = hook
+          pool.on_autoreconnect.should be hook
+          pool.on_autoreconnect(&hook)
         end
       end.resume
     end
@@ -99,12 +108,15 @@ describe PG::EM::ConnectionPool do
     pool.max_size.should eq 3
     pool.available.length.should eq 0
     pool.allocated.length.should eq 0
+    pool.on_connect.should be hook
+    pool.on_autoreconnect.should be hook
     pool.size.should eq 0
   end
 
   it "should allocate new connection with altered attributes" do
     client.should_receive(:new).with(
-      {connect_timeout: timeout, query_timeout: timeout}
+      {connect_timeout: timeout, query_timeout: timeout,
+       on_connect: hook, on_autoreconnect: hook}
     ).once.and_return(client.allocate)
     pool = subject.new connection_class: client, size: 1, lazy: true
     pool.should be_an_instance_of subject
@@ -112,8 +124,12 @@ describe PG::EM::ConnectionPool do
     pool.query_timeout.should be_nil
     pool.connect_timeout = timeout
     pool.query_timeout = timeout
+    pool.on_connect = hook
+    pool.on_autoreconnect(&hook)
     pool.connect_timeout.should eq timeout
     pool.query_timeout.should eq timeout
+    pool.on_connect.should be hook
+    pool.on_autoreconnect.should be hook
     pool.max_size.should eq 1
     pool.available.length.should eq 0
     pool.allocated.length.should eq 0
@@ -130,19 +146,27 @@ describe PG::EM::ConnectionPool do
       options.should be_empty
       pool.connect_timeout = timeout
       pool.query_timeout = timeout
+      pool.on_connect = hook
+      pool.on_autoreconnect(&hook)
       client.allocate.tap do |conn|
         conn.should_receive(:connect_timeout=).with(timeout).once
         conn.should_receive(:query_timeout=).with(timeout).once
+        conn.should_receive(:on_autoreconnect=).with(hook).once
+        conn.should_receive(:on_connect=).with(hook).once
       end
     end.once
     client.should_receive(:connect_defer) do |options|
       options.should be_empty
       pool.connect_timeout = timeout
       pool.query_timeout = timeout
+      pool.on_connect(&hook)
+      pool.on_autoreconnect = hook
       deferrable.new.tap do |df|
         df.succeed(client.allocate.tap do |conn|
           conn.should_receive(:connect_timeout=).with(timeout).once
           conn.should_receive(:query_timeout=).with(timeout).once
+          conn.should_receive(:on_autoreconnect=).with(hook).once
+          conn.should_receive(:on_connect=).with(hook).once
         end)
       end
     end.once

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Rafal Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,33 +69,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
 description: PostgreSQL asynchronous EventMachine client, based on pg interface (PG::Connection)
@@ -144,6 +131,8 @@ files:
 - spec/em_client.rb
 - spec/em_client_autoreconnect.rb
 - spec/em_client_common.rb
+- spec/em_client_on_connect.rb
+- spec/em_connection_pool.rb
 - spec/em_synchrony_client.rb
 - spec/em_synchrony_client_autoreconnect.rb
 - spec/pg_em_client_connect_finish.rb
@@ -155,6 +144,7 @@ files:
 homepage: http://github.com/royaltm/ruby-em-pg-client
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -164,23 +154,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - PostgreSQL server
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EventMachine PostgreSQL client
 test_files:
 - spec/pg_em_client_connect_timeout.rb
@@ -189,8 +177,10 @@ test_files:
 - spec/connection_pool_helpers.rb
 - spec/pg_em_client_options.rb
 - spec/em_synchrony_client.rb
+- spec/em_client_on_connect.rb
 - spec/em_client_common.rb
 - spec/em_synchrony_client_autoreconnect.rb
+- spec/em_connection_pool.rb
 - spec/pg_em_client_connect_finish.rb
 - spec/pg_em_connection_pool.rb
 - spec/em_client_autoreconnect.rb