postmark 0.4.5 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.5.0

data/lib/postmark.rb

@@ -22,9 +22,11 @@ module Postmark
     'Accept'       => 'application/json'
   }
 
+  MAX_RETRIES = 2
+
   class << self
     attr_accessor :host, :host_path, :port, :secure, :api_key, :http_open_timeout, :http_read_timeout,
-      :proxy_host, :proxy_port, :proxy_user, :proxy_pass
+      :proxy_host, :proxy_port, :proxy_user, :proxy_pass, :max_retries, :sleep_between_retries
 
     attr_writer :response_parser_class
 
@@ -47,16 +49,22 @@ module Postmark
       @host_path ||= 'email'
     end
 
-    # The HTTP open timeout (defaults to 2 seconds).
     def http_open_timeout
       @http_open_timeout ||= 5
     end
 
-    # The HTTP read timeout (defaults to 15 seconds).
     def http_read_timeout
       @http_read_timeout ||= 15
     end
 
+    def max_retries
+      @max_retries ||= 3
+    end
+
+    def sleep_between_retries
+      @sleep_between_retries ||= 10
+    end
+
     def configure
       yield self
     end
@@ -70,6 +78,20 @@ module Postmark
     end
 
     def send_through_postmark(message) #:nodoc:
+      @retries = 0
+      begin
+        attempt_sending(message)
+      rescue Exception => e
+        if @retries < max_retries
+           @retries += 1
+           retry
+        else
+          raise
+        end
+      end
+    end
+
+    def attempt_sending(message)
       ResponseParsers.const_get(response_parser_class) # loads JSON lib, defining #to_json
       http = Net::HTTP::Proxy(proxy_host,
                               proxy_port,
@@ -80,7 +102,7 @@ module Postmark
       http.open_timeout = http_open_timeout
       http.use_ssl = !!secure
 
-      headers = HEADERS.merge({ "X-Postmark-Server-Token" => api_key })
+      headers = HEADERS.merge({ "X-Postmark-Server-Token" => api_key.to_s })
 
       response = http.post(url.path, convert_tmail(message).to_json, headers)
 
@@ -134,7 +156,8 @@ module Postmark
       headers = []
       message.each_header do |key, value|
         next if bogus_headers.include? key.dup.downcase
-        headers << { "Name" => key, "Value" => value.body }
+        name = key.split(/-/).map {|i| i.capitalize }.join('-')
+        headers << { "Name" => name, "Value" => value.body }
       end
       headers
     end

data/postmark.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postmark}
-  s.version = "0.4.5"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-02-26}
   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 = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
     }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby gem for sending emails through http://postmarkapp.com HTTP API}
   s.test_files = [
     "spec/postmark_spec.rb",

data/spec/postmark_spec.rb

@@ -1,12 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Postmark" do
-  context "configuration" do
-    it "should allow configuration of host" do
-      Postmark.configure { |config| config.host = "test" }
-      Postmark.host.should == "test"
-    end
-  end
 
   let :message do
     TMail::Mail.new.tap do |mail|
@@ -27,69 +21,46 @@ describe "Postmark" do
     end
   end
 
-  let :net_http_proxy do
-    stub(:new => http_request)
-  end
+  context "service call" do
 
-  def http_response(code)
-    Net::HTTPResponse.new("1.1", code, nil).tap do |resp|
-      resp.stub! :body => '{ "Message": "OK" }'
+    before do
+      Postmark.sleep_between_retries = 0
     end
-  end
-
-  let :http_response_ok do
-    http_response(200)
-  end
-
-  let :http_response_unauthorized do
-    http_response(401)
-  end
-
-  let :http_response_invalid do
-    http_response(422)
-  end
-
-  let :http_response_server_error do
-    http_response(500)
-  end
-
-  let :http_response_unknown do
-    http_response(503)
-  end
-
-  let :http_request do
-    stub(:read_timeout= => nil, :open_timeout= => nil, :use_ssl= => nil)
-  end
-
-  before do
-    Net::HTTP.stub!(:Proxy).and_return(net_http_proxy)
-  end
 
-  context "service call" do
     it "should send email successfully" do
-      http_request.stub! :post => http_response_ok
-      lambda { Postmark.send_through_postmark(message) }.should_not raise_error
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/", {})
+      Postmark.send_through_postmark(message)
+      FakeWeb.should have_requested(:post, "http://api.postmarkapp.com/email/")
     end
 
     it "should warn when header is invalid" do
-      http_request.stub! :post => http_response_unauthorized
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/", {:status => [ "401", "Unauthorized" ], :body => "Missing API token"})
       lambda { Postmark.send_through_postmark(message) }.should raise_error(Postmark::InvalidApiKeyError)
     end
 
     it "should warn when json is not ok" do
-      http_request.stub! :post => http_response_invalid
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/", {:status => [ "422", "Invalid" ], :body => "Invalid JSON"})
       lambda { Postmark.send_through_postmark(message) }.should raise_error(Postmark::InvalidMessageError)
     end
 
     it "should warn when server fails" do
-      http_request.stub! :post => http_response_server_error
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/", {:status => [ "500", "Internal Server Error" ]})
       lambda { Postmark.send_through_postmark(message) }.should raise_error(Postmark::InternalServerError)
     end
 
     it "should warn when unknown stuff fails" do
-      http_request.stub! :post => http_response_unknown
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/", {:status => [ "485", "Custom HTTP response status" ]})
       lambda { Postmark.send_through_postmark(message) }.should raise_error(Postmark::UnknownError)
     end
+
+    it "should retry 3 times" do
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email/",
+                           [ { :status => [ 500, "Internal Server Error" ] },
+                           { :status => [ 500, "Internal Server Error" ] },
+                           {  } ]
+                          )
+      lambda { Postmark.send_through_postmark(message) }.should_not raise_error
+    end
   end
 
   context "tmail parse" do
@@ -116,7 +87,7 @@ describe "Postmark" do
     end
 
     it "should encode headers properly" do
-      json = %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"custom-header", "Value":"header"}]}]
+      json = %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
       result = Postmark.convert_tmail(message_with_headers)
       result.should == JSON.parse(json)
     end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'rubygems'
 require 'active_support'
 require 'json'
 require 'ruby-debug'
+require 'fakeweb'
+require 'fakeweb_matcher'
 require 'spec'
 require 'spec/autorun'
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: postmark
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -9,39 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +02:00
+date: 2010-02-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Ruby gem for sending emails through http://postmarkapp.com HTTP API. It relieas on TMail::Mail for message construction.
 email: underlog@gmail.com
 executables: []
@@ -84,18 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby gem for sending emails through http://postmarkapp.com HTTP API