postageapp 1.2.0 → 1.2.5

data/test/configuration_test.rb

@@ -20,7 +20,7 @@ class ConfigurationTest < MiniTest::Test
     assert_equal nil, config.project_root
     assert_equal 'production', config.environment
     assert_equal nil, config.logger
-    assert_equal 'undefined framework', config.framework
+    assert_equal 'Ruby', config.framework
   end
   
   def test_initialization_overrides

data/test/failed_request_test.rb

@@ -8,23 +8,25 @@ class FailedRequestTest < MiniTest::Test
   end
   
   def test_store_and_initialize
-    assert_match /.*?\/tmp\/postageapp_failed_requests/, PostageApp::FailedRequest.store_path
+    assert_match(/.*?\/tmp\/postageapp_failed_requests/, PostageApp::FailedRequest.store_path)
     
     request = PostageApp::Request.new(:send_message, {
-      :headers => {
+      headers: {
         'from' => 'sender@test.test',
         'subject' => 'Test Message'
       },
-      :recipients => 'test@test.test',
-      :content => {
+      recipients: 'test@test.test',
+      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)
+
+    assert File.exist?(file_path)
     
     stored_request = PostageApp::FailedRequest.initialize_request(request.uid)
 
@@ -54,6 +56,7 @@ class FailedRequestTest < MiniTest::Test
   
   def test_store_with_no_file_path_defined
     PostageApp.configuration.project_root = nil
+
     assert !PostageApp::FailedRequest.store_path
     assert !PostageApp::FailedRequest.store('something')
   end
@@ -62,12 +65,12 @@ class FailedRequestTest < MiniTest::Test
     mock_failed_send
     
     request = PostageApp::Request.new(:send_message, {
-      :headers => {
+      headers: {
         'from' => 'sender@test.test',
         'subject' => 'Test Message'
       },
-      :recipients => 'test@test.test',
-      :content => {
+      recipients: 'test@test.test',
+      content: {
         'text/plain' => 'text content',
         'text/html' => 'html content'
       }
@@ -77,44 +80,56 @@ class FailedRequestTest < MiniTest::Test
     assert response.fail?
 
     file_path = File.join(PostageApp::FailedRequest.store_path, request.uid)
-    assert File.exists?(file_path)
+    assert File.exist?(file_path)
     
     mock_successful_send
     
     request = PostageApp::Request.new(:get_project_info)
     
-    message_receipt_response = stub(:fail? => false, :ok? => false, :not_found? => true)
+    message_receipt_response = stub(
+      :fail? => false,
+      :ok? => false,
+      :not_found? => true
+    )
+
     message_receipt_request = stub(:send => message_receipt_response)
-    PostageApp::Request.stubs(:new).with{|a,b| a == :get_message_receipt}.returns(message_receipt_request)
+
+    PostageApp::Request.stubs(:new).with do |a,b|
+      a == :get_message_receipt
+    end.returns(message_receipt_request)
     
     response = request.send
+
     assert response.ok?
     
-    assert !File.exists?(file_path)
+    assert !File.exist?(file_path)
   end
   
   def test_resend_all_failure
     mock_failed_send
     request = PostageApp::Request.new(:send_message, {
-      :headers => {
+      headers: {
         'from' => 'sender@test.test',
         'subject' => 'Test Message'
       },
-      :recipients => 'test@test.test',
-      :content => {
+      recipients: 'test@test.test',
+      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)
+
+    assert File.exist?(file_path)
     
     # Forcing to resend. Should quit right away as we can't connect
     PostageApp::FailedRequest.resend_all
     
-    assert File.exists?(file_path)
+    assert File.exist?(file_path)
   end
 end

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

@@ -1,12 +1,16 @@
 source 'http://rubygems.org'
 
+# rubygems 1.8.30
+
+gem 'rails', '~> 2.3.0'
+
 gem 'json'
 gem 'mail'
+gem 'mime-types', '2.99.1' # Locked for 1.9 compatibility
 
 group :test do
   gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters'
-  gem 'rails', '~> 2.3.0'
   gem 'mocha'
 end

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

@@ -1,12 +1,17 @@
 source 'http://rubygems.org'
 
+# rubygems 1.8.30
+
+gem 'bundler', '1.0.22'
+gem 'rails', '~> 3.0.0'
+
 gem 'json'
 gem 'mail'
+gem 'mime-types', '~> 1.16' # Rails 3.0.x dependency
 
 group :test do
   gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters'
-  gem 'rails', '~> 3.0.0'
   gem 'mocha'
 end

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

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

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

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

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

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

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

@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+gem 'rails', '~> 4.1.0'
+
 gem 'json'
 gem 'mail'
 
@@ -7,6 +9,5 @@ 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

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

data/test/gemfiles/Gemfile.ruby

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem 'json'
 gem 'mail'
+gem 'mime-types', '2.99.1' # Locked for 1.9 compatibility
 
 group :test do
   gem 'rake'

data/test/helper.rb

@@ -21,6 +21,12 @@ require 'postageapp/mailer'
 require 'mocha/setup'
 require 'with_environment'
 
+# This fixes an issue in Rails 3.2.22.2 where HashWithIndifferentAccess isn't
+# being loaded properly during testing.
+if (defined?(ActiveSupport) and !defined?(HashWithIndifferentAccess))
+  require 'active_support/hash_with_indifferent_access'
+end
+
 class MiniTest::Test
   include WithEnvironment
 
@@ -67,12 +73,12 @@ class MiniTest::Test
   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',
-        :status => status
+      response: { 
+        uid: 'sha1hashuid23456789012345678901234567890',
+        status: status
       },
-      :data => {
-        :message => { :id => 999 }
+      data: {
+        message: { id: 999 }
       }
     }.to_json)
   end
@@ -84,6 +90,7 @@ class MiniTest::Test
   # 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)
 

data/test/live_test.rb

@@ -9,9 +9,9 @@ class LiveTest < MiniTest::Test
       super
       
       PostageApp.configure do |config|
-        config.secure   = false
-        config.host     = 'api.postageapp.local'
-        config.api_key  = 'PROJECT_API_KEY'
+        config.secure = false
+        config.host = 'api.postageapp.local'
+        config.api_key = 'PROJECT_API_KEY'
       end
     end
     
@@ -21,55 +21,74 @@ class LiveTest < MiniTest::Test
       
       assert_equal 'PostageApp::Response', response.class.name
       assert_equal 'ok', response.status
-      assert_match /^\w{40}$/, response.uid
+      assert_match(/^\w{40}$/, response.uid)
       assert_equal nil, response.message
-      assert_equal ({
-        'methods' => 'get_account_info, get_message_receipt, get_method_list, get_project_info, send_message'
-      }), response.data
+      assert_equal(
+        {
+          'methods' => 'get_account_info, get_message_receipt, get_method_list, get_project_info, send_message'
+        },
+        response.data
+      )
     end
     
     def test_request_send_message
       request = PostageApp::Request.new(:send_message, {
-        :headers => {
+        headers: {
           'from' => 'sender@example.com',
           'subject' => 'Test Message'
         },
-        :recipients => 'recipient@example.net',
-        :content => {
+        recipients: 'recipient@example.net',
+        content: {
           'text/plain' => 'text content',
           'text/html' => 'html content'
         }
       })
+
       response = request.send
+
       assert_equal 'PostageApp::Response', response.class.name
       assert_equal 'ok', response.status
-      assert_match /^\w{40}$/, response.uid
+
+      assert_match(/^\w{40}$/, response.uid)
       assert_equal nil, response.message
-      assert_match /\d+/, response.data['message']['id'].to_s
+      assert_match(/\d+/, response.data['message']['id'].to_s)
+      
+      receipt = PostageApp::Request.new(
+        :get_message_receipt,
+        uid: response.uid
+      ).send
       
-      receipt = PostageApp::Request.new(:get_message_receipt, :uid => response.uid).send
       assert receipt.ok?
       
-      receipt = PostageApp::Request.new(:get_message_receipt, :uid => 'bogus').send
+      receipt = PostageApp::Request.new(
+        :get_message_receipt,
+        uid: 'bogus'
+      ).send
+
       assert receipt.not_found?
     end
     
     def test_request_non_existant_method
       request = PostageApp::Request.new(:non_existant)
+
       response = request.send
+
       assert_equal 'PostageApp::Response', response.class.name
       assert_equal 'internal_server_error', response.status
-      assert_match /^\w{40}$/, response.uid
-      assert_equal 'No action responded to non_existant. Actions: get_account_info, get_message_receipt, get_method_list, get_project_info, and send_message', response.message
+      assert_match(/\A\w{40}$/, response.uid)
+      assert_match(/\ANo action responded to non_existant/, response.message)
       assert_equal nil, response.data
     end
     
     # Testable under ruby 1.9.2 Probably OK in production too... Probably
     # Lunchtime reading: http://ph7spot.com/musings/system-timer
     def test_request_timeout
-      PostageApp.configuration.host = 'dead.postageapp.local'
+      PostageApp.configuration.host = '127.0.0.254'
+
       request = PostageApp::Request.new(:get_method_list)
+
       response = request.send
+
       assert_equal 'PostageApp::Response', response.class.name
       assert_equal 'fail', response.status
     end

data/test/mailer_2_test.rb

@@ -1,6 +1,5 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
-# tests for ActionMailer bundled with Rails 2
 class Mailer2Test < MiniTest::Test
   require_action_mailer(2) do
     require File.expand_path('mailer/action_mailer_2/notifier', File.dirname(__FILE__))
@@ -19,7 +18,7 @@ class Mailer2Test < MiniTest::Test
       assert mail = Notifier.create_with_no_content
 
       assert_equal 'recipient@example.net', mail.arguments['recipients']
-      assert_equal ({ 'from' => 'sender@example.com', 'subject' => 'Test Email' }), mail.arguments['headers']
+      assert_equal({ 'from' => 'sender@example.com', 'subject' => 'Test Email' }, mail.arguments['headers'])
       assert mail.arguments['content'].blank?
     end
     
@@ -77,9 +76,9 @@ class Mailer2Test < MiniTest::Test
       assert_equal 'custom_uid', mail.uid
       assert_equal 'custom_api_key', mail.api_key
       assert_equal 'test-template', mail.arguments['template']
-      assert_equal ({ 'variable' => 'value' }), mail.arguments['variables']
-      assert_equal ({ 'test2@example.net' => { 'name' => 'Test 2'}, 
-                      'test1@example.net' => { 'name' => 'Test 1'}}), mail.arguments['recipients']
+      assert_equal({ 'variable' => 'value' }, mail.arguments['variables'])
+      assert_equal({ 'test2@example.net' => { 'name' => 'Test 2'}, 
+                      'test1@example.net' => { 'name' => 'Test 1'}}, mail.arguments['recipients'])
       assert_equal 'text content', mail.arguments['content']['text/plain']
       assert_equal 'html content', mail.arguments['content']['text/html']
     end

data/test/mailer_3_test.rb

@@ -1,6 +1,5 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
-# tests for ActionMailer bundled with Rails 3
 class Mailer3Test < MiniTest::Test
   require_action_mailer(3) do
     require File.expand_path('mailer/action_mailer_3/notifier', File.dirname(__FILE__))
@@ -72,13 +71,16 @@ class Mailer3Test < MiniTest::Test
 
       args = args['arguments']
 
-      assert_equal ({
-        'test1@example.net' => { 'name' => 'Test 1'},
-        'test2@example.net' => { 'name' => 'Test 2'}
-      }), args['recipients']
+      assert_equal(
+        {
+          'test1@example.net' => { 'name' => 'Test 1' },
+          'test2@example.net' => { 'name' => 'Test 2' }
+        },
+        args['recipients']
+      )
 
       assert_equal 'test-template', args['template']
-      assert_equal ({ 'variable' => 'value' }), args['variables']
+      assert_equal({ 'variable' => 'value' }, args['variables'])
       assert_equal 'CustomValue1', args['headers']['CustomHeader1']
       assert_equal 'CustomValue2', args['headers']['CustomHeader2']
       assert_equal 'text content', args['content']['text/plain']