mail-gpg 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.6 2014-05-30
+
+* preserve names in mail headers (i.e. Jane Doe <user@host.com>)
+
 == 0.1.5 2014-05-28
 
 * signing refactoring so the signed part only contains the necessary headers

data/lib/mail/gpg.rb

@@ -95,8 +95,8 @@ module Mail
       false
     end
 
-    STANDARD_HEADERS = %w(from to cc bcc subject reply_to in_reply_to return_path message_id)
-    CUSTOM_HEADERS = %w(Auto-Submitted)
+    STANDARD_HEADERS = %w(from to cc bcc reply_to subject in_reply_to return_path message_id)
+    MORE_HEADERS = %w(Auto-Submitted)
 
     private
 
@@ -104,10 +104,12 @@ module Mail
       Mail.new do
         self.perform_deliveries = cleartext_mail.perform_deliveries
         STANDARD_HEADERS.each do |field|
-          send field, cleartext_mail.send(field)
+          if h = cleartext_mail.header[field]
+            self.header[field] = h.value
+          end
         end
         cleartext_mail.header.fields.each do |field|
-          if CUSTOM_HEADERS.include?(field.name) or field.name =~ /^X-/
+          if MORE_HEADERS.include?(field.name) or field.name =~ /^X-/
             header[field.name] = field.value
           end
         end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/mail-gpg.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mail", "~> 2.5.3"
-  spec.add_dependency "gpgme", "~> 2.0.2"
+  spec.add_dependency "mail", "~> 2.5", ">= 2.5.3"
+  spec.add_dependency "gpgme", "~> 2.0", ">= 2.0.2"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest", "~> 4.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "actionmailer", ">= 3.2.0"
   spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "shoulda-context"
+  spec.add_development_dependency "shoulda-context", '~> 1.1'
 end

data/test/gpg_test.rb

@@ -52,8 +52,13 @@ class GpgTest < Test::Unit::TestCase
 
   def check_headers_signed(mail = @mail, signed = @signed)
     assert_equal mail.to, signed.to
-    assert_equal mail.cc, signed.cc
-    assert_equal mail.bcc, signed.bcc
+    if mail.cc
+      assert_equal mail.cc, signed.cc
+    end
+    if mail.bcc
+      assert_equal mail.bcc, signed.bcc
+    end
+
     assert_equal mail.subject, signed.subject
     assert_equal mail.return_path, signed.return_path
   end
@@ -76,7 +81,7 @@ class GpgTest < Test::Unit::TestCase
     setup do
       @mail = Mail.new do
         to 'joe@foo.bar'
-        from 'jane@foo.bar'
+        from '<Jane Doe> jane@foo.bar'
         subject 'test test'
         body 'sign me!'
         content_type 'text/plain; charset=UTF-8'
@@ -88,6 +93,10 @@ class GpgTest < Test::Unit::TestCase
         @signed = Mail::Gpg.sign(@mail, password: 'abc')
       end
 
+      should 'preserve from name' do
+        assert_equal '<Jane Doe> jane@foo.bar', @signed.header['from'].value
+      end
+
       should 'have same recipients and subject' do
         check_headers_signed
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -17,6 +17,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.3
   type: :runtime
@@ -25,6 +28,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.3
 - !ruby/object:Gem::Dependency
@@ -33,6 +39,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
@@ -41,6 +50,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
@@ -128,17 +140,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 description: ! 'GPG/MIME encryption plugin for the Ruby Mail Library
 
   This tiny gem adds GPG capabilities to Mail::Message and ActionMailer::Base. Because