mail-gpg 0.1.1 → 0.1.2

data/lib/mail/gpg.rb

@@ -15,13 +15,13 @@ require 'mail/gpg/sign_part'
 module Mail
   module Gpg
     # options are:
-    # :sign : sign message using the sender's private key
-    # :sign_as : sign using this key (give the corresponding email address)
+    # :sign: sign message using the sender's private key
+    # :sign_as: sign using this key (give the corresponding email address or key fingerprint)
     # :passphrase: passphrase for the signing key
-    # :keys : A hash mapping recipient email addresses to public keys or public
+    # :keys: A hash mapping recipient email addresses to public keys or public
     # key ids. Imports any keys given here that are not already part of the
     # local keychain before sending the mail.
-    # :always_trust : send encrypted mail to untrusted receivers, true by default
+    # :always_trust: send encrypted mail to untrusted receivers, true by default
     def self.encrypt(cleartext_mail, options = {})
       construct_mail(cleartext_mail, options) do
         receivers = []

data/lib/mail/gpg/gpgme_helper.rb

@@ -18,7 +18,7 @@ module Mail
           begin
             if options[:sign]
               if options[:signers]
-                signers = GPGME::Key.find(:public, options[:signers], :sign)
+                signers = GPGME::Key.find(:secret, options[:signers], :sign)
                 ctx.add_signer(*signers)
               end
               ctx.encrypt_sign(recipient_keys, plain_data, cipher_data, flags)

data/lib/mail/gpg/sign_part.rb

@@ -1,16 +1,17 @@
 module Mail
-	module Gpg
-		class SignPart < Mail::Part
+  module Gpg
+    class SignPart < Mail::Part
 
-			def initialize(cleartext_mail, options = {})
-				signature = GpgmeHelper.sign(cleartext_mail.encoded, options)
-				super() do
-					body signature.to_s
-					content_type "application/pgp-signature; name=\"signature.asc\""
-					content_disposition 'attachment; filename="signature.asc"'
-					content_description 'OpenPGP digital signature'
-				end	
-			end	
-		end
-	end
+      def initialize(cleartext_mail, options = {})
+        signature = GpgmeHelper.sign(cleartext_mail.encoded, options)
+        super() do
+          body signature.to_s
+          content_type "application/pgp-signature; name=\"signature.asc\""
+          content_disposition 'attachment; filename="signature.asc"'
+          content_description 'OpenPGP digital signature'
+        end
+      end
+
+    end
+  end
 end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/gpg_test.rb

@@ -52,8 +52,15 @@ class GpgTest < Test::Unit::TestCase
 
   context "gpg installation" do
     should "have keys for jane and joe" do
-      assert joe = GPGME::Key.find(:public, 'joe@foo.bar').first
-      assert jane = GPGME::Key.find(:public, 'jane@foo.bar').first
+      assert joe = GPGME::Key.find(:public, 'joe@foo.bar')
+      assert_equal 1, joe.size
+      joe = joe.first
+      assert jane = GPGME::Key.find(:public, 'jane@foo.bar')
+      assert_equal 1, jane.size
+      jane = jane.first
+      assert id = jane.fingerprint
+      assert jane = GPGME::Key.find(:public, id).first
+      assert_equal id, jane.fingerprint
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail