cryptic 1.0.0.beta.4 → 1.0.0.beta.5

data/lib/cryptic/encrypted_data.rb

@@ -8,8 +8,6 @@ module Cryptic
 
   # A class with methods to encrypt/decrypt data
   #
-  # @!attribute [Symbol] encoding the encoding to use
-  # @!attribute [String] data the encrypted data string
   # @author Erran Carey <me@errancarey.com>
   class EncryptedData
     attr_reader :data
@@ -32,13 +30,18 @@ module Cryptic
       if !public_key_file
         # If no public key was provided the data should already be encrypted
         @data = data
-      elsif File.exists? public_key_file.to_s
+      elsif File.exists?(public_key_file.to_s)
         public_key = OpenSSL::PKey::RSA.new(File.read(public_key_file))
         encrypted_data = public_key.public_encrypt(data)
         @data = encode(encrypted_data)
       else
-        raise Cryptic::KeyNotFound
+        public_key = OpenSSL::PKey::RSA.new(public_key_file)
+        encrypted_data = public_key.public_encrypt(data)
+        @data = encode(encrypted_data)
       end
+    rescue => e
+      $stderr.puts e
+      raise Cryptic::KeyNotFound
     end
 
     # Creates a new encrypted data object from an encrypted data string
@@ -60,13 +63,18 @@ module Cryptic
     # @raise [KeyNotFound] if the specified public key wasn't found on the
     #   file system
     def decrypt(private_key_file, passphrase = nil)
-      if File.exists? private_key_file.to_s
+      if File.exists?(private_key_file.to_s)
         private_key = OpenSSL::PKey::RSA.new(File.read(private_key_file), passphrase)
         decoded_string = decode(@data)
         private_key.private_decrypt(decoded_string)
       else
-        raise Cryptic::KeyNotFound
+        private_key = OpenSSL::PKey::RSA.new(private_key_file, passphrase)
+        decoded_string = decode(@data)
+        private_key.private_decrypt(decoded_string)
       end
+    rescue => e
+      $stderr.puts e
+      raise Cryptic::KeyNotFound
     end
 
     # @return [String] the encrypted data string

data/lib/cryptic/version.rb

@@ -1,4 +1,4 @@
 module Cryptic
   # The version of the cryptic gem
-  VERSION = '1.0.0.beta.4'
+  VERSION = '1.0.0.beta.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.beta.5
   prerelease: 6
 platform: ruby
 authors:
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -858447365145584923
+      hash: -577705480629066227
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: