vmail 1.3.0 → 1.3.2

data/Rakefile

@@ -35,10 +35,13 @@ desc "Run tests"
 task :test do 
   $:.unshift File.expand_path("test")
   require 'test_helper'
-  require 'time_format_test'
-  require 'message_formatter_test'
-  require 'reply_template_test'
-  require 'base64_test'
+  Dir.chdir("test") do 
+    Dir['*_test.rb'].each do |x|
+      puts "requiring #{x}"
+      require x
+    end
+  end
+
   MiniTest::Unit.autorun
 end
 

data/lib/vmail.rb

@@ -12,7 +12,7 @@ module Vmail
     puts "starting vmail #{Vmail::VERSION}"
 
     vim = ENV['VMAIL_VIM'] || 'vim'
-    ENV['VMAIL_BROWSER'] ||= 'open'
+    ENV['VMAIL_BROWSER'] ||= RUBY_PLATFORM.downcase.include?('linux') ? 'gnome-open' : 'open'
 
     check_lynx
 

data/lib/vmail.vim

@@ -766,6 +766,7 @@ func! s:message_window_mappings()
   noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
   noremap <silent> <buffer> <Leader>h :call <SID>open_html_part()<CR><cr>
   nnoremap <silent> <buffer> q :call <SID>close_message_window()<cr> 
+  nmap <silent> <buffer> <leader>q q
 
   nnoremap <silent> <buffer> <leader>#  :close<cr>:call <SID>focus_list_window()<cr>:call <SID>delete_messages("Deleted")<cr>
   nnoremap <silent> <buffer> <leader>*  :call <SID>focus_list_window()<cr>:call <SID>toggle_star()<cr>
@@ -793,6 +794,7 @@ func! s:message_list_window_mappings()
   noremap <silent> <buffer> <LeftMouse> :call <SID>show_message(0)<CR>
   nnoremap <silent> <buffer> l :call <SID>show_message(1)<CR>
   noremap <silent> <buffer> q :qal!<cr>
+  nmap <silent> <buffer> <leader>q q
 
   noremap <silent> <buffer> <leader>* :call <SID>toggle_star()<CR>
   noremap <silent> <buffer> <leader># :call <SID>delete_messages("Deleted")<CR>
@@ -826,7 +828,6 @@ endfunc
 
 func! s:compose_window_mappings()
   noremap <silent> <buffer> <leader>q :call <SID>cancel_compose()<cr>
-  "nmap <silent> <buffer> q <leader>q
   setlocal ai
   " setlocal textwidth=72
   autocmd CursorMoved <buffer> call <SID>toggle_textwidth()

data/lib/vmail/address_quoter.rb

@@ -0,0 +1,16 @@
+module Vmail
+  module AddressQuoter
+
+    def quote_addresses(string)
+      email_addrs = []
+      string.scan(/\s*(.*?)\s*<(.+?)>(?:,|\Z)/) do |match|
+        # yields ["Bob Smith", "bobsmith@gmail.com"]
+        # then   ["Jones, Rich A.", "richjones@gmail.com"]
+        email_addrs << "\"#{match.first}\" <#{match.last}>"
+      end
+      res = email_addrs.join(", ") 
+      res
+    end
+
+  end
+end

data/lib/vmail/imap_client.rb

@@ -6,9 +6,12 @@ require 'mail'
 require 'net/imap'
 require 'time'
 require 'logger'
+require 'vmail/address_quoter'
 
 module Vmail
   class ImapClient
+    include Vmail::AddressQuoter
+
     DIVIDER_WIDTH = 46
 
     MailboxAliases = { 'sent' => '[Gmail]/Sent Mail',
@@ -672,6 +675,10 @@ EOF
       headers = {}
       raw_headers.split("\n").each do |line|
         key, value = *line.split(/:\s*/, 2)
+        log [key, value].join(':')
+        if %w(from to cc bcc).include?(key)
+          value = quote_addresses(value)
+        end
         headers[key] = value
       end
       log "delivering message with headers: #{headers.to_yaml}"

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

data/test/address_quoter_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'vmail/address_quoter'
+
+class AddressQuoterTest < MiniTest::Unit::TestCase
+  include Vmail::AddressQuoter
+
+  def setup
+    @string = "Bob Smith <bobsmith@gmail.com>, Jones, Rich A. <richjones@gmail.com>"
+    @expected = '"Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>'
+    @string2 = "Jones, Rich A. <richjones@gmail.com>, Bob Smith <bobsmith@gmail.com>"
+    @expected2 = '"Jones, Rich A." <richjones@gmail.com>, "Bob Smith" <bobsmith@gmail.com>'
+  end
+
+  def test_quoting
+    assert_equal @expected, quote_addresses(@string)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
+    assert_equal @expected2, quote_addresses(@string2)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Daniel Choi
@@ -69,6 +69,7 @@ files:
 - bin/vmailsend
 - lib/vmail.rb
 - lib/vmail.vim
+- lib/vmail/address_quoter.rb
 - lib/vmail/contacts_extractor.rb
 - lib/vmail/imap_client.rb
 - lib/vmail/message_formatter.rb
@@ -79,6 +80,7 @@ files:
 - lib/vmail/sender.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb
+- test/address_quoter_test.rb
 - test/base64_test.rb
 - test/fixtures/euc-kr-header.eml
 - test/fixtures/euc-kr-html.eml
@@ -161,6 +163,7 @@ signing_key:
 specification_version: 3
 summary: A Vim interface to Gmail
 test_files: 
+- test/address_quoter_test.rb
 - test/base64_test.rb
 - test/fixtures/euc-kr-header.eml
 - test/fixtures/euc-kr-html.eml