postageapp 1.3.0 → 1.4.2

data/test/helper.rb

@@ -10,8 +10,10 @@ Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
 
 require 'fileutils'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+
+ENV['POSTAGEAPP_API_KEY'] ||= '__TEST_API_KEY__'
 
 require 'mail'
 
@@ -45,7 +47,7 @@ class MiniTest::Test
   def setup
     # Resetting to default configuration
 
-    PostageApp.configure(:reset) do |config|
+    PostageApp.configure(reset: true) do |config|
       config.requests_to_resend = %w( send_message )
       config.project_root = File.expand_path('../', __FILE__)
       config.logger = nil

data/test/log/.gitignore

@@ -0,0 +1 @@
+*

data/test/mailer/action_mailer_3/notifier.rb

@@ -1,7 +1,7 @@
 # Test mailer for ActionMailer 3.x+
 
 class Notifier < PostageApp::Mailer
-  self.append_view_path(File.dirname(__FILE__))
+  self.append_view_path(__dir__)
 
   def blank
     # ... nothing to see here

data/test/tmp/.gitignore

@@ -0,0 +1 @@
+*

data/test/travis_test.rb

@@ -1,15 +1,18 @@
 #!/usr/bin/env ruby
 
 require 'yaml'
+require 'open3'
+require 'shellwords'
 
-require File.expand_path('with_environment', File.dirname(__FILE__))
+require_relative './with_environment'
 
 class TravisTest
   extend WithEnvironment
 
   ENV_VARIABLE = {
-    :rvm => "RBENV_VERSION",
-    :gemfile => "BUNDLE_GEMFILE"
+    rvm: 'RBENV_VERSION',
+    version: 'RBENV_VERSION',
+    gemfile: 'BUNDLE_GEMFILE'
   }
 
   def self.bash_env(env)
@@ -20,30 +23,44 @@ class TravisTest
     end.compact.join(' ')
   end
 
-  def self.env_expanded(env)
-    Hash[
-      env.collect do |key, value|
-        [ ENV_VARIABLE[key], value ]
-      end
-    ]
+  def self.environment(env)
+    env.map do |key, value|
+      [ ENV_VARIABLE[key], value ]
+    end.to_h
   end
 
-  def self.shell_command!(args, env)
-    commands = args.collect do |s|
+  def self.shell!(commands, env)
+    commands = commands.collect do |s|
       s % env
     end
 
-    env_expanded(env).each do |key, value|
-      puts 'export %s=%s' % [ key, value ]
-    end
-    puts(commands.join(' && '))
-    
-    with_environment(env_expanded(env)) do
-      result = system(commands.join(' && '))
+    shell_cmds = [
+      'eval "$(rbenv init -)"',
+      'set -e',
+      *commands
+    ].join('; ')
+
+    # p environment(env)
+    # puts shell_cmds
+
+    Open3.popen3(
+      environment(env),
+      shell_cmds
+    ) do |_sin, sout, serr, proc|
+      status = proc.value.exitstatus
 
-      yield(result) if (block_given?)
+      yield(status) if (block_given?)
 
-      result
+      status.tap do |status|
+        if (status != 0)
+          $stderr.puts 'Error code: %d' % status
+        end
+
+        if (status != 0 or ENV['VERBOSE'])
+          puts sout.read
+          puts serr.read
+        end
+      end
     end
   end
 
@@ -52,15 +69,15 @@ class TravisTest
 
     travis_test.matrix.collect do |entry|
       {
-        :rvm => entry[:rvm]
+        rvm: entry[:rvm]
       }
     end.uniq.each do |entry|
-      puts "Ruby %{rvm}" % entry
+      puts 'Ruby %{rvm}' % entry
 
-      shell_command!(
+      shell!(
         [
-          "rbenv install %{version}",
-          "gem install bundler"
+          'rbenv install %{version}',
+          'gem install bundler'
         ],
         entry
       )
@@ -77,9 +94,9 @@ class TravisTest
 
       versions[entry[:rvm]] = true
 
-      shell_command!(
+      shell!(
         [
-          "ruby -e 'puts RUBY_VERSION'"
+          %q[ruby -e 'puts RUBY_VERSION']
         ],
         entry
       )
@@ -103,14 +120,15 @@ class TravisTest
     results = { }
 
     travis_test.matrix.each do |entry|
-      puts "RBENV_VERSION=%{rvm} BUNDLE_GEMFILE=%{gemfile}" % entry
+      puts 'RBENV_VERSION=%{rvm} BUNDLE_GEMFILE=%{gemfile}' % entry
 
       gemfile_lock_remove!(entry[:gemfile])
 
-      shell_command!(
+      shell!(
         [
-          "bundle install --quiet",
-          "rake test"
+          'gem install bundler --no-doc',
+          'bundle install --quiet',
+          'bundle exec rake test'
         ],
         entry
       ) do |code|
@@ -125,13 +143,13 @@ class TravisTest
       puts '%-20s %-24s %-6s' % [
         entry[:rvm],
         File.basename(entry[:gemfile]).sub(/\AGemfile\./,''),
-        code
+        code ? 'Pass' : 'Fail'
       ]
     end
   end
 
   def travis_config_path
-    @travis_config_path ||= File.expand_path('../.travis.yml', File.dirname(__FILE__))
+    @travis_config_path ||= File.expand_path('../.travis.yml', __dir__)
   end
 
   def travis_config
@@ -143,24 +161,24 @@ class TravisTest
   end
 
   def ruby_versions
-    travis_config['rvm']
+    travis_config['rvm'].sort
   end
 
   def matrix_exclusions
-    travis_config['matrix']['exclude'].collect do |entry|
+    travis_config.dig('matrix', 'exclude')&.collect do |entry|
       {
-        :rvm => entry['rvm'],
-        :gemfile => entry['gemfile']
+        rvm: entry['rvm'],
+        gemfile: entry['gemfile']
       }
-    end
+    end or [ ]
   end
 
   def matrix
     ruby_versions.flat_map do |version|
       gemfiles.collect do |gemfile|
         {
-          :rvm => version,
-          :gemfile => gemfile
+          rvm: version,
+          gemfile: gemfile
         }
       end
     end - matrix_exclusions

data/test/{configuration_test.rb → unit/configuration_test.rb}

@@ -1,28 +1,33 @@
-require_relative './helper'
+require_relative '../helper'
 
 class ConfigurationTest < MiniTest::Test
   def test_initialization_defaults
     config = PostageApp::Configuration.new
-    
+
     assert_equal true, config.secure
-    assert_equal ENV['POSTAGEAPP_API_KEY'], config.api_key
+
+    if (ENV['POSTAGEAPP_API_KEY'])
+      assert_equal ENV['POSTAGEAPP_API_KEY'], config.api_key
+    end
+
     assert_equal 'https', config.scheme
     assert_equal ENV['POSTAGEAPP_API_HOST'] || 'api.postageapp.com', config.host
     assert_equal 443, config.port
 
-    assert_equal nil, config.proxy_host
+    assert_nil config.proxy_host
     assert_equal 1080, config.proxy_port
-    assert_equal nil, config.proxy_user
-    assert_equal nil, config.proxy_pass
+    assert_nil config.proxy_user
+    assert_nil config.proxy_pass
+
+    assert_equal 5, config.http_open_timeout
+    assert_equal 10, config.http_read_timeout
 
-    assert_equal 5,   config.http_open_timeout
-    assert_equal 10,  config.http_read_timeout
-    assert_equal nil, config.recipient_override
+    assert_nil config.recipient_override
     assert_equal %w( send_message ), config.requests_to_resend
-    assert_equal nil, config.project_root
+    refute_nil config.project_root
     assert_equal 'production', config.environment
-    assert_equal nil, config.logger
-    assert_equal 'Ruby', config.framework
+    assert_nil config.logger
+    assert_match 'Ruby', config.framework
   end
   
   def test_initialization_overrides
@@ -52,6 +57,7 @@ class ConfigurationTest < MiniTest::Test
     config = PostageApp::Configuration.new
     
     config.secure = false
+
     assert_equal false, config.secure
     assert_equal 'http', config.scheme
     assert_equal 80, config.port

data/test/{failed_request_test.rb → unit/failed_request_test.rb}

@@ -1,10 +1,10 @@
-require_relative './helper'
+require_relative '../helper'
 
 class FailedRequestTest < MiniTest::Test
   def setup
     super
   
-    PostageApp.configuration.project_root = File.dirname(__FILE__)
+    PostageApp.configuration.project_root = __dir__
   end
   
   def test_store_and_initialize
@@ -87,12 +87,12 @@ class FailedRequestTest < MiniTest::Test
     request = PostageApp::Request.new(:get_project_info)
     
     message_receipt_response = stub(
-      :fail? => false,
-      :ok? => false,
-      :not_found? => true
+      fail?: false,
+      ok?: false,
+      not_found?: true
     )
 
-    message_receipt_request = stub(:send => message_receipt_response)
+    message_receipt_request = stub(send: message_receipt_response)
 
     PostageApp::Request.stubs(:new).with do |a,b|
       a == :get_message_receipt

data/test/{live_test.rb → unit/live_test.rb}

@@ -1,51 +1,16 @@
-require_relative './helper'
+require_relative '../helper'
 
 class LiveTest < MiniTest::Test
   # Note: Need access to a live PostageApp.com account
   # See helper.rb to set host / api key
 
-  if (ENV['POSTAGEAPP_API_KEY'])
+  if (ENV['POSTAGEAPP_API_KEY'] and ENV['POSTAGEAPP_API_KEY'] != '__TEST_API_KEY__')
     def test_configuration
       config = PostageApp.config
 
       assert config
       assert_equal ENV['POSTAGEAPP_API_KEY'], config.api_key
     end
-
-    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)
-      assert_equal nil, response.message
-      assert_equal(
-        {
-          'methods' => %w[
-            get_account_info
-            get_message_receipt
-            get_message_transmissions
-            get_messages
-            get_method_list
-            get_metrics
-            get_project_info
-            get_recipients_list
-            get_suppression_list
-            message_delivery_status
-            message_status
-            messages_history
-            project_create
-            project_destroy
-            project_info
-            send_message
-            test_mail_server
-            test_recipient
-          ].join(', ')
-        },
-        response.data
-      )
-    end
     
     def test_request_send_message
       request = PostageApp::Request.new(
@@ -67,7 +32,7 @@ class LiveTest < MiniTest::Test
       assert_equal 'ok', response.status
 
       assert_match(/^\w{40}$/, response.uid)
-      assert_equal nil, response.message
+      assert_nil response.message
       assert_match(/\d+/, response.data['message']['id'].to_s)
       
       receipt = PostageApp::Request.new(
@@ -95,7 +60,7 @@ class LiveTest < MiniTest::Test
 
       assert_match(/\A\w{40}$/, response.uid)
       assert_match(/\ARequest could not be processed/, response.message)
-      assert_equal nil, response.data
+      assert_nil response.data
     end
     
     # Testable under ruby 1.9.2 Probably OK in production too... Probably

data/test/{mail_delivery_method_test.rb → unit/mail_delivery_method_test.rb}

@@ -1,4 +1,4 @@
-require_relative './helper'
+require_relative '../helper'
 
 class MailerDeliveryTest < MiniTest::Test
   def setup

data/test/{mailer_4_test.rb → unit/mailer_4_test.rb}

@@ -1,8 +1,8 @@
-require_relative './helper'
+require_relative '../helper'
 
 class Mailer4Test < MiniTest::Test
   require_action_mailer(4) do
-    require File.expand_path('mailer/action_mailer_3/notifier', File.dirname(__FILE__))
+    require File.expand_path('mailer/action_mailer_3/notifier', __dir__)
     
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
 

data/test/{mailer_helper_methods_test.rb → unit/mailer_helper_methods_test.rb}

@@ -1,15 +1,15 @@
-require_relative './helper'
+require_relative '../helper'
 
 class MailerHelperMethodsTest < MiniTest::Test
   def test_mailer_helper_methods
     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'
       }

data/test/{postageapp_test.rb → unit/postageapp_test.rb}

@@ -1,4 +1,4 @@
-require_relative './helper'
+require_relative '../helper'
 
 class PostageAppTest < MiniTest::Test
   def test_method_configure
@@ -13,6 +13,12 @@ class PostageAppTest < MiniTest::Test
   ensure
     PostageApp.configuration_reset!
   end
+
+  def test_version
+    assert PostageApp.version.match(/\A\d+\.\d+\.\d+\z/), -> {
+      "%s is not a valid version number" % PostageApp.version.inspect
+    }
+  end
   
   def test_logger
     assert PostageApp.logger.is_a?(Logger)

data/test/{rails_initialization_test.rb → unit/rails_initialization_test.rb}

@@ -1,6 +1,6 @@
-require_relative './helper'
+require_relative '../helper'
 
-require File.expand_path('../lib/postageapp/rails/rails', File.dirname(__FILE__))
+require_relative '../../lib/postageapp/rails/rails'
 
 class RailsInitializationTest < MiniTest::Test
   def test_initialization

data/test/{request_test.rb → unit/request_test.rb}

@@ -1,4 +1,4 @@
-require_relative './helper'
+require_relative '../helper'
 
 class RequestTest < MiniTest::Test
   def test_method_uid
@@ -10,15 +10,15 @@ class RequestTest < MiniTest::Test
     assert_equal uid, request.uid
     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
+    assert_equal '/v.1.1/test_method.json', request.url.path
   end
-  
+
   def test_method_arguments_to_send
     request = PostageApp::Request.new('send_message',
       'headers' => {
@@ -34,9 +34,10 @@ class RequestTest < MiniTest::Test
 
     args = request.arguments_to_send
 
+    assert args['api_key']
     assert !args['api_key'].empty?
     assert_match(/^\w{40}$/, args['uid'])
-    
+
     payload = args['arguments']
 
     assert_equal 'sender@test.test', payload['headers']['from']
@@ -44,7 +45,7 @@ class RequestTest < MiniTest::Test
     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
@@ -53,37 +54,37 @@ class RequestTest < MiniTest::Test
     assert_match(/^\w{40}$/, args['uid'])
     assert_equal 'content', args['arguments']['data']
   end
-  
+
   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
-  
+
   def test_send
     mock_successful_send
-    
+
     request = PostageApp::Request.new('send_message',
       'headers' => {
         'from' => 'sender@test.test',
@@ -102,10 +103,10 @@ class RequestTest < MiniTest::Test
     assert_equal 'sha1hashuid23456789012345678901234567890', response.uid
     assert_equal({ 'message' => { 'id' => 999 } }, response.data)
   end
-  
+
   def test_send_failure
     mock_failed_send
-    
+
     request = PostageApp::Request.new(
       'send_message',
       'headers' => {
@@ -122,7 +123,7 @@ class RequestTest < MiniTest::Test
     response = request.send
 
     assert_equal 'fail', response.status
-    assert_equal nil, response.uid
-    assert_equal nil, response.data
+    assert_nil response.uid
+    assert_nil response.data
   end
 end