postageapp 1.2.5 → 1.4.0

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.1.0'
 gem 'json'

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.0'
 

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
 

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

@@ -1,8 +1,7 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 4.2.0'
 
-gem 'json'
 gem 'mail'
 
 group :test do

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

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

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

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

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

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

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

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

data/test/gemfiles/Gemfile.ruby

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

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,24 +47,11 @@ 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.http_read_timeout  = 10
-      config.recipient_override = nil
+    PostageApp.configure(reset: true) do |config|
       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.framework = 'Ruby [Test]'
     end
 
     if (defined?(ActionMailer))

data/test/log/.gitignore

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

data/test/mailer/action_mailer_3/notifier.rb

@@ -1,7 +1,7 @@
-# Test mailer for ActionMailer 3 and 4
+# 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
@@ -66,9 +66,9 @@ class Notifier < PostageApp::Mailer
     postageapp_uid 'custom_uid'
 
     mail(
-      :from => 'sender@example.com',
-      :subject => 'Test Message',
-      :to => {
+      from: 'sender@example.com',
+      subject: 'Test Message',
+      to: {
         'test1@example.net' => { 'name' => 'Test 1' },
         'test2@example.net' => { 'name' => 'Test 2' }
       }
@@ -76,11 +76,11 @@ class Notifier < PostageApp::Mailer
   end
 
 private
-  def headers_hash(options = { })
+  def headers_hash(options = nil)
     {
-      :from => 'sender@example.com',
-      :to => 'recipient@example.net',
-      :subject => 'Test Message'
-    }.merge(options)
+      from: 'sender@example.com',
+      to: 'recipient@example.net',
+      subject: 'Test Message'
+    }.merge(options || { })
   end
 end

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,35 +1,42 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
 class ConfigurationTest < MiniTest::Test
   def test_initialization_defaults
     config = PostageApp::Configuration.new
-    
+
     assert_equal true, config.secure
-    assert_equal nil,config.api_key
-    assert_equal 'https', config.protocol
-    assert_equal 'api.postageapp.com', config.host
+
+    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_equal nil, config.proxy_port
-    assert_equal nil, config.proxy_user
-    assert_equal nil, config.proxy_pass
-    assert_equal 5,   config.http_open_timeout
-    assert_equal 10,  config.http_read_timeout
-    assert_equal nil, config.recipient_override
+
+    assert_nil config.proxy_host
+    assert_equal 1080, config.proxy_port
+    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_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
     config = PostageApp::Configuration.new
     
-    config.protocol = 'http'
-    config.port     = 999
+    config.scheme = 'http'
+    config.port = 999
     
-    assert_equal 'http', config.protocol
+    assert_equal 'http', config.scheme
     assert_equal 999, config.port
   end
   
@@ -37,19 +44,22 @@ class ConfigurationTest < MiniTest::Test
     config = PostageApp::Configuration.new
     
     config.secure = true
+
     assert_equal true, config.secure
-    assert_equal 'https', config.protocol
+    assert_equal 'https', config.scheme
     assert_equal 443, config.port
     
-    assert config.secure?
+    assert_equal true, config.secure?
+    assert_equal true, config.port_default?
   end
   
   def test_initialization_for_insecure
     config = PostageApp::Configuration.new
     
     config.secure = false
+
     assert_equal false, config.secure
-    assert_equal 'http', config.protocol
+    assert_equal 'http', config.scheme
     assert_equal 80, config.port
     
     assert !config.secure?
@@ -70,6 +80,9 @@ class ConfigurationTest < MiniTest::Test
     config = PostageApp::Configuration.new
     
     config.host = 'api.postageapp.com'
-    assert_equal 'https://api.postageapp.com:443', config.url
+
+    assert_equal true, config.port_default?
+
+    assert_equal 'https://api.postageapp.com', config.url
   end
 end