em-pg-client 0.3.3 → 0.3.4

data/spec/em_synchrony_client_autoreconnect.rb

@@ -64,7 +64,7 @@ describe 'em-synchrony-pg default autoreconnect' do
   end
 
   it "should fail to get last result asynchronously after server restart" do
-    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     expect do
@@ -76,7 +76,7 @@ describe 'em-synchrony-pg default autoreconnect' do
   end
 
   it "should fail to get each result asynchronously after server restart" do
-    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     result = @client.get_result
@@ -93,6 +93,72 @@ describe 'em-synchrony-pg default autoreconnect' do
     EM.stop
   end
 
+  it "should fail wait_for_notify while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    f = Fiber.current
+    notify_flag = false
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+  end
+
+  it "should fail wait_for_notify and finish slow query while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    f = Fiber.current
+    notify_flag = false
+    query_flag = false
+    start_time = Time.now
+    Fiber.new do
+      result = @client.query('SELECT pg_sleep(2); SELECT 42')
+      result.should be_an_instance_of PG::Result
+      result.getvalue(0,0).to_i.should eq 42
+      (Time.now - start_time).should be > 2
+      query_flag = true
+    end.resume
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      query_flag.should be_true
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.query('SELECT pg_database_size(current_database());') do |result|
@@ -138,7 +204,7 @@ describe 'em-synchrony-pg autoreconnect with on_autoreconnect' do
     @client.on_autoreconnect = proc {
       EM::DefaultDeferrable.new.tap {|df| df.succeed }
     }
-    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     expect do
@@ -151,7 +217,7 @@ describe 'em-synchrony-pg autoreconnect with on_autoreconnect' do
 
   it "should fail to get each result asynchronously after server restart" do
     @client.on_autoreconnect = proc { true }
-    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     result = @client.get_result
@@ -168,6 +234,76 @@ describe 'em-synchrony-pg autoreconnect with on_autoreconnect' do
     EM.stop
   end
 
+  it "should fail wait_for_notify while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    @client.on_autoreconnect(&@on_autoreconnect)
+    f = Fiber.current
+    notify_flag = false
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+    @tested_proc.call
+  end
+
+  it "should fail wait_for_notify and finish slow query while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    @client.on_autoreconnect = @on_autoreconnect
+    f = Fiber.current
+    notify_flag = false
+    query_flag = false
+    start_time = Time.now
+    Fiber.new do
+      result = @client.query('SELECT pg_sleep(2); SELECT 42')
+      result.should be_an_instance_of PG::Result
+      result.getvalue(0,0).to_i.should eq 42
+      (Time.now - start_time).should be > 2
+      query_flag = true
+    end.resume
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      query_flag.should be_true
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+    @tested_proc.call
+  end
+
   it "should execute on_connect before on_autoreconnect after server restart" do
     @client.on_connect.should be_nil
     run_on_connect = false
@@ -259,7 +395,7 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     begin
-      @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+      @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
       @client.status.should be PG::CONNECTION_BAD
       @client.get_last_result.should be_nil
@@ -280,7 +416,7 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     begin
-      @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+      @client.send_query('SELECT pg_sleep(50); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
       @client.status.should be PG::CONNECTION_BAD
       @client.get_result.should be_nil
@@ -304,6 +440,113 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     EM.stop
   end
 
+  it "should fail wait_for_notify while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    f = Fiber.current
+    notify_flag = false
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      @client.status.should be PG::CONNECTION_BAD
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      @client.status.should be PG::CONNECTION_BAD
+      @client.reset
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+  end
+
+  it "should fail both wait_for_notify and slow query while server restarts" do
+    @client.status.should be PG::CONNECTION_OK
+    f = Fiber.current
+    notify_flag = false
+    query_flag = false
+    Fiber.new do
+      expect {
+        @client.query('SELECT pg_sleep(2); SELECT 42')
+      }.to raise_error(PG::ConnectionBad)
+      query_flag = true
+    end.resume
+    Fiber.new do
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      query_flag.should be_true
+      @client.status.should be PG::CONNECTION_BAD
+      expect {
+        @client.wait_for_notify do
+          raise "This block should not be called"
+        end
+      }.to raise_error(PG::ConnectionBad)
+      @client.status.should be PG::CONNECTION_BAD
+      expect {
+        @client.query('SELECT 1')
+      }.to raise_error(PG::UnableToSend)
+      @client.reset
+      @client.status.should be PG::CONNECTION_OK
+      Fiber.new do
+        @client.wait_for_notify do |name,|
+          name.should eq 'em_synchrony_client_autoreconnect'
+          notify_flag = true
+        end.should eq 'em_synchrony_client_autoreconnect'
+        @client.query('UNLISTEN *').should be_an_instance_of PG::Result
+        f.resume
+      end.resume
+      @client.query('LISTEN em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+      @client.query('NOTIFY em_synchrony_client_autoreconnect').should be_an_instance_of PG::Result
+    end.resume
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    Fiber.yield
+    notify_flag.should be_true
+  end
+
+  it "should fail wait_for_notify when server was shutdown" do
+    @client.status.should be PG::CONNECTION_OK
+    @client.wait_for_notify(0.1) do
+      raise "This block should not be called"
+    end.should be_nil
+    system($pgserver_cmd_stop).should be_true
+    expect {
+      @client.wait_for_notify do
+        raise "This block should not be called"
+      end
+    }.to raise_error(PG::ConnectionBad)
+    @client.status.should be PG::CONNECTION_BAD
+    expect {
+      @client.wait_for_notify do
+        raise "This block should not be called"
+      end
+    }.to raise_error(PG::ConnectionBad)
+    @client.status.should be PG::CONNECTION_BAD
+    system($pgserver_cmd_start).should be_true
+    @client.status.should be PG::CONNECTION_BAD
+    @client.reset
+    @client.status.should be PG::CONNECTION_OK
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.query('SELECT pg_database_size(current_database());') do |result|

data/spec/pg_em_client_connect_finish.rb

@@ -13,7 +13,7 @@ shared_context 'test deferred' do
         ex.connection.should be_an_instance_of subject
         ex.connection.finished?.should be_false
         EM.stop
-      end.should be_a_kind_of ::EM::DefaultDeferrable
+      end.should be_a_kind_of ::EM::Deferrable
     end
   end
 end

data/spec/pg_em_client_connect_timeout.rb

@@ -15,7 +15,7 @@ shared_context 'test async connect timeout' do
       ex.message.should include 'timeout expired (async)'
       (Time.now - start).should be > timeout
       EM.stop
-    end.should be_a_kind_of ::EM::DefaultDeferrable
+    end.should be_a_kind_of ::EM::Deferrable
     this.should be :first
   end
 

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
+  prerelease: 
 platform: ruby
 authors:
 - Rafal Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-05-24 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
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,29 +78,33 @@ 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,7 +157,6 @@ files:
 homepage: http://github.com/royaltm/ruby-em-pg-client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -154,21 +166,23 @@ 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: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: EventMachine PostgreSQL client
 test_files:
 - spec/pg_em_client_connect_timeout.rb