mail 2.1.5 → 2.1.5.1

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

@@ -1,51 +1,42 @@
 # encoding: utf-8
 module Mail
   module CommonDate # :nodoc:
-    
-    module InstanceMethods # :doc:
-      
-      # Returns a date time object of the parsed date
-      def date_time
-        ::DateTime.parse("#{element.date_string} #{element.time_string}")
-      end
+    # Returns a date time object of the parsed date
+    def date_time
+      ::DateTime.parse("#{element.date_string} #{element.time_string}")
+    end
 
-      def default
-        date_time
-      end
-      
-      def parse(val = value)
-        unless val.blank?
-          @element = Mail::DateTimeElement.new(val)
-          @tree = @element.tree
-        else
-          nil
-        end
+    def default
+      date_time
+    end
+    
+    def parse(val = value)
+      unless val.blank?
+        @element = Mail::DateTimeElement.new(val)
+        @tree = @element.tree
+      else
+        nil
       end
+    end
 
-      private
-      
-      def do_encode(field_name)
-        "#{field_name}: #{value}\r\n"
-      end
-      
-      def do_decode
-        "#{value}"
-      end
+    private
+    
+    def do_encode(field_name)
+      "#{field_name}: #{value}\r\n"
+    end
+    
+    def do_decode
+      "#{value}"
+    end
 
-      def element
-        @element ||= Mail::DateTimeElement.new(value)
-      end
-      
-      # Returns the syntax tree of the Date
-      def tree
-        @tree ||= element.tree
-      end
-      
+    def element
+      @element ||= Mail::DateTimeElement.new(value)
     end
     
-    def self.included(receiver) # :nodoc:
-      receiver.send :include, InstanceMethods
+    # Returns the syntax tree of the Date
+    def tree
+      @tree ||= element.tree
     end
     
   end
-end
+end

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

@@ -1,64 +1,50 @@
 # encoding: utf-8
 module Mail
   module CommonField # :nodoc:
+    def name=(value)
+      @name = value
+    end
     
-    module ClassMethods # :nodoc:
-      
+    def name
+      @name
     end
     
-    module InstanceMethods # :doc:
-      
-      def name=(value)
-        @name = value
-      end
-      
-      def name
-        @name
-      end
-      
-      def value=(value)
-        @length = nil
-        @tree = nil
-        @element = nil
-        @value = value
-      end
-      
-      def value
-        @value
-      end
-      
-      def to_s
-        decoded
-      end
-      
-      def default
-        decoded
-      end
-      
-      def field_length
-        @length ||= name.length + value.length + ': '.length
-      end
-      
-      def responsible_for?( val )
-        name.to_s.downcase == val.to_s.downcase
-      end
-
-      private
-
-      def strip_field(field_name, string)
-        if string.is_a?(Array)
-          string.join(', ')
-        else
-          string.to_s.gsub(/#{field_name}:\s+/i, '')
-        end
-      end
-
+    def value=(value)
+      @length = nil
+      @tree = nil
+      @element = nil
+      @value = value
     end
     
-    def self.included(receiver) # :nodoc:
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
+    def value
+      @value
     end
     
+    def to_s
+      decoded
+    end
+    
+    def default
+      decoded
+    end
+    
+    def field_length
+      @length ||= name.length + value.length + ': '.length
+    end
+    
+    def responsible_for?( val )
+      name.to_s.downcase == val.to_s.downcase
+    end
+
+    private
+
+    def strip_field(field_name, string)
+      if string.is_a?(Array)
+        string.join(', ')
+      else
+        string.to_s.gsub(/#{field_name}:\s+/i, '')
+      end
+    end
+
   end
-end
+end

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

@@ -1,57 +1,43 @@
 # encoding: utf-8
 module Mail
   module CommonMessageId # :nodoc:
-    
-    module ClassMethods # :nodoc:
-      
+    def element
+      @element ||= Mail::MessageIdsElement.new(value)
     end
     
-    module InstanceMethods # :doc:
-
-      def element
-        @element ||= Mail::MessageIdsElement.new(value)
-      end
-      
-      def parse(val = value)
-        unless val.blank?
-          @element = Mail::MessageIdsElement.new(val)
-        else
-          nil
-        end
-      end
-      
-      def message_id
-        element.message_id
+    def parse(val = value)
+      unless val.blank?
+        @element = Mail::MessageIdsElement.new(val)
+      else
+        nil
       end
-      
-      def message_ids
-        element.message_ids
-      end
-      
-      def default
-        if message_ids.length == 1
-          message_ids[0]
-        else
-          message_ids
-        end
+    end
+    
+    def message_id
+      element.message_id
+    end
+    
+    def message_ids
+      element.message_ids
+    end
+    
+    def default
+      if message_ids.length == 1
+        message_ids[0]
+      else
+        message_ids
       end
+    end
 
-      private
-      
-      def do_encode(field_name)
-        %Q{#{field_name}: #{message_ids.map { |m| "<#{m}>" }.join(', ')}\r\n}
-      end
-      
-      def do_decode
-        "#{message_ids.map { |m| "<#{m}>" }.join(', ')}"
-      end
-      
+    private
+    
+    def do_encode(field_name)
+      %Q{#{field_name}: #{message_ids.map { |m| "<#{m}>" }.join(', ')}\r\n}
     end
     
-    def self.included(receiver) # :nodoc:
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
+    def do_decode
+      "#{message_ids.map { |m| "<#{m}>" }.join(', ')}"
     end
     
   end
-end
+end

data/lib/mail/fields/content_disposition_field.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-# 
-# 
-# 
+require 'mail/fields/common/parameter_hash'
+
 module Mail
   class ContentDispositionField < StructuredField
     

data/lib/mail/fields/content_type_field.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-# 
-# 
-# 
+require 'mail/fields/common/parameter_hash'
+
 module Mail
   class ContentTypeField < StructuredField
     

data/lib/mail/fields/date_field.rb

@@ -21,6 +21,8 @@
 #  mail['date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
 #  mail['Date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
 # 
+require 'mail/fields/common/common_date'
+
 module Mail
   class DateField < StructuredField
     

data/lib/mail/fields/from_field.rb

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

data/lib/mail/fields/in_reply_to_field.rb

@@ -26,6 +26,8 @@
 # 
 #  mail[:in_reply_to].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
+require 'mail/fields/common/common_message_id'
+
 module Mail
   class InReplyToField < StructuredField
     

data/lib/mail/fields/message_id_field.rb

@@ -28,6 +28,8 @@
 #  mail[:message_id].message_id   #=> 'F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom'
 #  mail[:message_id].message_ids  #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
+require 'mail/fields/common/common_message_id'
+
 module Mail
   class MessageIdField < StructuredField
     

data/lib/mail/fields/optional_field.rb

@@ -4,6 +4,8 @@
 #    field name specified elsewhere in this standard.
 # 
 # optional-field  =       field-name ":" unstructured CRLF
+require 'mail/fields/unstructured_field'
+
 module Mail
   class OptionalField < UnstructuredField
     

data/lib/mail/fields/references_field.rb

@@ -26,6 +26,8 @@
 # 
 #  mail[:references].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
+require 'mail/fields/common/common_message_id'
+
 module Mail
   class ReferencesField < StructuredField
     

data/lib/mail/fields/reply_to_field.rb

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

data/lib/mail/fields/resent_bcc_field.rb

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

data/lib/mail/fields/resent_cc_field.rb

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

data/lib/mail/fields/resent_date_field.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 # 
 # resent-date     =       "Resent-Date:" date-time CRLF
+require 'mail/fields/common/common_date'
+
 module Mail
   class ResentDateField < StructuredField
     

data/lib/mail/fields/resent_from_field.rb

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

data/lib/mail/fields/resent_message_id_field.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 # 
 # resent-msg-id   =       "Resent-Message-ID:" msg-id CRLF
+require 'mail/fields/common/common_message_id'
+
 module Mail
   class ResentMessageIdField < StructuredField
     

data/lib/mail/fields/resent_sender_field.rb

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

data/lib/mail/fields/resent_to_field.rb

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

data/lib/mail/fields/return_path_field.rb

@@ -27,6 +27,8 @@
 # item-value      =       1*angle-addr / addr-spec /
 #                          atom / domain / msg-id
 # 
+require 'mail/fields/common/common_address'
+
 module Mail
   class ReturnPathField < StructuredField
     

data/lib/mail/fields/sender_field.rb

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