pod4 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b48c8744ce1bd87ebb08d8400fc19fe926b2cde
-  data.tar.gz: 1cae79e576a907a9ad71c54e86207b1dddc9c1bb
+  metadata.gz: 0ee46818707291111af50ad94a88168a026f9d2a
+  data.tar.gz: 9cae9859c19fbbd3784d8a43cb33d40a0effe7ca
 SHA512:
-  metadata.gz: 442f51f8a3f4b35967a8240f6f71e0291610f4e23959002ab308a6946736e36c61b512dd995aa2a64591e346491386739ab9c9c943cc892f722157a384864c82
-  data.tar.gz: 2446598aa6b5cf755f5526a790a7f505389f6d687066967d5cb3cdadb9a661842d52504db302dc123f5ee5240f1559d3265b2e75f84002485627ced7c5e334b7
+  metadata.gz: ac96259ec5dad9ce2ad6b92d80e4b92987138ceba5d176dee3debfdc647699bd8dfa88858ecca0690384217fac34b6d8a175eae6da38ce1bccb4c2589dd48f47
+  data.tar.gz: 4fa5a9bbec0022d3da862b4b1a5d14b0298417fc0a3ef0e710a4f1db44c25f61cabb01110db83ead8f33a8ca4e9a1cfed434ffbf52ba94b948da30802a35309d

data/lib/pod4/encrypting.rb

@@ -142,7 +142,7 @@ module Pod4
         end
 
         self.class.encryption_columns.each do |col|
-          hash[col] = crypt(cipher, encryption_iv, hash[col].to_s)
+          hash[col] = crypt(cipher, :encrypt, encryption_iv, hash[col])
         end
 
         Octothorpe.new(hash)
@@ -157,7 +157,7 @@ module Pod4
         iv     = hash[self.class.encryption_iv_column] # not yet set on the model
 
         self.class.encryption_columns.each do |col|
-          hash[col] = crypt(cipher, iv, hash[col])
+          hash[col] = crypt(cipher, :decrypt, iv, hash[col])
         end
 
         super Octothorpe.new(hash)
@@ -206,11 +206,16 @@ module Pod4
       ##
       # Encrypt / decrypt
       #
-      def crypt(cipher, iv, string)
+      def crypt(cipher, direction, iv, string)
         return string if use_iv? and iv.nil?
+        return string if string.nil? 
         cipher.key = self.class.encryption_key
         cipher.iv = iv if use_iv?
-        cipher.update(string) + cipher.final
+
+        answer = ""
+        answer << cipher.update(string.to_s) unless direction == :encrypt && string.empty?
+        answer << cipher.final
+        answer
 
       rescue OpenSSL::Cipher::CipherError
         raise Pod4::Pod4Error, $!

data/lib/pod4/version.rb

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

data/spec/common/model_plus_encrypting_spec.rb

@@ -18,7 +18,8 @@ describe "(Model with Encryption)" do
     cipher.encrypt
     cipher.key = key
     cipher.iv = iv if iv
-    cipher.update(plaintext) + cipher.final
+
+    (plaintext.empty? ? "" : cipher.update(plaintext) ) + cipher.final
   end
 
   let(:encryption_key) { "dflkasdgklajndgnalkghlgasdgasdghaalsdg" }
@@ -302,6 +303,16 @@ describe "(Model with Encryption)" do
       expect{ bad.map_to_interface }.to raise_exception Pod4::Pod4Error
     end
 
+    it "doesn't freak out when asked to encrypt an empty column" do
+      bad = medical_model_class.new
+      bad.id      = 998
+      bad.nhs_no  = "12345"
+      bad.name    = ""
+      bad.ailment = nil
+
+      expect{ bad.map_to_interface }.not_to raise_exception
+    end
+
     context "when we don't have an IV column" do
 
       it "encrypts only the encryptable columns for the interface" do
@@ -351,6 +362,15 @@ describe "(Model with Encryption)" do
         expect( d.text    ).to eq "sore toe"
       end
 
+      it "successfully decrypts an empty column" do
+        d44.text = ""
+        d44.create
+
+        d = diary_model_class.new(44)
+        d.read
+        expect( d.text ).to eq ""
+      end
+
     end 
 
     context "when we have an IV column" do
@@ -370,6 +390,18 @@ describe "(Model with Encryption)" do
         expect( m.prescription ).to eq "suck thumb"
       end
        
+      it "successfully decrypts an empty column" do
+        m40.ailment      = ""
+        m40.prescription = nil
+        m40.create
+
+        m = medical_model_class.new(40)
+        m.read
+        expect( m.ailment      ).to eq ""
+        expect( m.prescription ).to be_nil
+      end
+
+
     end
     
   end # of Model#map_to_model

data/spec/common/model_plus_typecasting_spec.rb

@@ -31,7 +31,7 @@ describe "ProductModel" do
       set_interface NullInterface.new( :id, :code, :band, :sales, :created, :yrstart, 
                                        :flag, :foo, :bar, [] )
 
-      def mycast(value, opts); end
+      def mycast(value, opts); "blarg" end
     end
   end
 
@@ -316,7 +316,18 @@ describe "ProductModel" do
       c.foo  = "12345"
       c.create
     end
-     
+
+    it "writes the return value from the use method to the interface" do
+      c = customer_model_class.new
+      c.id   = 33
+      c.code = "baz"
+      c.foo  = "12345"
+      c.create
+
+      record = customer_model_class.interface.read(33)
+      expect( record.>>.foo ).to eq "blarg"
+    end
+
   end # of #map_to_interface"
 
 

metadata

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