crypt_keeper 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eac3b38bb9d7a211846dbec145dd7b65bad9d72
-  data.tar.gz: 695e58e58810319cde7778e366990b4225c75768
+  metadata.gz: bebe9201328a264bc331e557bfb7b29eda6f8cec
+  data.tar.gz: f429009d3af1a7a09e8a3a4e45f21211994491c8
 SHA512:
-  metadata.gz: 792805bc915d2e8e9b77cce29631760ef34f5bb60ec48184ab0c7beda4f3387be5e9cbc36572c6cc66af3662a1bf5f5cc03103bd3881bd07bcf5ee8f4d9ec056
-  data.tar.gz: 6ce70f3a8c2c6e2bf2a38ca626f29f920028f658b1bd15a0ed8c3a7654f9d6d19291757c36eb86c36705d23d96179e6d7d5761199183fffade60ab6e28a3fb85
+  metadata.gz: 16879b1ba1a690e850e5f1a26fb0d3f9db237b926acaf1dfdfab4d490da7723e2a7d079223d626a293916661ed1c63c29673a71a2d318482e99ecceb02b8c379
+  data.tar.gz: 52a28a7ba7a2a3ed75fc9194bc5d42cb1fff57249aab11681c0288b90f3babbe6e4340c05320ea07cbe62402fe252454c33b36361ed09a3758eb32ede731e680

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/jmazzi/crypt_keeper.png?branch=master)](http://travis-ci.org/jmazzi/crypt_keeper)
+[![Build Status](https://secure.travis-ci.org/jmazzi/crypt_keeper.png?branch=master)](http://travis-ci.org/jmazzi/crypt_keeper) [![Gem Version](https://badge.fury.io/rb/crypt_keeper.svg)](http://badge.fury.io/rb/crypt_keeper)
 
 ![CryptKeeper](http://i.imgur.com/qf0aD.jpg)
 

data/lib/crypt_keeper/model.rb

@@ -24,6 +24,13 @@ module CryptKeeper
       end
     end
 
+    # Private: Force string encodings if the option is set
+    def force_encodings_on_fields
+      crypt_keeper_fields.each do |field|
+        send(field).force_encoding(crypt_keeper_encoding) if send(field).respond_to?(:force_encoding)
+      end
+    end
+
     module ClassMethods
       # Public: Setup fields for encryption
       #
@@ -42,15 +49,22 @@ module CryptKeeper
         class_attribute :crypt_keeper_fields
         class_attribute :crypt_keeper_encryptor
         class_attribute :crypt_keeper_options
+        class_attribute :crypt_keeper_encoding
 
         self.crypt_keeper_options   = args.extract_options!
         self.crypt_keeper_encryptor = crypt_keeper_options.delete(:encryptor)
+        self.crypt_keeper_encoding  = crypt_keeper_options.delete(:encoding)
         self.crypt_keeper_fields    = args
 
         ensure_valid_encryptor!
 
         before_save :enforce_column_types_callback
 
+        if self.crypt_keeper_encoding
+          after_find :force_encodings_on_fields
+          before_save :force_encodings_on_fields
+        end
+
         crypt_keeper_fields.each do |field|
           serialize field, encryptor_klass.new(crypt_keeper_options).
             extend(::CryptKeeper::Helper::Serializer)

data/lib/crypt_keeper/version.rb

@@ -1,3 +1,3 @@
 module CryptKeeper
-  VERSION = "0.16.1"
+  VERSION = "0.17.0"
 end

data/spec/model_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module CryptKeeper
@@ -91,5 +93,24 @@ module CryptKeeper
         expect { SensitiveData.search_by_plaintext(:what, 'test1') }.to raise_error(/what is not a crypt_keeper field/)
       end
     end
+
+    context "Encodings" do
+      before do
+        SensitiveData.crypt_keeper :storage, key: 'tool', salt: 'salt', encryptor: :aes_new, encoding: 'utf-8'
+      end
+
+      it "forces the encoding on decrypt" do
+        record = SensitiveData.create!(storage: 'Tromsø')
+        record.reload
+        expect(record.storage).to eql('Tromsø')
+      end
+
+      it "converts from other encodings" do
+        plaintext = "\xC2\xA92011 AACR".force_encoding('ASCII-8BIT')
+        record = SensitiveData.create!(storage: plaintext)
+        record.reload
+        expect(record.storage.encoding.name).to eql('UTF-8')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypt_keeper
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord