crypt_keeper 0.5.0 → 0.6.0

data/README.md

@@ -15,7 +15,7 @@ is a simple class that does 3 things.
 Note: Any options defined using `crypt_keeper` will be passed to `new` as a
 hash.
 
-You can see an AES example [here](/jmazzi/crypt_keeper/blob/master/lib/crypt_keeper/provider/aes.rb).
+You can see an AES example [here](https://github.com/jmazzi/crypt_keeper/blob/master/lib/crypt_keeper/provider/aes.rb).
 
 ## Why?
 

data/gemfiles/activerecord_3_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/justin/work/ruby/crypt_keeper
   specs:
-    crypt_keeper (0.4.2)
+    crypt_keeper (0.5.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       appraisal (~> 0.4.1)

data/gemfiles/activerecord_3_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/justin/work/ruby/crypt_keeper
   specs:
-    crypt_keeper (0.4.2)
+    crypt_keeper (0.5.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       appraisal (~> 0.4.1)

data/gemfiles/activerecord_3_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/justin/work/ruby/crypt_keeper
   specs:
-    crypt_keeper (0.4.2)
+    crypt_keeper (0.5.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       appraisal (~> 0.4.1)

data/lib/crypt_keeper.rb

@@ -2,14 +2,10 @@ require 'active_record'
 
 require 'crypt_keeper/version'
 require 'crypt_keeper/model'
-
+require 'crypt_keeper/helper'
 require 'crypt_keeper/provider/aes'
 require 'crypt_keeper/provider/mysql_aes'
 require 'crypt_keeper/provider/postgres_pgp'
 
 module CryptKeeper
 end
-
-ActiveSupport.on_load :active_record do
-  include CryptKeeper::Model
-end

data/lib/crypt_keeper/helper.rb

@@ -0,0 +1,13 @@
+module CryptKeeper
+  module Helper
+    module SQL
+      private
+
+      # Private: Sanitize an sql query and then execute it
+      def escape_and_execute_sql(query)
+        query = ::ActiveRecord::Base.send :sanitize_sql_array, query
+        ::ActiveRecord::Base.connection.execute(query).first
+      end
+    end
+  end
+end

data/lib/crypt_keeper/model.rb

@@ -102,3 +102,7 @@ module CryptKeeper
     end
   end
 end
+
+ActiveSupport.on_load :active_record do
+  include CryptKeeper::Model
+end

data/lib/crypt_keeper/provider/mysql_aes.rb

@@ -3,6 +3,8 @@ require 'crypt_keeper/log_subscriber/mysql_aes'
 module CryptKeeper
   module Provider
     class MysqlAes
+      include CryptKeeper::Helper::SQL
+
       attr_accessor :key
 
       # Public: Initializes the encryptor
@@ -18,22 +20,16 @@ module CryptKeeper
       #
       # Returns an encrypted string
       def encrypt(value)
-        escape_and_execute_sql(["SELECT AES_ENCRYPT(?, ?)", value, key]).first
+        Base64.encode64 escape_and_execute_sql(
+          ["SELECT AES_ENCRYPT(?, ?)", value, key]).first
       end
 
       # Public: Decrypts a string
       #
       # Returns a plaintext string
       def decrypt(value)
-        escape_and_execute_sql(["SELECT AES_DECRYPT(?, ?)", value, key]).first
-      end
-
-      private
-
-      # Private: Sanitize an sql query and then execute it
-      def escape_and_execute_sql(query)
-        query = ::ActiveRecord::Base.send :sanitize_sql_array, query
-        ::ActiveRecord::Base.connection.execute(query).first
+        escape_and_execute_sql(
+          ["SELECT AES_DECRYPT(?, ?)", Base64.decode64(value), key]).first
       end
     end
   end

data/lib/crypt_keeper/provider/postgres_pgp.rb

@@ -3,6 +3,7 @@ require 'crypt_keeper/log_subscriber/postgres_pgp'
 module CryptKeeper
   module Provider
     class PostgresPgp
+      include CryptKeeper::Helper::SQL
       attr_accessor :key
 
       # Public: Initializes the encryptor
@@ -18,7 +19,7 @@ module CryptKeeper
       #
       # Returns an encrypted string
       def encrypt(value)
-        escape_and_execute_sql(["SELECT pgp_sym_encrypt(?, ?)", value, key])['pgp_sym_encrypt']
+        escape_and_execute_sql(["SELECT pgp_sym_encrypt(?, ?)", value.to_s, key])['pgp_sym_encrypt']
       end
 
       # Public: Decrypts a string
@@ -27,14 +28,6 @@ module CryptKeeper
       def decrypt(value)
         escape_and_execute_sql(["SELECT pgp_sym_decrypt(?, ?)", value, key])['pgp_sym_decrypt']
       end
-
-      private
-
-      # Private: Sanitize an sql query and then execute it
-      def escape_and_execute_sql(query)
-        query = ::ActiveRecord::Base.send :sanitize_sql_array, query
-        ::ActiveRecord::Base.connection.execute(query).first
-      end
     end
   end
 end

data/lib/crypt_keeper/version.rb

@@ -1,3 +1,3 @@
 module CryptKeeper
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/log_subscriber/{mysql_aes.rb → mysql_aes_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-module CryptKeeperProviders
-  describe MysqlAesLogSubscriber do
+module CryptKeeper::LogSubscriber
+  describe MysqlAes do
     use_postgres
 
     subject { ::ActiveRecord::LogSubscriber.new }

data/spec/log_subscriber/{postgres_pgp.rb → postgres_pgp_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-module CryptKeeperProviders
-  describe PostgresPgpLogSubscriber do
+module CryptKeeper::LogSubscriber
+  describe PostgresPgp do
     use_postgres
 
     subject { ::ActiveRecord::LogSubscriber.new }

data/spec/provider/mysql_aes_spec.rb

@@ -11,7 +11,7 @@ module CryptKeeper
       # into a spec :). This is a Base64 encoded string of 'test' AES encrypted
       # by AES_ENCRYPT()
       let(:cipher_text) do
-        Base64.decode64 "nbKOoWn8kvAw9k/C2Mex6Q==\n"
+        "nbKOoWn8kvAw9k/C2Mex6Q==\n"
       end
 
       subject { MysqlAes.new key: 'candy' }

data/spec/provider/postgres_pgp_spec.rb

@@ -6,7 +6,10 @@ module CryptKeeper
       use_postgres
 
       let(:cipher_text) { '\\xc30d0407030283b15f71b6a7d0296cd23501bd2c8fe3c7a56005ff4619527c4291509a78c77a6758cddd2a14acbde589fa10b3e0686865182d3beadaf237b9f928e7ba1810b8' }
-      let(:plain_text) { 'test' }
+      let(:plain_text)  { 'test' }
+
+      let(:integer_cipher_text) { '\xc30d040703028c65c58c0e9d015360d2320125112fc38f094e57cce1c0313f3eea4a7fc3e95c048bc319e25003ab6f29ceabe3609089d12094508c1eb79a2d70f95233' }
+      let(:integer_plain_text) { 1 }
 
       subject { PostgresPgp.new key: 'candy' }
 
@@ -23,6 +26,11 @@ module CryptKeeper
           subject.encrypt(plain_text).should_not == plain_text
           subject.encrypt(plain_text).should_not be_empty
         end
+
+        it "encrypts integers" do
+          subject.encrypt(integer_plain_text).should_not == integer_plain_text
+          subject.encrypt(integer_plain_text).should_not be_empty
+        end
       end
 
       describe "#decrypt" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crypt_keeper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,6 +195,7 @@ files:
 - gemfiles/activerecord_3_2.gemfile
 - gemfiles/activerecord_3_2.gemfile.lock
 - lib/crypt_keeper.rb
+- lib/crypt_keeper/helper.rb
 - lib/crypt_keeper/log_subscriber/mysql_aes.rb
 - lib/crypt_keeper/log_subscriber/postgres_pgp.rb
 - lib/crypt_keeper/model.rb
@@ -203,8 +204,8 @@ files:
 - lib/crypt_keeper/provider/postgres_pgp.rb
 - lib/crypt_keeper/version.rb
 - spec/default.database.yml
-- spec/log_subscriber/mysql_aes.rb
-- spec/log_subscriber/postgres_pgp.rb
+- spec/log_subscriber/mysql_aes_spec.rb
+- spec/log_subscriber/postgres_pgp_spec.rb
 - spec/model_spec.rb
 - spec/provider/aes_spec.rb
 - spec/provider/mysql_aes_spec.rb
@@ -226,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 777875145635862709
+      hash: 4508045864759288754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 777875145635862709
+      hash: 4508045864759288754
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -244,8 +245,8 @@ specification_version: 3
 summary: Transparent encryption for ActiveRecord that isn't over-engineered
 test_files:
 - spec/default.database.yml
-- spec/log_subscriber/mysql_aes.rb
-- spec/log_subscriber/postgres_pgp.rb
+- spec/log_subscriber/mysql_aes_spec.rb
+- spec/log_subscriber/postgres_pgp_spec.rb
 - spec/model_spec.rb
 - spec/provider/aes_spec.rb
 - spec/provider/mysql_aes_spec.rb