simple_postmark 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9de1ac47100b912b377ad14820d3b529b21c25a1
+  data.tar.gz: f7a59261a018c6089be91095f517067061fbcc9b
+SHA512:
+  metadata.gz: 35da1d86866675baaea4557c108804aac3fdc67cdf4cb299a920d8f47b58e6d1610cba82d8741bf296d413374a8daa194fecd1e0157506384ded67ffe173bc77
+  data.tar.gz: c06df2471facc7192a9156c49277a7a1193d4bc0288072182efd88cd28f0d344b886c6bbb9dd3df901be24db2a5b85d08def38b30b803c52308ce543dea2c83d

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
+  - 2.1.0
+  - 2.2.0
 
 gemfile:
   - Gemfile
@@ -12,18 +12,8 @@ gemfile:
   - gemfiles/Rails_3_1.gemfile
   - gemfiles/Rails_3_2.gemfile
   - gemfiles/Rails_4_0.gemfile
-  - gemfiles/Rails_master.gemfile
+  - gemfiles/Rails_4_1.gemfile
 
 branches:
   only:
     - master
-
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/Rails_master.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/Rails_4_0.gemfile
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/Rails_master.gemfile

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.0 (February 12, 2015)
+* Rails 4.1.
+* Replaces specs with tests. 
+
+## 0.6.0 (July 8, 2013)
+* Rails 4.0!
+
 ## 0.5.2 (May 11, 2013)
 * Some refactoring.
 * Ruby 2.0 support!

data/README.md

@@ -2,18 +2,21 @@
 
 simple_postmark makes it easy to send mails via [Postmark](http://postmarkapp.com)™ using Rails's ActionMailer.
 
-~~simple_postmark is inspired by [postmark-gem](https://github.com/wildbit/postmark-gem), but unfortunately postmark-gem forced to me to use non-standard Rails calls like `postmark_attachments`. simple_postmark uses the standard Rails's ActionMailer syntax to send your emails via Postmark.~~
+## Table of Contents
 
----
+* [About](#about)
+* [Installation](#installation)
+* [Usage](#usage)
+* [Configuration](#configuration)
+* [Testing](#testing)
+* [Contributing](#contributing)
+* [Copyright](#copyright)
 
-**Update:** It seems that the [issue](https://github.com/wildbit/postmark-rails/issues/17#issuecomment-13761405) was fixed in the `0.9.19` version of the [postmark gem](https://github.com/wildbit/postmark-gem), which marks this gem as obligatory. However I have not decided what to do, so simple_postmark will still be there for a while. At least until Rails `4.0` is released.
+## About
 
----
+simple_postmark was created because of the lack of the proper Rails API support in the official [postmark-gem](https://github.com/wildbit/postmark-gem). This was back in 2011, the postmark-gem was [updated](https://github.com/wildbit/postmark-rails/issues/17#issuecomment-13761405) to support the Rails API since then. I recently decided to deprecate this gem in favor of the official gem. However, this gem will continue to support all Rails versions until `5.0`.
 
-Tested against Ruby versions `1.9.2`, `1.9.3` and Rails versions `3.0.x`, `3.1.x`, `3.2.x`.
-`ruby-head`, `2.0` and Rails `master` should work too btw.
-
-If you are still using Ruby `1.8.7` or `Ruby Enterprise Edition` with Rails, you can use the backported version of this gem called [simple_postmark18](https://github.com/haihappen/simple_postmark/tree/ruby18).
+Tested against Ruby version `>= 1.9.3` up to `=< 2.2.0` and Rails versions `~> 3.0.0` up to `~> 4.1.0`.
 
 ## Installation
 
@@ -60,7 +63,7 @@ class NotificationMailer < ActionMailer::Base
 end
 ```
 
-## Advanced Configuration
+## Configuration
 
 * `api_key`: Your Postmark API key. Go to [your Rack](https://postmarkapp.com/servers),
 selected the one you want to use and then go to the **Credentials** tab to find your API key.
@@ -108,7 +111,7 @@ With this setup, it will actually trigger a connection to the Postmark API, but
 
 (The MIT license)
 
-Copyright (c) 2011-2013 Mario Uher
+Copyright (c) 2011-2015 Mario Uher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList['spec/**/*_spec.rb']
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 task default: :test

data/gemfiles/Rails_4_0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'rails', '~> 4.0.0'

data/gemfiles/Rails_4_1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'rails', '~> 4.0.0'

data/lib/simple_postmark/version.rb

@@ -1,3 +1,3 @@
 module SimplePostmark
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/simple_postmark.gemspec

@@ -6,19 +6,20 @@ Gem::Specification.new do |gem|
   gem.version       = SimplePostmark::VERSION
   gem.authors       = 'Mario Uher'
   gem.email         = 'uher.mario@gmail.com'
-  gem.description   = 'SimplePostmark makes it easy to send mails via Postmark™ using Rails\'s ActionMailer.'
-  gem.summary       = 'A simple way to use Postmark™ with your Rails app.'
+  gem.description   = 'SimplePostmark makes it easy to send mails via Postmark using Rails\'s ActionMailer.'
+  gem.summary       = 'A simple way to use Postmark with your Rails app.'
   gem.homepage      = 'http://haihappen.github.com/simple_postmark'
 
   gem.files         = `git ls-files`.split("\n")
   gem.require_path  = 'lib'
 
-  gem.add_dependency 'activesupport', '>= 3.0'
+  gem.add_dependency 'activesupport', '>= 3.0', '< 4.2.0'
+  gem.add_dependency 'actionmailer',  '>= 3.0', '< 4.2.0'
   gem.add_dependency 'httparty'
   gem.add_dependency 'json'
   gem.add_dependency 'mail'
 
-  gem.add_development_dependency 'minitest'
-  gem.add_development_dependency 'rails', '>= 3.0'
+  gem.add_development_dependency 'minitest', '>= 4.0', '< 5.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'webmock'
 end

data/test/mail/message_test.rb

@@ -0,0 +1,7 @@
+require_relative '../test_helper'
+
+class Mail::MessageTest < MiniTest::Unit::TestCase
+  def test_responds_to_to_postmark
+    assert_respond_to Mail::Message.new, :to_postmark
+  end
+end

data/test/mail/part_test.rb

@@ -0,0 +1,38 @@
+require_relative '../test_helper'
+
+class Mail::PartTest < MiniTest::Unit::TestCase
+  def test_responds_to_to_postmark
+    assert_respond_to Mail::Part.new, :to_postmark
+  end
+
+
+  def test_to_postmark_text_part
+    content = %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!}
+
+    part = Mail::Part.new
+    part.body = content
+    part.content_type = 'text/plain'
+
+    assert_equal Hash['Name' => nil, 'Content' => content, 'ContentType' => 'text/plain'], part.to_postmark
+  end
+
+
+  def test_to_postmark_mail_part
+    content = %{<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>}
+
+    part = Mail::Part.new
+    part.body = content
+    part.content_type = 'text/html'
+
+    assert_equal Hash['Name' => nil, 'Content' => content, 'ContentType' => 'text/html'], part.to_postmark
+  end
+
+
+  def test_to_postmark_file_part
+    part = Mail::Part.new
+    part.add_file BROCODE
+    attachment = part.attachments.first
+
+    assert_equal Hash['Name' => 'thebrocode.jpg', 'Content' => [File.read(BROCODE)].pack('m'), 'ContentType' => 'image/jpeg'], attachment.to_postmark
+  end
+end

data/test/mail_test.rb

@@ -0,0 +1,92 @@
+require_relative 'test_helper'
+
+class MailTest < MiniTest::Unit::TestCase
+  def test_responds_to_to_postmark
+    assert_respond_to Mail.new, :to_postmark
+  end
+
+
+  def build_mail
+    Mail.new do
+      from     'barney@himym.tld'
+      to       'ted@himym.tld'
+      subject  %{I'm your bro!}
+      body     %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!}
+      tag      'simple-postmark'
+    end
+  end
+
+
+  def test_to_postmark_returns_a_hash
+    hash = {
+      'From'        => 'barney@himym.tld',
+      'To'          => 'ted@himym.tld',
+      'Subject'     => %{I'm your bro!},
+      'TextBody'    => %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!},
+      'Tag'         => 'simple-postmark',
+      'Attachments' => [{
+        'Name'        => 'thebrocode.jpg',
+        'Content'     => [File.read(BROCODE)].pack('m'),
+        'ContentType' => 'image/jpeg'
+      }]
+    }
+
+    mail = build_mail
+    mail.add_file BROCODE
+
+    assert_equal hash, mail.to_postmark
+  end
+
+
+  def test_multiple_recipients
+    mail = build_mail
+    mail.to = ['barney@himym.tld', 'marshall@himym.tld']
+
+    assert_equal 'barney@himym.tld, marshall@himym.tld', mail.to_postmark.fetch('To')
+  end
+
+
+  def test_email_headers
+    hash = {
+      'Bcc'      => 'lily@himym.tld',
+      'Cc'       => 'marshall@himym.tld',
+      'From'     => 'barney@himym.tld',
+      'ReplyTo'  => 'barney@barneystinsonblog.com',
+      'Subject'  => %{I'm your bro!},
+      'Tag'      => 'simple-postmark',
+      'TextBody' => %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!},
+      'To'       => 'ted@himym.tld'
+    }
+
+    mail = build_mail
+    mail.bcc = 'lily@himym.tld'
+    mail.cc = 'marshall@himym.tld'
+    mail.reply_to = 'barney@barneystinsonblog.com'
+
+    assert_equal hash, mail.to_postmark
+  end
+
+
+  def test_from_and_reply_to
+    hash = {
+      'To'       => 'Lily <lily@himym.tld>',
+      'From'     => 'Marshall <marshall@himym.tld>',
+      'ReplyTo'  => 'Barney <barney@barneystinsonblog.com>',
+      'Bcc'      => 'lily@himym.tld',
+      'Cc'       => 'marshall@himym.tld',
+      'Subject'  => %{I'm your bro!},
+      'Tag'      => 'simple-postmark',
+      'TextBody' => %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!},
+    }
+
+    mail = build_mail
+    mail.to = 'Lily <lily@himym.tld>'
+    mail.from = 'Marshall <marshall@himym.tld>'
+    mail.reply_to = 'Barney <barney@barneystinsonblog.com>'
+    mail.bcc = 'lily@himym.tld'
+    mail.cc = 'marshall@himym.tld'
+
+    assert_equal hash, mail.to_postmark
+  end
+end
+

data/test/simple_postmark/api_test.rb

@@ -0,0 +1,69 @@
+require_relative '../test_helper'
+
+
+class SimplePostmark::APITest < MiniTest::Unit::TestCase
+  def setup
+    ActionMailer::Base.add_delivery_method :simple_postmark, Mail::SimplePostmark, api_key: nil
+    ActionMailer::Base.delivery_method = :simple_postmark
+    ActionMailer::Base.simple_postmark_settings = { api_key: 'POSTMARK_API_TEST', return_response: true }
+    ActionMailer::Base.raise_delivery_errors = true
+
+    load File.join(File.dirname(__FILE__), '../test_mailer.rb')
+
+    WebMock.disable!
+  end
+
+
+  def test_send_email
+    TestMailer.email.deliver
+  end
+
+
+  def test_send_email_with_tags
+    TestMailer.email_with_tags.deliver
+  end
+
+
+  def test_send_email_with_attachments
+    TestMailer.email_with_attachments.deliver
+  end
+
+
+  def test_send_email_with_reply_to
+    TestMailer.email_with_reply_to.deliver
+  end
+
+
+  def test_fails_using_wrong_settings
+    ActionMailer::Base.simple_postmark_settings = { api_key: '********-****-****-****-************', return_response: true }
+
+    assert_raises SimplePostmark::APIError do
+      TestMailer.email.deliver
+    end
+  end
+
+
+  def test_can_be_silent
+    ActionMailer::Base.simple_postmark_settings = { api_key: '********-****-****-****-************', return_response: true }
+    ActionMailer::Base.raise_delivery_errors = false
+
+    TestMailer.email.deliver
+  end
+
+
+  def test_parsed_response
+    response = TestMailer.email.deliver!.parsed_response
+
+    assert_equal 'ted@himym.tld', response.fetch('To')
+    assert_equal 'Test job accepted', response.fetch('Message')
+    assert response.fetch('MessageID')
+  end
+
+
+  def teardown
+    WebMock.enable!
+
+    ActionMailer::Base.delivery_method = :test
+  end
+end
+

data/test/simple_postmark/integration_test.rb

@@ -0,0 +1,91 @@
+require_relative '../test_helper'
+
+
+class IntegrationTest < MiniTest::Unit::TestCase
+  URL = 'http://api.postmarkapp.com/email'
+  API_KEY = '********-****-****-****-************'
+
+  HEADERS = {
+    'Accept'                  => 'application/json',
+    'ContentType'             => 'application/json',
+    'X-Postmark-Server-Token' => API_KEY
+  }
+
+  BODY = {
+    'From'     => 'barney@himym.tld',
+    'Subject'  => %{I'm your bro!},
+    'TextBody' => %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!},
+    'To'       => 'ted@himym.tld'
+  }
+
+
+  def setup
+    ActionMailer::Base.add_delivery_method :simple_postmark, Mail::SimplePostmark, api_key: nil
+    ActionMailer::Base.delivery_method = :simple_postmark
+    ActionMailer::Base.simple_postmark_settings = { api_key: API_KEY, return_response: true }
+    ActionMailer::Base.raise_delivery_errors = true
+
+    WebMock.enable!
+  end
+
+
+  def test_responds_to_simple_postmark_settings
+    assert_respond_to ActionMailer::Base, :simple_postmark_settings
+  end
+
+
+  def test_set_api_key
+    assert_equal API_KEY, ActionMailer::Base.simple_postmark_settings.fetch(:api_key)
+  end
+
+
+  def test_send_email
+    stub_request :post, URL
+    TestMailer.email.deliver
+
+    assert_requested :post, URL, headers: HEADERS, body: BODY.to_json
+  end
+
+
+  def test_send_email_with_tags
+    stub_request :post, URL
+    TestMailer.email_with_tags.deliver
+
+    assert_requested :post, URL, headers: HEADERS, body: Hash[BODY.merge('Tag' => 'simple-postmark').sort].to_json
+  end
+
+
+  def test_send_email_with_attachments
+    attachment = {
+      'Content'     => [BROCODE].pack('m'),
+      'ContentType' => 'image/jpeg',
+      'Name'        => 'thebrocode.jpg'
+    }
+
+    stub_request :post, URL
+    TestMailer.email_with_attachments.deliver
+
+    assert_requested :post, URL, headers: HEADERS, body: Hash[BODY.merge('Subject' => %{The Brocode!}, 'Attachments' => [attachment]).sort].to_json
+  end
+
+
+  def test_send_email_with_multipart
+    multipart = {
+      'HtmlBody' => %{<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>},
+      'TextBody' => %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!}
+    }
+
+    stub_request :post, URL
+    TestMailer.email_with_multipart.deliver
+
+    assert_requested :post, URL, headers: HEADERS, body: Hash[BODY.merge(multipart).sort].to_json
+  end
+
+
+  def teardown
+    ActionMailer::Base.delivery_method = :test
+
+    WebMock.disable!
+  end
+end
+

data/test/simple_postmark_test.rb

@@ -0,0 +1,31 @@
+require_relative 'test_helper'
+
+class SimplePostmarkTest < MiniTest::Unit::TestCase
+  def test_responds_to_deliver!
+    assert_respond_to Mail::SimplePostmark.new, :deliver!
+  end
+
+
+  def test_makes_request
+    WebMock.enable!
+
+    url = 'http://api.postmarkapp.com/email'
+
+    mail = Mail.new do
+      from     'barney@himym.tld'
+      to       'ted@himym.tld'
+      subject  %{I'm your bro!}
+      body     %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!}
+      tag      'simple-postmark'
+      add_file BROCODE
+    end
+
+    mail.delivery_method Mail::SimplePostmark
+    stub_request :post, url
+    mail.deliver
+
+    assert_requested :post, url, headers: { 'Accept' => 'application/json', 'ContentType' => 'application/json', 'X-Postmark-Server-Token' => '' }
+
+    WebMock.disable!
+  end
+end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,9 +1,11 @@
 $: << File.expand_path('../../lib', __FILE__)
-
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'minitest/spec'
+require 'webmock/minitest'
 
+require 'action_mailer'
 require 'simple_postmark'
 
-require 'webmock/minitest'
+require_relative 'test_mailer'
+
+BROCODE = File.join(File.dirname(__FILE__), 'thebrocode.jpg')

data/test/test_mailer.rb

@@ -0,0 +1,41 @@
+class TestMailer < ActionMailer::Base
+  default from: 'barney@himym.tld', to: 'ted@himym.tld'
+
+  def text
+    %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!}
+  end
+
+  def email
+    mail subject: %{I'm your bro!} do |as|
+      as.text { render text: text }
+    end
+  end
+
+  def email_with_tags
+    mail subject: %{I'm your bro!}, tag: 'simple-postmark' do |as|
+      as.text { render text: text }
+    end
+  end
+
+  def email_with_attachments
+    attachments['thebrocode.jpg'] = BROCODE
+
+    mail subject: %{The Brocode!} do |as|
+      as.text { render text: text }
+    end
+  end
+
+  def email_with_reply_to
+    mail subject: %{I'm your bro!}, reply_to: 'barney@barneystinsonblog.com' do |as|
+      as.text { render text: text }
+    end
+  end
+
+
+  def email_with_multipart
+    mail subject: %{I'm your bro!} do |as|
+      as.text { render text: %{Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!} }
+      as.html { render text: %{<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>} }
+    end
+  end
+end

metadata

@@ -1,137 +1,154 @@
 --- !ruby/object:Gem::Specification
 name: simple_postmark
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-  type: :runtime
-  name: activesupport
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :runtime
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
+- !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
+- !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-  type: :development
-  name: rails
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-description: SimplePostmark makes it easy to send mails via Postmark™ using Rails's
+description: SimplePostmark makes it easy to send mails via Postmark using Rails's
   ActionMailer.
 email: uher.mario@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -139,7 +156,8 @@ files:
 - gemfiles/Rails_3_0.gemfile
 - gemfiles/Rails_3_1.gemfile
 - gemfiles/Rails_3_2.gemfile
-- gemfiles/Rails_master.gemfile
+- gemfiles/Rails_4_0.gemfile
+- gemfiles/Rails_4_1.gemfile
 - lib/simple_postmark.rb
 - lib/simple_postmark/api_error.rb
 - lib/simple_postmark/delivery_method.rb
@@ -148,35 +166,37 @@ files:
 - lib/simple_postmark/railtie.rb
 - lib/simple_postmark/version.rb
 - simple_postmark.gemspec
-- spec/delivery_method_spec.rb
-- spec/integration_spec.rb
-- spec/mail_ext/message_spec.rb
-- spec/mail_ext/part_spec.rb
-- spec/railtie_spec.rb
-- spec/spec_helper.rb
-- spec/thebrocode.jpg
+- test/mail/message_test.rb
+- test/mail/part_test.rb
+- test/mail_test.rb
+- test/simple_postmark/api_test.rb
+- test/simple_postmark/integration_test.rb
+- test/simple_postmark_test.rb
+- test/test_helper.rb
+- test/test_mailer.rb
+- test/thebrocode.jpg
 homepage: http://haihappen.github.com/simple_postmark
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: A simple way to use Postmark™ with your Rails app.
+specification_version: 4
+summary: A simple way to use Postmark with your Rails app.
 test_files: []
+has_rdoc: 

data/gemfiles/Rails_master.gemfile

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activesupport', github: 'rails/rails'
-gem 'httparty'
-gem 'json'
-gem 'mail'
-
-group :development do
-  gem 'minitest'
-  gem 'rails', github: 'rails/rails'
-  gem 'webmock'
-end

data/spec/delivery_method_spec.rb

@@ -1,44 +0,0 @@
-require_relative 'spec_helper'
-
-describe Mail do
-  describe SimplePostmark do
-    let(:instance) { Mail::SimplePostmark.new }
-
-
-    it 'responds to deliver!' do
-      instance.must_respond_to(:deliver!)
-    end
-
-
-    describe :deliver! do
-      let(:mail) do
-        Mail.new do
-          from     'barney@himym.tld'
-          to       'ted@himym.tld'
-          subject  "I'm your bro!"
-          body     "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!"
-          tag      'simple-postmark'
-          add_file(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))
-        end
-      end
-      let(:url) { 'http://api.postmarkapp.com/email' }
-
-
-      before do
-        mail.delivery_method(Mail::SimplePostmark)
-        stub_request(:post, url)
-        mail.deliver
-      end
-
-
-      it 'sends emails' do
-        assert_requested(:post, url)
-      end
-
-
-      it 'sends appropriate headers' do
-        assert_requested(:post, url, headers: { 'Accept' => 'application/json', 'ContentType' => 'application/json', 'X-Postmark-Server-Token' => '' })
-      end
-    end
-  end
-end

data/spec/integration_spec.rb

@@ -1,101 +0,0 @@
-require_relative 'spec_helper'
-require 'action_mailer'
-require 'rails'
-require 'simple_postmark/railtie'
-
-WebMock.allow_net_connect!
-
-class IntegrationMailer < ActionMailer::Base
-  default from: 'barney@himym.tld', to: 'ted@himym.tld'
-
-  def text
-    'Mail send via Postmark using SimplePostmark'
-  end
-
-  def email
-    mail(subject: 'SimplePostmark') do |as|
-      as.text { render(text: text) }
-    end
-  end
-
-  def email_with_tags
-    mail(subject: 'SimplePostmark with Tags', tag: 'simple-postmark') do |as|
-      as.text { render(text: text) }
-    end
-  end
-
-  def email_with_attachments
-    attachments['thebrocode.jpg'] = File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))
-
-    mail(subject: 'SimplePostmark with Attachments') do |as|
-      as.text { render(text: text) }
-    end
-  end
-
-  def email_with_reply_to
-    mail(subject: 'SimplePostmark with Reply To', reply_to: 'barney@barneystinsonblog.com') do |as|
-      as.text { render(text: text) }
-    end
-  end
-end
-
-describe 'SimplePostmark integration' do
-  before do
-    ActionMailer::Base.simple_postmark_settings = { api_key: 'POSTMARK_API_TEST', return_response: true }
-    ActionMailer::Base.raise_delivery_errors = true
-  end
-
-
-  it 'sends emails' do
-    IntegrationMailer.email.deliver
-  end
-
-
-  it 'sends emails with tags' do
-    IntegrationMailer.email_with_tags.deliver
-  end
-
-
-  it 'sends emails with attachments' do
-    IntegrationMailer.email_with_attachments.deliver
-  end
-
-
-  it 'sends emails with reply-to' do
-    IntegrationMailer.email_with_reply_to.deliver
-  end
-
-
-  describe 'wrong mail settings' do
-    before do
-      ActionMailer::Base.simple_postmark_settings = { api_key: '********-****-****-****-************' }
-    end
-
-
-    it 'is silent if raise_delivery_errors is not set' do
-      ActionMailer::Base.raise_delivery_errors = false
-
-      IntegrationMailer.email.deliver
-    end
-
-
-    it 'raises a SimplePostmark::APIError containing the error from postmarkapp.com if raise_delivery_errors is set' do
-      ->{ IntegrationMailer.email.deliver }.must_raise(SimplePostmark::APIError)
-    end
-  end
-
-
-  describe 'setting return_response option' do
-    before do
-      ActionMailer::Base.simple_postmark_settings = { api_key: 'POSTMARK_API_TEST', return_response: true }
-    end
-
-    it 'returns the response from postmarkapp.com' do
-      response = IntegrationMailer.email.deliver!.parsed_response
-
-      response['To'].must_equal('ted@himym.tld')
-      response['Message'].must_equal('Test job accepted')
-      response['MessageID'].wont_be_empty
-    end
-  end
-end

data/spec/mail_ext/message_spec.rb

@@ -1,103 +0,0 @@
-require_relative '../spec_helper'
-
-describe Mail::Message do
-  describe 'integration into Mail::Message' do
-    subject { Mail::Message.new }
-
-
-    it 'responds to +to_postmark+' do
-      subject.must_respond_to(:to_postmark)
-    end
-  end
-
-
-  describe 'integration into Mail' do
-    subject { Mail.new }
-
-
-    it 'responds to +to_postmark+' do
-      subject.must_respond_to(:to_postmark)
-    end
-  end
-
-
-  describe :to_postmark do
-    subject do
-      Mail.new do
-        from     'barney@himym.tld'
-        to       'ted@himym.tld'
-        subject  "I'm your bro!"
-        body     "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!"
-        tag      'simple-postmark'
-      end
-    end
-
-
-    it 'returns a hash' do
-      hash = {
-        'From'        => 'barney@himym.tld',
-        'To'          => 'ted@himym.tld',
-        'Subject'     => "I'm your bro!",
-        'TextBody'    => "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!",
-        'Tag'         => 'simple-postmark',
-        'Attachments' => [{
-          'Name'        => 'thebrocode.jpg',
-          'Content'     => [File.read(File.join(File.dirname(__FILE__), '..', 'thebrocode.jpg'))].pack('m'),
-          'ContentType' => 'image/jpeg'
-        }]
-      }
-      subject.add_file(File.join(File.dirname(__FILE__), '..', 'thebrocode.jpg'))
-      
-      subject.to_postmark.must_equal(hash)
-    end
-
-
-    it 'returns multiple recipients as comma-separated list' do
-      subject.to = ['barney@himym.tld', 'marshall@himym.tld']
-      
-      subject.to_postmark['To'].must_equal('barney@himym.tld, marshall@himym.tld')
-    end
-
-
-    it 'returns all email headers as hash' do
-      subject.bcc = 'lily@himym.tld'
-      subject.cc = 'marshall@himym.tld'
-      subject.reply_to = 'barney@barneystinsonblog.com'
-      
-      hash = {
-        'Bcc'      => 'lily@himym.tld',
-        'Cc'       => 'marshall@himym.tld',
-        'From'     => 'barney@himym.tld',
-        'ReplyTo'  => 'barney@barneystinsonblog.com',
-        'Subject'  => "I'm your bro!",
-        'Tag'      => 'simple-postmark',
-        'TextBody' => "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!",
-        'To'       => 'ted@himym.tld'
-      }
-      
-      subject.to_postmark.must_equal(hash)
-    end
-
-
-    it 'should use the from and reply-to names as well as the email addresses' do
-      subject.to = 'Lily <lily@himym.tld>'
-      subject.from = 'Marshall <marshall@himym.tld>'
-      subject.reply_to = 'Barney <barney@barneystinsonblog.com>'
-      subject.bcc = 'lily@himym.tld'
-      subject.cc = 'marshall@himym.tld'
-      
-      hash = {
-        'To'       => 'Lily <lily@himym.tld>',
-        'From'     => 'Marshall <marshall@himym.tld>',
-        'ReplyTo'  => 'Barney <barney@barneystinsonblog.com>',
-        'Bcc'      => 'lily@himym.tld',
-        'Cc'       => 'marshall@himym.tld',
-        'Subject'  => "I'm your bro!",
-        'Tag'      => 'simple-postmark',
-        'TextBody' => "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!",
-      }
-      
-      subject.to_postmark.must_equal(hash)
-    end
-  end
-end

data/spec/mail_ext/part_spec.rb

@@ -1,62 +0,0 @@
-require_relative '../spec_helper'
-
-describe 'Mail::Part' do
-  describe 'integration into Mail::Part' do
-    subject { Mail::Part.new }
-
-
-    it 'responds to +to_postmark+' do
-      subject.must_respond_to(:to_postmark)
-    end
-  end
-
-
-  describe :to_postmark do
-    describe 'a text/plain part' do
-      let(:content) { "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!" }
-      subject do
-        Mail::Part.new.tap do |mail|
-          mail.body = content
-          mail.content_type = 'text/plain'
-        end
-      end
-
-
-      it 'returns body hash' do
-        subject.to_postmark.must_equal('Name' => nil, 'Content' => content, 'ContentType' => 'text/plain')
-      end
-    end
-
-
-    describe 'a text/html part' do
-      let(:content) { "<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>" }
-      subject do
-        Mail::Part.new.tap do |mail|
-          mail.body = content
-          mail.content_type = 'text/html'
-        end
-      end
-
-
-      it 'returns body hash' do
-        subject.to_postmark.must_equal('Name' => nil, 'Content' => content, 'ContentType' => 'text/html')
-      end
-    end
-
-
-    describe 'a file part' do
-      let(:file) { File.join(File.dirname(__FILE__), '..', 'thebrocode.jpg') }
-      let(:content) { [File.read(file)].pack('m') }
-      subject do
-        Mail::Part.new.tap do |mail|
-          mail.add_file(file)
-        end.attachments.first
-      end
-
-
-      it 'returns base64-encoded file-content hash if part is an attachment' do
-        subject.to_postmark.must_equal('Name' => 'thebrocode.jpg', 'Content' => content, 'ContentType' => 'image/jpeg')
-      end
-    end
-  end
-end

data/spec/railtie_spec.rb

@@ -1,118 +0,0 @@
-require_relative 'spec_helper'
-require 'action_mailer'
-require 'rails'
-require 'simple_postmark/railtie'
-
-ActionMailer::Base.delivery_method = :simple_postmark
-
-class NotificationMailer < ActionMailer::Base
-  default from: 'barney@himym.tld', to: 'ted@himym.tld'
-
-  def im_your_bro
-    mail(subject: "I'm your bro!", body: '')
-  end
-
-  def im_your_bro_tagged
-    mail(subject: "I'm your bro!", tag: 'simple-postmark', body: '')
-  end
-
-  def im_your_bro_multipart
-    mail(subject: "I'm your bro!") do |as|
-      as.html { render(text: "<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>" )}
-      as.text { render(text: "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!" )}
-    end
-  end
-
-  def the_bro_code
-    attachments['thebrocode.jpg'] = File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))
-    mail(subject: 'The Brocode!', body: '')
-  end
-end
-
-def merge_body(hash = {})
-  Hash[*body.merge(hash).sort.flatten(1)].to_json
-end
-
-describe ActionMailer::Base do
-  let(:url) { 'http://api.postmarkapp.com/email' }
-  let(:api_key) { '********-****-****-****-************' }
-
-  let(:headers) do
-    {
-      'Accept'                  => 'application/json',
-      'ContentType'             => 'application/json',
-      'X-Postmark-Server-Token' => api_key
-    }
-  end
-
-  let(:body) do
-    {
-      'From'    => 'barney@himym.tld',
-      'Subject' => "I'm your bro!",
-      'To'      => 'ted@himym.tld'
-    }
-  end
-
-
-  before do
-    stub_request(:post, url)
-  end
-
-
-  it 'responds to +simple_postmark_settings+' do
-    ActionMailer::Base.must_respond_to(:simple_postmark_settings)
-  end
-
-
-  it 'allows setting an api key' do
-    ActionMailer::Base.simple_postmark_settings = { api_key: api_key }
-
-    ActionMailer::Base.simple_postmark_settings[:api_key].must_equal(api_key)
-  end
-
-
-  describe 'sending mails' do
-    before do
-      ActionMailer::Base.simple_postmark_settings = { api_key: api_key }
-    end
-
-
-    it 'works' do
-      NotificationMailer.im_your_bro.deliver
-
-      assert_requested(:post, url, headers: headers, body: merge_body)
-    end
-
-
-    it 'allows tags' do
-      NotificationMailer.im_your_bro_tagged.deliver
-
-      assert_requested(:post, url, headers: headers, body: merge_body('Tag' => 'simple-postmark'))
-    end
-
-
-    it 'works with attachments' do
-      attachment = {
-        'Content'     => [File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))].pack('m'),
-        'ContentType' => 'image/jpeg',
-        'Name'        => 'thebrocode.jpg'
-      }
-
-      NotificationMailer.the_bro_code.deliver
-
-      assert_requested(:post, url, headers: headers, body: merge_body('Subject' => 'The Brocode!', 'Attachments' => [attachment]))
-    end
-
-
-    it 'works with multipart messages' do
-      bodies = {
-        'HtmlBody' => "<p>Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome.<br /><br />I'm your bro-I'm Broda!</p>",
-        'TextBody' => "Think of me like Yoda, but instead of being little and green I wear suits and I'm awesome. I'm your bro-I'm Broda!"
-      }
-
-      NotificationMailer.im_your_bro_multipart.deliver
-
-      assert_requested(:post, url, headers: headers, body: merge_body(bodies))
-    end
-  end
-end