vmail 1.0.6 → 1.0.7

data/lib/vmail/imap_client.rb

@@ -100,6 +100,7 @@ module Vmail
     end
 
     def clear_cached_message
+      log "CLEARING CACHED MESSAGE"
       @current_mail = nil
       @current_message_index = nil
       @current_message = nil
@@ -441,6 +442,7 @@ module Vmail
       mail = data[:mail]
       size = data[:size] 
       @current_message_index = index
+      log "- setting @current_mail"
       @current_mail = mail # used later to show raw message or extract attachments if any
       @current_message = data[:message_text]
     rescue
@@ -549,7 +551,6 @@ EOF
           end
         end
 
-        clear_cached_message
       end
     end
 
@@ -677,13 +678,16 @@ EOF
 
     def reply_template(replyall=false)
       log "sending reply template"
+      if @current_mail.nil?
+        log "- missing @current mail!"
+        return nil
+      end
       # user reply_template class
       reply_headers = Vmail::ReplyTemplate.new(@current_mail, @username, @name, replyall).reply_headers
       body = reply_headers.delete(:body)
       format_headers(reply_headers) + "\n\n\n" + body + signature
     end
 
-
     def signature
       return '' unless @signature
       "\n\n#@signature"

data/lib/vmail/reply_template.rb

@@ -21,14 +21,6 @@ module Vmail
       quote_header = "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n"
       body = quote_header + formatter.process_body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
       {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
-    rescue NoMethodError
-      # a total hack TODO but stopgap
-      if try_again
-        sleep 0.3
-        return reply_headers(false) # try one more time
-      else
-        raise
-      end
     end
 
     def primary_recipient

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Daniel Choi