larch 1.1.0.dev.20100206 → 1.1.0.dev.20100208

data/HISTORY

@@ -30,6 +30,8 @@ Version 1.1.0 (git)
     --all-subscribed to copy messages from multiple source folders to a single
     destination folder.
   * More concise log messages to reduce visual clutter in the log.
+  * Monkeypatched Net::IMAP to fix broken response handling with certain server
+    responses, particularly when changing mailboxes on a Dovecot 1.2+ server.
   * Fixed encoding issues when creating mailboxes and getting mailbox lists.
   * Fixed incorrect case-sensitive treatment of the 'INBOX' folder name.
   * Fixed a bug in which Larch would try to copy flags that weren't supported on

data/lib/larch.rb

@@ -9,6 +9,8 @@ require 'yaml'
 require 'sequel'
 require 'sequel/extensions/migration'
 
+require 'larch/monkeypatch/net/imap'
+
 require 'larch/config'
 require 'larch/errors'
 require 'larch/imap'

data/lib/larch/monkeypatch/net/imap.rb

@@ -0,0 +1,48 @@
+# Monkeypatch Net::IMAP in Ruby <= 1.9.1 to fix broken response handling,
+# particularly when changing mailboxes on a Dovecot 1.2+ server.
+#
+# This monkeypatch shouldn't be necessary in Ruby 1.9.2 and higher.
+
+if RUBY_VERSION <= '1.9.1'
+  module Net # :nodoc:
+    class IMAP # :nodoc:
+      class ResponseParser # :nodoc:
+        private
+
+        # This monkeypatched method is the one included in Ruby 1.9 SVN trunk as
+        # of 2010-02-08.
+        def resp_text_code
+          @lex_state = EXPR_BEG
+          match(T_LBRA)
+          token = match(T_ATOM)
+          name = token.value.upcase
+          case name
+          when /\A(?:ALERT|PARSE|READ-ONLY|READ-WRITE|TRYCREATE|NOMODSEQ)\z/n
+            result = ResponseCode.new(name, nil)
+          when /\A(?:PERMANENTFLAGS)\z/n
+            match(T_SPACE)
+            result = ResponseCode.new(name, flag_list)
+          when /\A(?:UIDVALIDITY|UIDNEXT|UNSEEN)\z/n
+            match(T_SPACE)
+            result = ResponseCode.new(name, number)
+          else
+            token = lookahead
+            if token.symbol == T_SPACE
+              shift_token
+              @lex_state = EXPR_CTEXT
+              token = match(T_TEXT)
+              @lex_state = EXPR_BEG
+              result = ResponseCode.new(name, token.value)
+            else
+              result = ResponseCode.new(name, nil)
+            end
+          end
+          match(T_RBRA)
+          @lex_state = EXPR_RTEXT
+          return result
+        end
+      end
+
+    end
+  end
+end

data/lib/larch/version.rb

@@ -1,6 +1,6 @@
 module Larch
   APP_NAME      = 'Larch'
-  APP_VERSION   = '1.1.0.dev.20100206'
+  APP_VERSION   = '1.1.0.dev.20100208'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'http://github.com/rgrove/larch/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: larch
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.dev.20100206
+  version: 1.1.0.dev.20100208
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -08:00
+date: 2010-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - lib/larch/imap/mailbox.rb
 - lib/larch/imap.rb
 - lib/larch/logger.rb
+- lib/larch/monkeypatch/net/imap.rb
 - lib/larch/version.rb
 - lib/larch.rb
 has_rdoc: true