dball-mail 2.2.9.2 → 2.2.9.3

data/CHANGELOG.rdoc

@@ -1,9 +1,3 @@
-== Mon Nov  8 15:13:13 EST 2010 Donald Ball <donald.ball@gmail.com>
-
-* Add test retriever
-* Fix comma bug in References and In-Reply-To headers
-* Add message#reply method
-
 == Tue Oct 26 07:14:36 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
 
 * Version Bump to 2.2.9 and tag
@@ -456,4 +450,4 @@ content-disposition or content-location
 
 == Sat Oct 25 13:38:01 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
-* Birthday, Mail released as a gem... phew
+* Birthday, Mail released as a gem... phew

data/lib/VERSION

@@ -1,4 +1,4 @@
 patch:9
 major:2
-build:
+build:3
 minor:2

data/lib/mail/configuration.rb

@@ -55,8 +55,6 @@ module Mail
         Mail::POP3
       when :imap
         Mail::IMAP
-      when :test
-        Mail::TestRetriever
       else
         method
       end

data/lib/mail/fields/common/common_message_id.rb

@@ -33,11 +33,11 @@ module Mail
     private
     
     def do_encode(field_name)
-      %Q{#{field_name}: #{do_decode}\r\n}
+      %Q{#{field_name}: #{message_ids.map { |m| "<#{m}>" }.join(', ')}\r\n}
     end
     
     def do_decode
-      "#{message_ids.map { |m| "<#{m}>" }.join(' ')}"
+      "#{message_ids.map { |m| "<#{m}>" }.join(', ')}"
     end
     
   end

data/lib/mail/message.rb

@@ -253,42 +253,6 @@ module Mail
       end
     end
 
-    def reply(*args, &block)
-      self.class.new.tap do |reply|
-        if message_id
-          bracketed_message_id = "<#{message_id}>"
-          reply.in_reply_to = bracketed_message_id
-          if !references.nil?
-            reply.references = (references.to_a.map { |r| "<#{r}>" } << bracketed_message_id).join(' ')
-          elsif !in_reply_to.nil? && !in_reply_to.kind_of?(Array)
-            reply.references = "<#{in_reply_to}> #{bracketed_message_id}"
-          end
-          reply.references ||= bracketed_message_id
-        end
-        if subject
-          reply.subject = "RE: #{subject}"
-        end
-        if reply_to || from
-          reply.to = self[reply_to ? :reply_to : :from].to_s
-        end
-        if to
-          reply.from = self[:to].formatted.first.to_s
-        end
-
-        unless args.empty?
-          if args.flatten.first.respond_to?(:each_pair)
-            reply.send(:init_with_hash, args.flatten.first)
-          else
-            reply.send(:init_with_string, args.flatten[0].to_s.strip)
-          end
-        end
-
-        if block_given?
-          reply.instance_eval(&block)
-        end
-      end
-    end
-
     # Provides the operator needed for sort et al.
     #
     # Compares this mail object with another mail object, this is done by date, so an

data/lib/mail/network.rb

@@ -6,5 +6,4 @@ module Mail
 
   autoload :POP3, 'mail/network/retriever_methods/pop3'
   autoload :IMAP, 'mail/network/retriever_methods/imap'
-  autoload :TestRetriever, 'mail/network/retriever_methods/test_retriever'
 end

data/lib/mail/network/retriever_methods/imap.rb

@@ -122,7 +122,11 @@ module Mail
             fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
             new_message = Mail.new(fetchdata.attr['RFC822'])
             new_message.mark_for_delete = true if options[:delete_after_find]
-            yield new_message
+            if block.arity == 3
+              yield imap, message_id, new_message
+            else
+              yield new_message
+            end
             imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
           end
           imap.expunge if options[:delete_after_find]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dball-mail
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 2
   - 2
   - 9
-  - 2
-  version: 2.2.9.2
+  - 3
+  version: 2.2.9.3
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,22 +83,6 @@ dependencies:
   requirement: *id004
   type: :runtime
   name: i18n
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  prerelease: false
-  requirement: *id005
-  type: :runtime
-  name: tlsmail
 description: A really Ruby Mail handler.
 email: 
 - raasdnil@gmail.com
@@ -191,7 +175,6 @@ files:
 - lib/mail/network/delivery_methods/test_mailer.rb
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
-- lib/mail/network/retriever_methods/test_retriever.rb
 - lib/mail/network.rb
 - lib/mail/parsers/address_lists.rb
 - lib/mail/parsers/address_lists.treetop
@@ -234,7 +217,7 @@ files:
 - lib/VERSION
 - CHANGELOG.rdoc
 has_rdoc: true
-homepage: http://github.com/dball/mail
+homepage: http://github.com/dball/mail/tree/decisiv
 licenses: []
 
 post_install_message: 
@@ -266,6 +249,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Fork of Mail with changes for Decisiv, at least until they're merged upstream
+summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []
 

data/lib/mail/network/retriever_methods/test_retriever.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-module Mail
-
-  class TestRetriever
-    cattr_accessor :emails
-
-    def initialize(values)
-      @@emails = []
-    end
-
-    def find(options = {}, &block)
-      emails = @@emails
-      case count = options[:count]
-        when :all then emails
-        when 1 then emails.first
-        when Fixnum then emails[0, count]
-        else
-          raise 'Invalid count option value'
-      end
-    end
-
-    def all(options = {}, &block)
-      options ||= {}
-      options[:count] = :all
-      find(options, &block)
-    end
-
-  end
-
-end