messagebus_ruby_api 3.0.6 → 3.0.7

data/lib/messagebus_ruby_api/messagebus.rb

@@ -190,10 +190,11 @@ module MessagebusApi
       time.strftime("%Y-%m-%dT%H:%M:%SZ")
     end
 
-    #used by ActionMailer
-    def deliver!(message)
-      #minimum required headers
+    def deliver(message)
+      deliver!(message)
+    end
 
+    def deliver!(message)
       if message.to.first.nil? ||message.subject.nil? || message.from.first.nil? then
         raise "Messagebus API error=Missing required header: :toEmail => #{message.to.first} :subject => #{message.subject} :fromEmail => #{message.from.first}"
       end
@@ -210,16 +211,21 @@ module MessagebusApi
         raise "Messagebus API error=From Address is invalid :toEmail => #{message.to.first} :subject => #{message.subject} :fromEmail => #{message.from.first}"
       end
 
+      custom_headers = {}
+
+      custom_headers["envelope-sender"] = message.return_path if !message.return_path.nil?
+      custom_headers["bcc"] = message.bcc[0] if !message.bcc.nil?
+
+      message.header.fields.each do |f|
+        custom_headers[f.name] = f.value if f.name =~ /x-.*/i
+       end
+
       msg = {
         :toEmail => message.to.first,
         :subject => message.subject,
         :fromEmail => from_email,
-        :fromName => from_name
-      }
-
-      message.header.fields.delete_if { |k|
-        ( k.name.casecmp('bcc') == 0 ||
-          k.name.casecmp('cc') == 0 )
+        :fromName => from_name,
+        :customHeaders => custom_headers
       }
 
       msg[:plaintextBody] = ( message.body ) ? "#{message.body}" : "No plaintext version was supplied."

data/lib/messagebus_ruby_api/version.rb

@@ -13,7 +13,7 @@
 # under the License.
 
 module MessagebusApi
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 
   class Info
     @@ClientVersion = MessagebusApi::VERSION

data/spec/messagebus_ruby_api/messagebus_spec.rb

@@ -468,11 +468,14 @@ describe MessagebusApi::Messagebus do
       message_body = JSON.parse(FakeWeb.last_request.body)
       message_body["messages"][0]["fromName"].should == ""
       message_body["messages"][0]["fromEmail"].should == to_email
+      message_body["messages"][0]["customHeaders"].should == {"envelope-sender"=>"bounce@bounce.example.com"}
     end
 
     it "works with from with nice name in address" do
       to_email = "Joe Mail <hello_joe@example.com>"
-      message = MessageBusActionMailerTest.new_message(to_email)
+      bcc = "goodbye@example.com"
+      x_headers = {"x-header-a" => "header1", "x-tracking" => "1234"}
+      message = MessageBusActionMailerTest.new_message(to_email, bcc, x_headers)
 
       FakeWeb.register_uri(:post, "https://api.messagebus.com/api/v3/emails/send", :body => json_valid_send)
       client.deliver!(message)
@@ -480,6 +483,9 @@ describe MessagebusApi::Messagebus do
       message_body = JSON.parse(FakeWeb.last_request.body)
       message_body["messages"][0]["fromName"].should == "Joe Mail"
       message_body["messages"][0]["fromEmail"].should == "hello_joe@example.com"
+      message_body["messages"][0]["customHeaders"]["bcc"].should == "goodbye@example.com"
+      message_body["messages"][0]["customHeaders"]["x-header-a"].should == "header1"
+      message_body["messages"][0]["customHeaders"]["x-tracking"].should == "1234"
     end
   end
 

data/spec/spec_helper.rb

@@ -128,14 +128,24 @@ JAVASCRIPT
   json
 end
 
+
+
 ActionMailer::Base.add_delivery_method :messagebus, MessagebusApi::Messagebus, @api_key
+ActionMailer::Base.delivery_method = :messagebus
+
 class MessageBusActionMailerTest < ActionMailer::Base
   default :to => "someone@example.com",
           :from => "no-reply@messagebus.com",
           :body => "This is a test",
-          :subject => "Unit Test"
+          :subject => "Unit Test",
+          :return_path => "bounce@bounce.example.com"
+
+  def new_message(from_email, bcc = "", x_headers = {})
+    x_headers.each do |key, value|
+      headers[key] = value
+    end
 
-  def new_message(from_email)
+    mail(:bcc => bcc) if bcc != ""
     mail(:from => from_email)
   end
 end

metadata

@@ -1,34 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: messagebus_ruby_api
-version: !ruby/object:Gem::Version
-  version: 3.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 3
+  - 0
+  - 7
+  version: 3.0.7
 platform: ruby
-authors:
+authors: 
 - Message Bus dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-30 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multipart-post
-  requirement: &70268165864740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70268165864740
-description: ! 'Allows you to use the Message Bus API '
-email:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: "Allows you to use the Message Bus API "
+email: 
 - messagebus@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/messagebus_ruby_api/errors.rb
 - lib/messagebus_ruby_api/messagebus.rb
 - lib/messagebus_ruby_api/version.rb
@@ -41,32 +51,37 @@ files:
 - Gemfile
 - Rakefile
 - .rvmrc
-homepage: ''
-licenses:
+has_rdoc: true
+homepage: ""
+licenses: 
 - APACHE2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: messagebus_ruby_api
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Send email through the Message Bus service
-test_files:
+test_files: 
 - spec/messagebus_ruby_api/cacert.pem
 - spec/messagebus_ruby_api/messagebus_spec.rb
 - spec/spec_core_extensions.rb