postageapp 1.3.1 → 1.4.0

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

data/lib/postageapp/version.rb

@@ -1,3 +0,0 @@
-module PostageApp
-  VERSION = '1.3.1'.freeze
-end

data/test/mailer/action_mailer_2/notifier.rb

@@ -1,77 +0,0 @@
-# Test mailer for ActionMailer 2.x
-
-class Notifier < PostageApp::Mailer
-  self.template_root = File.dirname(__FILE__)
-
-  def blank
-    # Empty method
-  end
-  
-  def with_no_content
-    setup_headers
-  end
-  
-  def with_text_only_view
-    setup_headers
-  end
-  
-  def with_html_and_text_views
-    setup_headers
-  end
-  
-  def with_simple_view
-    setup_headers
-  end
-  
-  def with_manual_parts
-    setup_headers
-
-    part(
-      :content_type => 'text/html',
-      :body => 'html content'
-    )
-
-    part(
-      content_type: 'text/plain',
-      body: 'text content'
-    )
-
-    attachment(
-      content_type: 'image/jpeg',
-      filename: 'foo.jpg',
-      body: '123456789'
-    )
-  end
-  
-  def with_body_and_attachment
-    setup_headers
-
-    attachment(
-      content_type: 'image/jpeg',
-      filename: 'foo.jpg',
-      body: '123456789'
-    )
-  end
-  
-  def with_custom_postage_variables
-    postageapp_template 'test-template'
-    postageapp_variables 'variable' => 'value'
-    postageapp_uid 'custom_uid'
-    postageapp_api_key 'custom_api_key'
-    
-    from 'sender@example.com'
-    subject 'Test Email'
-    
-    recipients(
-      'test1@example.net' => { 'name' => 'Test 1' },
-      'test2@example.net' => { 'name' => 'Test 2' }
-    )
-  end
-  
-private
-  def setup_headers
-    recipients 'recipient@example.net'
-    from 'sender@example.com'
-    subject 'Test Email'
-  end
-end

data/test/mailer/action_mailer_2/notifier/with_body_and_attachment.erb

@@ -1 +0,0 @@
-body text

data/test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.html.erb

@@ -1 +0,0 @@
-html content

data/test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.plain.erb

@@ -1 +0,0 @@
-text content

data/test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.html.erb

@@ -1 +0,0 @@
-html and text: html

data/test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.plain.erb

@@ -1 +0,0 @@
-html and text: plain text

data/test/mailer/action_mailer_2/notifier/with_simple_view.erb

@@ -1 +0,0 @@
-simple view content

data/test/mailer/action_mailer_2/notifier/with_text_only_view.text.plain.erb

@@ -1 +0,0 @@
-text only: plain text

data/test/mailer_2_test.rb

@@ -1,95 +0,0 @@
-require_relative './helper'
-
-class Mailer2Test < MiniTest::Test
-  require_action_mailer(2) do
-    require File.expand_path('mailer/action_mailer_2/notifier', File.dirname(__FILE__))
-
-    puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
-        
-    def test_create_blank
-      assert mail = Notifier.create_blank
-
-      assert_equal 'send_message', mail.method
-      assert_equal 'https://api.postageapp.com/v.1.0/send_message.json', mail.url.to_s
-      assert mail.arguments.blank?
-    end
-    
-    def test_create_with_no_content
-      assert mail = Notifier.create_with_no_content
-
-      assert_equal 'recipient@example.net', mail.arguments['recipients']
-      assert_equal({ 'from' => 'sender@example.com', 'subject' => 'Test Email' }, mail.arguments['headers'])
-      assert mail.arguments['content'].blank?
-    end
-    
-    def test_create_with_text_only_view
-      assert mail = Notifier.create_with_text_only_view
-
-      assert_equal 'text only: plain text', mail.arguments['content']['text/plain']
-    end
-    
-    def test_create_with_html_and_text_views
-      assert mail = Notifier.create_with_html_and_text_views
-
-      assert_equal 'html and text: plain text', mail.arguments['content']['text/plain']
-      assert_equal 'html and text: html', mail.arguments['content']['text/html']
-    end
-    
-    def test_deliver_with_html_and_text_views
-      mock_successful_send
-      
-      assert response = Notifier.deliver_with_html_and_text_views
-
-      assert response.is_a?(PostageApp::Response)
-      assert response.ok?
-    end
-    
-    def test_create_with_simple_view
-      assert mail = Notifier.create_with_simple_view
-      assert_equal 'simple view content', mail.arguments['content']['text/plain']
-    end
-    
-    def test_create_with_manual_parts
-      assert mail = Notifier.create_with_manual_parts
-
-      assert_equal 'text content', mail.arguments['content']['text/plain']
-      assert_equal 'html content', mail.arguments['content']['text/html']
-      assert !mail.arguments['attachments'].blank?
-      assert !mail.arguments['attachments']['foo.jpg']['content'].blank?
-      assert_equal 'image/jpeg', mail.arguments['attachments']['foo.jpg']['content_type']
-    end
-    
-    def test_create_with_body_and_attachment
-      assert mail = Notifier.create_with_body_and_attachment
-
-      assert !mail.arguments['content'].blank?
-      assert !mail.arguments['content']['text/plain'].blank?
-      assert_equal 'body text', mail.arguments['content']['text/plain']
-      assert !mail.arguments['attachments'].blank?
-      assert !mail.arguments['attachments']['foo.jpg']['content'].blank?
-      assert_equal 'image/jpeg', mail.arguments['attachments']['foo.jpg']['content_type']
-    end
-    
-    def test_create_with_custom_postage_variables
-      assert mail = Notifier.create_with_custom_postage_variables
-
-      assert_equal 'custom_uid', mail.uid
-      assert_equal 'custom_api_key', mail.api_key
-      assert_equal 'test-template', mail.arguments['template']
-      assert_equal({ 'variable' => 'value' }, mail.arguments['variables'])
-      assert_equal({ 'test2@example.net' => { 'name' => 'Test 2'}, 
-                      'test1@example.net' => { 'name' => 'Test 1'}}, mail.arguments['recipients'])
-      assert_equal 'text content', mail.arguments['content']['text/plain']
-      assert_equal 'html content', mail.arguments['content']['text/html']
-    end
-    
-    def test_create_with_recipient_override
-      PostageApp.configuration.recipient_override = 'override@example.net'
-
-      assert mail = Notifier.create_with_html_and_text_views
-
-      assert_equal 'recipient@example.net', mail.arguments['recipients']
-      assert_equal 'override@example.net', mail.arguments_to_send['arguments']['recipient_override']
-    end
-  end
-end