postageapp 1.2.5 → 1.4.0

data/test/{failed_request_test.rb → unit/failed_request_test.rb}

@@ -1,10 +1,10 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
 class FailedRequestTest < MiniTest::Test
   def setup
     super
   
-    PostageApp.configuration.project_root = File.dirname(__FILE__)
+    PostageApp.configuration.project_root = __dir__
   end
   
   def test_store_and_initialize
@@ -87,12 +87,12 @@ class FailedRequestTest < MiniTest::Test
     request = PostageApp::Request.new(:get_project_info)
     
     message_receipt_response = stub(
-      :fail? => false,
-      :ok? => false,
-      :not_found? => true
+      fail?: false,
+      ok?: false,
+      not_found?: true
     )
 
-    message_receipt_request = stub(:send => message_receipt_response)
+    message_receipt_request = stub(send: message_receipt_response)
 
     PostageApp::Request.stubs(:new).with do |a,b|
       a == :get_message_receipt

data/test/{live_test.rb → unit/live_test.rb}

@@ -1,38 +1,20 @@
-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
-    end
-    
-    def test_request_get_method_list
-      request = PostageApp::Request.new(:get_method_list)
-      response = request.send
-      
-      assert_equal 'PostageApp::Response', response.class.name
-      assert_equal 'ok', response.status
-      assert_match(/^\w{40}$/, response.uid)
-      assert_equal nil, response.message
-      assert_equal(
-        {
-          'methods' => 'get_account_info, get_message_receipt, get_method_list, get_project_info, send_message'
-        },
-        response.data
-      )
+  if (ENV['POSTAGEAPP_API_KEY'] and ENV['POSTAGEAPP_API_KEY'] != '__TEST_API_KEY__')
+    def test_configuration
+      config = PostageApp.config
+
+      assert config
+      assert_equal ENV['POSTAGEAPP_API_KEY'], config.api_key
     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 +24,7 @@ class LiveTest < MiniTest::Test
           'text/plain' => 'text content',
           'text/html' => 'html content'
         }
-      })
+      )
 
       response = request.send
 
@@ -50,7 +32,7 @@ class LiveTest < MiniTest::Test
       assert_equal 'ok', response.status
 
       assert_match(/^\w{40}$/, response.uid)
-      assert_equal nil, response.message
+      assert_nil response.message
       assert_match(/\d+/, response.data['message']['id'].to_s)
       
       receipt = PostageApp::Request.new(
@@ -74,35 +56,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_equal nil, response.data
+      assert_match(/\ARequest could not be processed/, response.message)
+      assert_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 → unit/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_4_test.rb → unit/mailer_4_test.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
 class Mailer4Test < MiniTest::Test
   require_action_mailer(4) do
-    require File.expand_path('mailer/action_mailer_3/notifier', File.dirname(__FILE__))
+    require File.expand_path('mailer/action_mailer_3/notifier', __dir__)
     
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
 

data/test/{mailer_helper_methods_test.rb → unit/mailer_helper_methods_test.rb}

@@ -1,15 +1,15 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
 class MailerHelperMethodsTest < MiniTest::Test
   def test_mailer_helper_methods
     request = PostageApp::Request.new(
       :send_message,
-      :headers => {
+      headers: {
         'from' => 'sender@test.test',
         'subject' => 'Test Message'
       },
-      :recipients => 'test@test.test',
-      :content => {
+      recipients: 'test@test.test',
+      content: {
         'text/plain' => 'text content',
         'text/html' => 'html content'
       }

data/test/{postageapp_test.rb → unit/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,15 @@ 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_version
+    assert PostageApp.version.match(/\A\d+\.\d+\.\d+\z/), -> {
+      "%s is not a valid version number" % PostageApp.version.inspect
+    }
   end
   
   def test_logger

data/test/{rails_initialization_test.rb → unit/rails_initialization_test.rb}

@@ -1,6 +1,6 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
-require File.expand_path('../lib/postageapp/rails/rails', File.dirname(__FILE__))
+require_relative '../../lib/postageapp/rails/rails'
 
 class RailsInitializationTest < MiniTest::Test
   def test_initialization

data/test/{request_test.rb → unit/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
@@ -10,15 +10,15 @@ class RequestTest < MiniTest::Test
     assert_equal uid, request.uid
     assert uid != request.uid(true)
   end
-  
+
   def test_method_url
     request = PostageApp::Request.new('test_method')
 
     assert_equal 'api.postageapp.com', request.url.host
     assert_equal 443, request.url.port
-    assert_equal '/v.1.0/test_method.json', request.url.path
+    assert_equal '/v.1.1/test_method.json', request.url.path
   end
-  
+
   def test_method_arguments_to_send
     request = PostageApp::Request.new('send_message',
       'headers' => {
@@ -34,56 +34,57 @@ class RequestTest < MiniTest::Test
 
     args = request.arguments_to_send
 
-    assert_equal '1234567890abcdef', args['api_key']
+    assert 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
-  
+
   def test_uid_is_enforceable
     request = PostageApp::Request.new('test_method')
 
     assert_match(/^\w{40}$/, request.arguments_to_send['uid'])
-    
+
     request.uid = 'my_uid'
 
     assert_equal 'my_uid', request.arguments_to_send['uid']
-    
+
     request = PostageApp::Request.new('test_method', 'uid' => 'new_uid', 'data' => 'value')
 
     assert_equal 'new_uid', request.uid
     assert_equal({ 'data' => 'value' }, request.arguments)
   end
-  
+
   def test_api_key
     request = PostageApp::Request.new('test_method')
 
     assert_equal PostageApp.configuration.api_key, request.api_key
-    
+
     request = PostageApp::Request.new('test_method', {
       'api_key' => 'custom_api_key'
     })
 
     assert_equal 'custom_api_key', request.api_key
   end
-  
+
   def test_send
     mock_successful_send
-    
+
     request = PostageApp::Request.new('send_message',
       'headers' => {
         'from' => 'sender@test.test',
@@ -102,10 +103,10 @@ class RequestTest < MiniTest::Test
     assert_equal 'sha1hashuid23456789012345678901234567890', response.uid
     assert_equal({ 'message' => { 'id' => 999 } }, response.data)
   end
-  
+
   def test_send_failure
     mock_failed_send
-    
+
     request = PostageApp::Request.new(
       'send_message',
       'headers' => {
@@ -122,7 +123,7 @@ class RequestTest < MiniTest::Test
     response = request.send
 
     assert_equal 'fail', response.status
-    assert_equal nil, response.uid
-    assert_equal nil, response.data
+    assert_nil response.uid
+    assert_nil response.data
   end
 end

data/test/{response_test.rb → unit/response_test.rb}

@@ -1,12 +1,12 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative '../helper'
 
 class ResponseTest < MiniTest::Test
   def test_initialization
     object = stub(
-      :body => {
+      body: {
         'response' => {
-          'uid'     => 'md5_hash_uid',
-          'status'  => 'ok',
+          'uid' => 'md5_hash_uid',
+          'status' => 'ok',
           'message' => 'api reply message'
         },
         'data' => {

data/test/unit/tmp/.gitignore

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

data/tmp/.gitignore

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

metadata

@@ -1,92 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.2.5
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
-- Oleg Khabarov
 - Scott Tadman
-- The Working Group Inc.
-autorequire: 
+- Oleg Khabarov
+- PostageApp Ltd.
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Gem that interfaces with PostageApp service to send emails from Ruby
-  applications
+        version: '2.4'
+description: PostageApp Library for Ruby and Ruby on Rails applications
 email:
-- oleg@khabarov.ca
 - tadman@postageapp.com
+- oleg@khabarov.ca
+- info@postageapp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
+- VERSION
+- app/ingresses/action_mailbox/ingresses/postage_app.rb
+- app/ingresses/action_mailbox/ingresses/postage_app/inbound_emails_controller.rb
+- config/routes.rb
+- doc/RAILS2.md
+- doc/RAILS3.md
+- exe/postageapp
 - generators/postageapp/postageapp_generator.rb
 - generators/postageapp/templates/initializer.rb
 - generators/postageapp/templates/postageapp_tasks.rake
 - lib/generators/postageapp/postageapp_generator.rb
 - lib/postageapp.rb
+- lib/postageapp/cli.rb
+- lib/postageapp/cli/command.rb
+- lib/postageapp/cli/command/config.rb
+- lib/postageapp/cli/command/create_mailbox.rb
+- lib/postageapp/cli/command/env.rb
+- lib/postageapp/cli/command/get_project_info.rb
 - lib/postageapp/configuration.rb
+- lib/postageapp/diagnostics.rb
+- lib/postageapp/engine.rb
+- lib/postageapp/env.rb
 - lib/postageapp/failed_request.rb
+- lib/postageapp/http.rb
 - lib/postageapp/logger.rb
 - lib/postageapp/mail.rb
 - lib/postageapp/mail/arguments.rb
 - lib/postageapp/mail/delivery_method.rb
 - lib/postageapp/mail/extensions.rb
 - lib/postageapp/mailer.rb
-- lib/postageapp/mailer/mailer_2.rb
-- lib/postageapp/mailer/mailer_3.rb
 - lib/postageapp/mailer/mailer_4.rb
 - lib/postageapp/rails/rails.rb
 - lib/postageapp/rails/railtie.rb
 - lib/postageapp/request.rb
 - lib/postageapp/response.rb
 - lib/postageapp/utils.rb
-- lib/postageapp/version.rb
+- log/.gitignore
 - postageapp.gemspec
 - rails/init.rb
 - script/with
-- test/configuration_test.rb
-- test/failed_request_test.rb
 - test/gemfiles/Gemfile.rails-2.3.x
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
@@ -94,18 +88,13 @@ files:
 - test/gemfiles/Gemfile.rails-4.0.x
 - test/gemfiles/Gemfile.rails-4.1.x
 - test/gemfiles/Gemfile.rails-4.2.x
+- test/gemfiles/Gemfile.rails-5.0.x
+- test/gemfiles/Gemfile.rails-5.2.x
+- test/gemfiles/Gemfile.rails-6.0.x
+- test/gemfiles/Gemfile.rails-6.1.x
 - test/gemfiles/Gemfile.ruby
 - test/helper.rb
-- test/live_test.rb
-- test/mail_delivery_method_test.rb
-- test/mailer/action_mailer_2/notifier.rb
-- test/mailer/action_mailer_2/notifier/with_body_and_attachment.erb
-- test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.html.erb
-- test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.plain.erb
-- test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.html.erb
-- test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.plain.erb
-- test/mailer/action_mailer_2/notifier/with_simple_view.erb
-- test/mailer/action_mailer_2/notifier/with_text_only_view.text.plain.erb
+- test/log/.gitignore
 - test/mailer/action_mailer_3/layouts/notifier.html.erb
 - test/mailer/action_mailer_3/notifier.rb
 - test/mailer/action_mailer_3/notifier/with_custom_postage_variables.html.erb
@@ -116,39 +105,42 @@ files:
 - test/mailer/action_mailer_3/notifier/with_old_api.text.erb
 - test/mailer/action_mailer_3/notifier/with_simple_view.erb
 - test/mailer/action_mailer_3/notifier/with_text_only_view.text.erb
-- test/mailer_2_test.rb
-- test/mailer_3_test.rb
-- test/mailer_4_test.rb
-- test/mailer_helper_methods_test.rb
-- test/postageapp_test.rb
-- test/rails_initialization_test.rb
-- test/request_test.rb
-- test/response_test.rb
+- test/tmp/.gitignore
 - test/travis_test.rb
+- test/unit/configuration_test.rb
+- test/unit/failed_request_test.rb
+- test/unit/live_test.rb
+- test/unit/mail_delivery_method_test.rb
+- test/unit/mailer_4_test.rb
+- test/unit/mailer_helper_methods_test.rb
+- test/unit/postageapp_test.rb
+- test/unit/rails_initialization_test.rb
+- test/unit/request_test.rb
+- test/unit/response_test.rb
+- test/unit/tmp/.gitignore
 - test/with_environment.rb
+- tmp/.gitignore
 homepage: http://github.com/postageapp/postageapp-ruby
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.30
-signing_key: 
-specification_version: 3
-summary: Gem for communicating with the PostageApp email API
+rubygems_version: 3.2.15
+signing_key:
+specification_version: 4
+summary: Client library for PostageApp Email API
 test_files: []