mail 1.2.9 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== Mon Nov 23 22:35:50 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Changed the way attachments are added so that it does not break depending on the order
+  of the Hash passed in.
+* Version bump to 1.3.0 - Now works with Edge ActionMailer, MRI 1.8.6, 1.8.7, 1.9.1, all tests passing
+
 == Sun Nov 22 12:19:44 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Added check on add_part to make sure if there is already a body, and if so, make a text_part of the body

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "1.2.9"
+  s.version     = "1.3.0"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"

data/lib/mail/message.rb

@@ -855,16 +855,24 @@ module Mail
     end
     
     def init_with_hash(hash)
-      passed_in_options = hash
+      passed_in_options = hash.with_indifferent_access
       self.raw_source = ''
       @header = Mail::Header.new
       @body = Mail::Body.new
-      hash.each_pair do |k,v|
-        next if k.to_sym == :data
-        if k.to_sym == :filename
-          add_attachment(passed_in_options)
-          break
-        elsif k == :headers
+
+      # Strip out the attachment headers and make an attachment
+      if passed_in_options.has_key?(:filename)
+        add_attachment(passed_in_options)
+        passed_in_options.delete(:content_disposition)
+        passed_in_options.delete(:content_type)
+        passed_in_options.delete(:mime_type)
+        passed_in_options.delete(:filename)
+        passed_in_options.delete(:data)
+      end
+      
+      passed_in_options.each_pair do |k,v|
+        k = underscoreize(k).to_sym if k.class == String
+        if k == :headers
           self.headers(v)
         else
           self[k] = v

data/lib/mail/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +11:00
+date: 2009-11-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency