lib/gmail/message.rb in gmail-0.3.4 vs lib/gmail/message.rb in gmail-0.4.0

@@ -62,25 +62,29 @@
     # Remove message from list of starred.
     def unstar!
       unflag('[Gmail]/Starred')
     end
     
-    # Move to trash.
+    # Move to trash / bin.
     def delete!
       @mailbox.messages.delete(uid)
-      flag(:Deleted)
-      move_to('[Gmail]/Trash') unless %w[[Gmail]/Spam [Gmail]/Trash].include?(@mailbox.name)
+      flag(:deleted)
+
+      # For some, it's called "Trash", for others, it's called "Bin". Support both.
+      trash =  @gmail.labels.exist?('[Gmail]/Bin') ? '[Gmail]/Bin' : '[Gmail]/Trash'
+      move_to(trash) unless %w[[Gmail]/Spam [Gmail]/Bin [Gmail]/Trash].include?(@mailbox.name)
     end
 
     # Archive this message.
     def archive!
       move_to('[Gmail]/All Mail')
     end
     
     # Move to given box and delete from others.  
     def move_to(name, from=nil)
-      label(name, from) && delete!
+      label(name, from)
+      delete! if !%w[[Gmail]/Bin [Gmail]/Trash].include?(name)
     end
     alias :move :move_to
     
     # Move message to given and delete from others. When given mailbox doesn't 
     # exist then it will be automaticaly created. 
@@ -92,36 +96,36 @@
     # Mark this message with given label. When given label doesn't exist then
     # it will raise <tt>NoLabelError</tt>. 
     #
     # See also <tt>Gmail::Message#label!</tt>.
     def label(name, from=nil)
-      @gmail.mailbox(from || @mailbox.name) { @gmail.conn.uid_copy(uid, name) }
+      @gmail.mailbox(Net::IMAP.encode_utf7(from || @mailbox.external_name)) { @gmail.conn.uid_copy(uid, Net::IMAP.encode_utf7(name)) }
     rescue Net::IMAP::NoResponseError
       raise NoLabelError, "Label '#{name}' doesn't exist!"
     end
-    alias :add_label :label
 
     # Mark this message with given label. When given label doesn't exist then
     # it will be automaticaly created. 
     #
     # See also <tt>Gmail::Message#label</tt>.
     def label!(name, from=nil)
       label(name, from) 
     rescue NoLabelError
-      @gmail.labels.add(name)
-      label!(name, from)
+      @gmail.labels.add(Net::IMAP.encode_utf7(name))
+      label(name, from)
     end
-    alias :add_label! :add_label
+    alias :add_label :label!
+    alias :add_label! :label!
     
     # Remove given label from this message. 
     def remove_label!(name)
       move_to('[Gmail]/All Mail', name)
     end
     alias :delete_label! :remove_label!
     
     def inspect
-      "#<Gmail::Message#{'0x%04x' % (object_id << 1)} mailbox=#{@mailbox.name}#{' uid='[e-mail]_s if @uid}#{' message_id='+@message_id.to_s if @message_id}>"
+      "#<Gmail::Message#{'0x%04x' % (object_id << 1)} mailbox=#{@mailbox.external_name}#{' uid='[e-mail]_s if @uid}#{' message_id='+@message_id.to_s if @message_id}>"
     end
     
     def method_missing(meth, *args, &block)
       # Delegate rest directly to the message.
       if envelope.respond_to?(meth)
@@ -130,21 +134,31 @@
         message.send(meth, *args, &block)
       else
         super(meth, *args, &block)
       end
     end
-    
+
+    def respond_to?(meth, *args, &block)
+      if envelope.respond_to?(meth)
+        return true
+      elsif message.respond_to?(meth)
+        return true
+      else
+        super(meth, *args, &block)
+      end
+    end
+
     def envelope
       @envelope ||= @gmail.mailbox(@mailbox.name) {
         @gmail.conn.uid_fetch(uid, "ENVELOPE")[0].attr["ENVELOPE"]
       }
     end
-
-    private
     
     def message
       @message ||= Mail.new(@gmail.mailbox(@mailbox.name) { 
         @gmail.conn.uid_fetch(uid, "RFC822")[0].attr["RFC822"] # RFC822
       })
     end
+    alias_method :raw_message, :message
+
   end # Message
 end # Gmail