postmark 0.9.11 → 0.9.12

data/CHANGELOG.rdoc

@@ -1,23 +1,29 @@
 = Changelog
 
+== 0.9.12
+
+* Fixed a problem of attachments processing when using deliver! method on Mail object.
+* Removed activesupport dependency for Postmark::AttachmentsFixForMail.
+* Added specs for AttachmentFixForMail.
+
 == 0.9.11
 
-* Replaced Jeweler by Bundler
-* Updated RSpec to 2.8
-* Fixed specs
-* Refactored the codebase
+* Replaced Jeweler by Bundler.
+* Updated RSpec to 2.8.
+* Fixed specs.
+* Refactored the codebase.
 
 == 0.9.10
 
-* Fixed Ruby 1.9 compatibility issue
+* Fixed Ruby 1.9 compatibility issue.
 
 == 0.9.9
 
-* Added support for non-array reply_to addresses
+* Added support for non-array reply_to addresses.
 
 == 0.9.8
 
-* Fixed bug that caused unexpected multiple email deliveries on Ruby1.9.2/Rails3.0.7
+* Fixed bug that caused unexpected multiple email deliveries on Ruby 1.9.2/Rails 3.0.7.
 
 == 0.9.7
 

data/README.rdoc

@@ -110,6 +110,7 @@ You can also explicitly specify which one to be used, using
 * Ilya Sabanin
 * Hristo Deshev
 * Artem Chistyakov
+* Dmitry Sabanin
 * Randy Schmidt
 * Chris Williams
 * Aitor García Rey

data/VERSION

@@ -1 +1 @@
-0.9.11
+0.9.12

data/lib/postmark/attachments_fix_for_mail.rb

@@ -19,25 +19,30 @@ module Postmark
   module AttachmentsFixForMail
     
     def self.included(base)
-      base.class_eval do      
-        alias_method_chain :deliver, :postmark_hook
+      base.class_eval do
+        alias_method :deliver_without_postmark_hook, :deliver
+        alias_method :deliver_without_postmark_hook!, :deliver!
+
+        def deliver!
+          remove_postmark_attachments_from_standard_fields
+          deliver_without_postmark_hook!
+        end
+        
+        def deliver
+          remove_postmark_attachments_from_standard_fields
+          deliver_without_postmark_hook
+        end
       end
     end
-    
-    def deliver_with_postmark_hook
-      remove_postmark_attachments_from_standard_fields
-      deliver_without_postmark_hook
-    end
-    
+
   private
-  
+
     def remove_postmark_attachments_from_standard_fields
       field = self['POSTMARK-ATTACHMENTS']
       return if field.nil?
       self.postmark_attachments = field.value
       header.fields.delete_if{|f| f.name == 'postmark-attachments'}
     end
-    
   end
   
 end

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = "0.9.11"
+  VERSION = "0.9.12"
 end

data/spec/postmark_spec.rb

@@ -158,6 +158,26 @@ describe Postmark do
     end
   end
 
+  context "attachments hook", :ruby => 1.9 do
+    before(:all) { Mail::Message.send(:include, Postmark::AttachmentsFixForMail) }
+
+    before do
+      mail_message.delivery_method Mail::Postmark
+      mail_message.should_receive(:remove_postmark_attachments_from_standard_fields)
+      Postmark.should_receive(:send_through_postmark).with(mail_message)
+    end
+
+    it "should run postmark attachments hook when using deliver! method" do
+      mail_message.deliver!
+    end
+
+    it "should run postmark attachments hook when using deliver method" do      
+      mail_message.deliver
+    end
+
+    
+  end
+
   context "JSON library support" do
     [:Json, :ActiveSupport, :Yajl].each do |lib|
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70183890117500 !ruby/object:Gem::Requirement
+  requirement: &70174637538220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183890117500
+  version_requirements: *70174637538220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70183890116520 !ruby/object:Gem::Requirement
+  requirement: &70174637537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183890116520
+  version_requirements: *70174637537320
 - !ruby/object:Gem::Dependency
   name: tmail
-  requirement: &70183890115520 !ruby/object:Gem::Requirement
+  requirement: &70174637536120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890115520
+  version_requirements: *70174637536120
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70183890114000 !ruby/object:Gem::Requirement
+  requirement: &70174637534700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890114000
+  version_requirements: *70174637534700
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70183890113040 !ruby/object:Gem::Requirement
+  requirement: &70174637533620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70183890113040
+  version_requirements: *70174637533620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70183890111940 !ruby/object:Gem::Requirement
+  requirement: &70174637532520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70183890111940
+  version_requirements: *70174637532520
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70183890110780 !ruby/object:Gem::Requirement
+  requirement: &70174637531520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890110780
+  version_requirements: *70174637531520
 - !ruby/object:Gem::Dependency
   name: fakeweb-matcher
-  requirement: &70183890109980 !ruby/object:Gem::Requirement
+  requirement: &70174637530680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890109980
+  version_requirements: *70174637530680
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70183890109260 !ruby/object:Gem::Requirement
+  requirement: &70174637529940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890109260
+  version_requirements: *70174637529940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70183890108540 !ruby/object:Gem::Requirement
+  requirement: &70174637529260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890108540
+  version_requirements: *70174637529260
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70183890107520 !ruby/object:Gem::Requirement
+  requirement: &70174637528420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,7 +133,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183890107520
+  version_requirements: *70174637528420
 description: Use this gem to send emails through Postmark HTTP API and retrieve info
   about bounces.
 email: ilya@wildbit.com
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 840760196048598273
+      hash: 2238284457988379279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: