pod4 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee46818707291111af50ad94a88168a026f9d2a
-  data.tar.gz: 9cae9859c19fbbd3784d8a43cb33d40a0effe7ca
+  metadata.gz: c65450007521cb6a9e312bdc47350624c85f381f
+  data.tar.gz: 37a401097db2e57f2ea96c337e4b3e151a154606
 SHA512:
-  metadata.gz: ac96259ec5dad9ce2ad6b92d80e4b92987138ceba5d176dee3debfdc647699bd8dfa88858ecca0690384217fac34b6d8a175eae6da38ce1bccb4c2589dd48f47
-  data.tar.gz: 4fa5a9bbec0022d3da862b4b1a5d14b0298417fc0a3ef0e710a4f1db44c25f61cabb01110db83ead8f33a8ca4e9a1cfed434ffbf52ba94b948da30802a35309d
+  metadata.gz: c7c157f8b35a9961a48e9457e7aa328dd1a4c361876aa236cdfbe009448a21e005c659fa7a089c79f4e61d169580d622e5539d3b04cf4d78f293422b0e20dc8e
+  data.tar.gz: 5be81a188a0e925fdbb45cb4f1bb74240eed34b16c6e103ce75905aefe3bc378354c744cf8437fca0389b1c68b82ef2f6fdb21b0b14a26672babcb133838c6e4

data/.hgtags

@@ -28,3 +28,4 @@ f1b3a814e7a8c7d818b57f6d35ce7ed749573d76 0.9.1
 4860714dd83ddb5b4ed0b7e32459fdaa845ac2fa 0.9.3
 77ad625b2ab048bd660194cf093015b1f2698069 0.10
 7ac52e99228fe39ca59c87fad8fe2c1236fce4fa 0.10.1
+7a39c71dceaf05b9204e1f2870f904940fdac4d3 0.10.3

data/lib/pod4/encrypting.rb

@@ -1,4 +1,5 @@
 require "openssl"
+require "base64"
 require "pod4/errors"
 require "pod4/metaxing"
 
@@ -137,8 +138,9 @@ module Pod4
         # If the IV is not set we need to set it both in the model object AND the hash, since we've
         # already obtained the hash from the model object.
         if use_iv? && encryption_iv.nil?
-          set_encryption_iv( cipher.random_iv )
-          hash[self.class.encryption_iv_column] = encryption_iv
+          iv = cipher.random_iv
+          set_encryption_iv(iv)
+          hash[self.class.encryption_iv_column] = Base64.strict_encode64(iv)
         end
 
         self.class.encryption_columns.each do |col|
@@ -154,10 +156,15 @@ module Pod4
       def map_to_model(ot)
         hash   = ot.to_h
         cipher = get_cipher(:decrypt)
-        iv     = hash[self.class.encryption_iv_column] # not yet set on the model
+
+        # The IV is not in columns, we need to de-base-64 it and set it on the model ourselves
+        if use_iv?
+          iv = Base64.strict_decode64 hash[self.class.encryption_iv_column]
+          set_encryption_iv(iv)
+        end
 
         self.class.encryption_columns.each do |col|
-          hash[col] = crypt(cipher, :decrypt, iv, hash[col])
+          hash[col] = crypt(cipher, :decrypt, encryption_iv, hash[col])
         end
 
         super Octothorpe.new(hash)
@@ -212,9 +219,13 @@ module Pod4
         cipher.key = self.class.encryption_key
         cipher.iv = iv if use_iv?
 
+        string = Base64.strict_decode64(string) if direction == :decrypt
+
         answer = ""
         answer << cipher.update(string.to_s) unless direction == :encrypt && string.empty?
         answer << cipher.final
+
+        answer = Base64.strict_encode64(answer) if direction == :encrypt
         answer
 
       rescue OpenSSL::Cipher::CipherError

data/lib/pod4/version.rb

@@ -1,3 +1,3 @@
 module Pod4 
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

data/spec/common/model_plus_encrypting_spec.rb

@@ -1,5 +1,6 @@
 require "date"
 require "openssl"
+require "base64"
 require "octothorpe"
 
 require "pod4"
@@ -19,7 +20,8 @@ describe "(Model with Encryption)" do
     cipher.key = key
     cipher.iv = iv if iv
 
-    (plaintext.empty? ? "" : cipher.update(plaintext) ) + cipher.final
+    answer = (plaintext.empty? ? "" : cipher.update(plaintext) ) + cipher.final
+    Base64.strict_encode64(answer)
   end
 
   let(:encryption_key) { "dflkasdgklajndgnalkghlgasdgasdghaalsdg" }
@@ -197,8 +199,10 @@ describe "(Model with Encryption)" do
       it "writes an IV to the nonce field" do
         m40.create
         expect( m40_record.>>.nonce ).not_to be_nil
-        expect( m40_record.>>.nonce ).to eq m40.nonce
-        expect( m40_record.>>.nonce ).to eq m40.encryption_iv
+
+        recordiv = Base64.strict_decode64(m40_record.>>.nonce)
+        expect( recordiv ).to eq m40.nonce
+        expect( recordiv ).to eq m40.encryption_iv
       end
 
       it "scrambles the encrypted columns and leaves the others alone" do

data/spec/fixtures/database.rb

@@ -11,3 +11,8 @@ DB[:pg] =
     user:     'pod4test',
     password: 'pod4test' }
 
+DB[:sequel] = 
+  { host:     'centos7andy',
+    user:     'pod4test',
+    password: 'pod4test' }
+

data/spec/jruby/sequel_encrypting_jdbc_pg_spec.rb

@@ -0,0 +1,80 @@
+require "pod4"
+require "pod4/sequel_interface"
+require "pod4/encrypting"
+require "sequel"
+require "jdbc/postgres"
+
+
+describe "(writing encrypted data via sequel_interface)" do
+
+  def db_setup(connection)
+    connection.run(%Q| drop table if exists medical;
+                       create table medical ( 
+                         id      serial primary key,
+                         nonce   text,
+                         name    text,
+                         ailment text );| )
+
+  end
+
+  def db_truncate(connection)
+    connection.run(%Q| truncate table medical restart identity; |)
+  end
+
+
+  before(:all) do
+    @Connection = Sequel.connect('jdbc:postgresql://centos7andy/pod4_test?user=pod4test&password=pod4test')
+    db_setup(@connection)
+  end
+
+  before(:each) do
+    db_truncate(@connection)
+    medical_model_class.set_interface medical_interface_class.new(@connection)
+  end
+
+
+  let(:medical_interface_class) do 
+    Class.new Pod4::SequelInterface do
+      set_table  :medical
+      set_id_fld :id
+    end
+  end
+
+  let(:medical_model_class) do 
+    Class.new Pod4::Model do
+      include Pod4::Encrypting
+
+      encrypted_columns :name, :ailment
+      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_iv_column     :nonce
+    end
+  end
+
+  #####
+
+
+  it "writes encrypted data to the database" do
+    m = medical_model_class.new
+    m.name    = "frank"
+    m.ailment = "sore toe"
+
+    expect{ m.create }.not_to raise_exception
+
+    record = m.class.interface.list.first
+    expect( record ).not_to be_nil
+  end
+
+  it "reads encrypted data back from the database" do
+    m1 = medical_model_class.new
+    m1.name    = "roger"
+    m1.ailment = "hiccups"
+    m1.create
+
+    m2 = medical_model_class.list.first
+    expect( m2 ).not_to be_nil
+    expect( m2.name    ).to eq "roger"
+    expect( m2.ailment ).to eq "hiccups"
+  end
+
+end
+

data/spec/mri/pg_encrypting_spec.rb

@@ -0,0 +1,87 @@
+require "pod4"
+require "pod4/pg_interface"
+require "pod4/encrypting"
+require "pg"
+
+require_relative '../fixtures/database'
+
+
+describe "(writing encrypted data via pg_interface)" do
+
+  def db_setup(connect)
+    client = PG.connect(connect)
+    client.exec(%Q| drop table if exists medical;
+                    create table medical ( 
+                      id      serial primary key,
+                      nonce   text,
+                      name    text,
+                      ailment text );| )
+
+  ensure
+    client.finish if client
+  end
+
+  def db_truncate(connect)
+    client = PG.connect(connect)
+    client.exec(%Q| truncate table medical restart identity; |)
+  ensure
+    client.finish if client
+  end
+
+
+  before(:all) do
+    @connect_hash = DB[:pg]
+    db_setup(@connect_hash)
+  end
+
+  before(:each) do
+    db_truncate(@connect_hash)
+    medical_model_class.set_interface medical_interface_class.new(@connect_hash)
+  end
+
+
+  let(:medical_interface_class) do 
+    Class.new Pod4::PgInterface do
+      set_table  :medical
+      set_id_fld :id
+    end
+  end
+
+  let(:medical_model_class) do 
+    Class.new Pod4::Model do
+      include Pod4::Encrypting
+
+      encrypted_columns :name, :ailment
+      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_iv_column     :nonce
+    end
+  end
+
+  #####
+
+
+  it "writes encrypted data to the database" do
+    m = medical_model_class.new
+    m.name    = "frank"
+    m.ailment = "sore toe"
+
+    expect{ m.create }.not_to raise_exception
+
+    record = m.class.interface.list.first
+    expect( record ).not_to be_nil
+  end
+
+  it "reads encrypted data back from the database" do
+    m1 = medical_model_class.new
+    m1.name    = "roger"
+    m1.ailment = "hiccups"
+    m1.create
+
+    m2 = medical_model_class.list.first
+    expect( m2 ).not_to be_nil
+    expect( m2.name    ).to eq "roger"
+    expect( m2.ailment ).to eq "hiccups"
+  end
+
+end
+

data/spec/mri/pg_interface_spec.rb.orig

@@ -0,0 +1,611 @@
+require 'pod4/pg_interface'
+require 'pg'
+
+require_relative '../common/shared_examples_for_interface'
+require_relative '../fixtures/database'
+
+
+describe "PgInterface" do
+
+  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
+
+  let(:schema_interface_class) do
+    Class.new PgInterface do
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
+
+  let(:prod_interface_class) do
+    Class.new PgInterface do
+      set_table  :product
+      set_id_fld :code
+    end
+  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
+
+
+  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,
+        medical_model_class.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
+
+
+  before(:all) do
+    @connect_hash = DB[:pg]
+    db_setup(@connect_hash)
+
+    @data = []
+    @data << { name:      'Barney',
+               level:     1.23,
+               day:       Date.parse("2016-01-01"),
+               timestamp: Time.parse('2015-01-01 12:11'),
+               price:     BigDecimal.new("1.24"),
+               flag:      true,
+               qty:       BigDecimal.new("1.25") }
+
+    @data << { name:      'Fred',
+               level:     2.34,
+               day:       Date.parse("2016-02-02"),
+               timestamp: Time.parse('2015-01-02 12:22'),
+               price:     BigDecimal.new("2.35"),
+               flag:      false,
+               qty:       BigDecimal.new("2.36") }
+
+    @data << { name:      'Betty',
+               level:     3.45,
+               day:       Date.parse("2016-03-03"),
+               timestamp: Time.parse('2015-01-03 12:33'),
+               price:     BigDecimal.new("3.46"),
+               flag:      nil,
+               qty:       BigDecimal.new("3.47") }
+
+  end
+
+
+  before do
+    interface.execute(%Q|
+      truncate table customer restart identity;
+      truncate table product;|)
+
+  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
+
+    let(:interface) do
+      pg_interface_class.new(@connect_hash)
+    end
+
+    let(:record) { {name: 'Barney'} }
+
+  end
+  ##
+ 
+
+  describe 'PgInterface.set_schema' do
+    it 'takes one argument' do
+      expect( pg_interface_class ).to respond_to(:set_schema).with(1).argument
+    end
+  end
+  ##
+
+
+  describe 'PgInterface.schema' do
+    it 'returns the schema' do
+      expect( schema_interface_class.schema ).to eq :public
+    end
+
+    it 'is optional' do
+      expect{ pg_interface_class.schema }.not_to raise_exception
+      expect( pg_interface_class.schema ).to eq nil
+    end
+  end
+  ##
+
+
+  describe 'PgInterface.set_table' do
+    it 'takes one argument' do
+      expect( pg_interface_class ).to respond_to(:set_table).with(1).argument
+    end
+  end
+  ##
+  
+
+  describe 'PgInterface.table' do
+    it 'returns the table' do
+      expect( pg_interface_class.table ).to eq :customer
+    end
+  end
+  ##
+
+
+  describe 'PgInterface.set_id_fld' do
+    it 'takes one argument' do
+      expect( pg_interface_class ).to respond_to(:set_id_fld).with(1).argument
+    end
+  end
+  ##
+
+
+  describe 'PgInterface.id_fld' do
+    it 'returns the ID field name' do
+      expect( pg_interface_class.id_fld ).to eq :id
+    end
+  end
+  ##
+
+
+  describe '#new' do
+
+    it 'requires a TinyTds connection string' 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
+    end
+
+  end
+  ##
+  
+
+  describe '#quoted_table' 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
+      ifce = schema_interface_class.new(@connect_hash)
+      expect( ifce.quoted_table ).to eq( %|"public"."customer"| )
+    end
+
+  end
+  ##
+
+
+  describe '#create' do
+
+    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 'creates the record when given a hash' do
+      # kinda impossible to seperate these two tests
+      id = interface.create(hash)
+
+      expect{ interface.read(id) }.not_to raise_exception
+      expect( interface.read(id).to_h ).to include hash
+    end
+
+    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}
+      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}
+      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
+      hash = {code: "foo", name: "bar"}
+      id = prod_interface.create( Octothorpe.new(hash) )
+
+      expect( id ).to eq "foo"
+      expect{ prod_interface.read("foo") }.not_to raise_exception
+      expect( prod_interface.read("foo").to_h ).to include hash
+    end
+
+  end
+  ##
+
+
+  describe '#read' do
+    before { fill_data(interface) }
+
+    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'
+    end
+
+    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
+      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
+      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
+      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
+      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
+      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
+      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
+      [1,2,3].each do |i|
+        flag = interface.read(i).>>.flag
+        expect( [true, false, nil].include? flag ).to be true
+        expect( flag ).to be @data[i - 1][:flag]
+      end
+    end
+
+    it 'shouldn\'t have a problem with non-integer keys' do
+      # this is a 100% overlap with the create test above...
+      fill_product_data(prod_interface)
+
+      expect{ prod_interface.read("foo") }.not_to raise_exception
+      expect( prod_interface.read("foo").to_h ).to include(code: "foo", name: "bar")
+    end
+
+  end
+  ##
+
+
+  describe '#list' do
+    before { fill_data(interface) }
+
+    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
+    end
+
+    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
+
+      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([])
+    end
+
+    it 'raises ArgumentError if the selection criteria is nonsensical' do
+      expect{ interface.list('foo') }.to raise_exception ArgumentError
+    end
+
+  end
+  ##
+  
+
+  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}
+      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') }.
+        to raise_exception CantContinue
+
+    end
+
+    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}
+      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}
+      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
+      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
+  ##
+
+
+  describe '#delete' do
+
+    def list_contains(ifce, id)
+      ifce.list.find {|x| x[ifce.id_fld] == id }
+    end
+
+    let(:id) { interface.list.first[:id] }
+
+    before { fill_data(interface) }
+
+    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
+      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
+      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
+  ##
+
+
+  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
+      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') }.
+        to raise_exception Pod4Error
+
+    end
+
+    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'
+    end
+
+  end
+  ##
+
+
+  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
+      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) }.
+        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
+      expect( interface.list.size ).to eq(@data.size - 1)
+      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+    end
+
+  end
+  ##
+
+
+  describe '#select' do
+
+    before { fill_data(interface) }
+
+    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') }.
+        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;'
+
+      expect{ interface.select(sql1) }.not_to raise_exception
+      expect( interface.select(sql1) ).to eq( [{name: 'Barney'}] )
+      expect( interface.select(sql2) ).to eq( [] )
+    end
+
+    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;'
+      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( ret ).to eq( [] )
+    end
+
+  end
+  ##
+
+
+  describe '#selectp' 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
+    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) }.
+        to raise_exception Pod4Error
+
+    end
+
+    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, 0.0) ).to eq( [] )
+    end
+
+    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( ret ).to eq( [] )
+    end
+
+
+  end
+  ##
+
+
+end
+

data/spec/mri/sequel_encrypting_spec.rb

@@ -0,0 +1,81 @@
+require "pod4"
+require "pod4/sequel_interface"
+require "pod4/encrypting"
+require "sequel"
+
+require_relative '../fixtures/database'
+
+
+describe "(writing encrypted data via sequel_interface)" do
+
+  def db_setup(connection)
+    connection.run(%Q| drop table if exists medical;
+                       create table medical ( 
+                         id      serial primary key,
+                         nonce   text,
+                         name    text,
+                         ailment text );| )
+
+  end
+
+  def db_truncate(connection)
+    connection.run(%Q| truncate table medical restart identity; |)
+  end
+
+
+  before(:all) do
+    @connection = Sequel.postgres("pod4_test", DB[:sequel])
+    db_setup(@connection)
+  end
+
+  before(:each) do
+    db_truncate(@connection)
+    medical_model_class.set_interface medical_interface_class.new(@connection)
+  end
+
+
+  let(:medical_interface_class) do 
+    Class.new Pod4::SequelInterface do
+      set_table  :medical
+      set_id_fld :id
+    end
+  end
+
+  let(:medical_model_class) do 
+    Class.new Pod4::Model do
+      include Pod4::Encrypting
+
+      encrypted_columns :name, :ailment
+      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_iv_column     :nonce
+    end
+  end
+
+  #####
+
+
+  it "writes encrypted data to the database" do
+    m = medical_model_class.new
+    m.name    = "frank"
+    m.ailment = "sore toe"
+
+    expect{ m.create }.not_to raise_exception
+
+    record = m.class.interface.list.first
+    expect( record ).not_to be_nil
+  end
+
+  it "reads encrypted data back from the database" do
+    m1 = medical_model_class.new
+    m1.name    = "roger"
+    m1.ailment = "hiccups"
+    m1.create
+
+    m2 = medical_model_class.list.first
+    expect( m2 ).not_to be_nil
+    expect( m2.name    ).to eq "roger"
+    expect( m2.ailment ).to eq "hiccups"
+  end
+
+end
+

data/spec/mri/tds_encrypting_spec.rb

@@ -0,0 +1,98 @@
+require "pod4"
+require "pod4/tds_interface"
+require "pod4/encrypting"
+require "tiny_tds"
+
+require_relative '../fixtures/database'
+
+
+describe "(writing encrypted data via tds_interface)" do
+
+  def db_setup(connect)
+    client = TinyTds::Client.new(connect)
+    client.execute(%Q|use [pod4_test];|).do
+
+    # Our SQL Server does not support DROP TABLE IF EXISTS !
+    # This is apparently an SQL-agnostic way of doing it:
+    client.execute(%Q|
+      if exists (select * from INFORMATION_SCHEMA.TABLES 
+                     where TABLE_NAME   = 'medical' 
+                       and TABLE_SCHEMA = 'dbo' )
+            drop table dbo.medical;
+
+      create table dbo.medical ( 
+        id        int identity(1,1) not null,
+        nonce     nvarchar(max),
+        name      nvarchar(max),
+        ailment   nvarchar(max) );| ).do
+
+  ensure
+    client.close if client
+  end
+
+  def db_truncate(connect)
+    client = TinyTds::Client.new(connect)
+    client.execute(%Q|use [pod4_test];|).do
+    client.execute(%Q| truncate table medical; |).do
+  ensure
+    client.close if client
+  end
+
+
+  before(:all) do
+    @connect_hash = DB[:tds]
+    db_setup(@connect_hash)
+  end
+
+  before(:each) do
+    db_truncate(@connect_hash)
+    medical_model_class.set_interface medical_interface_class.new(@connect_hash)
+  end
+
+
+  let(:medical_interface_class) do 
+    Class.new Pod4::TdsInterface do
+      set_db     :pod4_test
+      set_table  :medical
+      set_id_fld :id
+    end
+  end
+
+  let(:medical_model_class) do 
+    Class.new Pod4::Model do
+      include Pod4::Encrypting
+
+      encrypted_columns :name, :ailment
+      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_iv_column     :nonce
+    end
+  end
+
+  #####
+
+
+  it "writes encrypted data to the database" do
+    m = medical_model_class.new
+    m.name    = "frank"
+    m.ailment = "sore toe"
+
+    expect{ m.create }.not_to raise_exception
+
+    record = m.class.interface.list.first
+    expect( record ).not_to be_nil
+  end
+
+  it "reads encrypted data back from the database" do
+    m1 = medical_model_class.new
+    m1.name    = "roger"
+    m1.ailment = "hiccups"
+    m1.create
+
+    m2 = medical_model_class.list.first
+    expect( m2 ).not_to be_nil
+    expect( m2.name    ).to eq "roger"
+    expect( m2.ailment ).to eq "hiccups"
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Andy Jones
@@ -96,10 +96,15 @@ files:
 - spec/common/sql_helper_spec.rb
 - spec/doc_no_pending.rb
 - spec/fixtures/database.rb
+- spec/jruby/sequel_encrypting_jdbc_pg_spec.rb
 - spec/jruby/sequel_interface_jdbc_ms_spec.rb
 - spec/jruby/sequel_interface_jdbc_pg_spec.rb
+- spec/mri/pg_encrypting_spec.rb
 - spec/mri/pg_interface_spec.rb
+- spec/mri/pg_interface_spec.rb.orig
+- spec/mri/sequel_encrypting_spec.rb
 - spec/mri/sequel_interface_spec.rb
+- spec/mri/tds_encrypting_spec.rb
 - spec/mri/tds_interface_spec.rb
 - spec/spec_helper.rb
 - tags
@@ -145,9 +150,14 @@ test_files:
 - spec/common/sql_helper_spec.rb
 - spec/doc_no_pending.rb
 - spec/fixtures/database.rb
+- spec/jruby/sequel_encrypting_jdbc_pg_spec.rb
 - spec/jruby/sequel_interface_jdbc_ms_spec.rb
 - spec/jruby/sequel_interface_jdbc_pg_spec.rb
+- spec/mri/pg_encrypting_spec.rb
 - spec/mri/pg_interface_spec.rb
+- spec/mri/pg_interface_spec.rb.orig
+- spec/mri/sequel_encrypting_spec.rb
 - spec/mri/sequel_interface_spec.rb
+- spec/mri/tds_encrypting_spec.rb
 - spec/mri/tds_interface_spec.rb
 - spec/spec_helper.rb