mail-gpg 0.0.5 → 0.0.6

data/.gitignore

@@ -15,4 +15,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+test/gpghome/random_seed
 tmp

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.6 2013-08-28
+
+* bugfix: onlyu encrypt to specified keys if :keys option is present
+
 == 0.0.5 2013-08-28
 
 * add some docs to the Hkp client

data/lib/mail/gpg/encrypted_part.rb

@@ -63,15 +63,14 @@ module Mail
       # normalizes the list of recipients' emails, key ids and key data to a
       # list of Key objects
       def keys_for_data(emails_or_shas_or_keys, key_data = nil)
-        keys = if key_data
-          emails_or_shas_or_keys.map do |r|
+        if key_data
+          [emails_or_shas_or_keys].flatten.map do |r|
             # import any given keys
             k = key_data[r]
             if k and k =~ /-----BEGIN PGP/
-              GPGME::Key.import k
-              k = nil
+              k = GPGME::Key.import(k).imports.map(&:fpr)
             end
-            GPGME::Key.find(:public, k || r)
+            GPGME::Key.find(:public, k || r, :encrypt)
           end.flatten
         else
           # key lookup in keychain for all receivers

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/encrypted_part_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+require 'mail/gpg/encrypted_part'
+require 'pry-nav'
+
+class EncryptedPartTest < Test::Unit::TestCase
+  context 'EncryptedPart' do
+    setup do
+      mail = Mail.new do
+        to 'jane@foo.bar'
+        from 'joe@foo.bar'
+        subject 'test'
+        body 'i am unencrypted'
+      end
+      @part = Mail::Gpg::EncryptedPart.new(mail)
+    end
+
+    def check_key_list(keys)
+      assert_equal 1, keys.size
+      assert_equal GPGME::Key, keys.first.class
+      assert_equal 'jane@foo.bar', keys.first.email
+    end
+
+    context 'with email address' do
+      setup do
+        @email = 'jane@foo.bar'
+      end
+
+      should 'resolve email to gpg keys' do
+        assert keys = @part.send(:keys_for_data, @email)
+        check_key_list keys
+      end
+
+      should 'resolve emails to gpg keys' do
+        assert keys = @part.send(:keys_for_data, [@email])
+        check_key_list keys
+      end
+
+    end
+
+    context 'with key id' do
+      setup do
+        @key_id = GPGME::Key.find(:public, 'jane@foo.bar').first.sha
+      end
+
+      should 'resolve single id  gpg keys' do
+        assert keys = @part.send(:keys_for_data, @key_id)
+        check_key_list keys
+      end
+      should 'resolve id list to gpg keys' do
+        assert keys = @part.send(:keys_for_data, [@key_id])
+        check_key_list keys
+      end
+    end
+
+    context 'with key fingerprint' do
+      setup do
+        @key_fpr = GPGME::Key.find(:public, 'jane@foo.bar').first.fingerprint
+      end
+
+      should 'resolve single id  gpg keys' do
+        assert keys = @part.send(:keys_for_data, @key_fpr)
+        check_key_list keys
+      end
+      should 'resolve id list to gpg keys' do
+        assert keys = @part.send(:keys_for_data, [@key_fpr])
+        check_key_list keys
+      end
+    end
+
+    context 'with emails and key data' do
+      setup do
+        @key = GPGME::Key.find(:public, 'jane@foo.bar').first.export(armor: true).to_s
+        @emails = ['jane@foo.bar']
+        @key_data = { 'jane@foo.bar' => @key }
+      end
+
+      should 'resolve to gpg keys' do
+        assert keys = @part.send(:keys_for_data, @emails, @key_data)
+        check_key_list keys
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -154,6 +154,7 @@ files:
 - lib/mail/gpg/version_part.rb
 - mail-gpg.gemspec
 - test/action_mailer_test.rb
+- test/encrypted_part_test.rb
 - test/gpg_test.rb
 - test/gpghome/pubring.gpg
 - test/gpghome/pubring.gpg~
@@ -189,6 +190,7 @@ specification_version: 3
 summary: GPG/MIME encryption plugin for the Ruby Mail Library
 test_files:
 - test/action_mailer_test.rb
+- test/encrypted_part_test.rb
 - test/gpg_test.rb
 - test/gpghome/pubring.gpg
 - test/gpghome/pubring.gpg~