crypt_keeper 0.6.1 → 0.7.0

data/crypt_keeper.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'activerecord',           '>= 3.0'
   gem.add_runtime_dependency 'activesupport',          '>= 3.0'
-  gem.add_runtime_dependency 'appraisal',              '~> 0.4.1'
+  gem.add_runtime_dependency 'appraisal',              '~> 0.5.1'
 
   gem.add_development_dependency 'rspec',       '~> 2.11.0'
   gem.add_development_dependency 'guard',       '~> 1.3.0'

data/gemfiles/activerecord_3_0.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
-  remote: /home/justin/work/ruby/crypt_keeper
+  remote: /Users/justin/work/Personal/crypt_keeper
   specs:
-    crypt_keeper (0.5.0)
+    crypt_keeper (0.6.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-      appraisal (~> 0.4.1)
+      appraisal (~> 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)

data/gemfiles/activerecord_3_1.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
-  remote: /home/justin/work/ruby/crypt_keeper
+  remote: /Users/justin/work/Personal/crypt_keeper
   specs:
-    crypt_keeper (0.5.0)
+    crypt_keeper (0.6.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-      appraisal (~> 0.4.1)
+      appraisal (~> 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)

data/gemfiles/activerecord_3_2.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
-  remote: /home/justin/work/ruby/crypt_keeper
+  remote: /Users/justin/work/Personal/crypt_keeper
   specs:
-    crypt_keeper (0.5.0)
+    crypt_keeper (0.6.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-      appraisal (~> 0.4.1)
+      appraisal (~> 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)

data/lib/crypt_keeper/model.rb

@@ -5,6 +5,16 @@ module CryptKeeper
   module Model
     extend ActiveSupport::Concern
 
+    # Public: Ensures that each field exist and is of type text. This prevents
+    # encrypted data from being truncated.
+    def ensure_valid_field!(field)
+      if self.class.columns_hash["#{field}"].nil?
+        raise ArgumentError, "Column :#{field} does not exist"
+      elsif self.class.columns_hash["#{field}"].type != :text
+        raise ArgumentError, "Column :#{field} must be of type 'text' to be used for encryption"
+      end
+    end
+
     private
 
     # Private: Encrypt each crypt_keeper_fields
@@ -25,6 +35,13 @@ module CryptKeeper
       end
     end
 
+    # Private: Run each crypt_keeper_fields through ensure_valid_field!
+    def enforce_column_types_callback
+      crypt_keeper_fields.each do |field|
+        ensure_valid_field! field
+      end
+    end
+
     module ClassMethods
       # Public: Setup fields for encryption
       #
@@ -86,20 +103,7 @@ module CryptKeeper
         after_save :decrypt_callback
         after_find :decrypt_callback
         before_save :encrypt_callback
-
-        crypt_keeper_fields.each do |field|
-          ensure_valid_field! field
-        end
-      end
-
-      # Private: Ensures that each field exist and is of type text. This prevents
-      # encrypted data from being truncated.
-      def ensure_valid_field!(field)
-        if columns_hash["#{field}"].nil?
-          raise ArgumentError, "Column :#{field} does not exist"
-        elsif columns_hash["#{field}"].type != :text
-          raise ArgumentError, "Column :#{field} must be of type 'text' to be used for encryption"
-        end
+        before_save :enforce_column_types_callback
       end
     end
   end

data/lib/crypt_keeper/version.rb

@@ -1,3 +1,3 @@
 module CryptKeeper
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/model_spec.rb

@@ -20,12 +20,14 @@ module CryptKeeper
 
         it "should raise an exception with missing field" do
           msg = "Column :none does not exist"
-          expect { subject.crypt_keeper :none, encryptor: :fake_encryptor }.to raise_error(ArgumentError, msg)
+          subject.crypt_keeper :none, encryptor: :fake_encryptor
+          expect { subject.new.save }.to raise_error(ArgumentError, msg)
         end
 
         it "should raise an exception with wrong field type" do
           msg = "Column :name must be of type 'text' to be used for encryption"
-          expect { subject.crypt_keeper :name, encryptor: :fake_encryptor }.to raise_error(ArgumentError, msg)
+          subject.crypt_keeper :name, encryptor: :fake_encryptor
+          expect { subject.new.save }.to raise_error(ArgumentError, msg)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crypt_keeper
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 722237911978539307
+      hash: 1508799386363054050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 722237911978539307
+      hash: 1508799386363054050
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23