pod4 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 630728075021ff016e6ead3d63c58806821bc3ce
-  data.tar.gz: 8545dc27e2f1f73a7fd4bc0589d4f751a44d3811
+  metadata.gz: 3438ad2d9f28358a99d1704f7b3f3fd39ec7a8bc
+  data.tar.gz: 12e1ca2d33bff64be209509c42c2695dad462d9f
 SHA512:
-  metadata.gz: b93e6dc86f29c31acca757cb64392a23b406829f033e6db3a4c0158e951ce258a5abe874d6f6f3f393b03afc84b0a8d3db461d0fdf6e189cee545c201adc8d41
-  data.tar.gz: f07ac222e7260b0fd94669640fc519a14604779982d659333da5de52577e590cf811665645fd2192ec277b80d56765ac35e57e1689c5dec21c27c712d58b6f02
+  metadata.gz: 76f2db877e9ef30b57409f7b9d31ef9fa718cd21e58ac4a58d9f8512378bd6d39a1cc574575a0b558d3d48d1cce2ebd2b0e03d173188b947ecbf316870902945
+  data.tar.gz: 677f152afb19ba659f2b6d1fe0ffa31c4e81c76eb1d3bb31e7c464895116630339ee76afff59930b646261f81d24040d94f12b2d7bc7d19cbaa9771682ae3936

data/.hgtags

@@ -30,3 +30,4 @@ f1b3a814e7a8c7d818b57f6d35ce7ed749573d76 0.9.1
 7ac52e99228fe39ca59c87fad8fe2c1236fce4fa 0.10.1
 7a39c71dceaf05b9204e1f2870f904940fdac4d3 0.10.3
 e98232cdc6cbe61e2bf0513fcf578001a2931018 0.10.4
+daae29a48272b5c3029b6509354bd3c3e6bf339a 0.10.5

data/lib/pod4/encrypting.rb

@@ -35,6 +35,9 @@ module Pod4
   # You probably have a single key for the entire database and pass it to your application via an
   # environment variable. But we don't care about that.
   #
+  # If you set the key to nil, then the model should work exactly as if the encryption mixin was
+  # not present.
+  #
   # set_iv_column
   # -------------
   #
@@ -136,6 +139,8 @@ module Pod4
       # When mapping to the interface, encrypt the encryptable columns from the model
       #
       def map_to_interface
+        return super if self.class.encryption_key.nil?
+
         hash   = super.to_h
         cipher = get_cipher(:encrypt)
 
@@ -157,6 +162,8 @@ module Pod4
       # When mapping to the model, decrypt the encrypted columns from the interface
       #
       def map_to_model(ot)
+        return super(ot) if self.class.encryption_key.nil?
+
         hash   = ot.to_h
         cipher = get_cipher(:decrypt)
 

data/lib/pod4/version.rb

@@ -1,3 +1,3 @@
 module Pod4 
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/spec/common/model_plus_encrypting_spec.rb

@@ -48,6 +48,17 @@ describe "(Model with Encryption)" do
     end
   end
 
+  let(:medical_model_nokey_class) do  # model with no encryption key
+    Class.new Pod4::Model do
+      include Pod4::Encrypting
+      attr_columns :id, :nhs_no 
+      encrypted_columns :name, :ailment, :prescription
+      set_key nil
+      set_iv_column :nonce
+      set_interface NullInterface.new(:id, :nhs_no, :name, :ailment, :prescription, :nonce, [])
+    end
+  end
+
   let(:diary_model_class) do  # model without an IV column
     Class.new Pod4::Model do
       include Pod4::Encrypting
@@ -183,6 +194,27 @@ describe "(Model with Encryption)" do
 
   describe "(Creating a record)" do
 
+    context "when we don't have a key" do
+
+      it "writes the record without freaking out" do
+        m = medical_model_nokey_class.new
+        m.id           = 666
+        m.nhs_no       = "666666"
+        m.name         = "joe"
+        m.ailment      = "brain cloud"
+        m.prescription = "volcano"
+
+        expect{ m.create }.not_to raise_exception
+
+        record = m.interface.read(666)
+        expect( record.>>.nhs_no       ).to eq "666666"
+        expect( record.>>.name         ).to eq "joe"
+        expect( record.>>.ailment      ).to eq "brain cloud"
+        expect( record.>>.prescription ).to eq "volcano"
+      end
+
+    end
+    
     context "when we don't have an IV column" do
 
       it "scrambles the encrypted columns and leaves the others alone" do
@@ -220,6 +252,28 @@ describe "(Model with Encryption)" do
 
   describe "(reading a record)" do
 
+    context "when we don't have a key" do
+       
+      it "reads the record without freaking out" do
+        m = medical_model_nokey_class.new
+        m.id           = 666
+        m.nhs_no       = "666666"
+        m.name         = "joe"
+        m.ailment      = "brain cloud"
+        m.prescription = "volcano"
+        expect{ m.create }.not_to raise_exception
+
+        m666 = medical_model_nokey_class.new(666)
+        expect{ m666.read }.not_to raise_exception
+        expect( m666.model_status ).not_to eq :error
+        expect( m666.nhs_no       ).to eq "666666"
+        expect( m666.name         ).to eq "joe"
+        expect( m666.ailment      ).to eq "brain cloud"
+        expect( m666.prescription ).to eq "volcano"
+      end
+
+    end
+
     context "when we have no IV column" do
       before(:each) { d44.create }
 

data/spec/jruby/sequel_encrypting_jdbc_pg_spec.rb

@@ -23,7 +23,7 @@ describe "(writing encrypted data via sequel_interface)" do
 
 
   before(:all) do
-    @Connection = Sequel.connect('jdbc:postgresql://centos7andy/pod4_test?user=pod4test&password=pod4test')
+    @connection = Sequel.connect('jdbc:postgresql://centos7andy/pod4_test?user=pod4test&password=pod4test')
     db_setup(@connection)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devnull