postmark 0.9.12 → 0.9.13

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 0.9.13
+
+* Added error_code to DeliveryError
+* Added retries for Timeout::Error
+
 == 0.9.12
 
 * Fixed a problem of attachments processing when using deliver! method on Mail object.

data/README.rdoc

@@ -5,7 +5,7 @@ This gem is an official wrapper for Postmark HTTP API (http://postmarkapp.com).
 == Install
 
     gem install postmark
-    
+
 In addition to the +postmark+ gem you also need to install +tmail+ or +mail+ gem. Pick the one you like most:
 
     gem install mail
@@ -19,23 +19,23 @@ In addition to the +postmark+ gem you also need to install +tmail+ or +mail+ gem
     require 'tmail'
 
     Postmark.api_key = "your-api-key"
-    
+
     # Make sure you have a sender signature for every From email you specify.
-    # From can also accept array of addresses.   
-    
+    # From can also accept array of addresses.
+
     message              = TMail::Mail.new
     message.from         = "leonard@bigbangtheory.com"
     message.to           = "Sheldon Cooper <sheldon@bigbangtheory.com>"
     message.subject      = "Hi Sheldon!"
     message.content_type = "text/html"
     message.body         = "Hello my friend!"
-    
+
     # You can set customer headers if you like:
     message["CUSTOM-HEADER"] = "my custom header value"
-    
+
     # Added a tag:
     message.tag = "my-tracking-tag"
-    
+
     # Add attachments:
     message.postmark_attachments = [File.open("/path"), File.open("/path")]
 
@@ -45,18 +45,18 @@ In addition to the +postmark+ gem you also need to install +tmail+ or +mail+ gem
         "Content" => [pdf_content].pack("m"),
         "ContentType" => "application/pdf"
     }]
-    
+
     # Or specify a reply-to address (can also be an array of addresses):
     message.reply_to = "penny@bigbangtheory.com"
 
     Postmark.send_through_postmark(message)
-    
+
 == Mail Example
 
     require 'rubygems'
     require 'postmark'
     require 'mail'
-    
+
     message = Mail.new
     message.delivery_method(Mail::Postmark, :api_key => "your-api-key")
     # ...
@@ -70,12 +70,12 @@ You can retrieve various information about your server state using the Public bo
 
     # Get delivery stats: (JSON format)
     Postmark.delivery_stats
-    
-    # Get bounces information: (array of bounce objects)    
+
+    # Get bounces information: (array of bounce objects)
     Postmark::Bounce.all
-    
-    # Find specific bounce by id:    
-    bounce = Postmark::Bounce.find(bounce_id)    
+
+    # Find specific bounce by id:
+    bounce = Postmark::Bounce.find(bounce_id)
     bounce.dump     # string, containing raw SMTP data
     bounce.activate # reactivate hard bounce
 
@@ -118,6 +118,8 @@ You can also explicitly specify which one to be used, using
 * Yury Batenko
 * Pavel Maksimenko
 * Anton Astashov
+* Marcus Brito
+* Tyler Hunt
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.9.13

data/lib/postmark.rb

@@ -1,27 +1,32 @@
-def require_local(file)
-  require File.join(File.dirname(__FILE__), 'postmark', file)
-end
-
 require 'net/http'
 require 'net/https'
 
-require_local 'bounce'
-require_local 'json'
-require_local 'http_client'
-require_local 'message_extensions/shared'
-require_local 'message_extensions/tmail'
-require_local 'message_extensions/mail'
-require_local 'handlers/mail'
-require_local 'attachments_fix_for_mail'
+require 'postmark/bounce'
+require 'postmark/json'
+require 'postmark/http_client'
+require 'postmark/message_extensions/shared'
+require 'postmark/message_extensions/tmail'
+require 'postmark/message_extensions/mail'
+require 'postmark/handlers/mail'
+require 'postmark/attachments_fix_for_mail'
 
 module Postmark
 
-  class DeliveryError       < StandardError; end
+  class DeliveryError < StandardError
+    attr_accessor :error_code
+
+    def initialize(message = nil, error_code = nil)
+      super(message)
+      self.error_code = error_code
+    end
+  end
+
   class UnknownError        < DeliveryError; end
   class InvalidApiKeyError  < DeliveryError; end
   class InvalidMessageError < DeliveryError; end
   class InternalServerError < DeliveryError; end
   class UnknownMessageType  < DeliveryError; end
+  class TimeoutError        < DeliveryError; end
 
   module ResponseParsers
     autoload :Json,          'postmark/response_parsers/json'
@@ -34,8 +39,6 @@ module Postmark
     'Accept'       => 'application/json'
   }
 
-  MAX_RETRIES = 2
-
   extend self
 
   attr_accessor :host, :path_prefix, :port, :secure, :api_key, :http_open_timeout, :http_read_timeout,
@@ -86,7 +89,7 @@ module Postmark
     @retries = 0
     begin
       HttpClient.post("email", Postmark::Json.encode(convert_message_to_options_hash(message)))
-    rescue DeliveryError => e
+    rescue DeliveryError, Timeout::Error
       if @retries < max_retries
          @retries += 1
          retry
@@ -94,6 +97,8 @@ module Postmark
         raise
       end
     end
+  rescue Timeout::Error
+    raise TimeoutError.new($!)
   end
 
   def convert_message_to_options_hash(message)

data/lib/postmark/http_client.rb

@@ -35,11 +35,11 @@ module Postmark
       when 200
         return Postmark::Json.decode(response.body)
       when 401
-        raise InvalidApiKeyError, error_message(response.body)
+        raise error(InvalidApiKeyError, response.body)
       when 422
-        raise InvalidMessageError, error_message(response.body)
+        raise error(InvalidMessageError, response.body)
       when 500
-        raise InternalServerError, response.body
+        raise error(InternalServerError, response.body)
       else
         raise UnknownError, response
       end
@@ -72,5 +72,14 @@ module Postmark
     def error_message(response_body)
       Postmark::Json.decode(response_body)["Message"]
     end
+
+    def error_message_and_code(response_body)
+      reply = Postmark::Json.decode(response_body)
+      [reply["Message"], reply["ErrorCode"]]
+    end
+
+    def error(clazz, response_body)
+      clazz.send(:new, *error_message_and_code(response_body))
+    end
   end
 end

data/lib/postmark/version.rb

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

data/postmark.gemspec

@@ -41,9 +41,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fakeweb-matcher"
   s.add_development_dependency "timecop"
   s.add_development_dependency "yajl-ruby"
-  if RUBY_VERSION < '1.9.0'
-    s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-  else
-    s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-  end
 end

data/spec/bounce_spec.rb

@@ -18,7 +18,7 @@ describe "Bounce" do
 
     it "should retrieve and parce bounce correctly" do
       bounce.type.should == "HardBounce"
-      bounce.bounced_at.should == Time.now
+      bounce.bounced_at.to_s.should == Time.now.to_s
       bounce.details.should == "test bounce"
       bounce.email.should == "jim@test.com"
     end

data/spec/postmark_spec.rb

@@ -96,6 +96,11 @@ describe Postmark do
       lambda { Postmark.send_through_postmark(mail_message) }.should raise_error(Postmark::UnknownError)
     end
 
+    it "should warn when the request times out" do
+      Postmark::HttpClient.should_receive(:post).at_least(:once).and_raise(Timeout::Error)
+      lambda { Postmark.send_through_postmark(mail_message) }.should raise_error(Postmark::TimeoutError)
+    end
+
     it "should retry 3 times" do
       FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email",
                           [ 
@@ -105,6 +110,12 @@ describe Postmark do
                           ])
       lambda { Postmark.send_through_postmark(mail_message) }.should_not raise_error
     end
+
+    it "should retry on timeout" do
+      Postmark::HttpClient.should_receive(:post).and_raise(Timeout::Error)
+      Postmark::HttpClient.should_receive(:post).and_return('{}')
+      lambda { Postmark.send_through_postmark(mail_message) }.should_not raise_error
+    end
   end
 
   context "delivery stats" do

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require 'mail'
 require 'postmark'
 require 'active_support'
 require 'json'
-require 'ruby-debug'
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174637538220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174637538220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70174637537320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174637537320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tmail
-  requirement: &70174637536120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637536120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70174637534700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637534700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70174637533620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +87,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70174637533620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70174637532520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +103,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70174637532520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70174637531520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637531520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb-matcher
-  requirement: &70174637530680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637530680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70174637529940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637529940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70174637529260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,18 +167,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174637529260
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70174637528420 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70174637528420
 description: Use this gem to send emails through Postmark HTTP API and retrieve info
   about bounces.
 email: ilya@wildbit.com
@@ -143,7 +182,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .bundle/config
 - .document
 - .gitignore
 - .rake_tasks
@@ -190,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2238284457988379279
+      hash: -3519863047660442665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Official Postmark API wrapper.