spikex-strongbox 0.1.4 → 0.1.5

data/lib/strongbox.rb

@@ -5,7 +5,7 @@ require 'strongbox/lock'
 
 module Strongbox
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   RSA_PKCS1_PADDING	= OpenSSL::PKey::RSA::PKCS1_PADDING
   RSA_SSLV23_PADDING	= OpenSSL::PKey::RSA::SSLV23_PADDING

data/lib/strongbox/lock.rb

@@ -8,6 +8,8 @@ module Strongbox
       @name              = name
       @instance          = instance
       
+      @size = nil
+      
       options = Strongbox.options.merge(options)
       
       @base64 = options[:base64]
@@ -25,6 +27,7 @@ module Strongbox
         raise StrongboxError.new("#{@instance.class} model does not have public key_file")
       end
       if !plaintext.blank?
+        @size = plaintext.size # For validations
         # Using a blank password in OpenSSL::PKey::RSA.new prevents reading
         # the private key if the file is a key pair
         public_key = OpenSSL::PKey::RSA.new(File.read(@public_key),"")
@@ -58,13 +61,16 @@ module Strongbox
     def decrypt password = ""
       # Given a private key and a nil password OpenSSL::PKey::RSA.new() will
       # *prompt* for a password, we default to an empty string to avoid that.
+      ciphertext = @instance.read_attribute(@name)
+      return nil if ciphertext.nil?
+      return "" if ciphertext.empty?
+      
       return "*encrypted*" if password.blank?
 
       unless @private_key
         raise StrongboxError.new("#{@instance.class} model does not have private key_file")
       end
       
-      ciphertext = @instance.read_attribute(@name)
       if ciphertext
         ciphertext = Base64.decode64(ciphertext) if @base64
         private_key = OpenSSL::PKey::RSA.new(File.read(@private_key),password)
@@ -92,5 +98,18 @@ module Strongbox
     def to_s
       decrypt
     end
+    
+    # Needed for validations
+    def blank?
+      @instance.read_attribute(@name).blank?
+    end
+    
+    def nil?
+      @instance.read_attribute(@name).nil?
+    end
+    
+    def size
+      @size
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spikex-strongbox
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Spike Ilacqua
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 23:00:00 -07:00
+date: 2009-04-19 23:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency