maildir 1.0.1 → 2.0.0

data/README.rdoc

@@ -95,10 +95,17 @@ The following serializers are included:
 
 Maildir::Serializer::Base simply reads and writes strings to disk.
 
-  Maildir::Message.serializer # => Maildir::Serializer::Base.new (by default)
+`Maildir.serializer` and `Maildir.serializer=` allow you to set default serializer.
+
+  Maildir.serializer # => Maildir::Serializer::Base.new (default)
   message = maildir.add("Hello World!") # writes "Hello World!" to disk
   message.data # => "Hello World!"
 
+You can also set the serializer per maildir:
+
+  maildir = Maildir.new 'Maildir'
+  maildir.serializer = Maildir::Serializer::JSON.new
+
 As of version 1.0.0, the Maildir::Serializer::Base can write IO streams as well as strings. For example:
 
   message.add(STDIN)
@@ -106,18 +113,18 @@ As of version 1.0.0, the Maildir::Serializer::Base can write IO streams as well
 This will use Ruby 1.9's more efficient IO.copy_stream method if available,
 and degrade gracefully in Ruby 1.8.
 
+As of version 1.0.2, serializers are autoloaded. Thus it is no longer necessary to manually require them.
+
 The Mail serializer takes a ruby Mail object (http://github.com/mikel/mail) and writes RFC2822 email messages.
 
-  require 'maildir/serializer/mail'
-  Maildir::Message.serializer = Maildir::Serializer::Mail.new
+  maildir.serializer = Maildir::Serializer::Mail.new
   mail = Mail.new(...)
   message = maildir.add(mail) # writes an RFC2822 message to disk
   message.data == mail # => true; data is parsed as a Mail object
 
 The Marshal, JSON, and YAML serializers work similarly. E.g.:
 
-  require 'maildir/serializer/json'
-  Maildir::Message.serializer = Maildir::Serializer::JSON.new
+  maildir.serializer = Maildir::Serializer::JSON.new
   my_data = {"foo" => nil, "my_array" => [1,2,3]}
   message = maildir.add(my_data) # writes {"foo":null,"my_array":[1,2,3]}
   message.data == my_data # => true
@@ -127,13 +134,16 @@ It's trivial to create a custom serializer. Implement the following two methods:
   load(path)
   dump(data, path)
 
+== Author
+
+* Aaron Suggs (github[http://github.com/ktheory])
+
 == Contributors
 
-* Aaron Suggs (github[http://github.com/ktheory]) Primary author
-* Niklas E. Cathor (github[http://github.com/nilclass]) added subdir & courierimapkeywords support
-* Ali Polatel (github[http://github.com/alip]) for suggesting IO.copy_stream
-* Harry Vangberg (github[http://github.com/vangberg]) for fixing tests in ruby 1.9
-* Alexander Flatter (github[http://github.com/aflatter]) for improving serializers
+* Niklas E. Cathor (github[http://github.com/nilclass])
+* Ali Polatel (github[http://github.com/alip])
+* Harry Vangberg (github[http://github.com/vangberg])
+* Alexander Flatter (github[http://github.com/aflatter])
 
 == Copyright
 

data/lib/maildir.rb

@@ -1,6 +1,14 @@
 require 'fileutils' # For create_directories
 class Maildir
 
+  module Serializer
+    autoload :Base,    'maildir/serializer/base'
+    autoload :Mail,    'maildir/serializer/mail'
+    autoload :Marshal, 'maildir/serializer/marshal'
+    autoload :JSON,    'maildir/serializer/json'
+    autoload :YAML,    'maildir/serializer/yaml'
+  end
+
   SUBDIRS = [:tmp, :new, :cur].freeze
 
   include Comparable
@@ -8,6 +16,19 @@ class Maildir
   attr_reader :path
   attr_accessor :serializer
 
+  # Default serializer.
+  @@serializer = Maildir::Serializer::Base.new
+
+  # Gets the default serializer.
+  def self.serializer
+    @@serializer
+  end
+
+  # Sets the default serializer.
+  def self.serializer=(serializer)
+    @@serializer = serializer
+  end
+
   # Create a new maildir at +path+. If +create+ is true, will ensure that the
   # required subdirectories exist.
   def initialize(path, create = true)
@@ -17,6 +38,11 @@ class Maildir
     create_directories if create
   end
 
+  # Returns own serializer or falls back to default.
+  def serializer
+    @serializer || @@serializer
+  end
+
   # Compare maildirs by their paths.
   # If maildir is a different class, return nil.
   # Otherwise, return 1, 0, or -1.

data/lib/maildir/message.rb

@@ -17,19 +17,16 @@ class Maildir::Message
     message
   end
 
-  # The serializer processes data before it is written to disk and after
-  # reading from disk.
-  # Default serializer
-  @@serializer = Maildir::Serializer::Base.new
-
-  # Get the serializer
+  # DEPRECATED: Get the serializer.
+  # @see Maildir.serializer
   def self.serializer
-    @@serializer
+    Maildir.serializer
   end
 
-  # Set the serializer
+  # DEPRECATED: Set the serializer.
+  # @see Maildir.serializer=
   def self.serializer=(serializer)
-    @@serializer = serializer
+    Maildir.serializer = serializer
   end
 
   attr_reader :dir, :unique_name, :info
@@ -70,10 +67,9 @@ class Maildir::Message
     "#<#{self.class} key=#{key} maildir=#{@maildir.inspect}>"
   end
 
-  # Determines the serializer by first trying the maildir and then falling
-  # back to the default serializer.
+  # Helper to get serializer.
   def serializer
-    @maildir.serializer || @@serializer
+    @maildir.serializer
   end
 
   # Writes data to disk. Can only be called on messages instantiated without

data/lib/maildir/serializer/base.rb

@@ -1,36 +1,38 @@
-module Maildir::Serializer
-  # The Maildir::Serializer::Base class reads & writes data to disk as a
-  # string. Other serializers (e.g. Maildir::Serializer::Mail) can extend this
-  # class to do some pre- and post-processing of the string.
-  #
-  # The Serializer API has two methods:
-  #   load(path) # => returns data
-  #   dump(data, path) # => returns number of bytes written
-  class Base
-    # Reads the file at path. Returns the contents of path.
-    def load(path)
-      File.read(path)
-    end
+class Maildir
+  module Serializer
+    # The Maildir::Serializer::Base class reads & writes data to disk as a
+    # string. Other serializers (e.g. Maildir::Serializer::Mail) can extend this
+    # class to do some pre- and post-processing of the string.
+    #
+    # The Serializer API has two methods:
+    #   load(path) # => returns data
+    #   dump(data, path) # => returns number of bytes written
+    class Base
+      # Reads the file at path. Returns the contents of path.
+      def load(path)
+        File.read(path)
+      end
 
-    # Writes data to path. Returns number of bytes written.
-    # If data acts like an IO object (i.e., data responds to the read method),
-    # we call data.read or the more efficient IO.copy_stream available in
-    # ruby 1.9.1.
-    def dump(data, path)
-      if data.respond_to?(:read)
-        if IO.respond_to?(:copy_stream)
-          IO.copy_stream(data, path)
+      # Writes data to path. Returns number of bytes written.
+      # If data acts like an IO object (i.e., data responds to the read method),
+      # we call data.read or the more efficient IO.copy_stream available in
+      # ruby 1.9.1.
+      def dump(data, path)
+        if data.respond_to?(:read)
+          if IO.respond_to?(:copy_stream)
+            IO.copy_stream(data, path)
+          else
+            write(data.read, path)
+          end
         else
-          write(data.read, path)
+          write(data, path)
         end
-      else
-        write(data, path)
       end
-    end
 
-    protected
-    def write(data, path)
-      File.open(path, "w") {|file| file.write(data)}
+      protected
+      def write(data, path)
+        File.open(path, "w") {|file| file.write(data)}
+      end
     end
   end
 end

data/lib/maildir/serializer/json.rb

@@ -5,17 +5,19 @@ rescue LoadError
   require 'json'
 end
 
-# Serialize messages as JSON
-module Maildir::Serializer
-  class JSON < Base
-    # Read data from path and parse it as JSON.
-    def load(path)
-      ::JSON.load(super(path))
-    end
+class Maildir
+  module Serializer
+    # Serialize messages as JSON
+    class JSON < Base
+      # Read data from path and parse it as JSON.
+      def load(path)
+        ::JSON.load(super(path))
+      end
 
-    # Dump data as JSON and writes it to path.
-    def dump(data, path)
-      super(data.to_json, path)
+      # Dump data as JSON and writes it to path.
+      def dump(data, path)
+        super(data.to_json, path)
+      end
     end
   end
 end

data/lib/maildir/serializer/mail.rb

@@ -1,13 +1,17 @@
 require 'mail'
-# Serialize messages as a ruby Mail object
-class Maildir::Serializer::Mail < Maildir::Serializer::Base
-  # Build a new Mail object from the data at path.
-  def load(path)
-    ::Mail.new(super(path))
-  end
+class Maildir
+  module Serializer
+    # Serialize messages as a ruby Mail object
+    class Mail < Maildir::Serializer::Base
+      # Build a new Mail object from the data at path.
+      def load(path)
+        ::Mail.new(super(path))
+      end
 
-  # Write data to path as a Mail message.
-  def dump(data, path)
-    super(data.to_s, path)
+      # Write data to path as a Mail message.
+      def dump(data, path)
+        super(data.to_s, path)
+      end
+    end
   end
 end

data/lib/maildir/serializer/marshal.rb

@@ -1,12 +1,16 @@
-# Serialize messages as Marshalled ruby objects
-class Maildir::Serializer::Marshal < Maildir::Serializer::Base
-  # Read data from path and unmarshal it.
-  def load(path)
-    ::Marshal.load(super(path))
-  end
+class Maildir
+  module Serializer
+    # Serialize messages as Marshalled ruby objects
+    class Marshal < Maildir::Serializer::Base
+      # Read data from path and unmarshal it.
+      def load(path)
+        ::Marshal.load(super(path))
+      end
 
-  # Marshal data and write it to path.
-  def dump(data, path)
-    super(::Marshal.dump(data), path)
+      # Marshal data and write it to path.
+      def dump(data, path)
+        super(::Marshal.dump(data), path)
+      end
+    end
   end
 end

data/lib/maildir/serializer/yaml.rb

@@ -1,13 +1,17 @@
 require 'yaml'
-# Serialize messages as YAML
-class Maildir::Serializer::YAML < Maildir::Serializer::Base
-  # Read data from path and parse it as YAML.
-  def load(path)
-    ::YAML.load(super(path))
-  end
+class Maildir
+  module Serializer
+    # Serialize messages as YAML
+    class YAML < Maildir::Serializer::Base
+      # Read data from path and parse it as YAML.
+      def load(path)
+        ::YAML.load(super(path))
+      end
 
-  # Dump data as YAML and writes it to path.
-  def dump(data, path)
-    super(data.to_yaml, path)
+      # Dump data as YAML and writes it to path.
+      def dump(data, path)
+        super(data.to_yaml, path)
+      end
+    end
   end
 end

data/lib/maildir/version.rb

@@ -1,3 +1,3 @@
 class Maildir
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/test/test_maildir.rb

@@ -17,8 +17,8 @@ class TestMaildir < Test::Unit::TestCase
       end
     end
 
-    should "have no serializer" do
-      assert temp_maildir.serializer.nil?
+    should "have default serializer" do
+      assert_equal temp_maildir.serializer, Maildir::Message.serializer
     end
 
     should "set serializer" do

data/test/test_message.rb

@@ -8,11 +8,7 @@ class TestMessage < Test::Unit::TestCase
       @message = Maildir::Message.new(@maildir)
     end
 
-    should "use default serializer" do
-      assert_equal @message.serializer, Maildir::Message.serializer
-    end
-
-    should "prefer serializer of its maildir" do
+    should "use serializer of its maildir" do
       @maildir.serializer = :foo
       assert_equal @message.serializer, :foo
     end

metadata

@@ -1,113 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: maildir
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Aaron Suggs
-- Niklas E. Cathor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-08 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70101941878220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70101941878220
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70101941877660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70101941877660
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &70101941877140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70101941877140
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70101941876660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70101941876660
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70101941876060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
-  version_requirements: *id005
-description: A ruby library for reading and writing arbitrary messages in DJB's maildir format
+  prerelease: false
+  version_requirements: *70101941876060
+description: A ruby library for reading and writing arbitrary messages in DJB's maildir
+  format
 email: aaron@ktheory.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/maildir/keywords.rb
+files:
 - lib/maildir/message.rb
 - lib/maildir/serializer/base.rb
 - lib/maildir/serializer/json.rb
 - lib/maildir/serializer/mail.rb
 - lib/maildir/serializer/marshal.rb
 - lib/maildir/serializer/yaml.rb
-- lib/maildir/subdirs.rb
 - lib/maildir/unique_name.rb
 - lib/maildir/version.rb
 - lib/maildir.rb
@@ -115,53 +86,38 @@ files:
 - README.rdoc
 - Rakefile
 - test/test_helper.rb
-- test/test_keywords.rb
 - test/test_maildir.rb
 - test/test_message.rb
 - test/test_serializers.rb
-- test/test_subdirs.rb
 - test/test_unique_name.rb
-has_rdoc: true
 homepage: http://github.com/ktheory/maildir
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Read & write messages in the maildir format
-test_files: 
+test_files:
 - test/test_helper.rb
-- test/test_keywords.rb
 - test/test_maildir.rb
 - test/test_message.rb
 - test/test_serializers.rb
-- test/test_subdirs.rb
 - test/test_unique_name.rb

data/lib/maildir/keywords.rb

@@ -1,110 +0,0 @@
-# implements IMAP Keywords as used by the Courier Mail Server
-# see http://www.courier-mta.org/imap/README.imapkeywords.html for details
-
-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)
-    return @keyword_dir
-  end
-
-  # process contents of courierimapkeywords/ directory as described in README.imapkeywords
-  def read_keywords
-    messages = (list(:cur) + list(:new)).inject({}) { |m, msg| m[msg.unique_name] = msg ; m }
-    t = Time.now.to_i / 300
-    keywords = []
-    state = :head
-    # process :list
-    list_file = File.join(keyword_dir, ':list')
-    File.open(list_file).each_line do |line|
-      line.strip!
-      if state == :head
-        if line.empty?
-          state = :messages
-          next
-        end
-        keywords << line
-      else
-        key, ids = line.split(':')
-        if msg = messages[key]
-          msg.set_keywords(ids.split(/\s/).map {|id| keywords[id.to_i - 1] })
-        end
-      end
-    end if File.exist?(list_file)
-    # collect keyword files
-    keyword_files = (Dir.entries(keyword_dir) - %w(. .. :list)).inject({}) do |keyword_files, file|
-      if file =~ /^\.(\d+)\.(.*)$/
-        n = $1
-        key = $2
-      else
-        n = t + 1
-        key = file
-        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)
-        end
-      end
-      next(keyword_files)
-    end
-    # 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
-      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+/)
-      msg.set_keywords(current_keywords)
-      if (add = (current_keywords - keywords)).any?
-        keywords += add
-      end
-    end
-    # rebuild :list
-    @keywords = {}
-    tmp_file = File.join(path, 'tmp', ':list')
-    File.open(tmp_file, 'w') { |f|
-      f.write(keywords.join("\n")+"\n\n")
-      messages.each_pair do |key, msg|
-        next unless msg.keywords
-        f.puts([key, msg.keywords.map{|kw| keywords.index(kw) + 1 }.sort.join(' ')].join(':'))
-        @keywords[key] = msg.keywords
-      end
-    }
-    FileUtils.mv(tmp_file, list_file)
-  end
-
-  def keywords(key)
-    read_keywords unless @keywords
-    @keywords[key] || []
-  end
-
-  module MessageExtension
-    def keywords
-      return @keywords if @keywords
-      @maildir.keywords(unique_name)
-    end
-
-    # sets given keywords on the message.
-    def keywords=(list)
-      tmp_fname = File.join(@maildir.path, 'tmp', unique_name)
-      File.open(tmp_fname, 'w') { |f| f.write(list.join("\n")) }
-      FileUtils.mv(tmp_fname, File.join(@maildir.keyword_dir, unique_name))
-    end
-
-    # sets @keywords to the given list
-    def set_keywords(list)
-      @keywords = list
-    end
-  end
-end
-
-Maildir.send(:include, Maildir::Keywords)

data/lib/maildir/subdirs.rb

@@ -1,70 +0,0 @@
-# implements subdirs as used by the Courier Mail Server (courier-mta.org)
-require 'maildir'
-module Maildir::Subdirs
-  ROOT_NAME = 'INBOX'
-  DELIM = '.'
-
-  def self.included(base)
-    base.instance_eval do
-      alias_method :inspect_without_subdirs, :inspect
-      alias_method :inspect, :inspect_with_subdirs
-    end
-  end
-
-  def name
-    root? ? ROOT_NAME : subdir_parts(path).last
-  end
-
-  def create_subdir(name)
-    raise ArgumentError.new("'name' may not contain delimiter character (#{DELIM})") if name.include?(DELIM)
-    full_name = (root? ? [] : subdir_parts(File.basename(path))).push(name).unshift('').join(DELIM)
-    md = Maildir.new(File.join(path, full_name), true)
-    @subdirs << md if @subdirs
-    md
-  end
-
-  # returns the logical mailbox path
-  def mailbox_path
-    @mailbox_path ||= root? ? ROOT_NAME : subdir_parts(File.basename(path)).unshift(ROOT_NAME).join(DELIM)
-  end
-
-  # returns an array of Maildir objects representing the direct subdirectories of this Maildir
-  def subdirs(only_direct=true)
-    if root?
-      @subdirs ||= (Dir.entries(path) - %w(. ..)).select {|e|
-        e =~ /^\./ && File.directory?(File.join(path, e)) && (only_direct ? subdir_parts(e).size == 1 : true)
-      }.map { |e| Maildir.new(File.join(path, e), false) }
-    else
-      my_parts = subdir_parts(File.basename(path))
-      @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}>"
-  end
-
-  # returns the Maildir representing the root directory
-  def root
-    root? ? self : Maildir.new(File.dirname(path), false)
-  end
-
-  # returns true if the parent directory doesn't look like a maildir
-  def root?
-    ! ((Dir.entries(File.dirname(path)) & %w(cur new tmp)).size == 3)
-  end
-
-  private
-
-  def subdir_parts(path)
-    path.sub!(/\/$/, '') # remove trailing slash
-    parts = (path.split(DELIM) - [''])
-    # some clients (e.g. Thunderbird) mess up namespaces so subdirs
-    # end up looking like '.INBOX.Trash' instead of '.Trash'
-    parts.shift if parts.first == ROOT_NAME
-    parts
-  end
-end
-
-Maildir.send(:include, Maildir::Subdirs)

data/test/test_keywords.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-require 'maildir/keywords'
-class TestKeywords < Test::Unit::TestCase
-  context "A message" do
-    setup do
-      @data = "foo\n"
-      @msg = Maildir::Message.create(temp_maildir, @data)
-    end
-
-    should "remember keywords" do
-      kw = %w(Junk Seen)
-      @msg.keywords = kw
-      assert (@msg.keywords & kw).size == 2
-    end
-  end
-end

data/test/test_subdirs.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-require 'maildir/subdirs'
-class TestSubdirs < Test::Unit::TestCase
-  context "A maildir" do
-    setup do
-      FakeFS::FileSystem.clear
-      @maildir = temp_maildir
-      setup_subdirs(@maildir)
-    end
-
-    should "have subdirs" do
-      assert @maildir.subdirs.any?
-    end
-
-    should "be called INBOX" do
-      assert @maildir.name == 'INBOX'
-    end
-
-    should "include direct subdirs" do
-      subdir_names = @maildir.subdirs.map(&:name)
-      assert subdir_names.include?('a') && subdir_names.include?('b')
-    end
-
-    should "not include deeper subdirs" do
-      subdir_names = @maildir.subdirs.map(&:name)
-      assert ! subdir_names.include?('x') && ! subdir_names.include?('a.x')
-    end
-
-    should "create more subdirs" do
-      @maildir.create_subdir("test")
-      assert @maildir.subdirs.map(&:name).include?("test")
-    end
-  end
-
-  context "A subdir" do
-    setup do
-      FakeFS::FileSystem.clear
-      @maildir = temp_maildir
-      setup_subdirs(@maildir)
-    end
-
-    should "include more subdirs" do
-      assert_not_empty @maildir.subdirs.select{ |sd| sd.name == 'a'}.first.subdirs
-    end
-  end
-end