postageapp 1.3.0 → 1.4.2

data/lib/postageapp/engine.rb

@@ -0,0 +1,11 @@
+module PostageApp
+  class Engine < ::Rails::Engine
+    isolate_namespace PostageApp
+
+    initializer 'postageapp' do |app|
+      if (app.config.respond_to?(:action_mailbox))
+        app.config.action_mailbox.ingress = :postage_app
+      end
+    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/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/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/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/lib/postageapp.rb

@@ -9,70 +9,88 @@ require 'base64'
 
 module PostageApp
   class Error < StandardError ; end
-  
+
   # Call this method to modify your configuration
   # Example:
   #   PostageApp.configure do |config|
-  #     config.api_key             = '1234567890abcdef'
-  #     config.recipient_override  = 'test@test.test' if Rails.env.staging?
+  #     config.api_key = '1234567890abcdef'
+  #
+  #     if Rails.env.staging?
+  #       config.recipient_override = 'test@test.test'
+  #     end
   #   end
-  # 
+  #
   # If you do not want/need to initialize the gem in this way, you can use the environment
   # variable POSTAGEAPP_API_KEY to set up your key.
-  
-  def self.configure(reset = false)
+
+  VERSION = File.read(File.expand_path('../VERSION', __dir__)).gsub(/\s/, '')
+
+  def self.version
+    VERSION
+  end
+
+  def self.configure(reset: false)
     if (reset)
-      self.configuration_reset!
+      self.config_reset!
     end
 
-    yield(self.configuration)
+    yield(self.config)
   end
-  
+
   # Accessor for the PostageApp::Configuration object
   # Example use:
   #   PostageApp.configuration.api_key = '1234567890abcdef'
-  def self.configuration
-    @configuration ||= Configuration.new
+  def self.config
+    @config ||= Configuration.new
   end
 
-  def self.configuration_reset!
-    @configuration = nil
+  def self.config_reset!
+    @config = nil
   end
 
   class << self
-    alias :config :configuration
+    alias_method :configuration_reset!, :config_reset!
+    alias_method :configuration, :config
   end
-  
+
   # Logger for the plugin
   def self.logger
     @logger ||= begin
-      configuration.logger || PostageApp::Logger.new(
-        if (configuration.project_root)
-          FileUtils.mkdir_p(File.join(File.expand_path(configuration.project_root), 'log'))
-          File.join(configuration.project_root, "log/postageapp_#{configuration.environment}.log")
+      config.logger || PostageApp::Logger.new(
+        if (config.project_root)
+          FileUtils.mkdir_p(File.join(File.expand_path(config.project_root), 'log'))
+          File.join(config.project_root, "log/postageapp_#{config.environment}.log")
         else
-          STDOUT
+          $stdout
         end
       )
     end
   end
 end
 
-require 'postageapp/configuration'
-require 'postageapp/diagnostics'
-require 'postageapp/failed_request'
-require 'postageapp/http'
-require 'postageapp/logger'
-require 'postageapp/request'
-require 'postageapp/response'
-require 'postageapp/mail'
-require 'postageapp/mail/delivery_method'
-require 'postageapp/utils'
-require 'postageapp/version'
-
-require 'postageapp/rails/railtie' if (defined?(Rails::Railtie))
-
-require 'postageapp/mail/extensions'
+require_relative './postageapp/env'
+
+if (PostageApp::Env.rails?)
+  require_relative './postageapp/engine'
+  # require 'postageapp/ingresses/postage_app'
+end
+
+require_relative './postageapp/configuration'
+require_relative './postageapp/diagnostics'
+require_relative './postageapp/failed_request'
+require_relative './postageapp/http'
+require_relative './postageapp/logger'
+require_relative './postageapp/request'
+require_relative './postageapp/response'
+require_relative './postageapp/mail'
+require_relative './postageapp/mail/delivery_method'
+require_relative './postageapp/utils'
+
+if (defined?(Rails::Railtie))
+  require_relative './postageapp/rails/railtie'
+end
+
+require_relative './postageapp/mail/extensions'
 
 if (defined?(::Mail))
   PostageApp::Mail::Extensions.install!

data/log/.gitignore

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

data/postageapp.gemspec

@@ -1,34 +1,31 @@
 # 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'
   ]
 
-  s.homepage = 'http://github.com/postageapp/postageapp-ruby'
+  s.homepage = 'https://github.com/postageapp/postageapp-ruby'
 
   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'