postageapp 1.3.1 → 1.4.0

data/lib/postageapp/engine.rb

@@ -0,0 +1,9 @@
+module PostageApp
+  class Engine < ::Rails::Engine
+    isolate_namespace PostageApp
+
+    initializer 'postageapp' do |app|
+      app.config.action_mailbox.ingress = :postage_app
+    end
+  end
+end

data/lib/postageapp/env.rb

@@ -0,0 +1,9 @@
+module PostageApp::Env
+  def self.rails?
+    defined?(Rails)
+  end
+
+  def self.rails_with_encrypted_credentials?
+    defined?(Rails) and Rails.respond_to?(:application) and Rails.application.respond_to?(:credentials)
+  end
+end

data/lib/postageapp/mailer.rb

@@ -8,15 +8,5 @@ rescue LoadError
 end
 
 if (defined?(ActionMailer))
-  # Loading PostageApp::Mailer class depending on what action_mailer is
-  # currently installed on the system. Assuming we're dealing only with
-  # ones that come with Rails 2 and 3
-  case (ActionMailer::VERSION::MAJOR)
-  when 3
-    require File.expand_path('mailer/mailer_3', File.dirname(__FILE__))
-  when 2
-    require File.expand_path('mailer/mailer_2', File.dirname(__FILE__))
-  else
-    require File.expand_path('mailer/mailer_4', File.dirname(__FILE__))
-  end
+  require_relative './mailer/mailer_4'
 end

data/lib/postageapp/mailer/mailer_4.rb

@@ -24,7 +24,7 @@
 # Sending email
 #
 #   # Create a PostageApp::Request object
-#   request = Notifier.signup_notification(user) 
+#   request = Notifier.signup_notification(user)
 #   # Deliver the message and return a PostageApp::Response
 #   response = request.deliver_now
 
@@ -156,7 +156,7 @@ class PostageApp::Mailer < ActionMailer::Base
       :template_name,
       :template_path
     )
-    
+
     m.headers.merge!(assignable)
 
     # Render the templates and blocks
@@ -166,13 +166,29 @@ class PostageApp::Mailer < ActionMailer::Base
     m
   end
 
-protected
-  def each_template(paths, name, &block) #:nodoc:
-    (lookup_context.find_all(name, paths) || [ ]).uniq do |t|
-      t.formats
-    end.each(&block)
+  def find_first_mime_type(mt)
+    part = arguments['content'].detect{ |mime_type, body| mime_type == mt }
+
+    OpenStruct.new(mime_type: part[0], decoded: part[1]) if part
+  end
+
+  def header
+    @_message.arguments['headers']
+  end
+
+  def reply_to
+    @_message.arguments.dig('headers', 'reply_to')
+  end
+
+  def cc
+    @_message.arguments.dig('headers', 'cc')
+  end
+
+  def multipart?
+    %w[ text/plain text/html ].all? { |mt| arguments['content'].key?(mt) }
   end
 
+protected
   def create_parts_from_responses(m, responses) #:nodoc:
     content = m.arguments['content'] ||= { }
 
@@ -198,17 +214,17 @@ class PostageApp::Request
   def deliver_now
     inform_interceptors
 
-    if (perform_deliveries)
-      if (@delivery_method == Mail::TestMailer)
-        @delivery_method.deliveries << self
-      else
-        self.send
-      end
+    return unless (perform_deliveries)
+
+    if (@delivery_method == Mail::TestMailer)
+      @delivery_method.deliveries << self
+    else
+      self.send
     end
   end
   alias_method :deliver, :deliver_now
 
-  # Not 100% on this, but I need to assign this so I can properly handle deliver method
+  # Allows overriding the delivery method setting
   def delivery_method(method = nil, settings = nil)
     @delivery_method = method
   end

data/lib/postageapp/rails/railtie.rb

@@ -1,7 +1,5 @@
-require 'postageapp'
-
 if (defined?(ActionMailer))
-  require 'postageapp/mailer'
+  require_relative '../mailer'
 
   # Register as a delivery method with ActionMailer
   ActionMailer::Base.add_delivery_method(

data/lib/postageapp/request.rb

@@ -1,7 +1,7 @@
 class PostageApp::Request
   # == Constants ============================================================
 
-  API_VERSION = '1.0'
+  API_VERSION = '1.1'
   
   HEADERS_DEFAULT = {
     'Content-type' => 'application/json',
@@ -54,6 +54,11 @@ class PostageApp::Request
     http = PostageApp.configuration.http
 
     PostageApp.logger.info(self)
+
+    if (ENV['DEBUG'])
+      puts "// #{url}"
+      puts JSON.pretty_generate(self.arguments_to_send)
+    end
     
     http_response =
       begin

data/log/.gitignore

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

data/postageapp.gemspec

@@ -1,20 +1,19 @@
 # encoding: utf-8
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
-
-require 'postageapp/version'
+$LOAD_PATH.unshift(File.expand_path('./lib', __dir__))
 
 Gem::Specification.new do |s|
   s.name = 'postageapp'
-  s.version = PostageApp::VERSION
+  s.version = File.read(File.expand_path('VERSION', __dir__)).gsub(/\s/, '')
   s.authors = [
     'Scott Tadman',
     'Oleg Khabarov',
-    'The Working Group Inc.'
+    'PostageApp Ltd.'
   ]
   s.email = [
     'tadman@postageapp.com',
-    'oleg@khabarov.ca'
+    'oleg@khabarov.ca',
+    'info@postageapp.com'
   ]
 
   s.homepage = 'http://github.com/postageapp/postageapp-ruby'
@@ -22,13 +21,12 @@ Gem::Specification.new do |s|
   s.summary = 'Client library for PostageApp Email API'
   s.description = 'PostageApp Library for Ruby and Ruby on Rails applications'
   s.license = 'MIT'
-  
+
   s.files = `git ls-files`.split("\n")
   s.platform = Gem::Platform::RUBY
   s.require_paths = [ 'lib' ]
 
-  s.required_ruby_version = '>= 1.9.3'
-  
-  s.add_dependency 'json', '>= 1.8'
+  s.required_ruby_version = '>= 2.5.0'
+
   s.add_dependency 'mail', '~> 2.4'
 end

data/script/with

@@ -20,8 +20,8 @@
 
 # == Constants ==============================================================
 
-GEMFILE_DIR = File.expand_path('../test/gemfiles', File.dirname(__FILE__))
-GEMFILE_ROOT = File.expand_path('../Gemfile', File.dirname(__FILE__))
+GEMFILE_DIR = File.expand_path('../test/gemfiles', __dir__)
+GEMFILE_ROOT = File.expand_path('../Gemfile', __dir__)
 
 # == Support Methods ========================================================
 

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # rubygems 1.8.30
 

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

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # rubygems 1.8.30
 

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

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

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', '~> 1.8.3'
 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,8 @@ 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__'
 
@@ -47,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