larch 1.1.0.dev.20091123 → 1.1.0.dev.20091126

data/HISTORY

@@ -24,6 +24,9 @@ Version 1.1.0 (git)
   * 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
     the destination server.
+  * Fixed an issue when trying to copy a folder with leading or trailing
+    whitespace in the name to Gmail, since Gmail doesn't allow whitespace around
+    folder names.
 
 Version 1.0.2 (2009-08-05)
   * Fixed a bug that caused Larch to try to set the read-only \Recent flag on

data/lib/larch/imap.rb

@@ -6,7 +6,7 @@ module Larch
 # required reading if you're doing anything with IMAP in Ruby:
 # http://sup.rubyforge.org
 class IMAP
-  attr_reader :conn, :db_account, :mailboxes, :options
+  attr_reader :conn, :db_account, :mailboxes, :options, :quirks
 
   # URI format validation regex.
   REGEX_URI = URI.regexp(['imap', 'imaps'])
@@ -57,6 +57,9 @@ class IMAP
     @conn      = nil
     @mailboxes = {}
     @mutex     = Mutex.new
+    @quirks    = {
+      :gmail => false
+    }
 
     @db_account = Database::Account.find_or_create(
       :hostname => host,
@@ -125,6 +128,9 @@ class IMAP
     name = name.gsub(delim, self.delim)
     name = 'INBOX' if name.downcase == 'inbox'
 
+    # Gmail doesn't allow folders with leading or trailing whitespace.
+    name.strip! if @quirks[:gmail]
+
     begin
       @mailboxes.fetch(name) do
         update_mailboxes
@@ -231,6 +237,19 @@ class IMAP
 
   private
 
+  # Tries to identify server implementations with certain quirks that we'll need
+  # to work around.
+  def check_quirks
+    return unless @conn &&
+        @conn.greeting.kind_of?(Net::IMAP::UntaggedResponse) &&
+        @conn.greeting.data.kind_of?(Net::IMAP::ResponseText)
+
+    if @conn.greeting.data.text =~ /^Gimap ready/
+      @quirks[:gmail] = true
+      debug "looks like Gmail"
+    end
+  end
+
   # Resets the connection and mailbox state.
   def reset
     @mutex.synchronize do
@@ -282,6 +301,8 @@ class IMAP
 
         info "connected on port #{port}" << (ssl? ? ' using SSL' : '')
 
+        check_quirks
+
         auth_methods = ['PLAIN']
         tried        = []
         capability   = @conn.capability

data/lib/larch/version.rb

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

data/lib/larch.rb

@@ -115,16 +115,18 @@ module Larch
     # Opens a connection to the Larch message database, creating it if
     # necessary.
     def open_db(database)
-      filename  = File.expand_path(database)
-      directory = File.dirname(filename)
+      unless database == ':memory:'
+        filename  = File.expand_path(database)
+        directory = File.dirname(filename)
 
-      unless File.exist?(directory)
-        FileUtils.mkdir_p(directory)
-        File.chmod(0700, directory)
+        unless File.exist?(directory)
+          FileUtils.mkdir_p(directory)
+          File.chmod(0700, directory)
+        end
       end
 
       begin
-        db = Sequel.connect("sqlite://#{filename}")
+        db = Sequel.sqlite(:database => filename)
         db.test_connection
       rescue => e
         @log.fatal "unable to open message database: #{e}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: larch
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.dev.20091123
+  version: 1.1.0.dev.20091126
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency