postmark 0.9.10 → 0.9.11

data/lib/postmark/message_extensions/shared.rb

@@ -1,6 +1,6 @@
 module Postmark
   module SharedMessageExtensions
-  
+
     def tag
       self['TAG']
     end
@@ -8,15 +8,15 @@ module Postmark
     def tag=(value)
       self['TAG'] = value
     end
-  
+
     def postmark_attachments=(value)
-      @_attachments = value.is_a?(Array) ? value : [value]
+      @_attachments = Array.wrap(value)
     end
-  
+
     def postmark_attachments
       return if @_attachments.nil?
-          
-      @_attachments.collect do |item|
+
+      @_attachments.map do |item|
         if item.is_a?(Hash)
           item
         elsif item.is_a?(File)
@@ -28,6 +28,6 @@ module Postmark
         end
       end
     end
-  
+
   end
-end
+end

data/lib/postmark/version.rb

@@ -0,0 +1,3 @@
+module Postmark
+  VERSION = "0.9.11"
+end

data/postmark.gemspec

@@ -1,92 +1,49 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "postmark/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{postmark}
-  s.version = "0.9.10"
+  s.name             = "postmark"
+  s.version          = Postmark::VERSION
+  s.homepage         = "http://postmarkapp.com"
+  s.platform         = Gem::Platform::RUBY
+
+  s.authors          = ["Petyo Ivanov", "Ilya Sabanin", "Artem Chistyakov"]
+  s.date             = "2012-01-31"
+  s.email            = "ilya@wildbit.com"
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
+
+  s.summary          = "Official Postmark API wrapper."
+  s.description      = "Use this gem to send emails through Postmark HTTP API and retrieve info about bounces."
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ["lib"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Petyo Ivanov", "Ilya Sabanin", "Artem Chistyakov"]
-  s.date = %q{2012-01-31}
-  s.description = %q{Use this gem to send emails through Postmark HTTP API and retrieve info about bounces.}
-  s.email = %q{ilya@wildbit.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".bundle/config",
-    ".document",
-    ".rake_tasks",
-    "CHANGELOG.rdoc",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "init.rb",
-    "lib/postmark.rb",
-    "lib/postmark/attachments_fix_for_mail.rb",
-    "lib/postmark/bounce.rb",
-    "lib/postmark/handlers/mail.rb",
-    "lib/postmark/http_client.rb",
-    "lib/postmark/json.rb",
-    "lib/postmark/message_extensions/mail.rb",
-    "lib/postmark/message_extensions/shared.rb",
-    "lib/postmark/message_extensions/tmail.rb",
-    "lib/postmark/response_parsers/active_support.rb",
-    "lib/postmark/response_parsers/json.rb",
-    "lib/postmark/response_parsers/yajl.rb",
-    "postmark.gemspec",
-    "spec/bounce_spec.rb",
-    "spec/postmark_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://postmarkapp.com}
   s.post_install_message = %q{
-      ==================
-      Thanks for installing the postmark gem. If you don't have an account, please sign up at http://postmarkapp.com/.
-      Review the README.rdoc for implementation details and examples.
-      ==================
-    }
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Official Postmark API wrapper.}
+    ==================
+    Thanks for installing the postmark gem. If you don't have an account, please sign up at http://postmarkapp.com/.
+    Review the README.rdoc for implementation details and examples.
+    ==================
+  }
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.required_rubygems_version = ">= 1.3.7"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb-matcher>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<fakeweb-matcher>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    end
+  s.add_dependency "rake"
+  s.add_dependency "json"
+  
+  s.add_development_dependency "tmail"
+  s.add_development_dependency "mail"
+  s.add_development_dependency "rspec-core", "~> 2.0"
+  s.add_development_dependency "activesupport", "~> 3.0"
+  s.add_development_dependency "fakeweb"
+  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_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<fakeweb-matcher>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
   end
 end
-

data/spec/postmark_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Postmark" do
+describe Postmark do
 
   let :tmail_message do
     TMail::Mail.new.tap do |mail|
@@ -61,39 +61,49 @@ describe "Postmark" do
       Postmark.sleep_between_retries = 0
     end
 
+    def stub_web!(data={})
+      data[:body] ||= response_body(data[:status].nil? ? 200 : data[:status].first)
+      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", data)
+    end
+
+    def response_body(status, message="")
+      body = {"ErrorCode" => status, "Message" => message}.to_json
+    end
+
     it "should send email successfully" do
-      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", {})
-      Postmark.send_through_postmark(tmail_message)
+      stub_web!
+      Postmark.send_through_postmark(mail_message)
       FakeWeb.should have_requested(:post, "http://api.postmarkapp.com/email")
     end
 
     it "should warn when header is invalid" do
-      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", {:status => [ "401", "Unauthorized" ], :body => "Missing API token"})
-      lambda { Postmark.send_through_postmark(tmail_message) }.should raise_error(Postmark::InvalidApiKeyError)
+      stub_web!({:status => [ "401", "Unauthorized" ]})
+      lambda { Postmark.send_through_postmark(mail_message) }.should raise_error(Postmark::InvalidApiKeyError)
     end
 
     it "should warn when json is not ok" do
-      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", {:status => [ "422", "Invalid" ], :body => "Invalid JSON"})
-      lambda { Postmark.send_through_postmark(tmail_message) }.should raise_error(Postmark::InvalidMessageError)
+      stub_web!({:status => [ "422", "Invalid" ]})
+      lambda { Postmark.send_through_postmark(mail_message) }.should raise_error(Postmark::InvalidMessageError)
     end
 
     it "should warn when server fails" do
-      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", {:status => [ "500", "Internal Server Error" ]})
-      lambda { Postmark.send_through_postmark(tmail_message) }.should raise_error(Postmark::InternalServerError)
+      stub_web!({:status => [ "500", "Internal Server Error" ]})
+      lambda { Postmark.send_through_postmark(mail_message) }.should raise_error(Postmark::InternalServerError)
     end
 
     it "should warn when unknown stuff fails" do
-      FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email", {:status => [ "485", "Custom HTTP response status" ]})
-      lambda { Postmark.send_through_postmark(tmail_message) }.should raise_error(Postmark::UnknownError)
+      stub_web!({:status => [ "485", "Custom HTTP response status" ]})
+      lambda { Postmark.send_through_postmark(mail_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(tmail_message) }.should_not raise_error
+                          [ 
+                            { :status => [ 500, "Internal Server Error" ], :body => response_body(500, 'Internal Server Error') },
+                            { :status => [ 500, "Internal Server Error" ], :body => response_body(500, 'Internal Server Error')  },
+                            { :body => response_body(500, 'Internal Server Error')  }
+                          ])
+      lambda { Postmark.send_through_postmark(mail_message) }.should_not raise_error
     end
   end
 
@@ -110,117 +120,29 @@ describe "Postmark" do
     end
   end
 
-  context "tmail parse" do
-    def be_serialized_to(json)
-      simple_matcher "be serialized to #{json}" do |message|
-        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_message_to_options_hash, tmail_message)['TextBody'].should_not be_nil
-    end
-
-    it "should set html body for html message" do
-      Postmark.send(:convert_message_to_options_hash, tmail_html_message)['HtmlBody'].should_not be_nil
-    end
-    
-    it "should encode custom headers headers properly" do
-      tmail_message["CUSTOM-HEADER"] = "header"
-      tmail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
-    end
-    
-    it "should encode from properly when name is used" do
-      tmail_message.from = "Sheldon Lee Cooper <sheldon@bigbangtheory.com>"
-      tmail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-
-    it "should encode reply to" do
-      tmail_message.reply_to = ['a@a.com', 'b@b.com']
-      tmail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-
-    it "should encode tag" do
-      tmail_message.tag = "invite"
-      tmail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-
-    it "should encode multiple recepients (TO)" do
-      tmail_message.to = ['a@a.com', 'b@b.com']
-      tmail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
-    end
-
-    it "should encode multiple recepients (CC)" do
-      tmail_message.cc = ['a@a.com', 'b@b.com']
-      tmail_message.should be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-
-    it "should encode multiple recepients (BCC)" do
-      tmail_message.bcc = ['a@a.com', 'b@b.com']
-      tmail_message.should be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
+  context "tmail parse", :ruby => 1.8 do
+    require 'tmail'
+    subject { tmail_message }
+    it_behaves_like :mail    
   end
   
-  context "mail parse" do
-    def be_serialized_to(json)
-      simple_matcher "be serialized to #{json}" do |message|
-        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_message_to_options_hash, mail_message)['TextBody'].should_not be_nil
-    end
+  context "when mail parse" do
+    subject { mail_message }
+    it_behaves_like :mail
 
     it "should set html body for html message" do
       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_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
-      mail_message.header["CUSTOM-HEADER"] = "header"
-      mail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
-    end
-    
-    it "should encode from properly when name is used" do
-      mail_message.from = "Sheldon Lee Cooper <sheldon@bigbangtheory.com>"
-      mail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
 
-    it "should encode reply to" do
-      mail_message.reply_to = ['a@a.com', 'b@b.com']
-      mail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-    
-    it "should encode tag" do
-      mail_message.tag = "invite"
-      mail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-    
-    it "should encode multiple recepients (TO)" do
-      mail_message.to = ['a@a.com', 'b@b.com']
-      mail_message.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
-    end
-    
-    it "should encode multiple recepients (CC)" do
-      mail_message.cc = ['a@a.com', 'b@b.com']
-      mail_message.should be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
-    
-    it "should encode multiple recepients (BCC)" do
-      mail_message.bcc = ['a@a.com', 'b@b.com']
-      mail_message.should be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
-    end
+    it "should encode custom headers properly" do
+      subject.header["CUSTOM-HEADER"] = "header"
+      subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
+    end    
   end
   
   context "mail delivery method" do
     it "should be able to set delivery_method" do
       mail_message.delivery_method Mail::Postmark
-      puts mail_message.delivery_method
     end
     
     it "should wrap Postmark.send_through_postmark" do

data/spec/shared_examples.rb

@@ -0,0 +1,41 @@
+shared_examples :mail do
+  it "should set text body for plain message" do
+    Postmark.send(:convert_message_to_options_hash, subject)['TextBody'].should_not be_nil
+  end
+  
+  it "should encode from properly when name is used" do
+    subject.from = "Sheldon Lee Cooper <sheldon@bigbangtheory.com>"
+    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+  end
+
+  it "should encode reply to" do
+    subject.reply_to = ['a@a.com', 'b@b.com']
+    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+  end
+  
+  it "should encode tag" do
+    subject.tag = "invite"
+    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+  end
+  
+  it "should encode multiple recepients (TO)" do
+    subject.to = ['a@a.com', 'b@b.com']
+    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
+  end
+  
+  it "should encode multiple recepients (CC)" do
+    subject.cc = ['a@a.com', 'b@b.com']
+    subject.should be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+  end
+  
+  it "should encode multiple recepients (BCC)" do
+    subject.bcc = ['a@a.com', 'b@b.com']
+    subject.should be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+  end
+
+  it "should accept string as reply_to field" do
+    subject.reply_to = ['Anton Astashov <b@b.com>']
+    puts subject.reply_to.inspect
+    subject.should be_serialized_to %q[{"From": "sheldon@bigbangtheory.com", "ReplyTo": "b@b.com", "To": "lenard@bigbangtheory.com", "Subject": "Hello!", "TextBody": "Hello Sheldon!"}]
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
+require 'bundler'
+Bundler.setup(:development)
 require 'mail'
-require 'tmail'
+#require 'tmail'
 require 'postmark'
 require 'active_support'
 require 'json'
@@ -10,8 +12,9 @@ require 'ruby-debug'
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'timecop'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'shared_examples.rb')
 
 if ENV['JSONGEM']
   # `JSONGEM=Yajl rake spec`
@@ -19,6 +22,14 @@ if ENV['JSONGEM']
   puts "Setting ResponseParser class to #{Postmark::ResponseParsers.const_get Postmark.response_parser_class}"
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
+	config.filter_run_excluding :ruby => lambda { |version|
+    RUBY_VERSION.to_s !~ /^#{version.to_s}/
+  }
+end
 
+RSpec::Matchers.define :be_serialized_to do |json|
+  match do |mail_message|
+    Postmark.convert_message_to_options_hash(mail_message).should == JSON.parse(json)
+  end
 end