mail 1.6.0 → 2.0.3

data/lib/mail/parts_list.rb

@@ -0,0 +1,34 @@
+module Mail
+  class PartsList < Array
+    
+    def attachments
+      Mail::AttachmentsList.new(self)
+    end
+
+    def collect
+      if block_given?
+        ary = PartsList.new
+        each { |o| ary << yield(o) }
+        ary
+      else
+        to_a
+      end
+    end
+
+    alias :collect :map 
+    
+    def sort!(order)
+      sorted = self.sort do |a, b|
+        # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
+        # single email message... please show me a use case and I'll put more work into this method,
+        # in the meantime, it works :)
+        a_order = order.index(a[:content_type].string.downcase) || 10000
+        b_order = order.index(b[:content_type].string.downcase) || 10000
+        a_order <=> b_order
+      end
+      self.clear
+      sorted.each { |p| self << p }
+    end
+    
+  end
+end

data/lib/mail/vendor/treetop-1.4.3/examples/lambda_calculus/arithmetic.rb

@@ -2,7 +2,7 @@ module Arithmetic
   include Treetop::Runtime
   
   def root
-    @root ||= :expression
+    @root || :expression
   end
   
   def _nt_expression

data/lib/mail/vendor/treetop-1.4.3/examples/lambda_calculus/lambda_calculus.rb

@@ -2,7 +2,7 @@ module LambdaCalculus
   include Treetop::Runtime
   
   def root
-    @root ||= :program
+    @root || :program
   end
   
   include Arithmetic

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler/metagrammar.rb

@@ -7,7 +7,7 @@ module Treetop
       include Treetop::Runtime
 
       def root
-        @root ||= :treetop_file
+        @root || :treetop_file
       end
 
       module TreetopFile0

data/lib/mail/vendor/treetop.rb

@@ -1,4 +1,4 @@
 # Have to vendor treetop to avoid loading polyglot
-
+ 
 $:.unshift "#{File.dirname(__FILE__)}/treetop-1.4.3/lib"
 require 'treetop'

data/lib/mail/version.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 module Mail
   module VERSION
-    MAJOR = 1
-    MINOR = 6
-    TINY  = 0
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 2.0.3
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +11:00
+date: 2010-01-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO.rdoc
-- lib/mail/attachment.rb
+- lib/mail/attachments_list.rb
 - lib/mail/body.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
@@ -72,6 +72,7 @@ files:
 - lib/mail/fields/bcc_field.rb
 - lib/mail/fields/cc_field.rb
 - lib/mail/fields/comments_field.rb
+- lib/mail/fields/common/address_container.rb
 - lib/mail/fields/common/common_address.rb
 - lib/mail/fields/common/common_date.rb
 - lib/mail/fields/common/common_field.rb
@@ -109,12 +110,10 @@ files:
 - lib/mail/header.rb
 - lib/mail/mail.rb
 - lib/mail/message.rb
-- lib/mail/network/deliverable.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
 - lib/mail/network/delivery_methods/smtp.rb
 - lib/mail/network/delivery_methods/test_mailer.rb
-- lib/mail/network/retrievable.rb
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
 - lib/mail/parsers/address_lists.rb
@@ -146,6 +145,7 @@ files:
 - lib/mail/parsers/rfc2822_obsolete.rb
 - lib/mail/parsers/rfc2822_obsolete.treetop
 - lib/mail/part.rb
+- lib/mail/parts_list.rb
 - lib/mail/patterns.rb
 - lib/mail/utilities.rb
 - lib/mail/vendor/treetop-1.4.3/benchmark/seqpar.gnuplot

data/lib/mail/attachment.rb

@@ -1,107 +0,0 @@
-# encoding: utf-8
-module Mail
-  # An attachment is any data you want to attach to a mail message that is
-  # not part of the body and can be extracted to a file in it's own right
-  # 
-  # This includes images, sound files, text files, documents, anything really,
-  # the only requisite is that it has a file name and an encoding.
-  # 
-  # If you do not pass in an encoding when creating a new attachment, then
-  # Mail::Attachment will assume that the data you pass in is raw data and
-  # encode it with base64.
-  # 
-  # If you pass in an encoding, Mail::Attachment will assume that the data
-  # is encoded data and attempt to decode the data string with the encoding
-  # you supply.
-  # 
-  # So, raw data should be given in with no encoding, pre encoded data should
-  # be given with an encoding type.
-  # 
-  # Attachment will always encode with Base64, it's safe, it works, maybe in
-  # the future we will allow you to encode with different types.  If you really
-  # want to encode with a different encoder, then pre encode the data and pass
-  # it in with an encoding.  Mail::Attachment will happily initialize for you,
-  # however, if it doesn't understand the encoding, it will not decode for you
-  # and raise an error, but if you can encode it, we assume you know how to
-  # decode it, so just get back the encoded source (with #encoded) and then
-  # decode at your leisure.
-  class Attachment
-    
-    include Utilities
-    
-    # Raised when attempting to decode an unknown encoding type
-    class UnknownEncodingType < StandardError #:nodoc:
-    end
-    
-    def initialize(options_hash)
-      case
-      when options_hash[:data]
-        if options_hash[:filename].respond_to?(:force_encoding)
-          encoding = options_hash[:filename].encoding
-          filename = File.basename(options_hash[:filename].force_encoding(Encoding::BINARY))
-          @filename = filename.force_encoding(encoding)
-        else
-          @filename = File.basename(options_hash[:filename])
-        end
-        
-        add_file(options_hash[:data], options_hash[:encoding])
-      when options_hash[:filename]
-        @filename = File.basename(options_hash[:filename])
-        data = File.read(options_hash[:filename])
-        add_file(data, options_hash[:encoding])
-      end
-      set_mime_type(@filename, options_hash[:mime_type])
-    end
-    
-    def filename
-      @filename
-    end
-
-    alias :original_filename :filename
-
-    def encoded
-      @encoded_data
-    end
-    
-    def decoded
-      if Mail::Encodings.defined?(@encoding)
-        Mail::Encodings.get_encoding(@encoding).decode(@encoded_data)
-      else
-        raise UnknownEncodingType, "Don't know how to decode #{@encoding}, please call #encoded and decode it yourself."
-      end
-    end
-    
-    alias :read :decoded
-    
-    def mime_type
-      @mime_type.to_s
-    end
-    
-    private
-    
-    def set_mime_type(filename, mime_type)
-      unless mime_type
-        # Have to do this because MIME::Types is not Ruby 1.9 safe yet
-        if RUBY_VERSION >= '1.9'
-          new_file = String.new(filename).force_encoding(Encoding::BINARY)
-          ext = new_file.split('.'.force_encoding(Encoding::BINARY)).last
-          filename = "file.#{ext}".force_encoding('US-ASCII')
-        end
-        @mime_type = MIME::Types.type_for(filename).first
-      else
-        @mime_type = mime_type
-      end
-    end
-    
-    def add_file(data, encoding)
-      if encoding # We are being given encoded data
-        @encoded_data = data
-        @encoding = encoding.to_s
-      else # this is raw data
-        @encoded_data = Mail::Encodings::Base64.encode(data)
-        @encoding = 'base64'
-      end
-    end
-    
-  end
-end

data/lib/mail/network/deliverable.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-module Mail
-  # The deliverable class provides the way mail will send an email out when you
-  # are using the Mail.deliver! &block command or when you call Mail.deliver!(message)
-  # 
-  # The default delivery is SMTP, localhost, port 25.  You can change this through the
-  # Mail.defaults call.s
-  module Deliverable
-
-    def self.perform_delivery!(mail)
-      Mail.defaults.delivery_method.deliver!(mail)
-    end
-
-  end
-end

data/lib/mail/network/retrievable.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-# Include this module to retrieve emails via POP3. Each email retrieved is given to a new instance of the "includer".
-# This module uses the defaults set in Configuration to retrieve POP3 settings.
-#
-# Thanks to Nicolas Fouché for this wrapper
-#
-module Mail
-  module Retrievable
-
-    module_function
-
-    def method_missing(name, *args, &block)
-      Mail.defaults.retriever_method.__send__(name, *args, &block)
-    end
-
-  end
-
-end