vmail 1.9.0 → 1.9.1

data/README.markdown

@@ -307,7 +307,7 @@ at the top of the message window:
     to: Daniel Choi <dhchoi@gmail.com>
     subject: attachment test
 
-    see attached
+    Hi Dan, please see attached
 
 To download these attachments to a local directory, type `,A`. You'll be
 prompted for a directory path.  Then Vmail will save all the attachments in the
@@ -320,18 +320,24 @@ composition window:
     to: barackobama@whitehouse.gov
     subject: look at this!
     
-    attach:
-    - images/middle-east-map.png
-    - images/policypaper.pdf
-    - docs/
+    attach: images/middle-east-map.png
+    attach: images/policypaper.pdf
+    attach: docs/
     
     I think you'll find this stuff interesting.
     
-
-The `attach:` block is a YAML list. The items are paths (either relative to the
+The items following the `attach:` directives are paths (either relative to the
 current directory or absolute) to the files you want to attach to your message.
 Note that you can also specify a directory, in which case Vmail attaches every
-file it finds in that directory.
+file it finds in that directory. Make sure that you 
+
+* keep the `attach:` lines contiguous (no intervening empty lines) if you want to add multiple attachments
+* insert an empty line before the attachments section
+* insert an empty after the attachments section
+
+You don't have to type the `attach:` directives manually. You can use the 
+command `:VMAttach [filename-or-path]` to insert a `attach:` directive with
+the help of file auto-completion.
 
 One thing Vmail doesn't do yet is let you forward a message with all its
 attachments intact.  This feature will be implemented in the near future. 

data/lib/vmail.vim

@@ -655,6 +655,15 @@ func! s:save_attachments()
   let res = system(command)
   echo res
 endfunc
+
+func! s:attach_file(file)
+  normal gg
+  normal }
+  let attach = "attach: " . a:file
+  put =attach
+endfunc
+
+
 " -------------------------------------------------------------------------------- 
 
 func! s:toggle_maximize_window()
@@ -824,6 +833,7 @@ func! s:compose_window_mappings()
   setlocal ai
   " setlocal textwidth=72
   autocmd CursorMoved <buffer> call <SID>toggle_textwidth()
+  command! -bar -nargs=1 -complete=file VMAttach call s:attach_file(<f-args>)
 endfunc
 
 func! s:global_mappings()

data/lib/vmail/imap_client.rb

@@ -370,9 +370,9 @@ EOF
       mail.charset = 'UTF-8'
       # attachments are added as a snippet of YAML after a blank line
       # after the headers, and followed by a blank line
-      if (attachments = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
-        files = YAML::load(attachments).values.flatten
-        log "Attach: #{files}"
+      if (attachments_section = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
+        files = attachments_section.split(/\n/).map {|line| line[/[-:]\s*(.*)\s*$/, 1]}.compact
+        log "Attach: #{files.inspect}"
         files.each do |file|
           if File.directory?(file)
             Dir.glob("#{file}/*").each {|f| mail.add_file(f) if File.size?(f)}

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: vmail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors: 
 - Daniel Choi