postmark 0.9.1 → 0.9.2

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 0.9.2
+
+* Fixed "Illegal email address ']'" bug on Ruby 1.9
+
 == 0.9.1
 
 * Fixed TypeError when calling Bounce.all.

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/postmark.rb

@@ -16,11 +16,11 @@ require_local 'attachments_fix_for_mail'
 
 module Postmark
 
-  class InvalidApiKeyError < StandardError; end
-  class UnknownError < StandardError; end
+  class UnknownError        < StandardError; end
+  class InvalidApiKeyError  < StandardError; end
   class InvalidMessageError < StandardError; end
   class InternalServerError < StandardError; end
-  class UnknownMessageType < StandardError; end
+  class UnknownMessageType  < StandardError; end
 
   module ResponseParsers
     autoload :Json,          'postmark/response_parsers/json'
@@ -83,7 +83,7 @@ module Postmark
     def send_through_postmark(message) #:nodoc:
       @retries = 0
       begin
-        HttpClient.post("email", Postmark::Json.encode(convert(message)))
+        HttpClient.post("email", Postmark::Json.encode(convert_message_to_options_hash(message)))
       rescue Exception => e
         if @retries < max_retries
            @retries += 1
@@ -94,42 +94,25 @@ module Postmark
       end
     end
     
-    def convert(message)
-      if defined?(TMail) && message.is_a?(TMail::Mail)
-        convert_tmail(message)
-      else
-        convert_mail(message)
-      end
-    end
+    def convert_message_to_options_hash(message)
+      options = Hash.new
+      headers = extract_headers_according_to_message_format(message)
     
-    def delivery_stats
-      HttpClient.get("deliverystats")
-    end
-    
-  protected
-    
-    def convert_mail(message)
-      options = { "From" => message.from.to_s, "Subject" => message.subject }
-
-      headers = extract_mail_headers(message)
-      options["Headers"] = headers unless headers.length == 0
-      
-      options["To"] = message.to.join(", ")
-
-      options["Tag"] = message.tag.to_s unless message.tag.nil?
-
-      options["Cc"] = message.cc.join(", ").to_s unless message.cc.nil?
-      
-      options["Bcc"] = message.bcc.join(", ").to_s unless message.bcc.nil?
-      
-      options["Attachments"] = message.postmark_attachments unless message.postmark_attachments.nil?
-
-      if reply_to = message['reply-to']
-        options["ReplyTo"] = reply_to.to_s
-      end
+      options["From"]        = message.from.try(:first)
+      options["ReplyTo"]     = message.reply_to.try(:join, ", ")
+      options["To"]          = message.to.try(:join, ", ")
+      options["Cc"]          = message.cc.try(:join, ", ")
+      options["Bcc"]         = message.bcc.try(:join, ", ")
+      options["Subject"]     = message.subject
+      options["Attachments"] = message.postmark_attachments
+      options["Tag"]         = message.tag.to_s if message.tag
+      options["Headers"]     = headers          if headers.size > 0
       
+      options = options.delete_if{|k,v| v.nil?}
+    
       html = message.body_html
       text = message.body_text
+      
       if message.multipart?
         options["HtmlBody"] = html
         options["TextBody"] = text
@@ -138,9 +121,26 @@ module Postmark
       else
         options["TextBody"] = text
       end
+      
       options
     end
     
+    def delivery_stats
+      HttpClient.get("deliverystats")
+    end
+    
+  protected
+  
+    def extract_headers_according_to_message_format(message)
+      if defined?(TMail) && message.is_a?(TMail::Mail)
+        headers = extract_tmail_headers(message)
+      elsif defined?(Mail) && message.kind_of?(Mail::Message)
+        headers = extract_mail_headers(message)
+      else
+        raise "Can't convert message to a valid hash of API options. Unknown message format."
+      end
+    end
+    
     def extract_mail_headers(message)
       headers = []
       message.header.fields.each do |field|
@@ -153,37 +153,6 @@ module Postmark
       headers
     end
 
-    def convert_tmail(message)
-      options = { "From" => message['from'].to_s, "To" => message['to'].to_s, "Subject" => message.subject }
-
-      headers = extract_tmail_headers(message)
-      options["Headers"] = headers unless headers.length == 0
-
-      options["Tag"] = message.tag.to_s unless message.tag.nil?
-
-      options["Cc"] = message['cc'].to_s unless message.cc.nil?
-
-      options["Bcc"] = message['bcc'].to_s unless message.bcc.nil?
-      
-      options["Attachments"] = message.postmark_attachments unless message.postmark_attachments.nil?
-
-      if reply_to = message['reply-to']
-        options["ReplyTo"] = reply_to.to_s
-      end
-
-      html = message.body_html
-      text = message.body_text
-      if message.multipart?
-        options["HtmlBody"] = html
-        options["TextBody"] = text
-      elsif html
-        options["HtmlBody"] = message.body_html
-      else
-        options["TextBody"] = text
-      end
-      options
-    end
-
     def extract_tmail_headers(message)
       headers = []
       message.each_header do |key, value|
@@ -196,18 +165,12 @@ module Postmark
 
     def bogus_headers
       %q[
-        return-path
-        x-pm-rcpt
-        from
-        reply-to
-        sender
-        received
-        date
-        content-type
-        cc
-        bcc
-        subject
-        tag
+        return-path  x-pm-rcpt
+        from         reply-to
+        sender       received
+        date         content-type
+        cc           bcc
+        subject      tag
         attachment
       ]
     end

data/postmark.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postmark}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov", "Ilya Sabanin"]
-  s.date = %q{2010-09-20}
+  s.date = %q{2010-09-29}
   s.description = %q{Ruby gem for sending emails through http://postmarkapp.com HTTP API. It relieas on TMail::Mail for message construction.}
   s.email = %q{underlog@gmail.com}
   s.extra_rdoc_files = [

data/spec/bounce_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Bounce" do
   let(:bounce_json) { %{{"Type":"HardBounce","TypeCode":1,"Details":"test bounce","Email":"jim@test.com","BouncedAt":"#{Time.now.to_s}","DumpAvailable":true,"Inactive":false,"CanActivate":true,"ID":12}} }
-  let(:bounces_json) { "[#{bounce_json},#{bounce_json}]" }
+  let(:bounces_json) { %{{"Bounces": [#{bounce_json},#{bounce_json}]}} }
 
   context "single bounce" do
     let(:bounce) { Postmark::Bounce.find(12) }

data/spec/postmark_spec.rb

@@ -113,16 +113,16 @@ describe "Postmark" do
   context "tmail parse" do
     def be_serialized_to(json)
       simple_matcher "be serialized to #{json}" do |message|
-        Postmark.send(:convert_tmail, tmail_message).should == JSON.parse(json)
+        Postmark.send(:convert_message_to_options_hash, tmail_message).should == JSON.parse(json)
       end
     end
     
     it "should set text body for plain message" do
-      Postmark.send(:convert_tmail, tmail_message)['TextBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, tmail_message)['TextBody'].should_not be_nil
     end
 
     it "should set html body for html message" do
-      Postmark.send(:convert_tmail, tmail_html_message)['HtmlBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, tmail_html_message)['HtmlBody'].should_not be_nil
     end
     
     it "should encode custom headers headers properly" do
@@ -159,21 +159,21 @@ describe "Postmark" do
   context "mail parse" do
     def be_serialized_to(json)
       simple_matcher "be serialized to #{json}" do |message|
-        Postmark.send(:convert_mail, mail_message).should == JSON.parse(json)
+        Postmark.send(:convert_message_to_options_hash, mail_message).should == JSON.parse(json)
       end
     end
     
     it "should set text body for plain message" do
-      Postmark.send(:convert_mail, mail_message)['TextBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, mail_message)['TextBody'].should_not be_nil
     end
 
     it "should set html body for html message" do
-      Postmark.send(:convert_mail, mail_html_message)['HtmlBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, mail_html_message)['HtmlBody'].should_not be_nil
     end
     
     it "should set html and text body for multipart message" do
-      Postmark.send(:convert_mail, mail_multipart_message)['HtmlBody'].should_not be_nil
-      Postmark.send(:convert_mail, mail_multipart_message)['TextBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, mail_multipart_message)['HtmlBody'].should_not be_nil
+      Postmark.send(:convert_message_to_options_hash, mail_multipart_message)['TextBody'].should_not be_nil
     end
     
     it "should encode custom headers properly" do

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'mail'
 require 'tmail'
 require 'postmark'
-require 'rubygems'
 require 'active_support'
 require 'json'
 require 'ruby-debug'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: postmark
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +08:00
+date: 2010-09-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency