postageapp 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87918c47d50e1751788cda27b312a59b3ee55b32
-  data.tar.gz: 983a6fe90bf14de8fa3772bb9f94abc00c0df4b9
+  metadata.gz: 99701f8c8bb6345d893d0e891e4080b574934fd2
+  data.tar.gz: 96c72f588f097c9a04ed8e0d47dc1ca836f96799
 SHA512:
-  metadata.gz: b5711ee6b20b410068969d9b5aa2dcda4089f8db04a64abb957f3b54f56ec7ea2a42d98cbb7a491b7ea795d4b488b03525def4019b4eeefccfaf70adaef55805
-  data.tar.gz: 7676cb2ff7e3b55b5c8d1f4efcd62ffffd149705694d918e18a7a9b4f5cd640f10fe281721da2a42458dfb45d581a970ee91a2e7fc0a336d5a0082a8449f05ee
+  metadata.gz: 3bfdec8d06ffb5af34bd0e13897f46986fde993d36009c96aa34d0710e2ff5729415d157b1e7af28448592da86566b272fec80d4ea52d1038c254d506c098ac9
+  data.tar.gz: 8da78d92e5d62ca7e5a9e7e77d04dd33dee17977a37f372738cb1c58d278f954132f1ae722f04a5c7b9b76e53b05ac1cada4328517b9c8d74aef631ef09da37f

data/generators/postageapp/templates/postageapp_tasks.rake

@@ -1,6 +1,6 @@
 namespace :postageapp do
   desc 'Show the current PostageApp configuration'
-  task :config => :environment do
+  task config: :environment do
     puts "PostageApp Configuration"
     puts "------------------------"
     puts
@@ -30,12 +30,29 @@ namespace :postageapp do
   end
 
   desc 'Verify the PostageApp gem installation by requesting project info from the API'
-  task :test => :environment do 
-    
-    puts "Attempting to contact #{PostageApp.configuration.host} ..."
+  task test: :environment do
+    diag = PostageApp::Diagnostics.new(PostageApp.config)
+
+    puts "Resolving #{PostageApp.config.host.inspect}"
+    if (resolved = diag.host_resolved)
+      puts "\t#{resolved.join(',')}"
+    else
+      puts "\tCouldn't be resolved. [ERROR]"
+    end
+
+    if (PostageApp.config.proxy?)
+      puts "Resolving #{PostageApp.config.proxy_host.inspect}"
+      if (resolved = diag.proxy_host_resolved)
+        puts "\t#{resolved.join(',')}"
+      else
+        puts "\tCouldn't be resolved. [ERROR]"
+      end
+    end
+
+    puts "Trying to contact #{PostageApp.configuration.url}..."
     response = PostageApp::Request.new(:get_project_info).send
     
-    if response.ok?
+    if (response.ok?)
       project_name = response.data['project']['name']
       project_url = response.data['project']['url']
       user_emails = response.data['project']['users']
@@ -52,7 +69,8 @@ END
       # Most likely a single user if it's a new project
       puts 'Sending test message to users in the project...'
       r = send_test_message(user_emails)
-      if r.ok?
+
+      if (r.ok?)
         puts "Message was successfully sent!\n\n"
         puts 'Your application is ready to use PostageApp!'
       else
@@ -60,7 +78,6 @@ END
         puts 'This was the response:'
         puts r.to_yaml
       end
-      
     else
       puts 'Failed to fetch information about your project. This was the response:'
       puts response.to_yaml
@@ -68,7 +85,7 @@ END
   end
   
   desc 'Manually trigger resend of all failed emails'
-  task :resend_failed_emails => :environment do
+  task resend_failed_emails: :environment do
     puts 'Attempting to resend failed emails...'
     PostageApp::FailedRequest.resend_all
     puts 'Done!'

data/lib/postageapp.rb

@@ -2,22 +2,11 @@ require 'net/http'
 require 'net/https'
 require 'digest'
 require 'logger'
+require 'fileutils'
 
 require 'json'
 require 'base64'
 
-require 'postageapp/utils'
-require 'postageapp/version'
-require 'postageapp/configuration'
-require 'postageapp/logger'
-require 'postageapp/request'
-require 'postageapp/failed_request'
-require 'postageapp/response'
-require 'postageapp/mail'
-require 'postageapp/mail/delivery_method'
-
-require 'postageapp/rails/railtie' if (defined?(Rails::Railtie))
-
 module PostageApp
   class Error < StandardError ; end
   
@@ -31,8 +20,12 @@ module PostageApp
   # 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
-    yield(configuration)
+  def self.configure(reset = false)
+    if (reset)
+      self.configuration_reset!
+    end
+
+    yield(self.configuration)
   end
   
   # Accessor for the PostageApp::Configuration object
@@ -42,6 +35,10 @@ module PostageApp
     @configuration ||= Configuration.new
   end
 
+  def self.configuration_reset!
+    @configuration = nil
+  end
+
   class << self
     alias :config :configuration
   end
@@ -61,6 +58,20 @@ module PostageApp
   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'
 
 if (defined?(::Mail))

data/lib/postageapp/configuration.rb

@@ -38,19 +38,41 @@
 # Advanced Options
 # ----------------
 # :port - The port to make HTTP/HTTPS requests (default based on secure option)
-# :protocol - Set to either `http` or `https` (default based on secure option)
+# :scheme - Set to either `http` or `https` (default based on secure option)
 # :requests_to_resend - List of API calls that should be replayed if they fail.
 #                       (default: send_message)
 
 class PostageApp::Configuration
+  # == Constants ============================================================
+
+  HOST_DEFAULT = 'api.postageapp.com'.freeze
+
+  SOCKS5_PORT_DEFAULT = 1080
+  HTTP_PORT_DEFAULT = 80
+  HTTPS_PORT_DEFAULT = 443
+
+  SCHEME_FOR_SECURE = {
+    true => 'https'.freeze,
+    false => 'http'.freeze
+  }.freeze
+
+  PATH_DEFAULT = '/'.freeze
+
+  FRAMEWORK_DEFAULT = 'Ruby'.freeze
+  ENVIRONMENT_DEFAULT = 'production'.freeze
+
+  # == Properties ===========================================================
+
   attr_accessor :secure
-  attr_writer :protocol
+  attr_writer :scheme
   attr_accessor :host
   attr_writer :port
   attr_accessor :proxy_host
-  attr_accessor :proxy_port
+  attr_writer :proxy_port
   attr_accessor :proxy_user
   attr_accessor :proxy_pass
+
+  attr_accessor :verify_certificate
   attr_accessor :http_open_timeout
   attr_accessor :http_read_timeout
   attr_accessor :recipient_override
@@ -59,23 +81,41 @@ class PostageApp::Configuration
   attr_accessor :framework
   attr_accessor :environment
   attr_accessor :logger
+
+  # == Instance Methods =====================================================
   
   def initialize
     @secure = true
-    @host = 'api.postageapp.com'
+    @verify_certificate = true
+
+    @host = ENV['POSTAGEAPP_HOST'] || HOST_DEFAULT
+
+    @proxy_port = SOCKS5_PORT_DEFAULT
 
     @http_open_timeout = 5
     @http_read_timeout = 10
 
     @requests_to_resend = %w[ send_message ]
 
-    @framework = 'Ruby'
-
-    @environment = 'production'
+    @framework = FRAMEWORK_DEFAULT
+    @environment = ENVIRONMENT_DEFAULT
   end
   
   alias_method :secure?, :secure
-  
+  alias_method :verify_certificate?, :verify_certificate
+
+  def port_default?
+    if (self.secure?)
+      self.port == HTTPS_PORT_DEFAULT
+    else
+      self.port == HTTP_PORT_DEFAULT
+    end
+  end
+
+  def proxy?
+    self.proxy_host and self.proxy_host.match(/\A\S+\z/)
+  end
+
   # Assign which API key is used to make API calls. Can also be specified
   # using the `POSTAGEAPP_API_KEY` environment variable.
   def api_key=(key)
@@ -88,34 +128,35 @@ class PostageApp::Configuration
     @api_key ||= ENV['POSTAGEAPP_API_KEY']
   end
   
-  # Returns the HTTP protocol used to make API calls
-  def protocol
-    @protocol ||= (secure? ? 'https' : 'http')
+  # Returns the HTTP scheme used to make API calls
+  def scheme
+    @scheme ||= SCHEME_FOR_SECURE[self.secure?]
   end
+
+  alias_method :protocol=, :scheme=
+  alias_method :protocol, :scheme
   
   # Returns the port used to make API calls
   def port
-    @port ||= (secure? ? 443 : 80)
+    @port ||= (self.secure? ? HTTPS_PORT_DEFAULT : HTTP_PORT_DEFAULT)
+  end
+
+  # Returns the port used to connect via SOCKS5
+  def proxy_port
+    @proxy_port ||= SOCKS5_PORT_DEFAULT
   end
   
   # Returns the endpoint URL to make API calls
   def url
-    "#{self.protocol}://#{self.host}:#{self.port}"
+    '%s://%s%s' % [
+      self.scheme,
+      self.host,
+      self.port_default? ? '' : (':%d' % self.port)
+    ]
   end
 
-  # Returns a properly configured Net::HTTP connection
+  # Returns a connection aimed at the API endpoint
   def http
-    http = Net::HTTP::Proxy(
-      self.proxy_host,
-      self.proxy_port,
-      self.proxy_user,
-      self.proxy_pass
-    ).new(self.host, self.port)
-    
-    http.read_timeout = self.http_read_timeout
-    http.open_timeout = self.http_open_timeout
-    http.use_ssl = self.secure?
-
-    http
+    PostageApp::HTTP.connect(self)
   end
 end

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

@@ -1,10 +1,16 @@
 class PostageApp::Request
+  # == Constants ============================================================
+
   API_VERSION = '1.0'
   
   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)
@@ -45,18 +55,19 @@ class PostageApp::Request
 
     PostageApp.logger.info(self)
     
-    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/lib/postageapp/version.rb

@@ -1,3 +1,3 @@
 module PostageApp
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/postageapp.gemspec

@@ -8,19 +8,19 @@ Gem::Specification.new do |s|
   s.name = 'postageapp'
   s.version = PostageApp::VERSION
   s.authors = [
-    'Oleg Khabarov',
     'Scott Tadman',
+    'Oleg Khabarov',
     'The Working Group Inc.'
   ]
   s.email = [
-    'oleg@khabarov.ca',
-    'tadman@postageapp.com'
+    'tadman@postageapp.com',
+    'oleg@khabarov.ca'
   ]
 
   s.homepage = 'http://github.com/postageapp/postageapp-ruby'
 
-  s.summary = 'Client for PostageApp Email API'
-  s.description = 'Official client for the PostageApp email service'
+  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")
@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
   
-  s.add_dependency 'json'
-  s.add_dependency 'mail'
+  s.add_dependency 'json', '~> 1.8'
+  s.add_dependency 'mail', '~> 2.4'
 end

data/test/configuration_test.rb

@@ -1,18 +1,20 @@
-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
+    assert_equal ENV['POSTAGEAPP_API_KEY'], config.api_key
+    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 1080, 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
@@ -26,10 +28,10 @@ class ConfigurationTest < MiniTest::Test
   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,11 +39,13 @@ 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
@@ -49,7 +53,7 @@ class ConfigurationTest < MiniTest::Test
     
     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 +74,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

data/test/failed_request_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class FailedRequestTest < MiniTest::Test
   def setup

data/test/helper.rb

@@ -45,24 +45,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) 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/live_test.rb

@@ -1,20 +1,17 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+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_LIVE_TESTS'])
-    def setup
-      super
-      
-      PostageApp.configure do |config|
-        config.secure = false
-        config.host = 'api.postageapp.local'
-        config.api_key = 'PROJECT_API_KEY'
-      end
+  if (ENV['POSTAGEAPP_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
@@ -25,14 +22,34 @@ class LiveTest < MiniTest::Test
       assert_equal nil, response.message
       assert_equal(
         {
-          'methods' => 'get_account_info, get_message_receipt, get_method_list, get_project_info, send_message'
+          '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(:send_message, {
+      request = PostageApp::Request.new(
+        :send_message,
         headers: {
           'from' => 'sender@example.com',
           'subject' => 'Test Message'
@@ -42,7 +59,7 @@ class LiveTest < MiniTest::Test
           'text/plain' => 'text content',
           'text/html' => 'html content'
         }
-      })
+      )
 
       response = request.send
 
@@ -74,35 +91,43 @@ class LiveTest < MiniTest::Test
       response = request.send
 
       assert_equal 'PostageApp::Response', response.class.name
-      assert_equal 'internal_server_error', response.status
+      assert_equal 'call_error', response.status
+
       assert_match(/\A\w{40}$/, response.uid)
-      assert_match(/\ANo action responded to non_existant/, response.message)
+      assert_match(/\ARequest could not be processed/, response.message)
       assert_equal nil, response.data
     end
     
     # Testable under ruby 1.9.2 Probably OK in production too... Probably
     # Lunchtime reading: http://ph7spot.com/musings/system-timer
     def test_request_timeout
-      PostageApp.configuration.host = '127.0.0.254'
+      PostageApp.configuration.host = '127.0.0.255'
 
       request = PostageApp::Request.new(:get_method_list)
 
       response = request.send
 
       assert_equal 'PostageApp::Response', response.class.name
-      assert_equal 'fail', response.status
+      assert_equal 'timeout', response.status
     end
     
-    def test_deliver_with_custom_postage_variables
-      response = if ActionMailer::VERSION::MAJOR < 3
-        require File.expand_path('../mailer/action_mailer_2/notifier', __FILE__)
-        Notifier.deliver_with_custom_postage_variables
-      else
-        require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
-        Notifier.with_custom_postage_variables.deliver
+    if (defined?(Rails))
+      def test_deliver_with_custom_postage_variables
+        response =
+          if (ActionMailer::VERSION::MAJOR < 3)
+            require File.expand_path('../mailer/action_mailer_2/notifier', __FILE__)
+
+            Notifier.deliver_with_custom_postage_variables
+          else
+            require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+
+            Notifier.with_custom_postage_variables.deliver
+          end
+
+        assert_equal 'ok', response.status
+        assert_equal true, response.ok?
       end
-      assert response.ok?
-    end 
+    end
   else
     puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
 

data/test/mail_delivery_method_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class MailerDeliveryTest < MiniTest::Test
   def setup

data/test/mailer/action_mailer_2/notifier.rb

@@ -1,4 +1,5 @@
-# Test mailer for ActionMailer 2
+# Test mailer for ActionMailer 2.x
+
 class Notifier < PostageApp::Mailer
   self.template_root = File.dirname(__FILE__)
 
@@ -31,14 +32,14 @@ class Notifier < PostageApp::Mailer
     )
 
     part(
-      :content_type => 'text/plain',
-      :body => 'text content'
+      content_type: 'text/plain',
+      body: 'text content'
     )
 
     attachment(
-      :content_type => 'image/jpeg',
-      :filename => 'foo.jpg',
-      :body => '123456789'
+      content_type: 'image/jpeg',
+      filename: 'foo.jpg',
+      body: '123456789'
     )
   end
   
@@ -46,9 +47,9 @@ class Notifier < PostageApp::Mailer
     setup_headers
 
     attachment(
-      :content_type => 'image/jpeg',
-      :filename => 'foo.jpg',
-      :body => '123456789'
+      content_type: 'image/jpeg',
+      filename: 'foo.jpg',
+      body: '123456789'
     )
   end
   

data/test/mailer/action_mailer_3/notifier.rb

@@ -1,4 +1,4 @@
-# Test mailer for ActionMailer 3 and 4
+# Test mailer for ActionMailer 3.x+
 
 class Notifier < PostageApp::Mailer
   self.append_view_path(File.dirname(__FILE__))
@@ -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/mailer_2_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class Mailer2Test < MiniTest::Test
   require_action_mailer(2) do

data/test/mailer_3_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class Mailer3Test < MiniTest::Test
   require_action_mailer(3) do

data/test/mailer_4_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class Mailer4Test < MiniTest::Test
   require_action_mailer(4) do

data/test/mailer_helper_methods_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class MailerHelperMethodsTest < MiniTest::Test
   def test_mailer_helper_methods

data/test/postageapp_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class PostageAppTest < MiniTest::Test
   def test_method_configure
@@ -9,6 +9,9 @@ class PostageAppTest < MiniTest::Test
 
     assert_equal 'abcdefg12345', PostageApp.configuration.api_key
     assert_equal 'test.test', PostageApp.configuration.host
+
+  ensure
+    PostageApp.configuration_reset!
   end
   
   def test_logger

data/test/rails_initialization_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 require File.expand_path('../lib/postageapp/rails/rails', File.dirname(__FILE__))
 

data/test/request_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class RequestTest < MiniTest::Test
   def test_method_uid
@@ -34,22 +34,22 @@ class RequestTest < MiniTest::Test
 
     args = request.arguments_to_send
 
-    assert_equal '1234567890abcdef', 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']
-    assert_equal 'Test Message',     payload['headers']['subject']
-    assert_equal 'test@test.test',   payload['recipients']
-    assert_equal 'text content',     payload['content']['text/plain']
-    assert_equal 'html content',     payload['content']['text/html']
+    assert_equal 'Test Message', payload['headers']['subject']
+    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
 
-    assert_equal '1234567890abcdef', args['api_key']
+    assert !args['api_key'].empty?
     assert_match(/^\w{40}$/, args['uid'])
     assert_equal 'content', args['arguments']['data']
   end

data/test/response_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative './helper'
 
 class ResponseTest < MiniTest::Test
   def test_initialization

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
-- Oleg Khabarov
 - Scott Tadman
+- Oleg Khabarov
 - The Working Group Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Official client for the PostageApp email service
+        version: '2.4'
+description: PostageApp Library for Ruby and Ruby on Rails applications
 email:
-- oleg@khabarov.ca
 - tadman@postageapp.com
+- oleg@khabarov.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -62,7 +62,9 @@ files:
 - lib/generators/postageapp/postageapp_generator.rb
 - lib/postageapp.rb
 - lib/postageapp/configuration.rb
+- lib/postageapp/diagnostics.rb
 - lib/postageapp/failed_request.rb
+- lib/postageapp/http.rb
 - lib/postageapp/logger.rb
 - lib/postageapp/mail.rb
 - lib/postageapp/mail/arguments.rb
@@ -133,18 +135,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Client for PostageApp Email API
+summary: Client library for PostageApp Email API
 test_files: []