mail 2.1.5 → 2.1.5.1

data/lib/mail/fields/structured_field.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/fields/common/common_field'
+
 module Mail
   # Provides access to a structured header field
   #

data/lib/mail/fields/to_field.rb

@@ -26,6 +26,8 @@
 #  mail[:to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
+require 'mail/fields/common/common_address'
+
 module Mail
   class ToField < StructuredField
     

data/lib/mail/fields/unstructured_field.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/fields/common/common_field'
+
 module Mail
   # Provides access to an unstructured header field
   #

data/lib/mail/network.rb

@@ -0,0 +1,9 @@
+module Mail
+  autoload :SMTP, 'mail/network/delivery_methods/smtp'
+  autoload :FileDelivery, 'mail/network/delivery_methods/file_delivery'
+  autoload :Sendmail, 'mail/network/delivery_methods/sendmail'
+  autoload :TestMailer, 'mail/network/delivery_methods/test_mailer'
+
+  autoload :POP3, 'mail/network/retriever_methods/pop3'
+  autoload :IMAP, 'mail/network/retriever_methods/imap'
+end

data/lib/mail/network/delivery_methods/file_delivery.rb

@@ -4,7 +4,7 @@ module Mail
   # address.  Each file is appended to if it already exists.
   # 
   # So if you have an email going to fred@test, bob@test, joe@anothertest, and you
-  # set your location path to ~/tmp/mails then FileDelivery will create ~/tmp/mails
+  # set your location path to /path/to/mails then FileDelivery will create the directory
   # if it does not exist, and put one copy of the email in three files, called
   # "fred@test", "bob@test" and "joe@anothertest"
   # 
@@ -37,4 +37,4 @@ module Mail
     end
     
   end
-end
+end

data/lib/mail/patterns.rb

@@ -1,6 +1,5 @@
 module Mail
   module Patterns
-
     white_space = %Q|\x9\x20|
     text        = %Q|\x1-\x8\xB\xC\xE-\x7f|
     field_name  = %Q|\x21-\x39\x3b-\x7e|
@@ -24,20 +23,5 @@ module Mail
     ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
     TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n
-    
-    
-    module ClassMethods
-      
-    end
-  
-    module InstanceMethods
-      
-    end
-    
-    def self.included(receiver)
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
-    end
-    
   end
 end

data/lib/mail/utilities.rb

@@ -1,163 +1,150 @@
 # encoding: utf-8
 module Mail
   module Utilities
+    include Patterns
     
-    module ClassMethods # :nodoc:
-    
+    # Returns true if the string supplied is free from characters not allowed as an ATOM
+    def atom_safe?( str )
+      not ATOM_UNSAFE === str
     end
-  
-    module InstanceMethods
-
-      include Patterns
-      
-      # Returns true if the string supplied is free from characters not allowed as an ATOM
-      def atom_safe?( str )
-        not ATOM_UNSAFE === str
-      end
 
-      # If the string supplied has ATOM unsafe characters in it, will return the string quoted 
-      # in double quotes, otherwise returns the string unmodified
-      def quote_atom( str )
-        (ATOM_UNSAFE === str) ? dquote(str) : str
-      end
+    # If the string supplied has ATOM unsafe characters in it, will return the string quoted 
+    # in double quotes, otherwise returns the string unmodified
+    def quote_atom( str )
+      (ATOM_UNSAFE === str) ? dquote(str) : str
+    end
 
-      # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
-      # in double quotes, otherwise returns the string unmodified
-      def quote_phrase( str )
-        if RUBY_VERSION >= '1.9'
-          original_encoding = str.encoding
-          str.force_encoding('ASCII-8BIT')
-          if (PHRASE_UNSAFE === str)
-            dquote(str).force_encoding(original_encoding)
-          else
-            str.force_encoding(original_encoding)
-          end
+    # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
+    # in double quotes, otherwise returns the string unmodified
+    def quote_phrase( str )
+      if RUBY_VERSION >= '1.9'
+        original_encoding = str.encoding
+        str.force_encoding('ASCII-8BIT')
+        if (PHRASE_UNSAFE === str)
+          dquote(str).force_encoding(original_encoding)
         else
-          (PHRASE_UNSAFE === str) ? dquote(str) : str
+          str.force_encoding(original_encoding)
         end
+      else
+        (PHRASE_UNSAFE === str) ? dquote(str) : str
       end
+    end
 
-      # Returns true if the string supplied is free from characters not allowed as a TOKEN
-      def token_safe?( str )
-        not TOKEN_UNSAFE === str
-      end
-
-      # If the string supplied has TOKEN unsafe characters in it, will return the string quoted 
-      # in double quotes, otherwise returns the string unmodified
-      def quote_token( str )
-        (TOKEN_UNSAFE === str) ? dquote(str) : str
-      end
+    # Returns true if the string supplied is free from characters not allowed as a TOKEN
+    def token_safe?( str )
+      not TOKEN_UNSAFE === str
+    end
 
-      # Wraps supplied string in double quotes unless it is already wrapped.
-      # 
-      # Additionally will escape any double quotation marks in the string with a single
-      # backslash in front of the '"' character.
-      def dquote( str )
-        str = $1 if str =~ /^"(.*)?"$/
-        # First remove all escaped double quotes:
-        str = str.gsub(/\\"/, '"')
-        # Then wrap and re-escape all double quotes
-        '"' + str.gsub(/["]/n) {|s| '\\' + s } + '"'
-      end
-      
-      # Unwraps supplied string from inside double quotes.
-      # 
-      # Example:
-      # 
-      #  string = '"This is a string"'
-      #  unquote(string) #=> 'This is a string'
-      def unquote( str )
-        str =~ /^"(.*?)"$/ ? $1 : str
-      end
-      
-      # Wraps a string in parenthesis and escapes any that are in the string itself.
-      # 
-      # Example:
-      # 
-      #  string
-      def paren( str )
-        RubyVer.paren( str )
-      end
-      
-      # Unwraps a string from being wrapped in parenthesis
-      # 
-      # Example:
-      # 
-      #  str = '(This is a string)'
-      #  unparen( str ) #=> 'This is a string'
-      def unparen( str )
-        str =~ /^\((.*?)\)$/ ? $1 : str
-      end
-      
-      # Escape parenthesies in a string
-      # 
-      # Example:
-      # 
-      #  str = 'This is (a) string'
-      #  escape_paren( str ) #=> 'This is \(a\) string'
-      def escape_paren( str )
-        RubyVer.escape_paren( str )
-      end
-      
-      # Matches two objects with their to_s values case insensitively
-      # 
-      # Example:
-      # 
-      #  obj2 = "This_is_An_object"
-      #  obj1 = :this_IS_an_object
-      #  match_to_s( obj1, obj2 ) #=> true
-      def match_to_s( obj1, obj2 )
-        obj1.to_s.downcase == obj2.to_s.downcase
-      end
-      
-      # Capitalizes a string that is joined by hyphens correctly.
-      # 
-      # Example:
-      # 
-      #  string = 'resent-from-field'
-      #  capitalize_field( string ) #=> 'Resent-From-Field'
-      def capitalize_field( str )
-        str.to_s.split("-").map { |v| v.capitalize }.join("-")
-      end
-      
-      # Takes an underscored word and turns it into a class name
-      # 
-      # Example:
-      # 
-      #  constantize("hello") #=> "Hello"
-      #  constantize("hello-there") #=> "HelloThere"
-      #  constantize("hello-there-mate") #=> "HelloThereMate"
-      def constantize( str )
-        str.to_s.split(/[-_]/).map { |v| v.capitalize }.to_s
-      end
-      
-      # Swaps out all underscores (_) for hyphens (-) good for stringing from symbols
-      # a field name.
-      # 
-      # Example:
-      # 
-      #  string = :resent_from_field
-      #  dasherize ( string ) #=> 'resent-from-field'
-      def dasherize( str )
-        str.to_s.gsub('_', '-')
-      end
+    # If the string supplied has TOKEN unsafe characters in it, will return the string quoted 
+    # in double quotes, otherwise returns the string unmodified
+    def quote_token( str )
+      (TOKEN_UNSAFE === str) ? dquote(str) : str
+    end
 
-      # Swaps out all hyphens (-) for underscores (_) good for stringing to symbols
-      # a field name.
-      # 
-      # Example:
-      # 
-      #  string = :resent_from_field
-      #  underscoreize ( string ) #=> 'resent_from_field'
-      def underscoreize( str )
-        str.to_s.downcase.gsub('-', '_')
-      end
-      
+    # Wraps supplied string in double quotes unless it is already wrapped.
+    # 
+    # Additionally will escape any double quotation marks in the string with a single
+    # backslash in front of the '"' character.
+    def dquote( str )
+      str = $1 if str =~ /^"(.*)?"$/
+      # First remove all escaped double quotes:
+      str = str.gsub(/\\"/, '"')
+      # Then wrap and re-escape all double quotes
+      '"' + str.gsub(/["]/n) {|s| '\\' + s } + '"'
+    end
+    
+    # Unwraps supplied string from inside double quotes.
+    # 
+    # Example:
+    # 
+    #  string = '"This is a string"'
+    #  unquote(string) #=> 'This is a string'
+    def unquote( str )
+      str =~ /^"(.*?)"$/ ? $1 : str
+    end
+    
+    # Wraps a string in parenthesis and escapes any that are in the string itself.
+    # 
+    # Example:
+    # 
+    #  string
+    def paren( str )
+      RubyVer.paren( str )
+    end
+    
+    # Unwraps a string from being wrapped in parenthesis
+    # 
+    # Example:
+    # 
+    #  str = '(This is a string)'
+    #  unparen( str ) #=> 'This is a string'
+    def unparen( str )
+      str =~ /^\((.*?)\)$/ ? $1 : str
+    end
+    
+    # Escape parenthesies in a string
+    # 
+    # Example:
+    # 
+    #  str = 'This is (a) string'
+    #  escape_paren( str ) #=> 'This is \(a\) string'
+    def escape_paren( str )
+      RubyVer.escape_paren( str )
     end
     
-    def self.included(receiver) # :nodoc:
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
+    # Matches two objects with their to_s values case insensitively
+    # 
+    # Example:
+    # 
+    #  obj2 = "This_is_An_object"
+    #  obj1 = :this_IS_an_object
+    #  match_to_s( obj1, obj2 ) #=> true
+    def match_to_s( obj1, obj2 )
+      obj1.to_s.downcase == obj2.to_s.downcase
     end
+    
+    # Capitalizes a string that is joined by hyphens correctly.
+    # 
+    # Example:
+    # 
+    #  string = 'resent-from-field'
+    #  capitalize_field( string ) #=> 'Resent-From-Field'
+    def capitalize_field( str )
+      str.to_s.split("-").map { |v| v.capitalize }.join("-")
+    end
+    
+    # Takes an underscored word and turns it into a class name
+    # 
+    # Example:
+    # 
+    #  constantize("hello") #=> "Hello"
+    #  constantize("hello-there") #=> "HelloThere"
+    #  constantize("hello-there-mate") #=> "HelloThereMate"
+    def constantize( str )
+      str.to_s.split(/[-_]/).map { |v| v.capitalize }.to_s
+    end
+    
+    # Swaps out all underscores (_) for hyphens (-) good for stringing from symbols
+    # a field name.
+    # 
+    # Example:
+    # 
+    #  string = :resent_from_field
+    #  dasherize ( string ) #=> 'resent_from_field'
+    def dasherize( str )
+      str.to_s.gsub('_', '-')
+    end
+
+    # Swaps out all underscores (_) for hyphens (-) good for stringing from symbols
+    # a field name.
+    # 
+    # Example:
+    # 
+    #  string = :resent_from_field
+    #  underscoreize ( string ) #=> 'resent_from_field'
+    def underscoreize( str )
+      str.to_s.downcase.gsub('-', '_')
+    end
+    
   end
 end