attr_encrypted 1.1.0 → 1.1.1

data/lib/attr_encrypted.rb

@@ -1,5 +1,6 @@
 require 'eigenclass'
 require 'encryptor'
+require 'ruby-debug'
 
 module AttrEncrypted
   def self.extended(base)
@@ -177,26 +178,32 @@ module AttrEncrypted
         end
         
         define_method "#{attribute}" do
-          value = instance_variable_get("@#{attribute}")
-          encrypted_value = send(encrypted_attribute_name.to_sym)
-          original_options = [:key, :if, :unless].inject({}) do |hash, option|
-            hash[option] = options[option]
-            options[option] = self.class.send :evaluate_attr_encrypted_option, options[option], self
-            hash
+          begin
+            value = instance_variable_get("@#{attribute}")
+            encrypted_value = send(encrypted_attribute_name.to_sym)
+            original_options = [:key, :if, :unless].inject({}) do |hash, option|
+              hash[option] = options[option]
+              options[option] = self.class.send :evaluate_attr_encrypted_option, options[option], self
+              hash
+            end
+            value = instance_variable_set("@#{attribute}", self.class.send("decrypt_#{attribute}".to_sym, encrypted_value)) if value.nil? && !encrypted_value.nil?
+          ensure
+            options.merge!(original_options)
           end
-          value = instance_variable_set("@#{attribute}", self.class.send("decrypt_#{attribute}".to_sym, encrypted_value)) if value.nil? && !encrypted_value.nil?
-          options.merge!(original_options)
           value
         end
         
         define_method "#{attribute}=" do |value|
-          original_options = [:key, :if, :unless].inject({}) do |hash, option|
-            hash[option] = options[option]
-            options[option] = self.class.send :evaluate_attr_encrypted_option, options[option], self
-            hash
+          begin
+            original_options = [:key, :if, :unless].inject({}) do |hash, option|
+              hash[option] = options[option]
+              options[option] = self.class.send :evaluate_attr_encrypted_option, options[option], self
+              hash
+            end
+            send("#{encrypted_attribute_name}=".to_sym, self.class.send("encrypt_#{attribute}".to_sym, value))
+          ensure
+            options.merge!(original_options)
           end
-          send("#{encrypted_attribute_name}=".to_sym, self.class.send("encrypt_#{attribute}".to_sym, value))
-          options.merge!(original_options)
           instance_variable_set("@#{attribute}", value)
         end
       end

data/test/attr_encrypted_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
+require 'mocha'
 
 class SillyEncryptor
   def self.silly_encrypt(options)
@@ -24,13 +25,16 @@ class User
   attr_encrypted :with_false_if, :key => 'secret key', :if => false
   attr_encrypted :with_true_unless, :key => 'secret key', :unless => true
   attr_encrypted :with_false_unless, :key => 'secret key', :unless => false
+  attr_encrypted :with_if_changed, :key => 'secret key', :if => :should_encrypt
   
   attr_encryptor :aliased, :key => 'secret_key'
   
   attr_accessor :salt
+  attr_accessor :should_encrypt
   
   def initialize
     self.salt = Time.now.to_i.to_s
+    self.should_encrypt = true
   end
 end
 
@@ -249,4 +253,20 @@ class AttrEncryptedTest < Test::Unit::TestCase
     assert User.encrypted_attributes.include?('aliased')
   end
   
+  def test_should_always_reset_options
+    @user = User.new
+    @user.with_if_changed = "encrypt_stuff"
+    @user.stubs(:instance_variable_get).returns(nil)
+    @user.stubs(:instance_variable_set).raises("BadStuff")
+    assert_raise RuntimeError do 
+      @user.with_if_changed
+    end
+    
+    @user = User.new
+    @user.should_encrypt = false
+    @user.with_if_changed = "not_encrypted_stuff"
+    assert_equal "not_encrypted_stuff", @user.with_if_changed
+    assert_equal "not_encrypted_stuff", @user.encrypted_with_if_changed
+  end
+  
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: attr_encrypted
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Sean Huber
@@ -9,29 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -08:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eigenclass
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: encryptor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :runtime
+  version_requirements: *id003
 description: Generates attr_accessors that encrypt and decrypt attributes transparently
 email: shuber@huberry.com
 executables: []
@@ -69,18 +96,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generates attr_accessors that encrypt and decrypt attributes transparently