postageapp 1.3.0 → 1.4.2

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

@@ -1,12 +1,12 @@
-require_relative './helper'
+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,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Scott Tadman
 - Oleg Khabarov
-- The Working Group Inc.
-autorequire: 
+- PostageApp Ltd.
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -51,18 +37,31 @@ files:
 - ".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
@@ -71,20 +70,16 @@ files:
 - 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
@@ -93,18 +88,12 @@ files:
 - 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
@@ -115,21 +104,26 @@ 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
-homepage: http://github.com/postageapp/postageapp-ruby
+- tmp/.gitignore
+homepage: https://github.com/postageapp/postageapp-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,16 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Client library for PostageApp Email API
 test_files: []

data/lib/postageapp/mailer/mailer_2.rb

@@ -1,140 +0,0 @@
-# Postage::Mailer allows you to use/re-use existing mailers set up using
-# ActionMailer. The only catch is to change inheritance from ActionMailer::Base
-# to PostageApp::Mailer. Also don't forget to require 'postageapp/mailer'
-#
-# Here's an example of a valid PostageApp::Mailer class
-#  
-#   require 'postageapp/mailer'
-#  
-#   class Notifier < PostageApp::Mailer
-#     def signup_notification(recipient)
-#       recipients  recipient.email_address
-#       from        'system@example.com'
-#       subject     'New Account Information'
-#     end
-#   end
-#
-# Postage::Mailer introduces a few mailer methods specific to Postage:
-#
-# * template  - template name that is defined in your PostageApp project
-# * variables - extra variables you want to send along with the message
-#
-# Sending email
-#
-#   Notifier.deliver_signup_notification(user) # attempts to deliver to PostageApp (depending on env)
-#   request = Notifier.create_signup_notification(user) # creates PostageApp::Request object
-#
-class PostageApp::Mailer < ActionMailer::Base
-  # Using :test as a delivery method if set somewhere else
-  unless (self.delivery_method == :test)
-    self.delivery_method = :postage
-  end
-  
-  adv_attr_accessor :postageapp_uid
-  adv_attr_accessor :postageapp_api_key
-  adv_attr_accessor :postageapp_template
-  adv_attr_accessor :postageapp_variables
-  
-  def perform_delivery_postage(mail)
-    mail.send
-  end
-  
-  def deliver!(mail = @mail)
-    unless (mail)
-      raise 'PostageApp::Request object not present, cannot deliver'
-    end
-
-    if (perform_deliveries)
-      __send__("perform_delivery_#{delivery_method}", mail)
-    end
-  end
-  
-  # Creating a Postage::Request object unlike TMail one in ActionMailer::Base
-  def create_mail
-    params = { }
-
-    unless (self.recipients.blank?)
-      params['recipients'] = self.recipients
-    end
-    
-    params['headers'] = { }
-
-    unless (self.subject.blank?)
-      params['headers']['subject'] = self.subject
-    end
-
-    unless (self.subject.blank?)
-      params['headers']['from'] = self.from
-    end
-
-    unless (self.headers.blank?)
-      params['headers'].merge!(self.headers)
-    end
-    
-    params['content'] = { }
-    params['attachments'] = { }
-    
-    if (@parts.empty?)
-      unless (self.body.blank?)
-        params['content'][self.content_type] = self.body
-      end
-    else
-      self.parts.each do |part|
-        case (part.content_disposition)
-        when 'inline'
-          if (part.content_type.blank? && String === part.body)
-            part.content_type = 'text/plain'
-          end
-
-          params['content'][part.content_type] = part.body
-        when 'attachment'
-          params['attachments'][part.filename] = {
-            'content_type' => part.content_type,
-            'content' => Base64.encode64(part.body)
-          }
-        end
-      end
-    end
-    
-    unless (self.postageapp_template.blank?)
-      params['template']  = self.postageapp_template
-    end
-
-    unless (self.postageapp_variables.blank?)
-      params['variables'] = self.postageapp_variables
-    end
-    
-    if (params['headers'].blank?)
-      params.delete('headers')
-    end
-
-    if (params['content'].blank?)
-      params.delete('content')
-    end
-
-    if (params['attachments'].blank?)
-      params.delete('attachments')
-    end
-    
-    @mail = PostageApp::Request.new('send_message', params)
-
-    unless (self.postageapp_uid.blank?)
-      @mail.uid = self.postageapp_uid
-    end
-
-    unless (self.postageapp_api_key.blank?)
-      @mail.api_key = self.postageapp_api_key
-    end
-
-    @mail
-  end
-  
-  # Not insisting rendering a view if it's not there. PostageApp gem can send blank content
-  # provided that the template is defined.
-  def render(opts)
-    super(opts)
-
-  rescue ActionView::MissingTemplate
-    # do nothing
-  end
-end

data/lib/postageapp/mailer/mailer_3.rb

@@ -1,190 +0,0 @@
-# Postage::Mailer allows you to use/re-use existing mailers set up using
-# ActionMailer. The only catch is to change inheritance from ActionMailer::Base
-# to PostageApp::Mailer. Also don't forget to require 'postageapp/mailer'
-#
-# Here's an example of a valid PostageApp::Mailer class
-#
-#   require 'postageapp/mailer'
-#
-#   class Notifier < PostageApp::Mailer
-#     def signup_notification(recipient)
-#       mail(
-#         :to       => recipient.email,
-#         :from     => 'sender@test.test',
-#         :subject  => 'Test Message'
-#       )
-#     end
-#   end
-#
-# Postage::Mailer introduces a few mailer methods specific to Postage:
-#
-# * postageapp_template  - template name that is defined in your PostageApp project
-# * postageapp_variables - extra variables you want to send along with the message
-#
-# Sending email
-#
-#   request = Notifier.signup_notification(user) # creates PostageApp::Request object
-#   response = request.deliver # attempts to deliver the message and creates a PostageApp::Response
-
-class PostageApp::Mailer < ActionMailer::Base
-  # Wrapper for creating attachments
-  # Attachments sent to PostageApp are in the following format:
-  #  'filename.ext' => {
-  #    'content_type' => 'content/type',
-  #    'content'      => 'base64_encoded_content'
-  #   }
-
-  class Attachments < Hash
-    def initialize(message)
-      @_message = message
-
-      message.arguments['attachments'] ||= { }
-    end
-
-    def []=(filename, attachment)
-      default_content_type = MIME::Types.type_for(filename).first.content_type rescue ''
-
-      case (attachment)
-      when Hash
-        content_type = attachment[:content_type] || default_content_type
-        content = Base64.encode64(attachment[:body])
-      else
-        content_type = default_content_type
-        content = Base64.encode64(attachment)
-      end
-
-      @_message.arguments['attachments'][filename] = {
-        'content_type' => content_type,
-        'content' => content
-      }
-    end
-  end
-
-  # Instead of initializing Mail object, we prepare PostageApp::Request
-  def initialize(method_name = nil, *args)
-    super()
-
-    @_message = PostageApp::Request.new(:send_message)
-
-    if method_name
-      process(method_name, *args)
-    end
-  end
-
-  # Possible to define custom uid. Should be sufficiently unique
-  def postageapp_uid(value = nil)
-    value ? @_message.uid = value : @_message.uid
-  end
-
-  def postageapp_api_key(value = nil)
-    value ? @_message.api_key = value : @_message.api_key
-  end
-
-  # In API call we can specify PostageApp template that will be used
-  # to generate content of the message
-  def postageapp_template(value = nil)
-    if (value)
-      @_message.arguments['template'] = value
-    else
-      @_message.arguments['template']
-    end
-  end
-
-  # Hash of variables that will be used to inject into the content
-  def postageapp_variables(value = nil)
-    if (value)
-      @_message.arguments['variables'] = value
-    else
-      @_message.arguments['variables']
-    end
-  end
-
-  def attachments
-    @_attachments ||= Attachments.new(@_message)
-  end
-
-  # Override for headers assignment
-  def headers(args = nil)
-    @_message.headers(args)
-  end
-
-  # Overriding method that prepares Mail object. This time we'll be
-  # contructing PostageApp::Request payload.
-  def mail(headers = { }, &block)
-    # Guard flag to prevent both the old and the new API from firing
-    # Should be removed when old API is removed
-    @mail_was_called = true
-    m = @_message
-
-    # At the beginning, do not consider class default for parts order neither content_type
-    content_type = headers[:content_type]
-    parts_order = headers[:parts_order]
-
-    # Call all the procs (if any)
-    default_values = self.class.default.merge(self.class.default) do |k,v|
-      if (v.respond_to?(:call))
-        v.bind(self).call
-      else
-        v
-      end
-    end
-
-    # Handle defaults
-    headers = headers.reverse_merge(default_values)
-
-    # Set configure delivery behavior
-    wrap_delivery_behavior!(headers.delete(:delivery_method))
-
-    # Assigning recipients
-    m.arguments['recipients'] = headers.delete(:to)
-
-    # Assign all headers except parts_order, content_type and body
-    assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
-    m.headers.merge!(assignable)
-
-    # Render the templates and blocks
-    responses, explicit_order = collect_responses_and_parts_order(headers, &block)
-    create_parts_from_responses(m, responses)
-
-    m
-  end
-
-protected
-  def create_parts_from_responses(m, responses) #:nodoc:
-    content = m.arguments['content'] ||= { }
-
-    responses.each do |part|
-      content[part[:content_type]] = part[:body]
-    end
-  end
-end
-
-# A set of methods that are useful when request needs to behave as Mail
-class PostageApp::Request
-  attr_accessor :delivery_handler
-  attr_accessor :perform_deliveries
-  attr_accessor :raise_delivery_errors
-
-  def inform_interceptors
-    Mail.inform_interceptors(self)
-  end
-
-  # Either doing an actual send, or passing it along to Mail::TestMailer
-  # Probably not the best way as we're skipping way too many intermediate methods
-  def deliver
-    inform_interceptors
-
-    if (perform_deliveries)
-      if (@delivery_method == Mail::TestMailer)
-        @delivery_method.deliveries << self
-      else
-        self.send
-      end
-    end
-  end
-
-  # Not 100% on this, but I need to assign this so I can properly handle deliver method
-  def delivery_method(method = nil, settings = { })
-    @delivery_method = method
-  end
-end