simple_postmark 0.4.1 → 0.4.2

data/.gitignore

@@ -0,0 +1 @@
+.rbenv-vars

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.4.2 (April 28, 2012)
+
+* SimplePostmark will now raise Postmark API errors if `ActionMailer::Base.raise_delivery_errors` is set.

data/README.md

@@ -1,10 +1,8 @@
-# simple_postmark
+# simple_postmark [![Build Status](https://secure.travis-ci.org/haihappen/simple_postmark.png)](http://travis-ci.org/haihappen/simple_postmark)
 
 SimplePostmark makes it easy to send mails via [Postmark](http://postmarkapp.com)™ using Rails 3's ActionMailer.
 SimplePostmark 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`. SimplePostmark uses the standard Rails 3's ActionMailer syntax to send your emails via Postmark.
 
-[![Build Status](https://secure.travis-ci.org/haihappen/simple_postmark.png)](http://travis-ci.org/haihappen/simple_postmark)
-
 Tested against Ruby versions `1.9.2`, `1.9.3`, `ruby-head` and Rails versions `3.0.x`, `3.1.x`, `3.2.x`, `master` (upcoming Rails `4.0.0`).
 
 If you are still using Ruby `1.8.7` or `Ruby Enterprise Edition` with Rails 3, you can use the backported version of this gem called [simple_postmark18](https://github.com/haihappen/simple_postmark/tree/ruby18).
@@ -54,15 +52,13 @@ class NotificationMailer < ActionMailer::Base
 end
 ```
 
-## Contributing to simple_postmark
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the [issue tracker](https://github.com/haihappen/simple_postmark/issues) to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
 ## Copyright
 

data/gemfiles/Rails_master.gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
-gem 'activesupport', git: 'git://github.com/rails/rails.git'
+gem 'activesupport', github: 'rails/rails'
+gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
 gem 'httparty'
 gem 'json'
 gem 'mail'
@@ -8,6 +9,6 @@ gem 'mail'
 group :development do
   gem 'minitest'
   gem 'purdytest'
-  gem 'rails', git: 'git://github.com/rails/rails.git'
+  gem 'rails', github: 'rails/rails'
   gem 'webmock'
-end
+end

data/lib/simple_postmark.rb

@@ -9,6 +9,7 @@ module SimplePostmark
   require 'simple_postmark/mail_ext/part'
 
   require 'simple_postmark/delivery_method'
+  require 'simple_postmark/api_error'
 
   require 'simple_postmark/railtie' if defined?(Rails)
 end

data/lib/simple_postmark/api_error.rb

@@ -0,0 +1,7 @@
+module SimplePostmark
+  class APIError < StandardError
+    def initialize(response)
+      super(response.parsed_response['Message'])
+    end
+  end
+end

data/lib/simple_postmark/delivery_method.rb

@@ -13,7 +13,8 @@ module Mail
     def deliver!(mail)
       api_key = { 'X-Postmark-Server-Token' => settings[:api_key].to_s }
       
-      self.class.post('/email', headers: self.class.headers.merge(api_key), body: mail.to_postmark.to_json)
+      response = self.class.post('/email', headers: self.class.headers.merge(api_key), body: mail.to_postmark.to_json)
+      raise ::SimplePostmark::APIError.new(response) unless response.success?
     end
   end
 end

data/simple_postmark.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'simple_postmark'
-  gem.version       = '0.4.1'
+  gem.version       = '0.4.2'
   gem.authors       = 'Mario Uher'
   gem.email         = 'uher.mario@gmail.com'
   gem.description   = 'SimplePostmark makes it easy to send mails via Postmark™ using Rails 3\'s ActionMailer.'

data/spec/delivery_method_spec.rb

@@ -5,7 +5,7 @@ describe Mail do
     let(:instance) { Mail::SimplePostmark.new({}) }
 
 
-    it 'should respond to deliver!' do
+    it 'responds to deliver!' do
       instance.must_respond_to(:deliver!)
     end
 
@@ -23,22 +23,23 @@ describe Mail do
       end
       let(:url) { 'http://api.postmarkapp.com/email' }
 
+
       before do
         mail.delivery_method(Mail::SimplePostmark)
         stub_request(:post, url)
       end
 
 
-      it 'should send emails' do
+      it 'sends emails' do
         mail.deliver
-
+        
         assert_requested(:post, url)
       end
 
 
-      it 'should post appropriate data' do
+      it 'sends appropriate headers' do
         mail.deliver
-
+        
         assert_requested(:post, url, headers: { 'Accept' => 'application/json', 'ContentType' => 'application/json', 'X-Postmark-Server-Token' => '********-****-****-****-************' })
       end
     end

data/spec/integration_spec.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../spec_helper', __FILE__)
+require 'action_mailer'
+require 'rails'
+require 'simple_postmark/railtie'
+
+WebMock.allow_net_connect!
+
+class IntegrationMailer < ActionMailer::Base
+  default to: ENV['SIMPLE_POSTMARK_TO'], from: ENV['SIMPLE_POSTMARK_FROM']
+
+  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: ENV['SIMPLE_POSTMARK_REPLY_TO']) do |as|
+      as.text { render(text: text) }
+    end
+  end
+end
+
+describe 'SimplePostmark integration' do
+  before do
+    ActionMailer::Base.simple_postmark_settings = { api_key: ENV['SIMPLE_POSTMARK_API_KEY'] }
+    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
+end if ENV['SIMPLE_POSTMARK_INTEGRATION_SPEC']

data/spec/mail_ext/message_spec.rb

@@ -1,12 +1,12 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Mail::Message do
-  it 'should respond to +to_postmark+' do
+  it 'responds to +to_postmark+' do
     Mail::Message.new.must_respond_to(:to_postmark)
   end
 
 
-  it 'should respond to +to_postmark+' do
+  it 'responds to +to_postmark+' do
     Mail.new.must_respond_to(:to_postmark)
   end
 
@@ -23,7 +23,7 @@ describe Mail::Message do
     end
 
 
-    it 'should return a hash' do
+    it 'returns a hash' do
       hash = {
         'From'        => 'barney@himym.tld',
         'To'          => 'ted@himym.tld',
@@ -42,14 +42,14 @@ describe Mail::Message do
     end
 
 
-    it 'should return multiple recipients as comma-separated list' do
+    it 'returns multiple recipients as comma-separated list' do
       mail.to = ['barney@himym.tld', 'marshall@himym.tld']
       
       mail.to_postmark['To'].must_equal('barney@himym.tld, marshall@himym.tld')
     end
 
 
-    it 'should return all email headers as hash' do
+    it 'returns all email headers as hash' do
       mail.bcc = 'lily@himym.tld'
       mail.cc = 'marshall@himym.tld'
       mail.reply_to = 'barney@barneystinsonblog.com'

data/spec/mail_ext/part_spec.rb

@@ -1,13 +1,13 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Mail::Part do
-  it 'should respond to +to_postmark+' do
+  it 'responds to +to_postmark+' do
     Mail::Part.new.must_respond_to(:to_postmark)
   end
 
 
   describe :to_postmark do
-    it 'should return body hash if part is not an attachment' do
+    it 'returns body hash if part is not an attachment' do
       part = Mail::Part.new do
         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!"
         content_type 'text/plain'
@@ -19,7 +19,7 @@ describe Mail::Part do
     end
 
 
-    it 'should return body hash if part is not an attachment' do
+    it 'returns body hash if part is not an attachment' do
       part = Mail::Part.new do
         body         "<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>"
         content_type 'text/html'
@@ -31,13 +31,13 @@ describe Mail::Part do
     end
 
 
-    it 'should return base64-encoded file-content hash if part is an attachment' do
+    it 'returns base64-encoded file-content hash if part is an attachment' do
       file = File.join(File.dirname(__FILE__), '..', 'thebrocode.jpg')
       
       part = Mail::Part.new.tap do |mail|
         mail.add_file(file)
       end.attachments.first
-        
+      
       content = [File.read(file)].pack('m')
       
       part.to_postmark.must_equal('Name' => 'thebrocode.jpg', 'Content' => content, 'ContentType' => 'image/jpeg')

data/spec/railtie_spec.rb

@@ -53,17 +53,18 @@ describe ActionMailer::Base do
     }
   end
 
+
   before do
     stub_request(:post, url)
   end
 
 
-  it 'should respond to +simple_postmark_settings+' do
+  it 'responds to +simple_postmark_settings+' do
     ActionMailer::Base.must_respond_to(:simple_postmark_settings)
   end
 
 
-  it 'should allow setting an api key' do
+  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)
@@ -76,21 +77,21 @@ describe ActionMailer::Base do
     end
 
 
-    it 'should work' do
+    it 'works' do
       NotificationMailer.im_your_bro.deliver
       
       assert_requested(:post, url, headers: headers, body: merge_body)
     end
 
 
-    it 'should allow tags' do
+    it 'allows tags' do
       NotificationMailer.im_your_bro_tagged.deliver
       
       assert_requested(:post, url, headers: headers, body: merge_body('Tag' => 'simple-postmark'))
     end
 
 
-    it 'should work with attachments' do
+    it 'works with attachments' do
       attachment = {
         'Content'     => [File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))].pack('m'),
         'ContentType' => 'image/jpeg',
@@ -103,7 +104,7 @@ describe ActionMailer::Base do
     end
 
 
-    it 'should work with multipart messages' do
+    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!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_postmark
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70349875971380 !ruby/object:Gem::Requirement
+  requirement: &70104640539960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349875971380
+  version_requirements: *70104640539960
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70349875970980 !ruby/object:Gem::Requirement
+  requirement: &70104640539460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349875970980
+  version_requirements: *70104640539460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70349875970520 !ruby/object:Gem::Requirement
+  requirement: &70104640538860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349875970520
+  version_requirements: *70104640538860
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70349875970100 !ruby/object:Gem::Requirement
+  requirement: &70104640538360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349875970100
+  version_requirements: *70104640538360
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70349876018780 !ruby/object:Gem::Requirement
+  requirement: &70104640537860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349876018780
+  version_requirements: *70104640537860
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &70349876018360 !ruby/object:Gem::Requirement
+  requirement: &70104640537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349876018360
+  version_requirements: *70104640537320
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70349876017860 !ruby/object:Gem::Requirement
+  requirement: &70104640536700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70349876017860
+  version_requirements: *70104640536700
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70349876017440 !ruby/object:Gem::Requirement
+  requirement: &70104640552580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349876017440
+  version_requirements: *70104640552580
 description: SimplePostmark makes it easy to send mails via Postmark™ using Rails
   3's ActionMailer.
 email: uher.mario@gmail.com
@@ -106,7 +106,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -115,12 +117,14 @@ files:
 - gemfiles/Rails_3_2.gemfile
 - gemfiles/Rails_master.gemfile
 - lib/simple_postmark.rb
+- lib/simple_postmark/api_error.rb
 - lib/simple_postmark/delivery_method.rb
 - lib/simple_postmark/mail_ext/message.rb
 - lib/simple_postmark/mail_ext/part.rb
 - lib/simple_postmark/railtie.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