rgrove-larch 1.0.0.13 → 1.0.1

data/HISTORY

@@ -1,7 +1,7 @@
 Larch History
 ================================================================================
 
-Version 1.0.1 (?)
+Version 1.0.1 (2009-05-10)
   * Ruby 1.9.1 support.
   * Much more robust handling of unexpected server disconnects and dropped
     connections.
@@ -15,9 +15,7 @@ Version 1.0.1 (?)
   * Added a new "insane" logging level, which will output all IMAP commands and
     responses to STDERR.
   * Fixed excessive post-scan processing times for very large mailboxes.
-  * Message headers are now fetched in blocks of up to 1024 at a time rather
-    than all at once to prevent potential problems with certain servers when a
-    mailbox contains a huge number of messages.
+  * Fixed potential scan problems with very large mailboxes on certain servers.
   * POSIX signals are no longer trapped on platforms that aren't likely to
     support them.
 

data/README.rdoc

@@ -8,7 +8,7 @@ Larch is particularly well-suited for copying email to, from, or between Gmail
 accounts.
 
 *Author*::    Ryan Grove (mailto:ryan@wonko.com)
-*Version*::   ? (?)
+*Version*::   1.0.1 (2009-05-10)
 *Copyright*:: Copyright (c) 2009 Ryan Grove. All rights reserved.
 *License*::   GPL 2.0 (http://opensource.org/licenses/gpl-2.0.php)
 *Website*::   http://github.com/rgrove/larch

data/lib/larch/imap/mailbox.rb

@@ -4,9 +4,6 @@ module Larch; class IMAP
 class Mailbox
   attr_reader :attr, :delim, :imap, :name, :state
 
-  # Maximum number of messages to fetch at once.
-  MAX_FETCH_COUNT = 1024
-
   # Regex to capture a Message-Id header.
   REGEX_MESSAGE_ID = /message-id\s*:\s*(\S+)/i
 
@@ -20,7 +17,7 @@ class Mailbox
     @name       = name
     @delim      = delim
     @subscribed = subscribed
-    @attr       = *attr
+    @attr       = *attr.flatten # flatten is necessary for Ruby 1.9
 
     @ids       = {}
     @last_id   = 0
@@ -130,12 +127,10 @@ class Mailbox
     end
 
     last_id = @imap.safely { @imap.conn.responses['EXISTS'].last }
-
     @mutex.synchronize { @last_scan = Time.now }
     return if last_id == @last_id
 
     range = (@last_id + 1)..last_id
-
     @mutex.synchronize { @last_id = last_id }
 
     info "fetching message headers #{range}" <<
@@ -147,7 +142,7 @@ class Mailbox
       "(UID BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)] RFC822.SIZE INTERNALDATE)"
     end
 
-    imap_fetch(range, fields).each do |data|
+    imap_fetch(range.begin..-1, fields).each do |data|
       id = create_id(data)
 
       unless uid = data.attr['UID']
@@ -228,23 +223,13 @@ class Mailbox
     return true
   end
 
-  # Fetches the specified _fields_ for the specified message sequence id(s) from
-  # this mailbox.
-  def imap_fetch(ids, fields)
-    ids  = ids.to_a
-    data = []
-    pos  = 0
-
-    while pos < ids.length
-      @imap.safely do
-        imap_examine
-
-        data += @imap.conn.fetch(ids[pos, MAX_FETCH_COUNT], fields)
-        pos  += MAX_FETCH_COUNT
-      end
+  # Fetches the specified _fields_ for the specified _set_ of message sequence
+  # ids (either a Range or an Array of ids).
+  def imap_fetch(set, fields)
+    @imap.safely do
+      imap_examine
+      @imap.conn.fetch(set, fields)
     end
-
-    data
   end
 
   # Selects the mailbox if it is not already selected. If the mailbox does not
@@ -280,23 +265,13 @@ class Mailbox
     return true
   end
 
-  # Fetches the specified _fields_ for the specified UID(s) from the IMAP
-  # server.
-  def imap_uid_fetch(uids, fields)
-    uids = uids.to_a
-    data = []
-    pos  = 0
-
-    while pos < uids.length
-      @imap.safely do
-        imap_examine
-
-        data += @imap.conn.uid_fetch(uids[pos, MAX_FETCH_COUNT], fields)
-        pos  += MAX_FETCH_COUNT
-      end
+  # Fetches the specified _fields_ for the specified _set_ of UIDs (either a
+  # Range or an Array of UIDs).
+  def imap_uid_fetch(set, fields)
+    @imap.safely do
+      imap_examine
+      @imap.conn.uid_fetch(set, fields)
     end
-
-    data
   end
 
 end

data/lib/larch/version.rb

@@ -1,6 +1,6 @@
 module Larch
   APP_NAME      = 'Larch'
-  APP_VERSION   = '1.0.0.13'
+  APP_VERSION   = '1.0.1'
   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: rgrove-larch
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.13
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ryan Grove