simple_postmark 0.5.1 → 0.5.2

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
 
 gemfile:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.2 (May 11, 2013)
+* Some refactoring.
+* Ruby 2.0 support!
+* Rails 4.pre support! Thank you @frodsan! :)
+* Updated README.md: simple_postmark will die… someday! :(
+* Fixed some problems: #8 and #10.
+
 ## 0.5.1 (December 21, 2012)
 
 * Prepared for gem-release.

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gemspec

data/README.md

@@ -1,12 +1,19 @@
-# simple_postmark
+# simple_postmark [![Build Status](https://travis-ci.org/haihappen/simple_postmark.png)](https://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.
+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.~~
+
+---
+
+**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.
+
+---
 
 Tested against Ruby versions `1.9.2`, `1.9.3` and Rails versions `3.0.x`, `3.1.x`, `3.2.x`.
-`ruby-head` (a.k.a. Ruby `2.0`) and Rails `master` (upcoming Rails `4.0`) should work too btw.
+`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 3, you can use the backported version of this gem called [simple_postmark18](https://github.com/haihappen/simple_postmark/tree/ruby18).
+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).
 
 ## Installation
 
@@ -27,7 +34,7 @@ config.action_mailer.simple_postmark_settings = { api_key: '********-****-****-*
 
 ## Usage
 
-Just use your standard Rails 3 Mailer:
+Just use your standard Rails Mailer:
 
 ```ruby
 class NotificationMailer < ActionMailer::Base
@@ -101,7 +108,7 @@ With this setup, it will actually trigger a connection to the Postmark API, but
 
 (The MIT license)
 
-Copyright (c) 2011-2012 Mario Uher
+Copyright (c) 2011-2013 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,8 +1,7 @@
-require 'rake'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.test_files = Dir.glob('spec/**/*_spec.rb')
+  t.test_files = FileList['spec/**/*_spec.rb']
 end
 
-task(default: :test)
+task default: :test

data/gemfiles/Rails_3_0.gemfile

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

data/gemfiles/Rails_3_1.gemfile

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

data/gemfiles/Rails_3_2.gemfile

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

data/gemfiles/Rails_master.gemfile

@@ -1,7 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activesupport', github: 'rails/rails'
-gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
 gem 'httparty'
 gem 'json'
 gem 'mail'

data/lib/simple_postmark.rb

@@ -1,5 +1,4 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/inflector/methods'
+require 'active_support/core_ext'
 require 'httparty'
 require 'json'
 require 'mail'
@@ -12,4 +11,4 @@ module SimplePostmark
   require 'simple_postmark/api_error'
 
   require 'simple_postmark/railtie' if defined?(Rails)
-end
+end

data/lib/simple_postmark/api_error.rb

@@ -4,4 +4,4 @@ module SimplePostmark
       super(response.parsed_response['Message'])
     end
   end
-end
+end

data/lib/simple_postmark/delivery_method.rb

@@ -1,19 +1,16 @@
 module Mail
-  class SimplePostmark
+  class SimplePostmark < Struct.new(:settings)
     include HTTParty
 
-    def initialize(values)
-      self.settings = { api_key: '********-****-****-****-************' }.merge(values)
-    end
-
-    attr_accessor :settings
     base_uri 'http://api.postmarkapp.com'
     headers 'Accept' => 'application/json', 'ContentType' => 'application/json'
+    delegate :post, :headers, to: self
 
     def deliver!(mail)
-      api_key = { 'X-Postmark-Server-Token' => settings[:api_key].to_s }
-
-      response = self.class.post('/email', headers: self.class.headers.merge(api_key), body: mail.to_postmark.to_json)
+      headers = self.headers.merge('X-Postmark-Server-Token' => settings[:api_key].to_s)
+      body = mail.to_postmark.to_json
+      
+      response = post('/email', headers: headers, body: body)
       raise ::SimplePostmark::APIError.new(response) unless response.success?
       response
     end

data/lib/simple_postmark/mail_ext/part.rb

@@ -8,4 +8,4 @@ module Mail
       end
     end
   end
-end
+end

data/lib/simple_postmark/railtie.rb

@@ -1,5 +1,5 @@
 module SimplePostmark
-  class Railtie < ::Rails::Railtie
-    ActionMailer::Base.add_delivery_method(:simple_postmark, Mail::SimplePostmark, api_key: nil)
+  class Railtie < Rails::Railtie
+    ActionMailer::Base.add_delivery_method :simple_postmark, Mail::SimplePostmark, api_key: nil
   end
-end
+end

data/lib/simple_postmark/version.rb

@@ -1,3 +1,3 @@
 module SimplePostmark
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/simple_postmark.gemspec

@@ -1,23 +1,24 @@
-require './lib/simple_postmark/version'
+$: << File.expand_path('../lib', __FILE__)
+require 'simple_postmark/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'simple_postmark'
   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 3\'s ActionMailer.'
+  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'
   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'
+  gem.add_development_dependency 'rails', '>= 3.0'
   gem.add_development_dependency 'webmock'
 end

data/spec/delivery_method_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path('../spec_helper', __FILE__)
+require_relative 'spec_helper'
 
 describe Mail do
   describe SimplePostmark do
-    let(:instance) { Mail::SimplePostmark.new({}) }
+    let(:instance) { Mail::SimplePostmark.new }
 
 
     it 'responds to deliver!' do
@@ -27,21 +27,18 @@ describe Mail do
       before do
         mail.delivery_method(Mail::SimplePostmark)
         stub_request(:post, url)
+        mail.deliver
       end
 
 
       it 'sends emails' do
-        mail.deliver
-        
         assert_requested(:post, url)
       end
 
 
       it 'sends appropriate headers' do
-        mail.deliver
-        
-        assert_requested(:post, url, headers: { 'Accept' => 'application/json', 'ContentType' => 'application/json', 'X-Postmark-Server-Token' => '********-****-****-****-************' })
+        assert_requested(:post, url, headers: { 'Accept' => 'application/json', 'ContentType' => 'application/json', 'X-Postmark-Server-Token' => '' })
       end
     end
   end
-end
+end

data/spec/integration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require_relative 'spec_helper'
 require 'action_mailer'
 require 'rails'
 require 'simple_postmark/railtie'

data/spec/mail_ext/message_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require_relative '../spec_helper'
 
 describe Mail::Message do
   describe 'integration into Mail::Message' do

data/spec/mail_ext/part_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require_relative '../spec_helper'
 
 describe 'Mail::Part' do
   describe 'integration into Mail::Part' do

data/spec/railtie_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require_relative 'spec_helper'
 require 'action_mailer'
 require 'rails'
 require 'simple_postmark/railtie'
@@ -9,11 +9,11 @@ class NotificationMailer < ActionMailer::Base
   default from: 'barney@himym.tld', to: 'ted@himym.tld'
 
   def im_your_bro
-    mail(subject: "I'm your bro!")
+    mail(subject: "I'm your bro!", body: '')
   end
 
   def im_your_bro_tagged
-    mail(subject: "I'm your bro!", tag: 'simple-postmark')
+    mail(subject: "I'm your bro!", tag: 'simple-postmark', body: '')
   end
 
   def im_your_bro_multipart
@@ -25,7 +25,7 @@ class NotificationMailer < ActionMailer::Base
 
   def the_bro_code
     attachments['thebrocode.jpg'] = File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))
-    mail(subject: 'The Brocode!')
+    mail(subject: 'The Brocode!', body: '')
   end
 end
 
@@ -66,7 +66,7 @@ describe ActionMailer::Base 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)
   end
 
@@ -79,14 +79,14 @@ describe ActionMailer::Base do
 
     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
 
@@ -97,9 +97,9 @@ describe ActionMailer::Base do
         '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
 
@@ -109,10 +109,10 @@ describe ActionMailer::Base do
         '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
+end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$: << File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/spec'
+
 require 'simple_postmark'
+
 require 'webmock/minitest'

metadata

@@ -2,41 +2,41 @@
 name: simple_postmark
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
-  name: activesupport
   type: :runtime
-  prerelease: false
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: httparty
   type: :runtime
-  prerelease: false
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -44,15 +44,15 @@ dependencies:
         version: '0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: json
   type: :runtime
-  prerelease: false
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -60,15 +60,15 @@ dependencies:
         version: '0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: mail
   type: :runtime
-  prerelease: false
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -76,55 +76,55 @@ dependencies:
         version: '0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
     none: false
-  name: minitest
   type: :development
-  prerelease: false
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
-  name: rails
   type: :development
-  prerelease: false
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: webmock
   type: :development
-  prerelease: false
+  name: webmock
   requirement: !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
-  3's ActionMailer.
+description: SimplePostmark makes it easy to send mails via Postmark™ using Rails's
+  ActionMailer.
 email: uher.mario@gmail.com
 executables: []
 extensions: []
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple way to use Postmark™ with your Rails app.