imap_archiver 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/imap_archiver/archiver.rb

@@ -9,7 +9,7 @@ module ImapArchiver
       @logger.level = Logger::WARN
       if debug
         @logger.level = Logger::DEBUG
-        @Logger.debug "Debugging enabled."
+        @logger.debug "Debugging enabled."
       end
       @logger.debug "Loading config"
       self.load_config(config_file)
@@ -74,9 +74,11 @@ module ImapArchiver
         connection.select(folder)
         # puts "will search 1"
         msgs_to_archive = connection.search(conditions)
+        @logger.debug "#{msgs_to_archive.size} msgs to archive"
         if msgs_to_archive.size > 0
           @logger.debug "will archive #{msgs_to_archive.size} messages"
           if connection.list("",current_archive_folder).nil?
+            @logger.debug "creating archive folder #{current_archive_folder}"
             connection.create(current_archive_folder)
             if connection.capability.include?("ACL")
               self.archive_folder_acl.each do |key,value|
@@ -84,9 +86,11 @@ module ImapArchiver
               end
             end
           end
-          connection.copy(msgs_to_archive, current_archive_folder)
-          connection.store(msgs_to_archive, "+FLAGS",[:Deleted])
-          @msg_count += msgs_to_archive.size
+          while !msgs_to_archive.empty? && (msgs = msgs_to_archive.slice!(0,100))
+            connection.copy(msgs, current_archive_folder)
+            connection.store(msgs, "+FLAGS",[:Deleted])
+            @msg_count += msgs.size
+          end
           connection.expunge
         end
         if connection.search(["BEFORE", since_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).size > 0
@@ -118,7 +122,7 @@ module ImapArchiver
     end
     
     def self.run(config_file,debug=false)
-      self.new(config_file).start
+      self.new(config_file,debug).start
     end    
   end
 end

data/spec/archiver_spec.rb

@@ -108,4 +108,48 @@ describe ImapArchiver::Archiver do
       @archiver.folder_list.should == [mock1]
     end  
   end
-end
+
+  describe "copying mails" do
+    before do
+      ImapArchiver::Config.expects(:load_config)
+      ImapArchiver::Archiver.any_instance.expects(:config_valid?)
+      @archiver = ImapArchiver::Archiver.new("configfile")
+      @archiver.imap_server = "mailserver"
+      @archiver.username = "user"
+      @archiver.password = "password"
+      @archiver.auth_mech = 'CRAM-MD5'
+      @archiver.archive_folder = 'archive'
+      @archiver.base_folder = 'Public Folders'
+      # @archiver.expects(:connect)
+      @archiver.connection = mock
+      @archiver.connection.stubs(:capability).returns([])
+      @archiver.connection.stubs(:list).returns(mock)
+      @archiver.connection.stubs(:select)
+      @archiver.connection.stubs(:store)
+      @archiver.connection.stubs(:expunge)
+      @archiver.instance_variable_set("@msg_count",0)
+    end
+
+    it "should copy archivable msgs in chunks" do
+      #@archiver.folders_to_archive = ["Public Folders/test1"]
+      #@archiver.connection.expects(:list).with('',"Public Folders/test1").returns([mock1 = mock(:name => "Public Folders/test1")])
+      since_date = Date.today.months_ago(3).beginning_of_month 
+      before_date= Date.today.months_ago(2).beginning_of_month 
+      conditions = ["SINCE", since_date.strftime("%d-%b-%Y"), "BEFORE", before_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]
+      @archiver.connection.expects(:search).with(conditions).returns((1..996).to_a)
+      @archiver.connection.expects(:search).with(["BEFORE", since_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([])
+      @archiver.connection.expects(:copy).with((1..100).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((101..200).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((201..300).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((301..400).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((401..500).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((501..600).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((601..700).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((701..800).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((801..900).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:copy).with((901..996).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.archive_folder_between_dates("Public Folders/test1",since_date,before_date) #if folder.name =~ /^Public Folders\/Team\//
+      @archiver.instance_variable_get("@msg_count").should == 996
+    end
+  end
+end

data/spec/imap_archiver_spec.rb

@@ -2,6 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ImapArchiver" do
   it "should read the correct version" do
-    ImapArchiver::Version.should == "0.0.5"
+    ImapArchiver::Version.should == "0.0.6"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imap_archiver
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jelle Helsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +01:00
+date: 2011-02-06 00:00:00 +01:00
 default_executable: imap_archiver
 dependencies: 
 - !ruby/object:Gem::Dependency