mail 1.0.0 → 1.1.0

data/lib/mail/header.rb

@@ -72,8 +72,17 @@ module Mail
     def fields=(unfolded_fields)
       @fields = Mail::FieldList.new
       unfolded_fields.each do |field|
-        @fields << Field.new(field)
+
+        field = Field.new(field)
+        selected = select_field_for(field.name)
+
+        if selected.any? && limited_field?(field.name)
+          selected.first.update(field.name, field.value)
+        else
+          @fields << field
+        end
       end
+
     end
     
     #  3.6. Field definitions
@@ -98,7 +107,7 @@ module Mail
     #  h['To']          #=> 'mikel@me.com'
     #  h['X-Mail-SPAM'] #=> ['15', '20']
     def [](name)
-      selected = fields.select { |f| f.responsible_for?(name) }
+      selected = select_field_for(name)
       case
       when selected.length > 1
         selected.map { |f| f }
@@ -123,24 +132,22 @@ module Mail
     #  h['X-Mail-SPAM'] = nil
     #  h['X-Mail-SPAM'] # => nil
     def []=(name, value)
-      selected = fields.select { |f| f.responsible_for?(name) }
+      selected = select_field_for(name)
+
       case
       # User wants to delete the field
       when !selected.blank? && value == nil
         fields.delete_if { |f| selected.include?(f) }
         
       # User wants to change the field
-      when !selected.blank? && LIMITED_FIELDS.include?(name.downcase)
+      when !selected.blank? && limited_field?(name)
+
         selected.first.update(name, value)
         
       # User wants to create the field
       else
         # Need to insert in correct order for trace fields
-        if value.blank?
-          self.fields << Field.new(name)
-        else
-          self.fields << Field.new("#{name}: #{value}")
-        end
+        self.fields << Field.new(name.to_s, value)
       end
     end
     
@@ -148,7 +155,7 @@ module Mail
                            message-id in-reply-to references subject
                            return-path content-type mime-version
                            content-transfer-encoding content-description 
-                           content-id content-type content-disposition]
+                           content-id content-disposition content-location]
 
     def encoded
       buffer = ''
@@ -209,5 +216,13 @@ module Mail
       self.fields = unfolded_header.split(CRLF)
     end
     
+    def select_field_for(name)
+      fields.select { |f| f.responsible_for?(name) }
+    end
+    
+    def limited_field?(name)
+      LIMITED_FIELDS.include?(name.downcase)      
+    end
+    
   end
 end

data/lib/mail/message.rb

@@ -493,6 +493,10 @@ module Mail
       body.parts.select { |p| p.attachment? }.map { |p| p.attachment }
     end
     
+    def has_attachments?
+      !attachments.empty?
+    end
+    
     # Accessor for html_part
     def html_part(&block)
       if block_given?

data/lib/mail/network/deliverable.rb

@@ -26,7 +26,11 @@ module Mail
       
       smtp = Net::SMTP.new(config.smtp[0], config.smtp[1] || 25)
       if config.tls?
-        smtp.enable_tls(OpenSSL::SSL::VERIFY_NONE)
+        if OpenSSL::SSL::VERIFY_NONE.kind_of?(OpenSSL::SSL::SSLContext)
+          smtp.enable_tls(OpenSSL::SSL::VERIFY_NONE)
+        else
+          smtp.enable_tls
+        end
       else
         smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto)
       end

data/lib/mail/parsers/content_disposition.rb

@@ -143,8 +143,19 @@ module Mail
           if r3
             r0 = r3
           else
-            @index = i0
-            r0 = nil
+            if has_terminal?('', false, index)
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 0))
+              @index += 0
+            else
+              terminal_parse_failure('')
+              r4 = nil
+            end
+            if r4
+              r0 = r4
+            else
+              @index = i0
+              r0 = nil
+            end
           end
         end
       end
@@ -355,4 +366,4 @@ module Mail
     include ContentDisposition
   end
 
-end
+end

data/lib/mail/parsers/content_disposition.treetop

@@ -15,12 +15,13 @@ module Mail
     end
     
     rule disposition_type
-      "inline" / "attachment" / extension_token
+      "inline" / "attachment" / extension_token / ''
     end
     
     rule extension_token
       ietf_token / x_token
     end
+    
     rule parameter
       CFWS? attr:attribute "=" val:value CFWS? {
         def param_hash
@@ -42,4 +43,4 @@ module Mail
     end
     
   end
-end
+end

data/lib/mail/parsers/content_location.rb

@@ -0,0 +1,133 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Mail
+  module ContentLocation
+    include Treetop::Runtime
+
+    def root
+      @root || :primary
+    end
+
+    include RFC2822
+
+    include RFC2045
+
+    module Primary0
+      def CFWS1
+        elements[0]
+      end
+
+      def location
+        elements[1]
+      end
+
+      def CFWS2
+        elements[2]
+      end
+    end
+
+    def _nt_primary
+      start_index = index
+      if node_cache[:primary].has_key?(index)
+        cached = node_cache[:primary][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      i0, s0 = index, []
+      r1 = _nt_CFWS
+      s0 << r1
+      if r1
+        r2 = _nt_location
+        s0 << r2
+        if r2
+          r3 = _nt_CFWS
+          s0 << r3
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Primary0)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:primary][start_index] = r0
+
+      r0
+    end
+
+    module Location0
+      def text_value
+        quoted_content.text_value
+      end
+    end
+
+    def _nt_location
+      start_index = index
+      if node_cache[:location].has_key?(index)
+        cached = node_cache[:location][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      i0 = index
+      r1 = _nt_quoted_string
+      r1.extend(Location0)
+      if r1
+        r0 = r1
+      else
+        s2, i2 = [], index
+        loop do
+          i3 = index
+          r4 = _nt_token
+          if r4
+            r3 = r4
+          else
+            if has_terminal?('\G[\\x3d]', true, index)
+              r5 = true
+              @index += 1
+            else
+              r5 = nil
+            end
+            if r5
+              r3 = r5
+            else
+              @index = i3
+              r3 = nil
+            end
+          end
+          if r3
+            s2 << r3
+          else
+            break
+          end
+        end
+        if s2.empty?
+          @index = i2
+          r2 = nil
+        else
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        end
+        if r2
+          r0 = r2
+        else
+          @index = i0
+          r0 = nil
+        end
+      end
+
+      node_cache[:location][start_index] = r0
+
+      r0
+    end
+
+  end
+
+  class ContentLocationParser < Treetop::Runtime::CompiledParser
+    include ContentLocation
+  end
+
+end

data/lib/mail/parsers/content_location.treetop

@@ -0,0 +1,20 @@
+module Mail
+  grammar ContentLocation
+
+    include RFC2822
+    include RFC2045
+
+    rule primary
+      CFWS location CFWS
+    end
+    
+    rule location
+      quoted_string {
+        def text_value
+          quoted_content.text_value
+        end
+      } / (token / [\x3d])+
+    end
+
+  end
+end

data/lib/mail/part.rb

@@ -13,10 +13,10 @@ module Mail
         self.body = attachment.encoded
       else
         super
-        if content_type.parameters['filename']
-          @attachment = Mail::Attachment.new(:filename => content_type.parameters['filename'],
+        if filename = attachment?
+          @attachment = Mail::Attachment.new(:filename => filename,
                                              :data => body.to_s,
-                                             :encoding => content_transfer_encoding.to_s)
+                                             :encoding => content_transfer_encoding.encoding)
         end
       end
     end
@@ -33,7 +33,7 @@ module Mail
     
     # Returns true if this part is an attachment
     def attachment?
-      @attachment ? true : false
+      find_attachment
     end
     
     # Returns the attachment data if there is any
@@ -115,6 +115,21 @@ module Mail
       @delivery_status_data ||= Header.new(body.to_s.gsub("\r\n\r\n", "\r\n"))
     end
 
+    # Returns the filename of the attachment (if it exists) or returns nil
+    def find_attachment
+      case
+      when content_type && content_type.filename
+        filename = content_type.filename
+      when content_disposition && content_disposition.filename
+        filename = content_disposition.filename
+      when content_location && content_location.location
+        filename = content_location.location
+      else
+        filename = nil
+      end
+      filename
+    end
+
   end
   
 end

data/lib/mail/version.rb

@@ -2,7 +2,7 @@
 module Mail
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/mail/version_specific/ruby_1_8.rb

@@ -54,8 +54,11 @@ module Mail
       string = Encodings::QuotedPrintable.encode(str)
       "=?#{encoding}?Q?#{string.chomp}?="
     end
-
+    
+    def Ruby18.param_decode(str, encoding)
+      URI.unescape(str)
+    end
+    
   end
   
-  
 end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -45,5 +45,11 @@ module Mail
       "=?#{encoding}?Q?#{string.chomp}?="
     end
 
+    def Ruby19.param_decode(str, encoding)
+      string = URI.unescape(str)
+      string.force_encoding(encoding) if encoding
+      string
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.4"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.3"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   type: :runtime
@@ -52,9 +62,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - ./.gitignore
+- ./CHANGELOG.rdoc
 - ./Manifest.txt
-- ./README.rdoc
 - ./Rakefile
+- ./README.rdoc
 - ./lib/mail.rb
 - ./lib/mail/attachment.rb
 - ./lib/mail/body.rb
@@ -66,6 +77,7 @@ files:
 - ./lib/mail/elements/address.rb
 - ./lib/mail/elements/address_list.rb
 - ./lib/mail/elements/content_disposition_element.rb
+- ./lib/mail/elements/content_location_element.rb
 - ./lib/mail/elements/content_transfer_encoding_element.rb
 - ./lib/mail/elements/content_type_element.rb
 - ./lib/mail/elements/date_time_element.rb
@@ -87,9 +99,11 @@ files:
 - ./lib/mail/fields/common/common_date.rb
 - ./lib/mail/fields/common/common_field.rb
 - ./lib/mail/fields/common/common_message_id.rb
+- ./lib/mail/fields/common/parameter_hash.rb
 - ./lib/mail/fields/content_description_field.rb
 - ./lib/mail/fields/content_disposition_field.rb
 - ./lib/mail/fields/content_id_field.rb
+- ./lib/mail/fields/content_location_field.rb
 - ./lib/mail/fields/content_transfer_encoding_field.rb
 - ./lib/mail/fields/content_type_field.rb
 - ./lib/mail/fields/date_field.rb
@@ -124,6 +138,8 @@ files:
 - ./lib/mail/parsers/address_lists.treetop
 - ./lib/mail/parsers/content_disposition.rb
 - ./lib/mail/parsers/content_disposition.treetop
+- ./lib/mail/parsers/content_location.rb
+- ./lib/mail/parsers/content_location.treetop
 - ./lib/mail/parsers/content_transfer_encoding.rb
 - ./lib/mail/parsers/content_transfer_encoding.treetop
 - ./lib/mail/parsers/content_type.rb
@@ -151,12 +167,7 @@ files:
 - ./lib/mail/utilities.rb
 - ./lib/mail/version.rb
 - ./lib/mail/version_specific/ruby_1_8.rb
-- ./lib/mail/version_specific/ruby_1_8_string.rb
 - ./lib/mail/version_specific/ruby_1_9.rb
-- ./lib/mail/version_specific/multibyte.rb
-- ./lib/mail/version_specific/multibyte/chars.rb
-- ./lib/mail/version_specific/multibyte/exceptions.rb
-- ./lib/mail/version_specific/multibyte/unicode_database.rb
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/mikel/mail
@@ -183,6 +194,7 @@ requirements:
 - treetop, Treetop is a Ruby-based DSL for text parsing and interpretation
 - mime/types, A list of a lot of Mime Types
 - tlsmail, Used for encrypted SMTP, only if you are on RUBY_VERSION <= 1.8.6
+- activesupport, Because it has lots of goodies
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: