postageapp 1.0.23 → 1.0.24

data/.gitignore

@@ -4,4 +4,6 @@ rdoc
 pkg
 test/tmp
 test/log
-Gemfile.lock
+test/gemfiles/*.lock
+Gemfile.lock
+.ruby-version

data/Gemfile

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
+  gem 'minitest'
   gem 'rails'
   gem 'mocha'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-13 Oleg Khabarov, The Working Group, Inc
+Copyright (c) 2011-2014 Oleg Khabarov, The Working Group, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -158,6 +158,21 @@ class Notifier < PostageApp::Mailer
 end
 ```
 
+#### Interceptors
+
+Here's an example of using an interceptor
+
+```ruby
+class DevelopmentPostageappInterceptor
+  def self.delivering_email(postageapp_msg)
+    postageapp_msg.arguments["headers"][:subject] =
+      "[#{postageapp_msg.arguments["recipients"]}] #{postageapp_msg.arguments["headers"][:subject]}"
+    postageapp_msg.arguments["recipients"] = "test@example.com"
+    # postageapp_msg.perform_deliveries = false
+  end
+end
+```
+
 ### Rails 2
 
 Here's an example of a mailer you'd set in in a Rails 2 environment:
@@ -205,20 +220,6 @@ PostageApp.configure do |config|
 end
 ```
 
-Interceptors (Rails 3)
-----------------------
-Here's an example of using an interceptor
-
-```ruby
-class DevelopmentPostageappInterceptor
-  def self.delivering_email(postageapp_msg)
-    postageapp_msg.arguments["headers"][:subject] = "[#{postageapp_msg.arguments["recipients"]}] #{postageapp_msg.arguments["headers"][:subject]}"
-    postageapp_msg.arguments["recipients"] = "test@example.com"
-    # postageapp_msg.perform_deliveries = false
-  end
-end
-```
-
 Copyright
 ---------
-(C) 2011-13 Oleg Khabarov, [The Working Group, Inc](http://www.twg.ca/)
+(C) 2011-2014 Oleg Khabarov, [The Working Group, Inc](http://www.twg.ca/)

data/lib/postageapp/request.rb

@@ -1,5 +1,4 @@
 class PostageApp::Request
-  
   API_VERSION = '1.0'
   
   HEADERS = {
@@ -67,7 +66,17 @@ class PostageApp::Request
     
     response
   end
+
+  # Emulates Mail::Message#html_part
+  def html_part
+    self.arguments && self.arguments['content'] && self.arguments['content']['text/html']
+  end
   
+  # Emulates Mail::Message#text_part
+  def text_part
+    self.arguments && self.arguments['content'] && self.arguments['content']['text/plain']
+  end
+
   # URL of the where PostageApp::Request will be directed at
   def url
     URI.parse("#{PostageApp.configuration.url}/v.#{API_VERSION}/#{self.method}.json")
@@ -91,5 +100,4 @@ class PostageApp::Request
     end
     hash
   end
-  
-end
+end

data/lib/postageapp/version.rb

@@ -1,3 +1,3 @@
 module PostageApp
-  VERSION = "1.0.23"
+  VERSION = "1.0.24"
 end

data/postageapp.gemspec

@@ -6,15 +6,16 @@ require 'postageapp/version'
 Gem::Specification.new do |s|
   s.name          = "postageapp"
   s.version       = PostageApp::VERSION
-  s.authors       = ["Oleg Khabarov", "The Working Group Inc"]
-  s.email         = ["oleg@khabarov.ca"]
+  s.authors       = ["Oleg Khabarov", "Scott Tadman", "The Working Group Inc."]
+  s.email         = ["oleg@khabarov.ca", "scott@twg.ca"]
   s.homepage      = "http://github.com/postageapp/postageapp-ruby"
   s.summary       = "Easier way to send email from web apps"
   s.description   = "Gem that interfaces with PostageApp.com service to send emails from web apps"
+  s.license       = 'MIT'
   
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   
   s.add_dependency 'json'
-end
+end

data/test/configuration_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class ConfigurationTest < Test::Unit::TestCase
+class ConfigurationTest < Minitest::Test
   
   def test_initialization_defaults
     config = PostageApp::Configuration.new

data/test/failed_request_test.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class FailedRequestTest < Test::Unit::TestCase
-  
+class FailedRequestTest < Minitest::Test
   def setup
     super
     PostageApp.configuration.project_root = File.expand_path('../', __FILE__)
@@ -103,4 +102,4 @@ class FailedRequestTest < Test::Unit::TestCase
     
     assert File.exists?(file_path)
   end
-end
+end

data/test/gemfiles/Gemfile.rails-2.3.x

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
+  gem 'minitest'
   gem 'rails', '~> 2.3.0'
   gem 'mocha'
 end

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
+  gem 'minitest'
   gem 'rails', '~> 3.0.0'
   gem 'mocha'
 end

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
+  gem 'minitest'
   gem 'rails', '~> 3.1.0'
   gem 'mocha'
 end

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
+  gem 'minitest'
   gem 'rails', '~> 3.2.0'
   gem 'mocha'
 end

data/test/gemfiles/Gemfile.rails-4.0.x

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
+  gem 'minitest'
   gem 'rails', '~> 4.0.0'
   gem 'mocha'
 end

data/test/helper.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
-require 'test/unit'
+
+gem 'minitest'
+require 'minitest/autorun'
+
 require 'fileutils'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -10,10 +13,10 @@ require 'postageapp/mailer'
 
 require 'mocha/setup'
 
-class Test::Unit::TestCase
-  
+class Minitest::Test
   def setup
-    # resetting to default configuration
+    # Resetting to default configuration
+
     PostageApp.configure do |config|
       config.api_key            = '1234567890abcdef'
       config.secure             = true
@@ -33,6 +36,8 @@ class Test::Unit::TestCase
       config.logger             = nil
       config.framework          = 'undefined framework'
     end
+
+    ActionMailer::Base.deliveries.clear
   end
   
   def mock_successful_send(status = 'ok')
@@ -51,14 +56,12 @@ class Test::Unit::TestCase
   def mock_failed_send
     Net::HTTP.any_instance.stubs(:post).returns(nil)
   end
-  
 end
 
 # Setting up constants just for the duration of the test
 module ConstantDefinitions
-  
   def setup
-    @defined_constants = []
+    @defined_constants = [ ]
   end
   
   def teardown
@@ -71,5 +74,4 @@ module ConstantDefinitions
     Object.const_set(name, value)
     @defined_constants << name
   end
-  
 end

data/test/live_test.rb

@@ -1,16 +1,13 @@
 require File.expand_path('../helper', __FILE__)
 
-class LiveTest < Test::Unit::TestCase
-  
+class LiveTest < Minitest::Test
   # Note: Need access to a live PostageApp.com account
   # See helper.rb to set host / api key
-  unless false # set to +true+ to run tests
-    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
-    def test_nothing ; end
-  else
-    
+
+  if (ENV['POSTAGEAPP_LIVE_TESTS'])
     def setup
       super
+      
       PostageApp.configure do |config|
         config.secure   = false
         config.host     = 'api.postageapp.local'
@@ -83,7 +80,11 @@ class LiveTest < Test::Unit::TestCase
         Notifier.with_custom_postage_variables.deliver
       end
       assert response.ok?
+    end 
+  else
+    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
+
+    def test_nothing
     end
-    
   end
-end
+end

data/test/mailer_2_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../helper', __FILE__)
 
 # tests for ActionMailer bundled with Rails 2
-class Mailer2Test < Test::Unit::TestCase
-  
-  if ActionMailer::VERSION::MAJOR < 3
-    
+class Mailer2Test < Minitest::Test
+  case (ActionMailer::VERSION::MAJOR)
+  when 2
     require File.expand_path('../mailer/action_mailer_2/notifier', __FILE__)
+
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
         
     def test_create_blank
@@ -83,9 +83,10 @@ class Mailer2Test < Test::Unit::TestCase
       assert_equal 'test@test.test', mail.arguments['recipients']
       assert_equal 'oleg@test.test', mail.arguments_to_send['arguments']['recipient_override']
     end
-    
   else
     puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
-    def test_nothing ; end
+
+    def test_nothing
+    end
   end
-end
+end

data/test/mailer_3_test.rb

@@ -1,35 +1,40 @@
 require File.expand_path('../helper', __FILE__)
 
 # tests for ActionMailer bundled with Rails 3
-class Mailer3Test < Test::Unit::TestCase
-
-  if ActionMailer::VERSION::MAJOR == 3
-
+class Mailer3Test < Minitest::Test
+  case (ActionMailer::VERSION::MAJOR)
+  when 3
     require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
 
     def test_create_with_no_content
       mail = Notifier.with_no_content
-      assert_equal ({}), mail.arguments['content']
+
+      assert_equal({ }, mail.arguments['content'])
     end
 
     def test_create_with_no_subject
       mail = Notifier.with_no_subject
+
       assert mail.arguments['headers'][:subject].nil?
     end
 
     def test_create_with_simple_view
       mail = Notifier.with_simple_view
+
       assert_equal 'with layout simple view content', mail.arguments['content']['text/html']
     end
 
     def test_create_with_text_only_view
       mail = Notifier.with_text_only_view
+
       assert_equal 'text content', mail.arguments['content']['text/plain']
     end
 
     def test_create_with_html_and_text_views
       mail = Notifier.with_html_and_text_views
+
       assert_equal 'text content',              mail.arguments['content']['text/plain']
       assert_equal 'with layout html content',  mail.arguments['content']['text/html']
     end
@@ -44,6 +49,7 @@ class Mailer3Test < Test::Unit::TestCase
 
     def test_create_with_body_and_attachment_as_file
       mail = Notifier.with_body_and_attachment_as_file
+
       assert_equal 'manual body text', mail.arguments['content']['text/html']
       assert_equal 'text/plain', mail.arguments['attachments']['sample_file.txt']['content_type']
       assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
@@ -51,6 +57,7 @@ class Mailer3Test < Test::Unit::TestCase
 
     def test_create_with_body_and_attachment_as_hash
       mail = Notifier.with_body_and_attachment_as_hash
+
       assert_equal 'manual body text', mail.arguments['content']['text/html']
       assert_equal 'text/rich', mail.arguments['attachments']['sample_file.txt']['content_type']
       assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
@@ -58,10 +65,11 @@ class Mailer3Test < Test::Unit::TestCase
 
     def test_create_with_custom_postage_variables
       mail = Notifier.with_custom_postage_variables
+
       args = mail.arguments_to_send
 
-      assert_equal 'custom_uid',      args['uid']
-      assert_equal 'custom_api_key',  args['api_key']
+      assert_equal 'custom_uid', args['uid']
+      assert_equal 'custom_api_key', args['api_key']
 
       args = args['arguments']
 
@@ -80,28 +88,35 @@ class Mailer3Test < Test::Unit::TestCase
 
     def test_create_with_recipient_override
       PostageApp.configuration.recipient_override = 'oleg@test.test'
+
       assert mail = Notifier.with_html_and_text_views
+
       assert_equal 'test@test.test', mail.arguments['recipients']
       assert_equal 'oleg@test.test', mail.arguments_to_send['arguments']['recipient_override']
     end
 
     def test_deliver_for_test_mailer
       mail = Notifier.with_simple_view
+
       mail.delivery_method(Mail::TestMailer)
       mail.deliver
-      assert_equal [mail], ActionMailer::Base.deliveries
+
+      assert_equal [ mail ], ActionMailer::Base.deliveries
     end
 
     def test_deliver_for_not_performing_deliveries_with_test_mailer
       mail = Notifier.with_simple_view
+
       mail.perform_deliveries = false
       mail.delivery_method(Mail::TestMailer)
       mail.deliver
-      assert_equal [], ActionMailer::Base.deliveries
-    end
 
+      assert_equal [ ], ActionMailer::Base.deliveries
+    end
   else
     puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
-    def test_nothing ; end
+
+    def test_nothing
+    end
   end
 end

data/test/mailer_4_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../helper', __FILE__)
 
 # tests for ActionMailer bundled with Rails 3
-class Mailer4Test < Test::Unit::TestCase
-
-  if ActionMailer::VERSION::MAJOR == 4
-
+class Mailer4Test < Minitest::Test
+  case (ActionMailer::VERSION::MAJOR)
+  when 4
     require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+    
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
 
     def test_create_with_no_content
@@ -99,9 +99,10 @@ class Mailer4Test < Test::Unit::TestCase
       mail.deliver
       assert_equal [], ActionMailer::Base.deliveries
     end
-
   else
     puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
-    def test_nothing ; end
+
+    def test_nothing
+    end
   end
 end

data/test/mailer_helper_methods_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class MailerHelperMethodsTest < Test::Unit::TestCase
+class MailerHelperMethodsTest < Minitest::Test
   
   def test_mailer_helper_methods
     request = PostageApp::Request.new(:send_message, {

data/test/postageapp_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class PostageAppTest < Test::Unit::TestCase
+class PostageAppTest < Minitest::Test
   
   def test_method_configure
     PostageApp.configure do |config|

data/test/rails_initialization_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../helper', __FILE__)
 
 require File.expand_path('../../lib/postageapp/rails/rails', __FILE__)
 
-class RailsInitializationTest < Test::Unit::TestCase
+class RailsInitializationTest < Minitest::Test
   
   include ConstantDefinitions
   

data/test/request_test.rb

@@ -1,17 +1,19 @@
 require File.expand_path('../helper', __FILE__)
 
-class RequestTest < Test::Unit::TestCase
-  
+class RequestTest < Minitest::Test
   def test_method_uid
     request = PostageApp::Request.new('test_method')
+
     uid = request.uid
-    assert_match /^\w{40}$/, uid
+
+    assert_match /\A\w{40}\z/, uid
     assert_equal uid, request.uid
-    assert_not_equal uid, request.uid(true)
+    assert uid != request.uid(true)
   end
   
   def test_method_url
     request = PostageApp::Request.new('test_method')
+
     assert_equal 'api.postageapp.com',      request.url.host
     assert_equal 443,                       request.url.port
     assert_equal '/v.1.0/test_method.json', request.url.path
@@ -19,27 +21,37 @@ class RequestTest < Test::Unit::TestCase
   
   def test_method_arguments_to_send
     request = PostageApp::Request.new('send_message', {
-      'headers'     => { 'from'      => 'sender@test.test',
-                          'subject'   => 'Test Message' },
+      'headers'     => {
+        'from'      => 'sender@test.test',
+        'subject'   => 'Test Message'
+      },
       'recipients'  => 'test@test.test',
       'content'     => {
         'text/plain'  => 'text content',
         'text/html'   => 'html content'
       }
     })
+
+    assert_equal 'text content', request.text_part
+    assert_equal 'html content', request.html_part
+
     args = request.arguments_to_send
+
     assert_equal '1234567890abcdef', args['api_key']
     assert_match /^\w{40}$/, args['uid']
     
     payload = args['arguments']
-    assert_equal 'sender@test.test',  payload['headers']['from']
-    assert_equal 'Test Message',      payload['headers']['subject']
-    assert_equal 'test@test.test',    payload['recipients']
-    assert_equal 'text content',      payload['content']['text/plain']
-    assert_equal 'html content',      payload['content']['text/html']
+
+    assert_equal 'sender@test.test', payload['headers']['from']
+    assert_equal 'Test Message',     payload['headers']['subject']
+    assert_equal 'test@test.test',   payload['recipients']
+    assert_equal 'text content',     payload['content']['text/plain']
+    assert_equal 'html content',     payload['content']['text/html']
     
     request.arguments = { 'data' => 'content' }
+
     args = request.arguments_to_send
+
     assert_equal '1234567890abcdef', args['api_key']
     assert_match /^\w{40}$/, args['uid']
     assert_equal 'content', args['arguments']['data']
@@ -47,21 +59,26 @@ class RequestTest < Test::Unit::TestCase
   
   def test_uid_is_enforceable
     request = PostageApp::Request.new('test_method')
+
     assert_match /^\w{40}$/, request.arguments_to_send['uid']
     
     request.uid = 'my_uid'
+
     assert_equal 'my_uid', request.arguments_to_send['uid']
     
     request = PostageApp::Request.new('test_method', 'uid' => 'new_uid', 'data' => 'value')
+
     assert_equal 'new_uid', request.uid
     assert_equal ({'data' => 'value'}), request.arguments
   end
   
   def test_api_key
     request = PostageApp::Request.new('test_method')
+
     assert_equal PostageApp.configuration.api_key, request.api_key
     
     request = PostageApp::Request.new('test_method', {'api_key' => 'custom_api_key'})
+
     assert_equal 'custom_api_key', request.api_key
   end
   
@@ -69,8 +86,10 @@ class RequestTest < Test::Unit::TestCase
     mock_successful_send
     
     request = PostageApp::Request.new('send_message', {
-      'headers'     => {  'from'     => 'sender@test.test',
-                          'subject'  => 'Test Message'},
+      'headers'     => {
+        'from'     => 'sender@test.test',
+        'subject'  => 'Test Message'
+      },
       'recipients'  => 'test@test.test',
       'content'     => {
         'text/plain'  => 'text content',
@@ -80,25 +99,28 @@ class RequestTest < Test::Unit::TestCase
     response = request.send
     assert_equal 'ok', response.status
     assert_equal 'sha1hashuid23456789012345678901234567890', response.uid
-    assert_equal ({'message' => { 'id' => 999 }}), response.data
+    assert_equal({'message' => { 'id' => 999 }}, response.data)
   end
   
   def test_send_failure
     mock_failed_send
     
     request = PostageApp::Request.new('send_message', {
-      'headers'     => {  'from'     => 'sender@test.test',
-                          'subject'  => 'Test Message'},
+      'headers'     => {
+        'from'     => 'sender@test.test',
+        'subject'  => 'Test Message'
+      },
       'recipients'  => 'test@test.test',
       'content'     => {
         'text/plain'  => 'text content',
         'text/html'   => 'html content'
       }
     })
+
     response = request.send
+
     assert_equal 'fail', response.status
     assert_equal nil, response.uid
     assert_equal nil, response.data
   end
-  
-end
+end

data/test/response_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class ResponseTest < Test::Unit::TestCase
+class ResponseTest < Minitest::Test
   
   def test_initialization
     object = stub(:body => {

metadata

@@ -1,34 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
+  prerelease: 
 platform: ruby
 authors:
 - Oleg Khabarov
-- The Working Group Inc
+- Scott Tadman
+- The Working Group Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem that interfaces with PostageApp.com service to send emails from web
   apps
 email:
 - oleg@khabarov.ca
+- scott@twg.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -95,26 +100,28 @@ files:
 - test/request_test.rb
 - test/response_test.rb
 homepage: http://github.com/postageapp/postageapp-ruby
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Easier way to send email from web apps
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e4ce66fba6cb35602ebc6afe19498db5cdedb98f
-  data.tar.gz: 7bd2753935e216bce6283cf62f5c4bcc5c9a1885
-SHA512:
-  metadata.gz: c05d91dc01449f819db82997e123a89140c7d0fa01c8ac2c99a6342a71630cd58d93908b27f48458c3d50596c98c8ed082604173897cf81fd10ae08072d575af
-  data.tar.gz: 6ae7f5cc98f0041bc1c5dde01326fbae16eb5f7e0db836480e061333a7ba8cc44327357387fc41e3f26d0ebf8e5127e9cccc450e1c5bf064ffaee7e7e1c4cb76