postageapp 1.0.2 → 1.0.3

data/README.md

@@ -4,7 +4,7 @@
 This is the gem used to integrate Ruby apps with PostageApp service.
 Personalized, mass email sending can be offloaded to PostageApp via JSON based API.
 
-### [API Documentation](http://help.postageapp.com/faqs/api-reference) • [PostageApp FAQs](http://help.postageapp.com/faqs) • [PostageApp Help Portal](http://help.postageapp.com)
+### [API Documentation](http://help.postageapp.com/faqs/api) • [PostageApp FAQs](http://help.postageapp.com/faqs) • [PostageApp Help Portal](http://help.postageapp.com)
 
 Installation
 ------------
@@ -45,7 +45,7 @@ And then it's as simple as doing something like this:
 
 Usage
 -----
-Here's an example of sending a message ([See full API documentation](http://help.postageapp.com/faqs/api-reference/send_message)):
+Here's an example of sending a message ([See full API documentation](http://help.postageapp.com/faqs/api/send_message)):
   
     request = PostageApp::Request.new(:send_message, {
       'headers'     => { 'from'     => 'sender@example.com',

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/postageapp/mailer/mailer_3.rb

@@ -82,6 +82,11 @@ class PostageApp::Mailer < ActionMailer::Base
     @_attachments ||= Attachments.new(@_message)
   end
   
+  # Override for headers assignment
+  def headers(args=nil)
+    @_message.headers(args)
+  end
+  
   # Overriding method that prepares Mail object. This time we'll be 
   # contructing PostageApp::Request payload.
   def mail(headers = {}, &block)
@@ -111,7 +116,7 @@ class PostageApp::Mailer < ActionMailer::Base
     
     # Assign all headers except parts_order, content_type and body
     assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
-    m.arguments['headers'] = assignable
+    m.headers.merge!(assignable)
     
     # Render the templates and blocks
     responses, explicit_order = collect_responses_and_parts_order(headers, &block)

data/postageapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postageapp}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov, The Working Group Inc"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-07-27}
   s.description = %q{Gem that interfaces with PostageApp.com service to send emails from web apps}
   s.email = %q{oleg@twg.ca}
   s.extra_rdoc_files = [

data/test/mailer/action_mailer_3/notifier.rb

@@ -44,6 +44,9 @@ class Notifier < PostageApp::Mailer
   end
   
   def with_custom_postage_variables
+    headers['CustomHeader1'] = 'CustomValue1'
+    headers 'CustomHeader2' => 'CustomValue2'
+    
     postage_template 'test_template'
     postage_variables 'variable' => 'value'
     

data/test/mailer_3_test.rb

@@ -64,6 +64,8 @@ class Mailer3Test < Test::Unit::TestCase
       }), mail.arguments['recipients']
       assert_equal 'test_template', mail.arguments['template']
       assert_equal ({ 'variable' => 'value' }), mail.arguments['variables']
+      assert_equal 'CustomValue1', mail.arguments['headers']['CustomHeader1']
+      assert_equal 'CustomValue2', mail.arguments['headers']['CustomHeader2']
     end
     
     def test_create_with_old_api

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Oleg Khabarov, The Working Group Inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2010-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency