mail-gpg 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17026bb359e9e8681f5e61e5fbc2b53ede7daa68
-  data.tar.gz: 084f875fc24201c8f074c27c8029e6b77ec6bb9e
+  metadata.gz: 0013a726cc36fd4eb141aa3f8f20887f27dbfbfb
+  data.tar.gz: 20eac895d6e3bc61712ebd63be00806421aa1618
 SHA512:
-  metadata.gz: 893411f59ec0483c471d40ef7501948543f8405be9a3138c458d8728bbe8a8da480bf84a8cc298a99ce8f16038ef888162f6e65289c37003c29582d9f17f2830
-  data.tar.gz: b859c9850ec90f8a9877b34db7d3a89918ad46c7f3331073caf01dec216e6cd62e82ce3e17105e584d611ef7c26315a38d62ec05bb5a6514cce911661d7cd068
+  metadata.gz: 05870d215e2ecfa634e6eb81fe6d21ef9642cdcaead05e3373970c3eda1b711346a3a908deea9635c66c448b367e20a65679d36fa86dea681ed5a45b63db6b9f
+  data.tar.gz: be35cf83e2cfbab24ec725a2dac1919196c3cd5cb238c5886d7d407f203edffac8d9f019e16e43c942f7672dd8e959863e506133323e062ca37452f989cd090f

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
   - 2.2.2
-  - 2.1.1
+  - 2.1.3
   - 2.0.0
   - 1.9.3
 env:
-  - RAILS=3.2.14
-  - RAILS=4.0.0
+  - RAILS=3.2.21
+  - RAILS=4.1.10
+  - RAILS=4.2.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.5 2015-09-30
+
+* allow overriding of encrypted attachment name (patch by @chrislewis60)
+
 == 0.2.4 2015-04-20
 
 * preserve List-Id and List-Unsubscribe headers

data/lib/mail/gpg.rb

@@ -232,10 +232,10 @@ module Mail
     # check if inline PGP (i.e. if any parts of the mail includes
     # the PGP SIGNED marker)
     def self.signed_inline?(mail)
-      return true if mail.body.include?('-----BEGIN PGP SIGNED MESSAGE-----')
+      return true if mail.body.to_s =~ /^-----BEGIN PGP SIGNED MESSAGE-----/
       if mail.multipart?
         mail.parts.each do |part|
-          return true if part.body.include?('-----BEGIN PGP SIGNED MESSAGE-----')
+          return true if part.body.to_s =~ /^-----BEGIN PGP SIGNED MESSAGE-----/
         end
       end
       false

data/lib/mail/gpg/encrypted_part.rb

@@ -13,14 +13,16 @@ module Mail
       # 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
+      # :filename : define a custom name for the encrypted file attachment
       def initialize(cleartext_mail, options = {})
         options = { always_trust: true }.merge options
 
         encrypted = GpgmeHelper.encrypt(cleartext_mail.encoded, options)
         super() do
           body encrypted.to_s
-          content_type "#{CONTENT_TYPE}; name=\"encrypted.asc\""
-          content_disposition 'inline; filename="encrypted.asc"'
+          filename = options[:filename] || 'encrypted.asc'
+          content_type "#{CONTENT_TYPE}; name=\"#{filename}\""
+          content_disposition "inline; filename=\"#{filename}\""
           content_description 'OpenPGP encrypted message'
         end
       end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/test/gpg_test.rb

@@ -20,6 +20,12 @@ class GpgTest < Test::Unit::TestCase
     enc_part.content_type
   end
 
+  def check_attachment_name(mail = @mail, encrypted = @encrypted)
+    v_part, enc_part = encrypted.parts
+    assert_equal 'application/octet-stream; name=custom_filename.asc', enc_part.content_type
+    assert_equal 'inline; filename=custom_filename.asc', enc_part.content_disposition
+  end
+
   def check_content(mail = @mail, encrypted = @encrypted)
     assert enc = encrypted.parts.last
     assert clear = GPGME::Crypto.new.decrypt(enc.to_s, password: 'abc').to_s
@@ -235,6 +241,16 @@ class GpgTest < Test::Unit::TestCase
       end
     end
 
+    context 'simple mail (custom filename)' do
+      setup do
+        @encrypted = Mail::Gpg.encrypt(@mail, {filename: 'custom_filename.asc'})
+      end
+
+      should 'have same custom attachment filename' do
+        check_attachment_name
+      end
+    end
+
     context 'simple mail (signed)' do
       setup do
         @encrypted = Mail::Gpg.encrypt(@mail, { :sign => true, :password => 'abc' })

data/test/inline_decrypted_message_test.rb

@@ -76,7 +76,7 @@ class InlineDecryptedMessageTest < Test::Unit::TestCase
         assert !decrypted.encrypted?
         check_headers(@mail, decrypted)
         assert_equal 2, decrypted.parts.length
-        assert_equal @mail.body.to_s, decrypted.parts[0].body.to_s
+        assert @mail.body.to_s == decrypted.parts[0].body.to_s
         assert /application\/octet-stream; (?:charset=UTF-8; )?name=Rakefile/ =~ decrypted.parts[1].content_type
         assert_equal 'attachment; filename=Rakefile', decrypted.parts[1].content_disposition
         assert_equal rakefile, decrypted.parts[1].body.decoded
@@ -108,7 +108,7 @@ class InlineDecryptedMessageTest < Test::Unit::TestCase
         assert !decrypted.encrypted?
         check_headers(@mail, decrypted)
         assert_equal 2, decrypted.parts.length
-        assert_equal @mail.body.to_s, decrypted.parts[0].body.to_s
+        assert @mail.body.to_s == decrypted.parts[0].body.to_s
         assert /application\/octet-stream; (?:charset=UTF-8; )?name=Rakefile/ =~ decrypted.parts[1].content_type
         assert_equal 'attachment; filename=Rakefile', decrypted.parts[1].content_disposition
         assert_equal rakefile, decrypted.parts[1].body.decoded

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -229,3 +229,4 @@ test_files:
 - test/sign_part_test.rb
 - test/test_helper.rb
 - test/version_part_test.rb
+has_rdoc: