couch_potato-extensions 0.0.4 → 0.0.5

data/lib/couch_potato/extensions.rb

@@ -5,6 +5,6 @@ require File.expand_path(File.dirname(__FILE__) + "/extensions/encrypted_view_sp
 
 module CouchPotato
   module Extensions
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/couch_potato/extensions/encrypted_property.rb

@@ -2,49 +2,45 @@ require 'bcrypt'
 
 module CouchPotato
   module Extensions
-    class EncryptedProperty
-      attr_reader :type, :name
-      
-      def initialize(owner, name, options = {})
-        @type = owner
-        @name = name
+    class EncryptedProperty < CouchPotato::Persistence::SimpleProperty
+      def initialize(owner_clazz, name, options = {})
+        super
         @options = options
-        
-        define_accessors(name)
       end
       
-      def define_accessors(name)
-        type.class_eval do
-          define_method(name) do
-            instance_variable_get("@#{name}")
-          end
-          
-          define_method("#{name}=") do |value|
-            instance_variable_set("@#{name}", value)
-          end
-        end
-      end
-
       def build(object, json)
         value = json[name.to_s].nil? ? json[name.to_sym] : json[name.to_s]
         object.send "#{name}=", decrypt(value)
+        object.instance_variable_set("@encrypted_#{name}", value)
       end
 
       def dirty?(object)
-        false
+        object.send("#{name}_changed?")
       end
       
       def serialize(json, object)
-        json[name] = encrypt(object.send(name))
+        if dirty?(object) or encrypted_value(object).nil?
+          json[name] = encrypt(object.send(name))
+        else
+          json[name] = encrypted_value(object)
+        end
+      end
+
+      def value(result, object)
+        result[name] = object.send(name)
       end
       
       def encrypt(value)
-        Base64.encode64(EzCrypto::Key.encrypt_with_password(@options[:password], @options[:salt], value)) if not value.nil?
+        Base64.encode64(EzCrypto::Key.encrypt_with_password(@options[:password], @options[:salt], value))
       end
       
       def decrypt(value)
         EzCrypto::Key.decrypt_with_password(@options[:password], @options[:salt], Base64.decode64(value))
       end
+      
+      def encrypted_value(object)
+        object.instance_variable_get("@encrypted_#{name}")
+      end
     end
   end
 end

data/spec/encrypted_property_spec.rb

@@ -23,6 +23,11 @@ describe CouchPotato::Extensions::EncryptedProperty do
       document = SecureDocument.new(:body => "very important")
       document.body.should == 'very important'
     end
+    
+    it "should allow access through the attributes hash" do
+      document = SecureDocument.new(:body => "very important")
+      document.attributes[:body].should == "very important"
+    end
   end
   
   describe "saving documents" do
@@ -34,15 +39,31 @@ describe CouchPotato::Extensions::EncryptedProperty do
       body.should_not == 'very important'
       body.should == Base64.encode64(EzCrypto::Key.encrypt_with_password("coffee! more coffee!", "Va7JYeT7t08vMweYU6F6dO", "very important"))
     end
+    
+    it "should not encrypt an attribute that hasn't changed" do
+      @document = document
+      CouchPotato.database.save_document document
+      @document = CouchPotato.database.load_document(document.id)
+      @document.is_dirty
+      EzCrypto::Key.should_not_receive(:encrypt_with_password)
+      CouchPotato.database.save_document @document
+    end
   end
   
   describe "loading documents" do
-    let(:document) { SecureDocument.new(:body => "very important") } 
+    let(:document) do
+      document = SecureDocument.new(:body => "very important")
+      CouchPotato.database.save_document document
+      CouchPotato.database.load_document(document.id)
+    end
     
     it "should decrypt the attributes" do
-      CouchPotato.database.save_document document
-      loaded_document = CouchPotato.database.load_document(document.id)
-      loaded_document.body.should == "very important"
+      document.body.should == "very important"
+    end
+    
+    it "should not encrypt the data when it was changed" do
+      document.instance_variable_get(:@encrypted_body).should_not == nil
     end
   end
+
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato-extensions
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -14,47 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: couch_potato
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ezcrypto
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id003
+    version: 
 description: See summary, it says it all, trust me.
 email: meyer@paperplanes.de
 executables: []
@@ -87,20 +74,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Some extensions for CouchPotato, because more awesome is always a good thing.