nilclass-maildir 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/maildir/keywords.rb

@@ -1,13 +1,12 @@
 # implements IMAP Keywords as used by the Courier Mail Server
 # see http://www.courier-mta.org/imap/README.imapkeywords.html for details
 
-require 'ftools'
 require 'maildir'
 module Maildir::Keywords
   def self.included(base)
     Maildir::Message.send(:include, MessageExtension)
   end
-  
+
   def keyword_dir
     @keyword_dir ||= File.join(path, 'courierimapkeywords')
     Dir.mkdir(@keyword_dir) unless File.directory?(@keyword_dir)
@@ -45,14 +44,14 @@ module Maildir::Keywords
       else
         n = t + 1
         key = file
-        File.move(File.join(keyword_dir, file), File.join(keyword_dir, ".#{n}.#{key}"))
+        FileUtils.mv(File.join(keyword_dir, file), File.join(keyword_dir, ".#{n}.#{key}"))
       end
       if msg = messages[key]
         (keyword_files[key] ||= []) << [n, key]
       else # message doesn't exist
         fname = File.join(keyword_dir, file)
         if File.stat(fname).ctime < (Time.now - (15 * 60))
-          File.unlink(fname)
+          FileUtils.rm(fname)
         end
       end
       next(keyword_files)
@@ -60,7 +59,7 @@ module Maildir::Keywords
     # process keyword files
     keyword_files.each_pair do |key, files|
       files.sort! { |a, b| a[0] <=> b[0] }
-      files[0..-2].each { |f| File.unlink(File.join(keyword_dir, ".#{f.join('.')}")) } if files.last[0] < t
+      files[0..-2].each { |f| FileUtils.rm(File.join(keyword_dir, ".#{f.join('.')}")) } if files.last[0] < t
       msg = messages[key]
       file = (File.exist?(File.join(keyword_dir, files.last[1])) ? files.last[1] : ".#{files.last.join('.')}")
       current_keywords = File.read(File.join(keyword_dir, file)).split(/\s+/)
@@ -80,7 +79,7 @@ module Maildir::Keywords
         @keywords[key] = msg.keywords
       end
     }
-    File.move(tmp_file, list_file)
+    FileUtils.mv(tmp_file, list_file)
   end
 
   def keywords(key)
@@ -98,7 +97,7 @@ module Maildir::Keywords
     def keywords=(list)
       tmp_fname = File.join(@maildir.path, 'tmp', unique_name)
       File.open(tmp_fname, 'w') { |f| f.write(list.join("\n")) }
-      File.move(tmp_fname, File.join(@maildir.keyword_dir, unique_name))
+      FileUtils.mv(tmp_fname, File.join(@maildir.keyword_dir, unique_name))
     end
 
     # sets @keywords to the given list

data/lib/maildir/subdirs.rb

@@ -1,16 +1,28 @@
 # implements subdirs as used by the Courier Mail Server (courier-mta.org)
 require 'maildir'
 module Maildir::Subdirs
+  class MaildirNotFound < Exception
+  end
   ROOT_NAME = 'INBOX'
   DELIM = '.'
 
   def self.included(base)
-    base.instance_eval do 
+    base.instance_eval do
       alias_method :inspect_without_subdirs, :inspect
       alias_method :inspect, :inspect_with_subdirs
     end
   end
 
+  def subdir_by_path(sd_path)
+    if(File.directory?(p = File.join(path, ".#{sd_path}")))
+      Maildir.new(p, false)
+    elsif(File.directory?(p = File.join(path, ".INBOX.#{sd_path}")))
+      Maildir.new(p, false)
+    else
+      raise MaildirNotFound
+    end
+  end
+
   def name
     root? ? ROOT_NAME : subdir_parts(path).last
   end
@@ -39,7 +51,7 @@ module Maildir::Subdirs
       @subdirs ||= root.subdirs(false).select { |md| subdir_parts(File.basename(md.path))[0..-2] == my_parts }
     end
   end
-  
+
   # Friendly inspect method
   def inspect_with_subdirs
     "#<#{self.class} path=#{@path} mailbox_path=#{mailbox_path}>"

data/test/test_subdirs.rb

@@ -30,6 +30,18 @@ class TestSubdirs < Test::Unit::TestCase
       @maildir.create_subdir("test")
       assert @maildir.subdirs.map(&:name).include?("test")
     end
+
+    should "find the subdir by path" do
+      assert_nothing_raised do
+        @maildir.subdir_by_path('a.x')
+      end
+    end
+
+    should "raise MaildirNotFound" do
+      assert_raise Maildir::Subdirs::MaildirNotFound do
+        @maildir.subdir_by_path('a.b.c')
+      end
+    end
   end
 
   context "A subdir" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nilclass-maildir
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Aaron Suggs