postageapp 1.2.5 → 1.4.0

data/lib/postageapp/diagnostics.rb

@@ -0,0 +1,30 @@
+require 'socket'
+
+class PostageApp::Diagnostics
+  # == Instance Methods =====================================================
+
+  def initialize(config)
+    @config = config
+  end
+
+  def proxy_host_resolved
+    resolve(@config.proxy_host, 'socks5')
+  end
+
+  def host_resolved
+    resolve(@config.host, @config.protocol)
+  end
+
+protected
+  def resolve(fqdn, service)
+    return unless (fqdn)
+
+    Socket.getaddrinfo(fqdn, service).map do |e|
+      # Result: [ family, port, name, ip, faily, socktype, protocol ]
+      e[3]
+    end.uniq
+
+  rescue SocketError
+    # Couldn't resolve, so nil
+  end
+end

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/failed_request.rb

@@ -1,4 +1,6 @@
 module PostageApp::FailedRequest
+  # == Module Methods =======================================================
+  
   # Stores request object into a file for future re-send
   # returns true if stored, false if not (due to undefined project path)
   def self.store(request)

data/lib/postageapp/http.rb

@@ -0,0 +1,32 @@
+module PostageApp::HTTP
+  # == Moduule Methods ======================================================
+
+  def self.connect(config)
+    connector =
+      if (config.proxy?)
+        Net::HTTP::Proxy(
+          config.proxy_host,
+          config.proxy_port || SOCKS5_PORT_DEFAULT,
+          config.proxy_user,
+          config.proxy_pass
+        )
+      else
+        Net::HTTP
+      end
+
+    http = connector.new(config.host, config.port)
+
+    unless (config.verify_certificate?)
+      context = OpenSSL::SSL::SSLContext.new
+      context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      http.send(:instance_variable_set, :@ssl_context, context)
+    end
+
+    http.read_timeout = config.http_read_timeout
+    http.open_timeout = config.http_open_timeout
+    http.use_ssl = config.secure?
+
+    http
+  end
+end

data/lib/postageapp/logger.rb

@@ -1,4 +1,6 @@
 class PostageApp::Logger < ::Logger
+  # == Instance Methods =====================================================
+  
   def format_message(severity, datetime, progname, msg)
     "[%s] %s\n" % [
       datetime.strftime('%m/%d/%Y %H:%M:%S %Z'),

data/lib/postageapp/mail.rb

@@ -1,3 +1,3 @@
-class PostageApp::Mail
+module PostageApp::Mail
   require 'postageapp/mail/arguments'
 end

data/lib/postageapp/mailer.rb

@@ -1,4 +1,5 @@
 begin
+  require 'active_support'
   require 'action_mailer'
   require 'action_mailer/version'
 
@@ -7,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,15 +166,29 @@ class PostageApp::Mailer < ActionMailer::Base
     m
   end
 
-protected
-  def each_template(paths, name, &block) #:nodoc:
-    templates = lookup_context.find_all(name, paths)
+  def find_first_mime_type(mt)
+    part = arguments['content'].detect{ |mime_type, body| mime_type == mt }
 
-    if (templates.present?)
-      templates.uniq { |t| t.formats }.each(&block)
-    end
+    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'] ||= { }
 
@@ -200,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,10 +1,16 @@
 class PostageApp::Request
-  API_VERSION = '1.0'
+  # == Constants ============================================================
+
+  API_VERSION = '1.1'
   
   HEADERS_DEFAULT = {
     'Content-type' => 'application/json',
     'Accept' => 'text/json, application/json'
   }
+
+  TimeoutError = defined?(::Timeout) ? ::Timeout::Error : ::TimeoutError
+
+  # == Properties ===========================================================
   
   # Unique ID (UID) for the request
   attr_writer :uid
@@ -19,6 +25,8 @@ class PostageApp::Request
   # Assigns the API key to be used for the request
   attr_accessor :api_key
 
+  # == Class Methods ========================================================
+
   # Returns a user-agent string used for identification when making API calls.
   def self.user_agent
     @user_agent ||=
@@ -28,6 +36,8 @@ class PostageApp::Request
         PostageApp.configuration.framework
       ]
   end
+
+  # == Instance Methods =====================================================
   
   # Creates a new Request with the given API call method and arguments.
   def initialize(method, arguments = nil)
@@ -44,19 +54,25 @@ 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
-      http.post(
-        url.path, 
-        self.arguments_to_send.to_json, 
-        HEADERS_DEFAULT.merge(
-          'User-Agent' => self.class.user_agent
+    http_response =
+      begin
+        http.post(
+          url.path, 
+          self.arguments_to_send.to_json, 
+          HEADERS_DEFAULT.merge(
+            'User-Agent' => self.class.user_agent
+          )
         )
-      )
 
-    rescue TimeoutError, Errno::ECONNREFUSED
-      nil
-    end
+      rescue TimeoutError, Errno::ECONNREFUSED => e
+        e
+      end
     
     response = PostageApp::Response.new(http_response)
     

data/lib/postageapp/response.rb

@@ -1,4 +1,11 @@
 class PostageApp::Response
+  # == Constants ============================================================
+
+  STATUS_TIMEOUT = 'timeout'.freeze
+  STATUS_FAIL = 'fail'.freeze
+
+  # == Properties ===========================================================
+
   # The UID should match the Request's UID. If Request didn't provide with one
   # PostageApp service should generate it for the Response
   attr_reader :uid
@@ -15,22 +22,29 @@ class PostageApp::Response
   attr_reader :data
 
   attr_reader :exception
+
+  # == Instance Methods =====================================================
   
   # Takes in Net::HTTPResponse object as the attribute.
   # If something goes wrong Response will be thought of as failed
   def initialize(http_response)
-    hash = JSON::parse(http_response.body)
-
-    _response = hash['response']
+    case (http_response)
+    when Exception
+      @status = STATUS_TIMEOUT
+      @message = '[%s] %s' % [ http_response.class, http_response.to_s ]
+    else
+      hash = JSON::parse(http_response.body)
+      _response = hash['response']
 
-    @status = _response['status']
-    @uid = _response['uid']
-    @message = _response['message']
+      @status = _response['status']
+      @uid = _response['uid']
+      @message = _response['message']
 
-    @data = hash['data']
+      @data = hash['data']
+    end
 
   rescue => e
-    @status = 'fail'
+    @status = STATUS_FAIL
     @exception = '[%s] %s' % [ e.class, e ]
   end
   

data/lib/postageapp/utils.rb

@@ -31,14 +31,3 @@ class Hash
     end
   end
 end
-
-class Net::HTTP
-  # Getting rid of the 'warning: peer certificate won't be verified in this SSL session'
-  alias_method :__initialize, :initialize
-  def initialize(*args)
-    __initialize(*args)
-
-    @ssl_context = OpenSSL::SSL::SSLContext.new
-    @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-end

data/log/.gitignore

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

data/postageapp.gemspec

@@ -1,33 +1,32 @@
 # 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.name = 'postageapp'
+  s.version = File.read(File.expand_path('VERSION', __dir__)).gsub(/\s/, '')
   s.authors = [
-    "Oleg Khabarov",
-    "Scott Tadman",
-    "The Working Group Inc."
+    'Scott Tadman',
+    'Oleg Khabarov',
+    'PostageApp Ltd.'
   ]
   s.email = [
-    "oleg@khabarov.ca",
-    "tadman@postageapp.com"
+    'tadman@postageapp.com',
+    'oleg@khabarov.ca',
+    'info@postageapp.com'
   ]
 
-  s.homepage = "http://github.com/postageapp/postageapp-ruby"
+  s.homepage = 'http://github.com/postageapp/postageapp-ruby'
 
-  s.summary = "Gem for communicating with the PostageApp email API"
-  s.description = "Gem that interfaces with PostageApp service to send emails from Ruby applications"
+  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'
-  s.add_dependency 'mail'
+  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 ========================================================
 
@@ -74,7 +74,7 @@ def shell(*args)
   end
 
   unless (system(*args))
-    exit($?)
+    exit($?.to_i)
   end
 end
 

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