postageapp 1.0.24 → 1.2.0

data/test/failed_request_test.rb

@@ -1,28 +1,33 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class FailedRequestTest < Minitest::Test
+class FailedRequestTest < MiniTest::Test
   def setup
     super
-    PostageApp.configuration.project_root = File.expand_path('../', __FILE__)
+  
+    PostageApp.configuration.project_root = File.dirname(__FILE__)
   end
   
   def test_store_and_initialize
     assert_match /.*?\/tmp\/postageapp_failed_requests/, PostageApp::FailedRequest.store_path
     
     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'
+      :content => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
     })
+
     assert PostageApp::FailedRequest.store(request)
     file_path = File.join(PostageApp::FailedRequest.store_path, request.uid)
     assert File.exists?(file_path)
     
     stored_request = PostageApp::FailedRequest.initialize_request(request.uid)
+
     assert stored_request.is_a?(PostageApp::Request)
     assert_equal request.url, stored_request.url
     assert_equal request.uid, stored_request.uid
@@ -35,12 +40,15 @@ class FailedRequestTest < Minitest::Test
   
   def test_initialize_requests_with_bad_file
     file_path = File.join(PostageApp::FailedRequest.store_path, '1234567890')
+
     FileUtils.touch(file_path)
+
     assert !PostageApp::FailedRequest.initialize_request('1234567890')
   end
   
   def test_store_for_wrong_call_type
     request = PostageApp::Request.new(:get_project_info)
+
     assert !PostageApp::FailedRequest.store(request)
   end
   
@@ -54,16 +62,20 @@ class FailedRequestTest < Minitest::Test
     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'
+      :content => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
     })
+
     response = request.send
     assert response.fail?
+
     file_path = File.join(PostageApp::FailedRequest.store_path, request.uid)
     assert File.exists?(file_path)
     
@@ -84,14 +96,17 @@ class FailedRequestTest < Minitest::Test
   def test_resend_all_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'
+      :content => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
     })
+    
     response = request.send
     assert response.fail?
     file_path = File.join(PostageApp::FailedRequest.store_path, request.uid)

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

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'json'
+gem 'mail'
 
 group :test do
+  gem 'rake'
   gem 'minitest'
+  gem 'minitest-reporters'
   gem 'rails', '~> 2.3.0'
   gem 'mocha'
-end
+end

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

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'json'
+gem 'mail'
 
 group :test do
+  gem 'rake'
   gem 'minitest'
+  gem 'minitest-reporters'
   gem 'rails', '~> 3.0.0'
   gem 'mocha'
-end
+end

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

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'json'
+gem 'mail'
 
 group :test do
+  gem 'rake'
   gem 'minitest'
+  gem 'minitest-reporters'
   gem 'rails', '~> 3.1.0'
   gem 'mocha'
-end
+end

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

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'json'
+gem 'mail'
 
 group :test do
+  gem 'rake'
   gem 'minitest'
+  gem 'minitest-reporters'
   gem 'rails', '~> 3.2.0'
   gem 'mocha'
-end
+end

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

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'json'
+gem 'mail'
 
 group :test do
+  gem 'rake'
   gem 'minitest'
+  gem 'minitest-reporters'
   gem 'rails', '~> 4.0.0'
   gem 'mocha'
-end
+end

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

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'json'
+gem 'mail'
+
+group :test do
+  gem 'rake'
+  gem 'minitest'
+  gem 'minitest-reporters'
+  gem 'rails', '~> 4.1.0'
+  gem 'mocha'
+end

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

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'json'
+gem 'mail'
+
+group :test do
+  gem 'rake'
+  gem 'minitest'
+  gem 'minitest-reporters'
+  gem 'rails', '~> 4.2.0'
+  gem 'mocha'
+end

data/test/gemfiles/Gemfile.ruby

@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+
+gem 'json'
+gem 'mail'
+
+group :test do
+  gem 'rake'
+  gem 'minitest'
+  gem 'minitest-reporters'
+  gem 'mocha'
+end

data/test/helper.rb

@@ -3,48 +3,72 @@ require 'rubygems'
 gem 'minitest'
 require 'minitest/autorun'
 
+gem 'minitest-reporters'
+require 'minitest/reporters'
+
+Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
+
 require 'fileutils'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'mail'
+
 require 'postageapp'
 require 'postageapp/mailer'
 
 require 'mocha/setup'
+require 'with_environment'
+
+class MiniTest::Test
+  include WithEnvironment
+
+  def self.require_action_mailer(version)
+    if (defined?(ActionMailer))
+      if (ActionMailer::VERSION::MAJOR == version)
+        return yield
+      end
+    end
+
+    define_method(:test_skipped) do
+      skip("Not testing against ActionMailer #{version}.x")
+    end
+  end
 
-class Minitest::Test
   def setup
     # Resetting to default configuration
 
     PostageApp.configure do |config|
-      config.api_key            = '1234567890abcdef'
-      config.secure             = true
-      config.protocol           = 'https'
-      config.host               = 'api.postageapp.com'
-      config.port               = 443
-      config.proxy_host         = nil
-      config.proxy_port         = nil
-      config.proxy_user         = nil
-      config.proxy_pass         = nil
-      config.http_open_timeout  = 5
+      config.api_key = '1234567890abcdef'
+      config.secure = true
+      config.protocol = 'https'
+      config.host = 'api.postageapp.com'
+      config.port = 443
+      config.proxy_host = nil
+      config.proxy_port = nil
+      config.proxy_user = nil
+      config.proxy_pass = nil
+      config.http_open_timeout = 5
       config.http_read_timeout  = 10
       config.recipient_override = nil
       config.requests_to_resend = %w( send_message )
-      config.project_root       = File.expand_path('../', __FILE__)
-      config.environment        = 'production'
-      config.logger             = nil
-      config.framework          = 'undefined framework'
+      config.project_root = File.expand_path('../', __FILE__)
+      config.environment = 'production'
+      config.logger = nil
+      config.framework = 'undefined framework'
     end
 
-    ActionMailer::Base.deliveries.clear
+    if (defined?(ActionMailer))
+      ActionMailer::Base.deliveries.clear
+    end
   end
   
   def mock_successful_send(status = 'ok')
     Net::HTTP.any_instance.stubs(:post).returns(Net::HTTPResponse.new(nil, nil, nil))
     Net::HTTPResponse.any_instance.stubs(:body).returns({
       :response => { 
-        :uid    => 'sha1hashuid23456789012345678901234567890',
+        :uid => 'sha1hashuid23456789012345678901234567890',
         :status => status
       },
       :data => {
@@ -56,22 +80,17 @@ class Minitest::Test
   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 = [ ]
-  end
-  
-  def teardown
-    @defined_constants.each do |constant|
-      Object.__send__(:remove_const, constant)
-    end
-  end
-  
-  def define_constant(name, value)
-    Object.const_set(name, value)
-    @defined_constants << name
+  # Briefly substitutes a new object in place of an existing constant.
+  def const_replace(name, object)
+    original = Object.const_defined?(name) && Object.const_get(name)
+    Object.send(:remove_const, name) if (original)
+    Object.const_set(name, object)
+
+    yield
+
+  ensure
+    Object.send(:remove_const, name)
+    Object.const_set(name, original)
   end
 end

data/test/live_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class LiveTest < Minitest::Test
+class LiveTest < MiniTest::Test
   # Note: Need access to a live PostageApp.com account
   # See helper.rb to set host / api key
 
@@ -18,6 +18,7 @@ class LiveTest < Minitest::Test
     def test_request_get_method_list
       request = PostageApp::Request.new(:get_method_list)
       response = request.send
+      
       assert_equal 'PostageApp::Response', response.class.name
       assert_equal 'ok', response.status
       assert_match /^\w{40}$/, response.uid
@@ -29,12 +30,14 @@ class LiveTest < Minitest::Test
     
     def test_request_send_message
       request = PostageApp::Request.new(:send_message, {
-        :headers    => { 'from'     => 'sender@test.test',
-                         'subject'  => 'Test Message'},
-        :recipients => 'test@test.test',
-        :content    => {
-          'text/plain'  => 'text content',
-          'text/html'   => 'html content'
+        :headers => {
+          'from' => 'sender@example.com',
+          'subject' => 'Test Message'
+        },
+        :recipients => 'recipient@example.net',
+        :content => {
+          'text/plain' => 'text content',
+          'text/html' => 'html content'
         }
       })
       response = request.send

data/test/mail_delivery_method_test.rb

@@ -0,0 +1,161 @@
+require File.expand_path('helper', File.dirname(__FILE__))
+
+class MailerDeliveryTest < MiniTest::Test
+  def setup
+    PostageApp::Mail::DeliveryMethod.deliveries.clear
+  end
+
+  def test_text
+    mail = Mail.new do
+      from 'test@example.com'
+      to 'recipient@example.net'
+      subject 'Example message being sent through Mail'
+      body 'Example body text.'
+
+      # add_file :filename => 'somefile.png', :content => File.read('/somefile.png')
+    end
+
+    mail.delivery_method :postageapp, api_key: false
+
+    mail.deliver
+
+    api_call = PostageApp::Mail::DeliveryMethod.deliveries.pop
+
+    expected = [
+      :send_message,
+      {
+        'content' => {
+          'text/plain' => 'Example body text.'
+        },
+        'headers' => {
+          'From' => 'test@example.com',
+          'Subject' => 'Example message being sent through Mail'
+        },
+        'recipients' => [ 'recipient@example.net' ]
+      }
+    ]
+
+    assert_equal expected, api_call
+  end
+
+  def test_html
+    mail = Mail.new do
+      from 'test@example.com'
+      to 'recipient@example.net'
+      subject 'Example message being sent through Mail'
+      body '<p>Example body HTML text.</p>'
+
+      content_type 'text/html'
+    end
+
+    mail.delivery_method :postageapp, api_key: false
+
+    mail.deliver
+
+    api_call = PostageApp::Mail::DeliveryMethod.deliveries.pop
+
+    expected = [
+      :send_message,
+      {
+        'content' => {
+          'text/html' => '<p>Example body HTML text.</p>'
+        },
+        'headers' => {
+          'From' => 'test@example.com',
+          'Subject' => 'Example message being sent through Mail'
+        },
+        'recipients' => [ 'recipient@example.net' ]
+      }
+    ]
+
+    assert_equal expected, api_call
+  end
+
+  def test_text_body_with_attachment
+    mail = Mail.new do
+      from 'test@example.com'
+      to 'recipient@example.net'
+      subject 'Example message being sent through Mail'
+
+      body "Plain text"
+
+      add_file :filename => 'test.txt', :content => 'Test text file.'
+    end
+
+    mail.delivery_method :postageapp, api_key: false
+
+    mail.deliver
+
+    api_call = PostageApp::Mail::DeliveryMethod.deliveries.pop
+
+    expected = [
+      :send_message,
+      {
+        'content' => {
+          'text/plain' => 'Plain text'
+        },
+        'headers' => {
+          'From' => 'test@example.com',
+          'Subject' => 'Example message being sent through Mail'
+        },
+        'attachments' => {
+          'test.txt' => {
+            'content' => Base64.encode64('Test text file.'),
+            'content_type' => 'text/plain; filename=test.txt'
+          }
+        },
+        'recipients' => [ 'recipient@example.net' ]
+      }
+    ]
+
+    assert_equal expected, api_call
+  end
+
+  def test_html_body_with_attachment
+  end
+
+  def test_html_and_text
+    mail = Mail.new do
+      from 'test@example.com'
+      to 'recipient@example.net'
+      subject 'Example message being sent through Mail'
+
+      text_part do
+        body "Plain text"
+      end
+
+      html_part do
+        # Mail 2.2.20 requires a manual declaration of MIME type. Newer
+        # versions handle this correctly.
+        content_type 'text/html'
+        body "<p>HTML text</p>"
+      end
+    end
+
+    mail.delivery_method :postageapp, api_key: false
+
+    mail.deliver
+
+    api_call = PostageApp::Mail::DeliveryMethod.deliveries.pop
+
+    expected = [
+      :send_message,
+      {
+        'content' => {
+          'text/plain' => 'Plain text',
+          'text/html' => '<p>HTML text</p>'
+        },
+        'headers' => {
+          'From' => 'test@example.com',
+          'Subject' => 'Example message being sent through Mail'
+        },
+        'recipients' => [ 'recipient@example.net' ]
+      }
+    ]
+
+    assert_equal expected, api_call
+  end
+
+  def test_html_and_text_with_attachment
+  end
+end