pod4 0.8.0 → 0.8.1

data/spec/common/sequel_interface_pg_spec.rb

@@ -10,26 +10,30 @@ require 'time'
 require 'bigdecimal'
 
 
-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
+describe "SequelInterface (Pg)" do
 
+  let(:sequel_interface_class) do
+    Class.new SequelInterface do
+      set_table :customer
+      set_id_fld :id
+    end
+  end
 
+  let(:schema_interface_class) do
+    Class.new SequelInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
 
+  let(:prod_interface_class) do
+    Class.new SequelInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  end
 
-describe TestSequelInterfacePg do
 
   let(:data) do
     d = []
@@ -89,8 +93,8 @@ describe TestSequelInterfacePg do
     db
   end
 
-  let(:interface)      { TestSequelInterfacePg.new(db) }
-  let(:prod_interface) { ProdSequelInterfacePg.new(db) }
+  let(:interface)      { sequel_interface_class.new(db) }
+  let(:prod_interface) { prod_interface_class.new(db) }
 
 
   before do
@@ -115,7 +119,7 @@ describe TestSequelInterfacePg do
     end
 
     it 'returns the schema plus table when the schema is set' do
-      ifce = SchemaSequelInterfacePg.new(db)
+      ifce = schema_interface_class.new(db)
       expect( ifce.quoted_table.downcase ).to eq( %|"public"."customer"| )
     end
 

data/spec/common/sql_helper_spec.rb

@@ -3,25 +3,29 @@ require 'time'
 require 'bigdecimal'
 require 'pod4/sql_helper'
 
-class SQLHelperTester1
-  include SQLHelper
 
-  def schema; "marco"; end
-  def table;  "polo";  end
-  def id_fld; "foo";   end
-end
+describe "SQLHelper" do
 
-class SQLHelperTester2
-  include SQLHelper
+  let(:tester1_class) do
+    Class.new do
+      include SQLHelper
 
-  def table; "polo"; end
-end
+      def schema; "marco"; end
+      def table;  "polo";  end
+      def id_fld; "foo";   end
+    end
+  end
 
+  let(:tester2_class) do
+    Class.new do
+      include SQLHelper
 
-describe "SQLHelper" do
+      def table; "polo"; end
+    end
+  end
 
-  let(:tester1) {SQLHelperTester1.new}
-  let(:tester2) {SQLHelperTester2.new}
+  let(:tester1) {tester1_class.new}
+  let(:tester2) {tester2_class.new}
 
     
   describe "quoted_table" do
@@ -89,7 +93,13 @@ describe "SQLHelper" do
 
     it "returns time wrapped in a single quote" do
       tm = Time.parse(datetime)
-      expect( tester1.send :quote, tm ).to match dtmatch
+
+      # Ruby Time.parse swallows the given timezone and converts prior to Ruby 2.2
+      if RUBY_VERSION =~ /^2.[01]/
+        expect( tester1.send :quote, tm ).to match /'2055.12.31[T ]07.23.36 ?\+00:?00'/ 
+      else
+        expect( tester1.send :quote, tm ).to match dtmatch
+      end
     end
 
     it "returns a BigDecimal as a float" do

data/spec/jruby/sequel_interface_jdbc_ms_spec.rb

@@ -13,24 +13,31 @@ require 'bigdecimal'
 require 'sqljdbc4.jar' # from jdbc-mssqlserver
 
 
-class TestSequelInterfaceMs < SequelInterface
-  set_table :customer
-  set_id_fld :id
-end
+describe "SequelInterface (JDBC/MSSQL)" do
 
-class SchemaSequelInterfaceMs < SequelInterface
-  set_schema :public
-  set_table  :customer
-  set_id_fld :id
-end
+  let(:sequel_interface_class) do
+    Class.new SequelInterface do
+      set_table :customer
+      set_id_fld :id
+    end
+  end
 
-class ProdSequelInterfaceMs < SequelInterface
-  set_table  :product
-  set_id_fld :code
-end
+  let(:schema_interface_class) do
+    Class.new SequelInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
+
+  let(:prod_interface_class) do
+    Class.new SequelInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  end
 
 
-describe TestSequelInterfaceMs do
 
   let(:data) do
     d = []
@@ -101,8 +108,8 @@ describe TestSequelInterfaceMs do
     db
   end
 
-  let(:interface)      { TestSequelInterfaceMs.new(db) }
-  let(:prod_interface) { ProdSequelInterfaceMs.new(db) }
+  let(:interface)      { sequel_interface_class.new(db) }
+  let(:prod_interface) { prod_interface_class.new(db) }
 
   before do
     # TRUNCATE TABLE also resets the identity counter
@@ -123,7 +130,7 @@ describe TestSequelInterfaceMs do
     end
 
     it 'returns the schema plus table when the schema is set' do
-      ifce = SchemaSequelInterfaceMs.new(db)
+      ifce = schema_interface_class.new(db)
       expect( ifce.quoted_table.downcase ).to eq( %|[public].[customer]| )
     end
 

data/spec/jruby/sequel_interface_jdbc_pg_spec.rb

@@ -13,6 +13,8 @@ require 'bigdecimal'
 # the MSSQL one. But no --- and presumably Jeremy Evans has his reasons.
 require 'jdbc/postgres'
 
+
+=begin
 class TestSequelInterfacePg < SequelInterface
   set_table :customer
   set_id_fld :id
@@ -28,10 +30,34 @@ 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
+    end
+  end
 
+  let(:schema_interface_class) do
+    Class.new SequelInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
+
+  let(:prod_interface_class) do
+    Class.new SequelInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  end
 
-describe TestSequelInterfacePg do
 
   let(:data) do
     d = []
@@ -91,8 +117,8 @@ describe TestSequelInterfacePg do
     db
   end
 
-  let(:interface)      { TestSequelInterfacePg.new(db) }
-  let(:prod_interface) { ProdSequelInterfacePg.new(db) }
+  let(:interface)      { sequel_interface_class.new(db) }
+  let(:prod_interface) { prod_interface_class.new(db) }
 
   before do
     # TRUNCATE TABLE also resets the identity counter
@@ -117,7 +143,7 @@ describe TestSequelInterfacePg do
     end
 
     it 'returns the schema plus table when the schema is set' do
-      ifce = SchemaSequelInterfacePg.new(db)
+      ifce = schema_interface_class.new(db)
       expect( ifce.quoted_table.downcase ).to eq( %|"public"."customer"| )
     end
 

data/spec/mri/pg_interface_spec.rb

@@ -5,35 +5,44 @@ require_relative '../common/shared_examples_for_interface'
 require_relative '../fixtures/database'
 
 
-class TestPgInterface < PgInterface
-  set_table  :customer
-  set_id_fld :id
+describe "PgInterface" do
 
-  # We open a lot of connections, unusually
-  def stop; close; end
-end
+  let(:pg_interface_class) do
+    Class.new PgInterface do
+      set_table :customer
+      set_id_fld :id
 
-class SchemaPgInterface < PgInterface
-  set_schema :public
-  set_table  :customer
-  set_id_fld :id
-end
+      def stop; close; end # We open a lot of connections, unusually
+    end
+  end
 
-class BadPgInterface1 < PgInterface
-  set_table :customer
-end
+  let(:schema_interface_class) do
+    Class.new PgInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
 
-class BadPgInterface2 < PgInterface
-  set_id_fld :id
-end
+  let(:prod_interface_class) do
+    Class.new PgInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  end
 
-class ProdPgInterface < PgInterface
-  set_table  :product
-  set_id_fld :code
-end
+  let(:bad_interface_class1) do
+    Class.new PgInterface do
+      set_table :customer
+    end
+  end
 
+  let(:bad_interface_class2) do
+    Class.new PgInterface do
+      set_id_fld :id
+    end
+  end
 
-describe TestPgInterface do
 
   def db_setup(connect)
     client = PG.connect(connect)
@@ -114,11 +123,11 @@ describe TestPgInterface do
 
 
   let(:interface) do
-    TestPgInterface.new(@connect_hash)
+    pg_interface_class.new(@connect_hash)
   end
 
   let(:prod_interface) do
-    ProdPgInterface.new(@connect_hash)
+    prod_interface_class.new(@connect_hash)
   end
 
   #####
@@ -127,7 +136,7 @@ describe TestPgInterface do
   it_behaves_like 'an interface' do
 
     let(:interface) do
-      TestPgInterface.new(@connect_hash)
+      pg_interface_class.new(@connect_hash)
     end
 
     let(:record) { {name: 'Barney'} }
@@ -138,7 +147,7 @@ describe TestPgInterface do
 
   describe 'PgInterface.set_schema' do
     it 'takes one argument' do
-      expect( PgInterface ).to respond_to(:set_schema).with(1).argument
+      expect( pg_interface_class ).to respond_to(:set_schema).with(1).argument
     end
   end
   ##
@@ -146,12 +155,12 @@ describe TestPgInterface do
 
   describe 'PgInterface.schema' do
     it 'returns the schema' do
-      expect( SchemaPgInterface.schema ).to eq :public
+      expect( schema_interface_class.schema ).to eq :public
     end
 
     it 'is optional' do
-      expect{ TestPgInterface.schema }.not_to raise_exception
-      expect( TestPgInterface.schema ).to eq nil
+      expect{ pg_interface_class.schema }.not_to raise_exception
+      expect( pg_interface_class.schema ).to eq nil
     end
   end
   ##
@@ -159,7 +168,7 @@ describe TestPgInterface do
 
   describe 'PgInterface.set_table' do
     it 'takes one argument' do
-      expect( PgInterface ).to respond_to(:set_table).with(1).argument
+      expect( pg_interface_class ).to respond_to(:set_table).with(1).argument
     end
   end
   ##
@@ -167,7 +176,7 @@ describe TestPgInterface do
 
   describe 'PgInterface.table' do
     it 'returns the table' do
-      expect( TestPgInterface.table ).to eq :customer
+      expect( pg_interface_class.table ).to eq :customer
     end
   end
   ##
@@ -175,7 +184,7 @@ describe TestPgInterface do
 
   describe 'PgInterface.set_id_fld' do
     it 'takes one argument' do
-      expect( PgInterface ).to respond_to(:set_id_fld).with(1).argument
+      expect( pg_interface_class ).to respond_to(:set_id_fld).with(1).argument
     end
   end
   ##
@@ -183,7 +192,7 @@ describe TestPgInterface do
 
   describe 'PgInterface.id_fld' do
     it 'returns the ID field name' do
-      expect( TestPgInterface.id_fld ).to eq :id
+      expect( pg_interface_class.id_fld ).to eq :id
     end
   end
   ##
@@ -192,11 +201,11 @@ describe TestPgInterface do
   describe '#new' do
 
     it 'requires a TinyTds connection string' do
-      expect{ TestPgInterface.new        }.to raise_exception ArgumentError
-      expect{ TestPgInterface.new(nil)   }.to raise_exception ArgumentError
-      expect{ TestPgInterface.new('foo') }.to raise_exception ArgumentError
+      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{ TestPgInterface.new(@connect_hash) }.not_to raise_exception
+      expect{ pg_interface_class.new(@connect_hash) }.not_to raise_exception
     end
 
   end
@@ -210,7 +219,7 @@ describe TestPgInterface do
     end
 
     it 'returns the schema plus table when the schema is set' do
-      ifce = SchemaPgInterface.new(@connect_hash)
+      ifce = schema_interface_class.new(@connect_hash)
       expect( ifce.quoted_table ).to eq( %|"public"."customer"| )
     end
 
@@ -553,9 +562,9 @@ describe TestPgInterface do
     before { fill_data(interface) }
 
     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
+      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

data/spec/mri/sequel_interface_spec.rb

@@ -8,40 +8,44 @@ require 'bigdecimal'
 require_relative '../common/shared_examples_for_interface'
 
 
-class TestSequelInterface < SequelInterface
-  set_table :customer
-  set_id_fld :id
-end
 
-class SchemaSequelInterface < SequelInterface
-  set_schema :public
-  set_table  :customer
-  set_id_fld :id
-end
+describe "SequelInterface" do
 
-class BadSequelInterface1 < SequelInterface
-  set_table :customer
-end
-
-class BadSequelInterface2 < SequelInterface
-  set_id_fld :id
-end
+  let(:sequel_interface_class) do
+    Class.new SequelInterface do
+      set_table :customer
+      set_id_fld :id
+    end
+  end
 
-class ProdSequelInterface < SequelInterface
-  set_table  :product
-  set_id_fld :code
-end
+  let(:schema_interface_class) do
+    Class.new SequelInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
 
+  let(:prod_interface_class) do
+    Class.new SequelInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  end
 
+  let(:bad_interface_class1) do
+    Class.new SequelInterface do
+      set_table :customer
+    end
+  end
 
+  let(:bad_interface_class2) do
+    Class.new SequelInterface do
+      set_id_fld :id
+    end
+  end
 
-describe TestSequelInterface do
 
-  # We actually connect to a special test database for this. I don't generally
-  # like unit tests to involve other classes at all, but otherwise we are
-  # hardly testing anything, and in any case we do need to test that this class
-  # successfully interfaces with Sequel. We can't really do that without
-  # talking to a database.
 
   let(:data) do
     d = []
@@ -99,8 +103,8 @@ describe TestSequelInterface do
     db
   end
 
-  let(:interface)      { TestSequelInterface.new(db) }
-  let(:prod_interface) { ProdSequelInterface.new(db) }
+  let(:interface)      { sequel_interface_class.new(db) }
+  let(:prod_interface) { prod_interface_class.new(db) }
 
   before do
     fill_data(interface)
@@ -122,7 +126,7 @@ describe TestSequelInterface do
         BigDecimal  :price, :size=>[10.2] 
       end
 
-      TestSequelInterface.new(db2)
+      sequel_interface_class.new(db2)
     end
 
     let(:record)    { {name: 'Barney', price: 1.11} }
@@ -132,7 +136,7 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.set_schema' do
     it 'takes one argument' do
-      expect( SequelInterface ).to respond_to(:set_schema).with(1).argument
+      expect( sequel_interface_class ).to respond_to(:set_schema).with(1).argument
     end
   end
   ##
@@ -140,12 +144,12 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.schema' do
     it 'returns the schema' do
-      expect( SchemaSequelInterface.schema ).to eq :public
+      expect( schema_interface_class.schema ).to eq :public
     end
 
     it 'is optional' do
-      expect{ TestSequelInterface.schema }.not_to raise_exception
-      expect( TestSequelInterface.schema ).to eq nil
+      expect{ sequel_interface_class.schema }.not_to raise_exception
+      expect( sequel_interface_class.schema ).to eq nil
     end
   end
   ##
@@ -153,7 +157,7 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.set_table' do
     it 'takes one argument' do
-      expect( SequelInterface ).to respond_to(:set_table).with(1).argument
+      expect( sequel_interface_class ).to respond_to(:set_table).with(1).argument
     end
   end
   ##
@@ -161,7 +165,7 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.table' do
     it 'returns the table' do
-      expect( TestSequelInterface.table ).to eq :customer
+      expect( sequel_interface_class.table ).to eq :customer
     end
   end
   ##
@@ -169,7 +173,7 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.set_id_fld' do
     it 'takes one argument' do
-      expect( SequelInterface ).to respond_to(:set_id_fld).with(1).argument
+      expect( sequel_interface_class ).to respond_to(:set_id_fld).with(1).argument
     end
   end
   ##
@@ -177,7 +181,7 @@ describe TestSequelInterface do
 
   describe 'SequelInterface.id_fld' do
     it 'returns the ID field name' do
-      expect( TestSequelInterface.id_fld ).to eq :id
+      expect( sequel_interface_class.id_fld ).to eq :id
     end
   end
   ##
@@ -186,17 +190,17 @@ describe TestSequelInterface do
   describe '#new' do
 
     it 'requires a Sequel DB object' do
-      expect{ TestSequelInterface.new        }.to raise_exception ArgumentError
-      expect{ TestSequelInterface.new(nil)   }.to raise_exception ArgumentError
-      expect{ TestSequelInterface.new('foo') }.to raise_exception ArgumentError
+      expect{ sequel_interface_class.new        }.to raise_exception ArgumentError
+      expect{ sequel_interface_class.new(nil)   }.to raise_exception ArgumentError
+      expect{ sequel_interface_class.new('foo') }.to raise_exception ArgumentError
 
-      expect{ TestSequelInterface.new(db) }.not_to raise_exception
+      expect{ sequel_interface_class.new(db) }.not_to raise_exception
     end
 
     it 'requires the table and id field to be defined in the class' do
       expect{ SequelInterface.new(db) }.to raise_exception Pod4Error
-      expect{ BadSequelInterface1.new(db)   }.to raise_exception Pod4Error
-      expect{ BadSequelInterface2.new(db)   }.to raise_exception Pod4Error
+      expect{ bad_interface_class1.new(db)   }.to raise_exception Pod4Error
+      expect{ bad_interface_class2.new(db)   }.to raise_exception Pod4Error
     end
 
   end
@@ -210,7 +214,7 @@ describe TestSequelInterface do
     end
 
     it 'returns the schema plus table when the schema is set' do
-      ifce = SchemaSequelInterface.new(db)
+      ifce = schema_interface_class.new(db)
       expect( ifce.quoted_table ).to eq( %|`public`.`customer`| )
     end
 
@@ -340,15 +344,6 @@ describe TestSequelInterface do
       expect{ interface.list(name: 'Barney') }.not_to raise_exception
     end
 
-=begin
-    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
-=end
-
     it 'returns an array of Octothorpes that match the records' do
       arr = interface.list.map {|ot| x = ot.to_h}