mail-gpg 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa28ac570f95bf31e58025d3e29c4d8fe15c43a
-  data.tar.gz: 3a4afd5b7c7847333c364135aba9acb20fc9762d
+  metadata.gz: dc0c7bb838506fa1e0e3f01fbce200a95e13e76f
+  data.tar.gz: a528a571122d6c9b61c5ce2152b37973bdec88d9
 SHA512:
-  metadata.gz: d96da3558cb0b0ed814dce389d0e969e19edf718712adcecc0dc5bad04c6d1a35ed8da20acbf9427212072daf1c462e48a9391d5fc0c6d5b63c4e6a9e3593052
-  data.tar.gz: 3a8e23f13198857aa5fe9f533a08d7209d55ee0ba9839d913b977fbea59841315c211c1f87f3440e0c7a1d3a239419ed84dcb0b593efa6590aa85aadfce129cd
+  metadata.gz: 40c3c768a539f4e016fc259cbd13b5d7323b423bde90be8dcb4a970017dc9d33e686d73e5d1a834facd8db82e9816f96f1e1e08eebbdbfa21773eeb435e51493
+  data.tar.gz: 1b37f11b4beb3311a1c894c2b1c77e626f8cadfd4cacdac74ab9bb96e528c6773ad10a91b093585276677825ed589555e21a7fe1673e82fd6193960e71bb7d87

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.3 2018-04-01
+
+* fix broken GpgmeHelper#keys_for_data #59
+
 == 0.3.2 2018-03-30
 
 * do not attempt to decrypt inline-encrypted HTML parts #52

data/lib/mail/gpg/gpgme_helper.rb

@@ -128,8 +128,8 @@ module Mail
             unless key_id.nil? || key_id.empty?
               GPGME::Key.find(:public, key_id, :encrypt)
             end
-          end.flatten
-        elsif emails_or_shas_or_keys.size > 0
+          end.flatten.compact
+        elsif emails_or_shas_or_keys and emails_or_shas_or_keys.size > 0
           # key lookup in keychain for all receivers
           GPGME::Key.find :public, emails_or_shas_or_keys, :encrypt
         else

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/test/decrypted_part_test.rb

@@ -11,7 +11,9 @@ class DecryptedPartTest < Test::Unit::TestCase
         subject 'test'
         body 'i am unencrypted'
       end
-      @part = Mail::Gpg::EncryptedPart.new(@mail, { :sign => true, :password => 'abc' })
+      @part = Mail::Gpg::EncryptedPart.new(@mail, { recipients: ['jane@foo.bar'],
+                                                    :sign => true,
+                                                    :password => 'abc' })
     end
 
     should 'decrypt' do

data/test/encrypted_part_test.rb

@@ -17,67 +17,20 @@ class EncryptedPartTest < Test::Unit::TestCase
         subject 'test'
         body 'i am unencrypted'
       end
-      @part = Mail::Gpg::EncryptedPart.new(mail)
+      @part = Mail::Gpg::EncryptedPart.new(mail, recipients: ['jane@foo.bar'])
     end
 
-    context 'with email address' do
-      setup do
-        @email = 'jane@foo.bar'
-      end
-
-      should 'resolve email to gpg keys' do
-        assert keys = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @email)
-        check_key_list keys
-      end
-
-      should 'resolve emails to gpg keys' do
-        assert keys = Mail::Gpg::GpgmeHelper.send(:keys_for_data, [@email])
-        check_key_list keys
-      end
-
+    should 'have binary content type and name' do
+      assert_equal 'application/octet-stream; name=encrypted.asc', @part.content_type
     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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @key_id)
-        check_key_list keys
-      end
-      should 'resolve id list to gpg keys' do
-        assert keys = Mail::Gpg::GpgmeHelper.send(:keys_for_data, [@key_id])
-        check_key_list keys
-      end
+    should 'have description' do
+      assert_match(/openpgp/i, @part.content_description)
     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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @key_fpr)
-        check_key_list keys
-      end
-      should 'resolve id list to gpg keys' do
-        assert keys = Mail::Gpg::GpgmeHelper.send(:keys_for_data, [@key_fpr])
-        check_key_list keys
-      end
+    should 'have inline disposition and default filename' do
+      assert_equal 'inline; filename=encrypted.asc', @part.content_disposition
     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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @emails, @key_data)
-        check_key_list keys
-      end
-    end
   end
 end

data/test/gpgme_helper_test.rb

@@ -0,0 +1,79 @@
+require 'test_helper'
+
+class GpgmeHelperTest < Test::Unit::TestCase
+
+  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 'GpgmeHelper' do
+
+    should 'handle empty email list' do
+      assert_equal [], Mail::Gpg::GpgmeHelper.send(:keys_for_data, nil)
+      assert_equal [], Mail::Gpg::GpgmeHelper.send(:keys_for_data, [])
+    end
+
+    context 'with email address' do
+      setup do
+        @email = 'jane@foo.bar'
+      end
+
+      should 'resolve email to gpg keys' do
+        assert keys = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @email)
+        check_key_list keys
+      end
+
+      should 'resolve emails to gpg keys' do
+        assert keys = Mail::Gpg::GpgmeHelper.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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @key_id)
+        check_key_list keys
+      end
+      should 'resolve id list to gpg keys' do
+        assert keys = Mail::Gpg::GpgmeHelper.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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @key_fpr)
+        check_key_list keys
+      end
+      should 'resolve id list to gpg keys' do
+        assert keys = Mail::Gpg::GpgmeHelper.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 = Mail::Gpg::GpgmeHelper.send(:keys_for_data, @emails, @key_data)
+        check_key_list keys
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -182,6 +182,7 @@ files:
 - test/gpghome/random_seed
 - test/gpghome/secring.gpg
 - test/gpghome/trustdb.gpg
+- test/gpgme_helper_test.rb
 - test/hkp_test.rb
 - test/inline_decrypted_message_test.rb
 - test/inline_signed_message_test.rb
@@ -224,6 +225,7 @@ test_files:
 - test/gpghome/random_seed
 - test/gpghome/secring.gpg
 - test/gpghome/trustdb.gpg
+- test/gpgme_helper_test.rb
 - test/hkp_test.rb
 - test/inline_decrypted_message_test.rb
 - test/inline_signed_message_test.rb