em-pg-client 0.2.0.pre.3 → 0.2.0

data/spec/em_devel_client.rb

@@ -4,6 +4,9 @@ require 'date'
 require 'eventmachine'
 require 'pg/em'
 require 'em_client_common'
+RSpec.configure do |config|
+  config.include(PGSpecMacros)
+end
 
 describe PG::EM::Client do
 

data/spec/em_release_client.rb

@@ -4,6 +4,9 @@ require 'date'
 require 'eventmachine'
 require 'pg/em'
 require 'em_client_common'
+RSpec.configure do |config|
+  config.include(PGSpecMacros)
+end
 
 describe PG::EM::Client do
 

data/spec/em_synchrony_client.rb

@@ -9,10 +9,30 @@ describe PG::EM::Client do
     @client.should be_an_instance_of described_class
   end
 
-  it "should create simple table `foo`" do
+  it "should have disabled async_autoreconnect" do
+    @client.async_autoreconnect.should be_false
+  end
+  
+  it "should enable async_autoreconnect" do
+    @client.async_autoreconnect = true
+    @client.async_autoreconnect.should be_true
+  end
+
+  it "should have same internal and external encoding" do
+    @client.external_encoding.should be @client.internal_encoding
+  end
+
+  it "should begin transaction" do
+    @client.query('BEGIN TRANSACTION').should be_an_instance_of PG::Result
+  end
+
+  it "should drop table `foo` if exists" do
     @client.query(
       'DROP TABLE IF EXISTS foo'
     ).should be_an_instance_of PG::Result
+  end
+  
+  it "should create simple table `foo`" do
     @client.query(
       'CREATE TABLE foo (id integer,cdate timestamp with time zone,data varchar)'
     ).should be_an_instance_of PG::Result
@@ -30,33 +50,112 @@ describe PG::EM::Client do
     results.each {|r| r.should be_an_instance_of DateTime }
   end
 
-  it "should read foo table with prepared statement" do
+  it "should create prepared statement" do
     @client.prepare('get_foo', 
       'SELECT * FROM foo order by id'
     ).should be_an_instance_of PG::Result
-    @client.exec_prepared('get_foo') do |result|
+  end
+
+  it "should describe prepared statement" do
+    @client.describe_prepared('get_foo') do |result|
+      result.should be_an_instance_of PG::Result
+      result.nfields.should eq 3
+      result.fname(0).should eq 'id'      
+      result.values.should be_empty
+    end
+  end
+
+  it "should read foo table with prepared statement" do
+    ret = @client.exec_prepared('get_foo') do |result|
       result.should be_an_instance_of PG::Result
       result.each_with_index do |row, i|
         row['id'].to_i.should == i
         DateTime.parse(row['cdate']).should == @cdates[i]
         row['data'].should == @values[i][0]
       end
+      result
+    end
+    ret.should be_an_instance_of PG::Result
+    expect { ret.fields }.to raise_error(PG::Error, /result has been cleared/)
+  end
+
+  it "should declare cursor" do
+    @client.query(
+      'DECLARE foobar SCROLL CURSOR FOR SELECT * FROM foo'
+    ).should be_an_instance_of PG::Result
+  end
+
+  it "should fetch two rows from table" do
+    ret = @client.query('FETCH FORWARD 2 FROM foobar') do |result|
+      result.should be_an_instance_of PG::Result
+      result.nfields.should eq 3
+      result.fname(0).should eq 'id'      
+      result.values.length.should eq 2
+      result
+    end
+    ret.should be_an_instance_of PG::Result
+    expect { ret.fields }.to raise_error(PG::Error, /result has been cleared/)
+  end
+  
+  it "should describe cursor with describe_portal" do
+    @client.describe_portal('foobar') do |result|
+      result.should be_an_instance_of PG::Result
+      result.nfields.should eq 3
+      result.fname(0).should eq 'id'
     end
   end
 
+  it "should close cursor" do
+    @client.query(
+      'CLOSE foobar'
+    ).should be_an_instance_of PG::Result
+  end
+
   it "should connect to database asynchronously" do
     this = :first
+    Encoding.default_internal = Encoding::ISO_8859_1
     f = Fiber.current
     Fiber.new do
-      conn = described_class.new
-      this = :second
-      conn.should be_an_instance_of described_class
-      conn.query('SELECT pg_database_size(current_database());') do |result|
-        result.should be_an_instance_of PG::Result
-        result[0]['pg_database_size'].to_i.should be > 0
+      begin
+        result = described_class.new do |conn|
+          this = :second
+          Encoding.default_internal = nil
+          conn.should be_an_instance_of described_class
+          conn.external_encoding.should_not eq(conn.internal_encoding)
+          conn.internal_encoding.should be Encoding::ISO_8859_1
+          conn.get_client_encoding.should eq "LATIN1"
+          conn.query('SELECT pg_database_size(current_database());') do |result|
+            result.should be_an_instance_of PG::Result
+            result[0]['pg_database_size'].to_i.should be > 0
+          end
+          conn
+        end
+        result.should be_an_instance_of described_class
+        result.finished?.should be_true
+      ensure
+        f.resume
+      end
+    end.resume
+    this.should be :first
+    Fiber.yield
+    this.should be :second
+  end
+
+  it "should connect without setting incompatible encoding" do
+    this = :first
+    Encoding.default_internal = Encoding::Emacs_Mule
+    f = Fiber.current
+    Fiber.new do
+      begin
+        described_class.new do |conn|
+          this = :second
+          Encoding.default_internal = nil
+          conn.should be_an_instance_of described_class
+          conn.external_encoding.should be conn.internal_encoding
+        end
+      ensure
+        f.resume
       end
-      conn.close
-      f.resume
     end.resume
     this.should be :first
     Fiber.yield
@@ -67,12 +166,12 @@ describe PG::EM::Client do
     expect {
       @client.query('SELECT * from pg_class; SRELECT CURRENT_TIMESTAMP; SELECT 42 number')
     }.to raise_error(PG::Error, /syntax error/)
+  end
+  
+  it "should rollback transaction" do
     @client.query('ROLLBACK') do |result|
       result.should be_an_instance_of PG::Result
     end
-    @client.query('BEGIN TRANSACTION') do |result|
-      result.should be_an_instance_of PG::Result
-    end
   end
 
   it "should return only last statement" do
@@ -94,9 +193,7 @@ describe PG::EM::Client do
     @client.query_timeout = 0
     @client.query_timeout.should eq 0
     @client.async_command_aborted.should be_true
-    @client.query('BEGIN TRANSACTION') do |result|
-      result.should be_an_instance_of PG::Result
-    end
+    @client.status.should be PG::CONNECTION_BAD
   end
 
   it "should timeout not expire while executing query with partial results" do
@@ -116,6 +213,7 @@ describe PG::EM::Client do
       @client.query_timeout = 0
       @client.query_timeout.should eq 0
       @client.async_command_aborted.should be_false
+      @client.status.should be PG::CONNECTION_OK
     end
   end
 
@@ -133,14 +231,24 @@ describe PG::EM::Client do
           'SELECT 42 number')
     }.to raise_error(PG::Error, /query timeout expired/)
     (Time.now - start_time).should be > 2
+    @client.async_command_aborted.should be_true
+    @client.status.should be PG::CONNECTION_BAD
     @client.query_timeout = 0
     @client.query_timeout.should eq 0
-    @client.query('BEGIN TRANSACTION') do |result|
-      result.should be_an_instance_of PG::Result
+  end
+
+  it "should clear connection with blocking reset" do
+    @after_em_stop = proc do
+      @client.async_command_aborted.should be_true
+      @client.status.should be PG::CONNECTION_BAD
+      @client.reset
+      @client.async_command_aborted.should be_false
+      @client.status.should be PG::CONNECTION_OK
     end
   end
 
   around(:each) do |testcase|
+    @after_em_stop = nil
     EM.synchrony do
       begin
         testcase.call
@@ -148,17 +256,18 @@ describe PG::EM::Client do
         EM.stop
       end
     end
+    @after_em_stop.call if @after_em_stop
   end
 
   before(:all) do
     @cdates = []
     @values = Array(('AA'..'ZZ').each_with_index)
+    ENV['PGCLIENTENCODING'] = nil
+    Encoding.default_internal = nil
     @client = described_class.new
-    @client.query 'BEGIN TRANSACTION'
   end
 
   after(:all) do
-    @client.query 'ROLLBACK TRANSACTION'
     @client.close
   end
 

data/spec/em_synchrony_client_autoreconnect.rb

@@ -51,7 +51,7 @@ describe 'em-synchrony-pg default autoreconnect' do
         result[0]['pg_database_size'].to_i.should be > 0
       end
     end
-    @client = PG::EM::Client.new
+    @client = PG::EM::Client.new(async_autoreconnect: true)
     @client.set_notice_processor {|msg| puts "warning from pgsql: #{msg.to_s.chomp.inspect}"}
   end
 end
@@ -101,7 +101,9 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
   end
 
   it "should get database size using query after manual connection reset" do
+    @client.status.should be PG::CONNECTION_BAD
     @client.reset
+    @client.status.should be PG::CONNECTION_OK
     @tested_proc.call
   end
 
@@ -112,7 +114,7 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
         result[0]['pg_database_size'].to_i.should be > 0
       end
     end
-    @client = PG::EM::Client.new(async_autoreconnect: false)
+    @client = PG::EM::Client.new
     @client.set_notice_processor {|msg| puts "warning from pgsql: #{msg.to_s.chomp.inspect}"}
   end
 end

metadata

@@ -1,82 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-pg-client
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.2.0.pre.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rafal Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pg
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.13.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-synchrony
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-description: PostgreSQL asynchronous EventMachine client (ruby-pg) wrapper
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: PostgreSQL asynchronous EventMachine client, based on pg interface (PG::Connection)
 email: rafal@yeondir.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - BENCHMARKS.rdoc
-files: 
+files:
 - BENCHMARKS.rdoc
 - HISTORY.rdoc
 - README.rdoc
@@ -93,35 +115,34 @@ files:
 - spec/em_synchrony_client_autoreconnect.rb
 homepage: http://github.com/royaltm/ruby-em-pg-client
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - em-pg-client
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - PostgreSQL server
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: EventMachine PostgreSQL client
-test_files: 
+test_files:
 - spec/em_synchrony_client.rb
 - spec/em_devel_client.rb
 - spec/em_client_common.rb