pod4 0.10.6 → 1.0.0

data/spec/common/shared_examples_for_interface.rb

@@ -1,17 +1,16 @@
-require 'octothorpe'
+require "octothorpe"
 
 
 ##
-# These are the shared tests for all interfaces. To use them you need to
-# supply:
+# These are the shared tests for all interfaces. To use them you need to supply:
 #
 # * record - a record to insert
 # * interface - an instance of the interface to call.
 #
 # For example (from nebulous_interface_spec):
 #
-#     it_behaves_like 'an interface' do
-#       let(:record) { {id: 1, name: 'percy'} }
+#     it_behaves_like "an interface" do
+#       let(:record) { {id: 1, name: "percy"} }
 #
 #       let(:interface) do
 #         init_nebulous
@@ -19,36 +18,45 @@ require 'octothorpe'
 #       end
 #     end
 #
-# 'record' does not have to include every column in your table, and you should
-# actively exclude floats (where you cannot guarantee equality) or anything
-# that is supposed to render to a BigDecimal.  Make sure these fields are NULL
-# in the table definition.
+# 'record' does not have to include every column in your table, and you should actively exclude
+# floats (where you cannot guarantee equality) or anything that is supposed to render to a
+# BigDecimal.  Make sure these fields are NULL in the table definition.
 #
-# Note that these shared tests only test the common parts of the API that the
-# interface exposes to the *model*; they make no assumptions about where your
-# test data is coming from, or how you are calling or mocking whatever library
-# the interface is an adapter to. 
+# Note that these shared tests only test the common parts of the API that the interface exposes to
+# the *model* They don't attempt to test your Interface's communication to it's data access layer,
+# or how it talks to the Connection class. It makes no assumptions about where your test data is
+# coming from, or how you are calling or mocking whatever library the interface is an adapter to. 
 #
-# It's up to the individual specs to test that the interface is calling its
-# library correctly and deal with all the things specific to that interface -
-# which includes how the model calls new() and list(), for example.
+# It's up to the individual specs to test that the interface is calling its library correctly and
+# deal with all the things specific to that interface - which includes how the model calls new()
+# and list(), for example.
 #
-RSpec.shared_examples 'an interface' do 
+RSpec.shared_examples "an interface" do 
 
   let(:record_as_ot) { Octothorpe.new(record) }
 
 
-  describe '#id_fld' do
-    it 'is an attribute' do
+  describe "#id_fld" do
+
+    it "is an attribute" do
       expect( interface.id_fld ).not_to be_nil
     end
-  end
-  ##
 
+  end # of #id_fld
+
+
+  describe "#id_ai" do
+
+    it "is an attribute" do
+      expect( interface.id_ai ).not_to be_nil
+    end
 
-  describe '#create' do
+  end # of #id_ai
 
-    it 'requires a hash or an Octothorpe' do
+
+  describe "#create" do
+
+    it "requires a hash or an Octothorpe" do
       expect{ interface.create      }.to raise_exception ArgumentError
       expect{ interface.create(nil) }.to raise_exception ArgumentError
       expect{ interface.create(3)   }.to raise_exception ArgumentError
@@ -57,47 +65,43 @@ RSpec.shared_examples 'an interface' do
       expect{ interface.create(record_as_ot) }.not_to raise_exception
     end
 
-    it 'returns the ID' do
+    it "returns the ID" do
       record_id = interface.create(record)
       expect{ interface.read(record_id) }.not_to raise_exception
       expect( interface.read(record_id).to_h ).to include record
     end
 
-  end
-  ##
+  end # of #create
 
 
-  describe '#read' do
+  describe "#read" do
 
     before do
       interface.create(record)
       @id = interface.list.first[interface.id_fld]
     end
 
-    it 'requires an ID' do
+    it "requires an ID" do
       expect{ interface.read      }.to raise_exception ArgumentError
       expect{ interface.read(nil) }.to raise_exception ArgumentError
 
       expect{ interface.read(@id) }.not_to raise_exception
     end
 
-    it 'returns an Octothorpe' do
+    it "returns an Octothorpe" do
       expect( interface.read(@id) ).to be_a_kind_of Octothorpe
     end
 
-  end
-  ##
+  end # of #read
 
 
-  describe '#update' do
-
+  describe "#update" do
     before do
       interface.create(record)
       @id = interface.list.first[interface.id_fld]
     end
 
-    
-    it 'requires an ID and a record (hash or OT)' do
+    it "requires an ID and a record (hash or OT)" do
       expect{ interface.update      }.to raise_exception ArgumentError
       expect{ interface.update(nil) }.to raise_exception ArgumentError
       expect{ interface.update(14)  }.to raise_exception ArgumentError
@@ -105,55 +109,51 @@ RSpec.shared_examples 'an interface' do
       expect{ interface.update(@id, record) }.not_to raise_exception
     end
  
-    it 'returns self' do
+    it "returns self" do
       expect( interface.update(@id, record) ).to eq interface
     end
 
-  end
-  ##
-
+  end # of #update
 
-  describe '#delete' do
 
+  describe "#delete" do
     before do
       interface.create(record)
       @id = interface.list.first[interface.id_fld]
     end
 
-    it 'requires an id' do
+    it "requires an id" do
       expect{ interface.delete      }.to raise_exception ArgumentError
       expect{ interface.delete(nil) }.to raise_exception ArgumentError
 
       expect{ interface.delete(@id) }.not_to raise_exception
     end
 
-    it 'returns self' do
+    it "returns self" do
       expect( interface.delete(@id) ).to eq interface
     end
 
-  end
-  ##
+  end # of #delete
 
 
-  describe '#list' do
+  describe "#list" do
 
-    it 'will allow itself to be called with no parameter' do
+    it "will allow itself to be called with no parameter" do
       expect{ interface.list }.not_to raise_exception
     end
 
-    it 'returns an array of Octothorpes' do
+    it "returns an array of Octothorpes" do
       interface.create(record)
       expect( interface.list       ).to be_a_kind_of Array
       expect( interface.list.first ).to be_a_kind_of Octothorpe
     end
 
-    it 'has the ID field as one of the Octothorpe keys' do
+    it "has the ID field as one of the Octothorpe keys" do
       interface.create(record)
       expect( interface.list.first.to_h ).to have_key interface.id_fld
     end
 
-  end
-  ##
+  end # of #list
   
 
 end

data/spec/jruby/sequel_encrypting_jdbc_pg_spec.rb

@@ -36,7 +36,7 @@ describe "(writing encrypted data via sequel_interface)" do
   let(:medical_interface_class) do 
     Class.new Pod4::SequelInterface do
       set_table  :medical
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 

data/spec/jruby/sequel_interface_jdbc_ms_spec.rb

@@ -19,7 +19,7 @@ describe "SequelInterface (JDBC/MSSQL)" do
   let(:sequel_interface_class) do
     Class.new SequelInterface do
       set_table :customer
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 
@@ -27,14 +27,14 @@ describe "SequelInterface (JDBC/MSSQL)" do
     Class.new SequelInterface do
       set_schema :public
       set_table  :customer
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 
   let(:prod_interface_class) do
     Class.new SequelInterface do
       set_table  :product
-      set_id_fld :code
+      set_id_fld :code, autoincrement: false
     end
   end
 

data/spec/jruby/sequel_interface_jdbc_pg_spec.rb

@@ -14,32 +14,12 @@ require 'bigdecimal'
 require 'jdbc/postgres'
 
 
-=begin
-class TestSequelInterfacePg < SequelInterface
-  set_table :customer
-  set_id_fld :id
-end
-
-class SchemaSequelInterfacePg < SequelInterface
-  set_schema :public
-  set_table  :customer
-  set_id_fld :id
-end
-
-class ProdSequelInterfacePg < SequelInterface
-  set_table  :product
-  set_id_fld :code
-end
-=end
-
-
-
 describe "SequelInterface (JDBC/Pg)" do
 
   let(:sequel_interface_class) do
     Class.new SequelInterface do
       set_table :customer
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 
@@ -47,14 +27,14 @@ describe "SequelInterface (JDBC/Pg)" do
     Class.new SequelInterface do
       set_schema :public
       set_table  :customer
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 
   let(:prod_interface_class) do
     Class.new SequelInterface do
       set_table  :product
-      set_id_fld :code
+      set_id_fld :code, autoincrement: false
     end
   end
 

data/spec/mri/pg_encrypting_spec.rb

@@ -52,7 +52,7 @@ describe "(writing encrypted data via pg_interface)" do
       include Pod4::Encrypting
 
       encrypted_columns :name, :ailment
-      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_key           "dflkasdgklajnlga"
       set_iv_column     :nonce
     end
   end

data/spec/mri/pg_interface_spec.rb

@@ -1,18 +1,58 @@
-require 'pod4/pg_interface'
-require 'pg'
+require "pod4/pg_interface"
+require "pg"
 
-require_relative '../common/shared_examples_for_interface'
-require_relative '../fixtures/database'
+require_relative "../common/shared_examples_for_interface"
+require_relative "../fixtures/database"
 
 
 describe "PgInterface" do
 
+  def db_setup(connect)
+    client = PG.connect(connect)
+
+    client.exec(%Q|
+      drop table if exists customer;
+      drop table if exists product;
+
+      create table customer ( 
+        id        serial primary key,
+        name      text,
+        level     real      null,
+        day       date      null,
+        timestamp timestamp null,
+        price     money     null,
+        flag      boolean   null,
+        qty       numeric   null );
+
+      create table product (
+        code text,
+        name text );| )
+
+  ensure
+    client.finish if client
+  end
+
+  def fill_data(ifce)
+    @data.each{|r| ifce.create(r) }
+  end
+
+  def fill_product_data(ifce)
+    ifce.create( {code: "foo", name: "bar"} )
+  end
+
+  def list_contains(ifce, id)
+    ifce.list.find {|x| x[ifce.id_fld] == id }
+  end
+
+  def float_price(row)
+    row[:price] = row[:price].to_f
+    row
+  end
+
   let(:pg_interface_class) do
     Class.new PgInterface do
       set_table :customer
       set_id_fld :id
-
-      def stop; close; end # We open a lot of connections, unusually
     end
   end
 
@@ -20,14 +60,14 @@ describe "PgInterface" do
     Class.new PgInterface do
       set_schema :public
       set_table  :customer
-      set_id_fld :id
+      set_id_fld :id, autoincrement: true
     end
   end
 
   let(:prod_interface_class) do
     Class.new PgInterface do
       set_table  :product
-      set_id_fld :code
+      set_id_fld :code, autoincrement: false
     end
   end
 
@@ -43,76 +83,49 @@ describe "PgInterface" do
     end
   end
 
-
-  def db_setup(connect)
-    client = PG.connect(connect)
-
-    client.exec(%Q|
-      drop table if exists customer;
-      drop table if exists product;
-
-      create table customer ( 
-        id        serial primary key,
-        name      text,
-        level     real      null,
-        day       date      null,
-        timestamp timestamp null,
-        price     money     null,
-        flag      boolean   null,
-        qty       numeric   null );
-
-      create table product (
-        code text,
-        name text );| )
-
-  ensure
-    client.finish if client
-  end
-
-
-  def fill_data(ifce)
-    @data.each{|r| ifce.create(r) }
+  let(:interface) do
+    pg_interface_class.new(@pool)
   end
 
-
-  def fill_product_data(ifce)
-    ifce.create( {code: "foo", name: "bar"} )
+  let(:prod_interface) do
+    prod_interface_class.new(@pool)
   end
 
-
   before(:all) do
     @connect_hash = DB[:pg]
     db_setup(@connect_hash)
 
     @data = []
-    @data << { name:      'Barney',
+    @data << { name:      "Barney",
                level:     1.23,
                day:       Date.parse("2016-01-01"),
-               timestamp: Time.parse('2015-01-01 12:11'),
+               timestamp: Time.parse("2015-01-01 12:11"),
                price:     BigDecimal("1.24"),
                flag:      true,
                qty:       BigDecimal("1.25") }
 
-    @data << { name:      'Fred',
+    @data << { name:      "Fred",
                level:     2.34,
                day:       Date.parse("2016-02-02"),
-               timestamp: Time.parse('2015-01-02 12:22'),
+               timestamp: Time.parse("2015-01-02 12:22"),
                price:     BigDecimal("2.35"),
                flag:      false,
                qty:       BigDecimal("2.36") }
 
-    @data << { name:      'Betty',
+    @data << { name:      "Betty",
                level:     3.45,
                day:       Date.parse("2016-03-03"),
-               timestamp: Time.parse('2015-01-03 12:33'),
+               timestamp: Time.parse("2015-01-03 12:33"),
                price:     BigDecimal("3.46"),
                flag:      nil,
                qty:       BigDecimal("3.47") }
 
+    # one connection pool for the whole suite, so it doesn't grab (number of tests) connections.
+    @pool = ConnectionPool.new(interface: PgInterface)
+    @pool.data_layer_options = @connect_hash
   end
 
-
-  before do
+  before(:each) do
     interface.execute(%Q|
       truncate table customer restart identity;
       truncate table product;|)
@@ -120,127 +133,147 @@ describe "PgInterface" do
   end
 
 
-  after do
-    # We open a lot of connections, unusually
-    interface.stop if interface
-  end
-
-
-  let(:interface) do
-    pg_interface_class.new(@connect_hash)
-  end
-
-  let(:prod_interface) do
-    prod_interface_class.new(@connect_hash)
-  end
-
-  #####
-
-
-  it_behaves_like 'an interface' do
-
+  it_behaves_like "an interface" do
     let(:interface) do
       pg_interface_class.new(@connect_hash)
     end
 
-    let(:record) { {name: 'Barney'} }
+    let(:record) { {name: "Barney"} }
 
-  end
-  ##
+  end # of it_behaves_like
  
 
-  describe 'PgInterface.set_schema' do
-    it 'takes one argument' do
+  describe "PgInterface.set_schema" do
+
+    it "takes one argument" do
       expect( pg_interface_class ).to respond_to(:set_schema).with(1).argument
     end
-  end
-  ##
+
+  end # of PgInterface.set_schema
 
 
-  describe 'PgInterface.schema' do
-    it 'returns the schema' do
+  describe "PgInterface.schema" do
+
+    it "returns the schema" do
       expect( schema_interface_class.schema ).to eq :public
     end
 
-    it 'is optional' do
+    it "is optional" do
       expect{ pg_interface_class.schema }.not_to raise_exception
       expect( pg_interface_class.schema ).to eq nil
     end
-  end
-  ##
 
+  end # of PgInterface.schema
 
-  describe 'PgInterface.set_table' do
-    it 'takes one argument' do
+
+  describe "PgInterface.set_table" do
+
+    it "takes one argument" do
       expect( pg_interface_class ).to respond_to(:set_table).with(1).argument
     end
-  end
-  ##
+
+  end # of PgInterface.set_table
   
 
-  describe 'PgInterface.table' do
-    it 'returns the table' do
+  describe "PgInterface.table" do
+
+    it "returns the table" do
       expect( pg_interface_class.table ).to eq :customer
     end
-  end
-  ##
 
+  end # of PgInterface.table
+
+
+  describe "PgInterface.set_id_fld" do
 
-  describe 'PgInterface.set_id_fld' do
-    it 'takes one argument' do
+    it "takes one argument" do
       expect( pg_interface_class ).to respond_to(:set_id_fld).with(1).argument
     end
-  end
-  ##
 
+    it "takes an optional second 'autoincrement' argument" do
+      expect{ PgInterface.set_id_fld(:foo, autoincrement: false) }.not_to raise_error
+    end
 
-  describe 'PgInterface.id_fld' do
-    it 'returns the ID field name' do
+  end # of PgInterface.set_id_fld
+
+
+  describe "PgInterface.id_fld" do
+
+    it "returns the ID field name" do
       expect( pg_interface_class.id_fld ).to eq :id
     end
-  end
-  ##
 
+  end # of PgInterface.id_fld
+
+
+  describe "PgInterface.id_ai" do
+     
+    it "returns true if autoincrement is true" do
+      expect( schema_interface_class.id_ai ).to eq true
+    end
+
+    it "returns false if autoincrement is false" do
+      expect( prod_interface_class.id_ai ).to eq false
+    end
+
+    it "returns true if autoincrement is not specified" do
+      expect( pg_interface_class.id_ai ).to eq true
+    end
+    
+  end # of PgInterface.id_ai
+
+
+  describe "#new" do
+
+    it "creates a ConnectionPool when passed a PG connection hash" do
+      ifce = pg_interface_class.new(@connect_hash)
+      expect( ifce._connection ).to be_a ConnectionPool
+    end
+    
+    it "uses the ConnectionPool when given one" do
+      pool = ConnectionPool.new(interface: pg_interface_class)
+      ifce = pg_interface_class.new(pool)
 
-  describe '#new' do
+      expect( ifce._connection ).to eq pool
+    end
 
-    it 'requires a TinyTds connection string' do
+    it "raises ArgumentError when passed something else" do
       expect{ pg_interface_class.new        }.to raise_exception ArgumentError
       expect{ pg_interface_class.new(nil)   }.to raise_exception ArgumentError
-      expect{ pg_interface_class.new('foo') }.to raise_exception ArgumentError
-
-      expect{ pg_interface_class.new(@connect_hash) }.not_to raise_exception
+      expect{ pg_interface_class.new("foo") }.to raise_exception ArgumentError
     end
 
-  end
-  ##
+  end # of #new
   
 
-  describe '#quoted_table' do
+  describe "#quoted_table" do
 
-    it 'returns just the table when the schema is not set' do
+    it "returns just the table when the schema is not set" do
       expect( interface.quoted_table ).to eq( %Q|"customer"| )
     end
 
-    it 'returns the schema plus table when the schema is set' do
+    it "returns the schema plus table when the schema is set" do
       ifce = schema_interface_class.new(@connect_hash)
       expect( ifce.quoted_table ).to eq( %|"public"."customer"| )
     end
 
-  end
-  ##
+  end # of #quoted_table
 
 
-  describe '#create' do
+  describe "#create" do
+    let(:hash) { {name: "Bam-Bam", price: 4.44} }
+    let(:ot)   { Octothorpe.new(name: "Wilma", price: 5.55) }
 
-    let(:hash) { {name: 'Bam-Bam', price: 4.44} }
-    let(:ot)   { Octothorpe.new(name: 'Wilma', price: 5.55) }
+    it "raises a Pod4::DatabaseError if anything goes wrong" do
+      expect{ interface.create(one: "two") }.to raise_exception DatabaseError
+    end
 
-    it 'raises a Pod4::DatabaseError if anything goes wrong' do
-      expect{ interface.create(one: 'two') }.to raise_exception DatabaseError
+    it "raises an ArgumentError if ID field is missing in hash and not AI" do
+      hash = {name: "bar"}
+      expect{ prod_interface.create(Octothorpe.new hash) }.to raise_error ArgumentError
     end
 
-    it 'creates the record when given a hash' do
+    it "creates the record when given a hash" do
       # kinda impossible to seperate these two tests
       id = interface.create(hash)
 
@@ -248,28 +281,28 @@ describe "PgInterface" do
       expect( interface.read(id).to_h ).to include hash
     end
 
-    it 'creates the record when given an Octothorpe' do
+    it "creates the record when given an Octothorpe" do
       id = interface.create(ot)
 
       expect{ interface.read(id) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include ot.to_h
     end
 
-    it 'shouldn\'t have a problem with record values of nil' do
-      record = {name: 'Ranger', price: nil}
+    it "has no problem with record values of nil" do
+      record = {name: "Ranger", price: nil}
       expect{ interface.create(record) }.not_to raise_exception
       id = interface.create(record)
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with strings containing special characters' do
-      record = {name: %Q|T'Challa""|, price: nil}
+    it "has no problem with strings containing special characters" do
+      record = {name: %Q|T"Challa""|, price: nil}
       expect{ interface.create(record) }.not_to raise_exception
       id = interface.create(record)
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       hash = {code: "foo", name: "bar"}
       id = prod_interface.create( Octothorpe.new(hash) )
 
@@ -278,65 +311,79 @@ describe "PgInterface" do
       expect( prod_interface.read("foo").to_h ).to include hash
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.create(ot)
+    end
+
+    it "copes with an OT with an ID field when autoincrement = true" do
+      h = {id: nil, name: "Bam-Bam", qty: 4.44}
+      expect{ interface.create(h) }.not_to raise_error
+
+      id = interface.create(h)
+      expect( id ).not_to be_nil
+      expect{ interface.read(id) }.not_to raise_exception
+      expect( interface.read(id).to_h ).to include( {name: "Bam-Bam", qty: 4.44} )
+    end
+
+  end # of #create
 
 
-  describe '#read' do
+  describe "#read" do
     before { fill_data(interface) }
 
-    it 'returns the record for the id as an Octothorpe' do
+    it "returns the record for the id as an Octothorpe" do
       rec = interface.read(2)
       expect( rec ).to be_a_kind_of Octothorpe
-      expect( rec.>>.name ).to eq 'Fred'
+      expect( rec.>>.name ).to eq "Fred"
     end
 
-    it 'raises a Pod4::CantContinue if the ID is bad' do
+    it "raises a Pod4::CantContinue if the ID is bad" do
       expect{ interface.read(:foo) }.to raise_exception CantContinue
     end
 
-    it 'returns an empty Octothorpe if no record matches the ID' do
+    it "returns an empty Octothorpe if no record matches the ID" do
       expect{ interface.read(99) }.not_to raise_exception
       expect( interface.read(99) ).to be_a_kind_of Octothorpe
       expect( interface.read(99) ).to be_empty
     end
 
-    it 'returns real fields as Float' do
+    it "returns real fields as Float" do
       level = interface.read(1).>>.level
 
       expect( level ).to be_a_kind_of Float
       expect( level ).to be_within(0.001).of( @data.first[:level] )
     end
 
-    it 'returns date fields as Date' do
+    it "returns date fields as Date" do
       date = interface.read(1).>>.day
 
       expect( date ).to be_a_kind_of Date
       expect( date ).to eq @data.first[:day]
     end
 
-    it 'returns datetime fields as Time' do
+    it "returns datetime fields as Time" do
       timestamp = interface.read(1).>>.timestamp
 
       expect( timestamp ).to be_a_kind_of Time
       expect( timestamp ).to eq @data.first[:timestamp]
     end
 
-    it 'returns numeric fields as BigDecimal' do
+    it "returns numeric fields as BigDecimal" do
       qty = interface.read(1).>>.qty
 
       expect( qty ).to be_a_kind_of BigDecimal
       expect( qty ).to eq @data.first[:qty]
     end
 
-    it 'returns money fields as BigDecimal' do
+    it "returns money fields as BigDecimal" do
       price   = interface.read(1).>>.price
 
       expect( price ).to be_a_kind_of BigDecimal
       expect( price ).to eq @data.first[:price]
     end
 
-    it 'returns boolean fields as boolean' do
+    it "returns boolean fields as boolean" do
       [1,2,3].each do |i|
         flag = interface.read(i).>>.flag
         expect( [true, false, nil].include? flag ).to be true
@@ -344,7 +391,7 @@ describe "PgInterface" do
       end
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       # this is a 100% overlap with the create test above...
       fill_product_data(prod_interface)
 
@@ -352,260 +399,301 @@ describe "PgInterface" do
       expect( prod_interface.read("foo").to_h ).to include(code: "foo", name: "bar")
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.read(99)
+    end
+
+  end # of #read
 
 
-  describe '#list' do
+  describe "#list" do
     before { fill_data(interface) }
 
-    it 'has an optional selection parameter, a hash' do
+    it "has an optional selection parameter, a hash" do
       # Actually it does not have to be a hash, but FTTB we only support that.
-      expect{ interface.list(name: 'Barney') }.not_to raise_exception
+      expect{ interface.list(name: "Barney") }.not_to raise_exception
     end
 
-    it 'returns an array of Octothorpes that match the records' do
+    it "returns an array of Octothorpes that match the records" do
       # convert each OT to a hash and remove the ID key
       arr = interface.list.map {|ot| x = ot.to_h; x.delete(:id); x }
 
       expect( arr ).to match_array @data
     end
 
-    it 'returns a subset of records based on the selection parameter' do
-      expect( interface.list(name: 'Fred').size ).to eq 1
+    it "returns a subset of records based on the selection parameter" do
+      expect( interface.list(name: "Fred").size ).to eq 1
 
-      expect( interface.list(name: 'Betty').first.to_h ).
-        to include(name: 'Betty')
+      expect( interface.list(name: "Betty").first.to_h ).
+        to include(name: "Betty")
 
     end
 
-    it 'returns an empty Array if nothing matches' do
-      expect( interface.list(name: 'Yogi') ).to eq([])
+    it "returns an empty Array if nothing matches" do
+      expect( interface.list(name: "Yogi") ).to eq([])
     end
 
-    it 'raises ArgumentError if the selection criteria is nonsensical' do
-      expect{ interface.list('foo') }.to raise_exception ArgumentError
+    it "raises ArgumentError if the selection criteria is nonsensical" do
+      expect{ interface.list("foo") }.to raise_exception ArgumentError
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.list
+    end
+
+  end # of #list
   
 
-  describe '#update' do
+  describe "#update" do
     before { fill_data(interface) }
 
     let(:id) { interface.list.first[:id] }
 
-    def float_price(row)
-      row[:price] = row[:price].to_f
-      row
-    end
-
-    it 'updates the record at ID with record parameter' do
-      record = {name: 'Booboo', price: 99.99}
+    it "updates the record at ID with record parameter" do
+      record = {name: "Booboo", price: 99.99}
       interface.update(id, record)
 
       expect( float_price( interface.read(id).to_h ) ).to include(record)
     end
 
-    it 'raises a CantContinue if anything weird happens with the ID' do
-      expect{ interface.update(99, name: 'Booboo') }.
+    it "raises a CantContinue if anything weird happens with the ID" do
+      expect{ interface.update(99, name: "Booboo") }.
         to raise_exception CantContinue
 
     end
 
-    it 'raises a DatabaseError if anything weird happens with the record' do
-      expect{ interface.update(id, smarts: 'more') }.
+    it "raises a DatabaseError if anything weird happens with the record" do
+      expect{ interface.update(id, smarts: "more") }.
         to raise_exception DatabaseError
 
     end
 
-    it 'shouldn\'t have a problem with record values of nil' do
-      record = {name: 'Ranger', price: nil}
+    it "has no problem with record values of nil" do
+      record = {name: "Ranger", price: nil}
       expect{ interface.update(id, record) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with strings containing special characters' do
-      record = {name: %Q|T'Challa""|, price: nil}
+    it "has no problem with strings containing special characters" do
+      record = {name: %Q|T'Challa"|, price: nil}
       expect{ interface.update(id, record) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       fill_product_data(prod_interface)
       expect{ prod_interface.update("foo", name: "baz") }.not_to raise_error
       expect( prod_interface.read("foo").to_h[:name] ).to eq "baz"
     end
 
-  end
-  ##
-
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      record = {name: "Booboo", price: 99.99}
+      interface.update(id, record)
+    end
 
-  describe '#delete' do
+  end # of #update
 
-    def list_contains(ifce, id)
-      ifce.list.find {|x| x[ifce.id_fld] == id }
-    end
 
+  describe "#delete" do
     let(:id) { interface.list.first[:id] }
 
     before { fill_data(interface) }
 
-    it 'raises CantContinue if anything hinky happens with the id' do
+    it "raises CantContinue if anything hinky happens with the id" do
       expect{ interface.delete(:foo) }.to raise_exception CantContinue
       expect{ interface.delete(99)   }.to raise_exception CantContinue
     end
 
-    it 'makes the record at ID go away' do
+    it "makes the record at ID go away" do
       expect( list_contains(interface, id) ).to be_truthy
       interface.delete(id)
       expect( list_contains(interface, id) ).to be_falsy
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no roblem with non-integer keys" do
       fill_product_data(prod_interface)
       expect( list_contains(prod_interface, "foo") ).to be_truthy
       prod_interface.delete("foo")
       expect( list_contains(prod_interface, "foo") ).to be_falsy
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.delete(id)
+    end
 
+  end # of #delete
 
-  describe '#execute' do
 
-    let(:sql) { 'delete from customer where cast(price as numeric) < 2.0;' }
+  describe "#execute" do
+    let(:sql) { "delete from customer where cast(price as numeric) < 2.0;" }
 
     before { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.execute      }.to raise_exception ArgumentError
       expect{ interface.execute(nil) }.to raise_exception ArgumentError
       expect{ interface.execute(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.execute('delete from not_a_table') }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.execute("delete from not_a_table") }.
         to raise_exception Pod4Error
 
     end
 
-    it 'executes the string' do
+    it "executes the string" do
       expect{ interface.execute(sql) }.not_to raise_exception
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.execute(sql)
+    end
 
+  end # of #execute
 
-  describe '#executep' do
 
-    let(:sql) { 'delete from customer where cast(price as numeric) < %s and name = %s;' }
+  describe "#executep" do
+    let(:sql) { "delete from customer where cast(price as numeric) < %s and name = %s;" }
 
     before { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.executep      }.to raise_exception ArgumentError
       expect{ interface.executep(nil) }.to raise_exception ArgumentError
       expect{ interface.executep(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.executep('delete from not_a_table where foo = %s', 12) }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.executep("delete from not_a_table where foo = %s", 12) }.
         to raise_exception Pod4Error
 
     end
 
-    it 'executes the string with the given parameters' do
-      expect{ interface.executep(sql, 12.0, 'Barney') }.not_to raise_exception
+    it "executes the string with the given parameters" do
+      expect{ interface.executep(sql, 12.0, "Barney") }.not_to raise_exception
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.executep(sql, 12.0, "Barney")
+    end
 
+  end # of #executep
 
-  describe '#select' do
 
+  describe "#select" do
     before { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.select      }.to raise_exception ArgumentError
       expect{ interface.select(nil) }.to raise_exception ArgumentError
       expect{ interface.select(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.select('select * from not_a_table') }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.select("select * from not_a_table") }.
         to raise_exception Pod4Error
 
     end
 
-    it 'returns the result of the sql' do
-      sql1 = 'select name from customer where cast(price as numeric) < 2.0;'
-      sql2 = 'select name from customer where cast(price as numeric) < 0.0;'
+    it "returns the result of the sql" do
+      sql1 = "select name from customer where cast(price as numeric) < 2.0;"
+      sql2 = "select name from customer where cast(price as numeric) < 0.0;"
 
       expect{ interface.select(sql1) }.not_to raise_exception
-      expect( interface.select(sql1) ).to eq( [{name: 'Barney'}] )
+      expect( interface.select(sql1) ).to eq( [{name: "Barney"}] )
       expect( interface.select(sql2) ).to eq( [] )
     end
 
-    it 'works if you pass a non-select' do
+    it "works if you pass a non-select" do
       # By which I mean: still executes the SQL; returns []
-      sql = 'delete from customer where cast(price as numeric) < 2.0;'
+      sql = "delete from customer where cast(price as numeric) < 2.0;"
       ret = interface.select(sql)
 
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
       expect( ret ).to eq( [] )
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      sql = "select name from customer;"
+      interface.select(sql)
+    end
 
+  end # of #select
 
-  describe '#selectp' do
 
+  describe "#selectp" do
     before { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.selectp      }.to raise_exception ArgumentError
       expect{ interface.selectp(nil) }.to raise_exception ArgumentError
       expect{ interface.selectp(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.selectp('select * from not_a_table where thingy = %s', 12) }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.selectp("select * from not_a_table where thingy = %s", 12) }.
         to raise_exception Pod4Error
 
     end
 
-    it 'returns the result of the sql' do
-      sql = 'select name from customer where cast(price as numeric) < %s;'
+    it "returns the result of the sql" do
+      sql = "select name from customer where cast(price as numeric) < %s;"
 
       expect{ interface.selectp(sql, 2.0) }.not_to raise_exception
-      expect( interface.selectp(sql, 2.0) ).to eq( [{name: 'Barney'}] )
+      expect( interface.selectp(sql, 2.0) ).to eq( [{name: "Barney"}] )
       expect( interface.selectp(sql, 0.0) ).to eq( [] )
     end
 
-    it 'works if you pass a non-select' do
-      sql = 'delete from customer where cast(price as numeric) < %s;'
+    it "works if you pass a non-select" do
+      sql = "delete from customer where cast(price as numeric) < %s;"
       ret = interface.selectp(sql, 2.0)
 
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
       expect( ret ).to eq( [] )
     end
 
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      sql = "select name from customer where cast(price as numeric) < %s;"
+      interface.selectp(sql, 2.0)
+    end
+
+  end # of #selectp
+
+
+  describe "#new_connection" do
+     
+    it "returns a PG Client object" do
+      expect( interface.new_connection @connect_hash ).to be_a PG::Connection
+    end
+    
+  end # of #new_connection
 
-  end
-  ##
 
+  describe "#close_connection" do
 
+    it "closes the given PG Client object" do
+      client = interface.new_connection(@connect_hash)
+
+      expect( client ).to receive(:finish)
+
+      interface.close_connection(client)
+    end
+
+  end # of #close_connection
+  
 end