postageapp 1.0.19 → 1.0.20

data/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+coverage
+rdoc
+pkg
+test/tmp
+test/log
+Gemfile.lock

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
@@ -9,14 +10,14 @@ gemfile:
   - test/gemfiles/Gemfile.rails-3.0.x
   - test/gemfiles/Gemfile.rails-3.1.x
   - test/gemfiles/Gemfile.rails-3.2.x
-  - test/gemfiles/Gemfile.rails.4.0.x
+  - test/gemfiles/Gemfile.rails-4.0.x
 matrix:
   exclude:
     - rvm: 2.0.0
       gemfile: test/gemfiles/Gemfile.rails-2.3.x
     - rvm: 1.8.7
-      gemfile: test/gemfiles/Gemfile.rails.4.0.x
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
     - rvm: ree
-      gemfile: test/gemfiles/Gemfile.rails.4.0.x
-  allow_failures:
-    - gemfile: test/gemfiles/Gemfile.rails.4.0.x
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 1.9.2
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x

data/Gemfile

@@ -1,12 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'json'
-
-group :development do
-  gem 'jeweler'
-end
+gemspec
 
 group :test do
   gem 'rails'
   gem 'mocha'
-end
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Oleg Khabarov, The Working Group, Inc
+Copyright (c) 2011-13 Oleg Khabarov, The Working Group, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,12 +3,12 @@
 This is the gem used to integrate Ruby apps with PostageApp service.
 Personalized, mass email sending can be offloaded to PostageApp via JSON based API.
 
-### [API Documentation](http://help.postageapp.com/kb/api/api-overview) • [PostageApp Knowledge Base](http://help.postageapp.com/kb) • [PostageApp Help Portal](http://help.postageapp.com)
+### [API Documentation](http://help.postageapp.com/kb/api/api-overview) • [Knowledge Base](http://help.postageapp.com/kb) • [Help Portal](http://help.postageapp.com)
 
 Installation
 ------------
 
-### Rails 3.x
+### Rails 3 / 4
 Add postageapp gem to your Gemfile:
     
     gem 'postageapp'
@@ -18,7 +18,7 @@ Then from the Rails project's root run:
     bundle install
     script/rails generate postageapp --api-key PROJECT_API_KEY
   
-### Rails 2.x
+### Rails 2
 In config/environment.rb add the following:
     
     config.gem 'postageapp'
@@ -106,7 +106,7 @@ Please note that `deliver` method will return `PostageApp::Response` object. Thi
     >> response.ok?
     => true
 
-### Rails 3.x
+### Rails 3 / 4
 
 Here's an example of a mailer in Rails 3 environment:
 
@@ -158,7 +158,7 @@ class Notifier < PostageApp::Mailer
 end
 ```
 
-### Rails 2.x
+### Rails 2
 
 Here's an example of a mailer you'd set in in a Rails 2 environment:
 

data/Rakefile

@@ -1,34 +1,8 @@
-require 'rubygems'
-
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
+require 'rake/testtask'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name        = 'postageapp'
-  gem.summary     = 'Easier way to send email from web apps'
-  gem.description = 'Gem that interfaces with PostageApp.com service to send emails from web apps'
-  gem.email       = 'oleg@twg.ca'
-  gem.homepage    = 'http://github.com/postageapp/postageapp-ruby'
-  gem.authors     = ['Oleg Khabarov, The Working Group Inc']
-  gem.license     = 'MIT'
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler.require
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'

data/lib/postageapp/mailer.rb

@@ -4,7 +4,9 @@ require 'action_mailer/version'
 # 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
-if ActionMailer::VERSION::MAJOR >= 3
+if ActionMailer::VERSION::MAJOR == 4
+  require File.expand_path('../mailer/mailer_4', __FILE__)
+elsif ActionMailer::VERSION::MAJOR == 3
   require File.expand_path('../mailer/mailer_3', __FILE__)
 else
   require File.expand_path('../mailer/mailer_2', __FILE__)
@@ -13,7 +15,7 @@ end
 # General helper methods for Request object to act more like TMail::Mail
 # of Mail for testing
 class PostageApp::Request
-  
+
   # Getter and setter for headers. You can specify headers in the following
   # formats:
   #   headers['Custom-Header'] = 'Custom Value'
@@ -28,23 +30,23 @@ class PostageApp::Request
     end
     self.arguments['headers']
   end
-  
+
   def to
     out = self.arguments_to_send.dig('arguments', 'recipients')
     out.is_a?(Hash) ? out : [out].flatten
   end
-  
+
   def from
     [self.arguments_to_send.dig('arguments', 'headers', 'from')].flatten
   end
-  
+
   def subject
     self.arguments_to_send.dig('arguments', 'headers', 'subject')
   end
-  
+
   def body
     out = self.arguments_to_send.dig('arguments', 'content')
     out.is_a?(Hash) ? out.values.join("\n\n") : out.to_s
   end
-  
-end
+
+end

data/lib/postageapp/mailer/mailer_4.rb

@@ -0,0 +1,174 @@
+# 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 ''
+      if attachment.is_a?(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)
+    process(method_name, *args) if method_name
+  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)
+    value ? @_message.arguments['template'] = value : @_message.arguments['template']
+  end
+
+  # Hash of variables that will be used to inject into the content
+  def postageapp_variables(value = nil)
+    value ? @_message.arguments['variables'] = value : @_message.arguments['variables']
+  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]
+
+    # Call all the procs (if any)
+    class_default = self.class.default
+    default_values = class_default.merge(self.class.default) do |k,v|
+      v.respond_to?(:call) ? v.bind(self).call : v
+    end
+
+    # Handle defaults
+    headers = headers.reverse_merge(default_values)
+    headers[:subject] ||= default_i18n_subject
+
+    # Apply charset at the beginning so all fields are properly quoted
+    charset = headers[:charset]
+
+    # Set configure delivery behavior
+    wrap_delivery_behavior!(headers.delete(:delivery_method),headers.delete(:delivery_method_options))
+
+    # 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 = collect_responses(headers, &block)
+    create_parts_from_responses(m, responses)
+
+    m
+  end
+
+protected
+  def create_parts_from_responses(m, responses) #:nodoc:
+    map = {
+      'html' => 'text/html',
+      'text' => 'text/plain'
+    }
+    content = m.arguments['content'] ||= {}
+    responses.each do |part|
+      content_type = map[part[:content_type]] || part[:content_type]
+      content[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,
+                :perform_deliveries,
+                :raise_delivery_errors
+
+  # 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
+    if @delivery_method == Mail::TestMailer
+      @delivery_method.deliveries << self
+    else
+      self.send
+    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,7 +1,3 @@
 module PostageApp
-  VERSION = begin 
-    IO.read(File.join(File.dirname(__FILE__), '/../../VERSION')).chomp
-  rescue
-    'UNKNOWN'
-  end
+  VERSION = "1.0.20"
 end

data/postageapp.gemspec

@@ -1,101 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-Gem::Specification.new do |s|
-  s.name = "postageapp"
-  s.version = "1.0.19"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Oleg Khabarov, The Working Group Inc"]
-  s.date = "2013-03-19"
-  s.description = "Gem that interfaces with PostageApp.com service to send emails from web apps"
-  s.email = "oleg@twg.ca"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "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/configuration.rb",
-    "lib/postageapp/failed_request.rb",
-    "lib/postageapp/logger.rb",
-    "lib/postageapp/mailer.rb",
-    "lib/postageapp/mailer/mailer_2.rb",
-    "lib/postageapp/mailer/mailer_3.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",
-    "postageapp.gemspec",
-    "rails/init.rb",
-    "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",
-    "test/gemfiles/Gemfile.rails-3.2.x",
-    "test/gemfiles/Gemfile.rails-4.0.x",
-    "test/helper.rb",
-    "test/live_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/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",
-    "test/mailer/action_mailer_3/notifier/with_custom_postage_variables.text.erb",
-    "test/mailer/action_mailer_3/notifier/with_html_and_text_views.html.erb",
-    "test/mailer/action_mailer_3/notifier/with_html_and_text_views.text.erb",
-    "test/mailer/action_mailer_3/notifier/with_old_api.html.erb",
-    "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_helper_methods_test.rb",
-    "test/postageapp_test.rb",
-    "test/rails_initialization_test.rb",
-    "test/request_test.rb",
-    "test/response_test.rb"
-  ]
-  s.homepage = "http://github.com/postageapp/postageapp-ruby"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Easier way to send email from web apps"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'postageapp/version'
 
+Gem::Specification.new do |s|
+  s.name          = "postageapp"
+  s.version       = PostageApp::VERSION
+  s.authors       = ["Oleg Khabarov", "The Working Group Inc"]
+  s.email         = ["oleg@khabarov.ca"]
+  s.homepage      = "http://github.com/twg/api_docs"
+  s.summary       = "Easier way to send email from web apps"
+  s.description   = "Gem that interfaces with PostageApp.com service to send emails from web apps"
+  
+  s.files         = `git ls-files`.split("\n")
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ['lib']
+  
+  s.add_dependency 'json'
+end

data/test/gemfiles/Gemfile.rails-2.3.x

@@ -2,10 +2,6 @@ source 'http://rubygems.org'
 
 gem 'json'
 
-group :development do
-  gem 'jeweler'
-end
-
 group :test do
   gem 'rails', '~> 2.3.0'
   gem 'mocha'

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -2,10 +2,6 @@ source 'http://rubygems.org'
 
 gem 'json'
 
-group :development do
-  gem 'jeweler'
-end
-
 group :test do
   gem 'rails', '~> 3.0.0'
   gem 'mocha'

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -2,10 +2,6 @@ source 'http://rubygems.org'
 
 gem 'json'
 
-group :development do
-  gem 'jeweler'
-end
-
 group :test do
   gem 'rails', '~> 3.1.0'
   gem 'mocha'

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -2,10 +2,6 @@ source 'http://rubygems.org'
 
 gem 'json'
 
-group :development do
-  gem 'jeweler'
-end
-
 group :test do
   gem 'rails', '~> 3.2.0'
   gem 'mocha'

data/test/gemfiles/Gemfile.rails-4.0.x

@@ -2,11 +2,7 @@ source 'http://rubygems.org'
 
 gem 'json'
 
-group :development do
-  gem 'jeweler'
-end
-
 group :test do
-  gem 'rails', '~> 4.0.0.beta1'
+  gem 'rails', '~> 4.0.0.rc2'
   gem 'mocha'
 end

data/test/helper.rb

@@ -8,8 +8,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'postageapp'
 require 'postageapp/mailer'
 
-begin require 'redgreen' unless ENV['TM_FILEPATH']; rescue LoadError; end
-require 'mocha'
+require 'mocha/setup'
 
 class Test::Unit::TestCase
   

data/test/mailer_3_test.rb

@@ -2,69 +2,69 @@ require File.expand_path('../helper', __FILE__)
 
 # tests for ActionMailer bundled with Rails 3
 class Mailer3Test < Test::Unit::TestCase
-  
-  if ActionMailer::VERSION::MAJOR >= 3
-    
+
+  if ActionMailer::VERSION::MAJOR == 3
+
     require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
-    
+
     def test_create_with_no_content
       mail = Notifier.with_no_content
       assert_equal ({}), mail.arguments['content']
     end
-    
+
     def test_create_with_simple_view
       mail = Notifier.with_simple_view
       assert_equal 'with layout simple view content', mail.arguments['content']['text/html']
     end
-    
+
     def test_create_with_text_only_view
       mail = Notifier.with_text_only_view
       assert_equal 'text content', mail.arguments['content']['text/plain']
     end
-    
+
     def test_create_with_html_and_text_views
       mail = Notifier.with_html_and_text_views
       assert_equal 'text content',              mail.arguments['content']['text/plain']
       assert_equal 'with layout html content',  mail.arguments['content']['text/html']
     end
-    
+
     def test_deliver_with_html_and_text_views
       mock_successful_send
-      
+
       assert response = Notifier.with_html_and_text_views.deliver
       assert response.is_a?(PostageApp::Response)
       assert response.ok?
     end
-    
+
     def test_create_with_body_and_attachment_as_file
       mail = Notifier.with_body_and_attachment_as_file
       assert_equal 'manual body text', mail.arguments['content']['text/html']
       assert_equal 'text/plain', mail.arguments['attachments']['sample_file.txt']['content_type']
       assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
     end
-    
+
     def test_create_with_body_and_attachment_as_hash
       mail = Notifier.with_body_and_attachment_as_hash
       assert_equal 'manual body text', mail.arguments['content']['text/html']
       assert_equal 'text/rich', mail.arguments['attachments']['sample_file.txt']['content_type']
       assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
     end
-    
+
     def test_create_with_custom_postage_variables
       mail = Notifier.with_custom_postage_variables
       args = mail.arguments_to_send
-      
+
       assert_equal 'custom_uid',      args['uid']
       assert_equal 'custom_api_key',  args['api_key']
-      
+
       args = args['arguments']
-      
+
       assert_equal ({
         'test1@test.test' => { 'name' => 'Test 1'},
         'test2@test.test' => { 'name' => 'Test 2'}
       }), args['recipients']
-      
+
       assert_equal 'test-template',             args['template']
       assert_equal ({ 'variable' => 'value' }), args['variables']
       assert_equal 'CustomValue1',              args['headers']['CustomHeader1']
@@ -72,23 +72,23 @@ class Mailer3Test < Test::Unit::TestCase
       assert_equal 'text content',              args['content']['text/plain']
       assert_equal 'with layout html content',  args['content']['text/html']
     end
-    
+
     def test_create_with_recipient_override
       PostageApp.configuration.recipient_override = 'oleg@test.test'
       assert mail = Notifier.with_html_and_text_views
       assert_equal 'test@test.test', mail.arguments['recipients']
       assert_equal 'oleg@test.test', mail.arguments_to_send['arguments']['recipient_override']
     end
-    
+
     def test_deliver_for_test_mailer
       mail = Notifier.with_simple_view
       mail.delivery_method(Mail::TestMailer)
       mail.deliver
       assert_equal [mail], ActionMailer::Base.deliveries
     end
-    
+
   else
     puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
     def test_nothing ; end
   end
-end
+end

data/test/mailer_4_test.rb

@@ -0,0 +1,89 @@
+require File.expand_path('../helper', __FILE__)
+
+# tests for ActionMailer bundled with Rails 3
+class Mailer4Test < Test::Unit::TestCase
+
+  if ActionMailer::VERSION::MAJOR == 4
+
+    require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+    puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
+
+    def test_create_with_simple_view
+      mail = Notifier.with_simple_view
+      assert_equal 'with layout simple view content', mail.arguments['content']['text/html']
+    end
+
+    def test_create_with_text_only_view
+      mail = Notifier.with_text_only_view
+      assert_equal 'text content', mail.arguments['content']['text/plain']
+    end
+
+    def test_create_with_html_and_text_views
+      mail = Notifier.with_html_and_text_views
+      assert_equal 'text content',              mail.arguments['content']['text/plain']
+      assert_equal 'with layout html content',  mail.arguments['content']['text/html']
+    end
+
+    def test_deliver_with_html_and_text_views
+      mock_successful_send
+
+      assert response = Notifier.with_html_and_text_views.deliver
+      assert response.is_a?(PostageApp::Response)
+      assert response.ok?
+    end
+
+    def test_create_with_body_and_attachment_as_file
+      mail = Notifier.with_body_and_attachment_as_file
+      assert_equal 'manual body text', mail.arguments['content']['text/html']
+      assert_equal 'text/plain', mail.arguments['attachments']['sample_file.txt']['content_type']
+      assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
+    end
+
+    def test_create_with_body_and_attachment_as_hash
+      mail = Notifier.with_body_and_attachment_as_hash
+      assert_equal 'manual body text', mail.arguments['content']['text/html']
+      assert_equal 'text/rich', mail.arguments['attachments']['sample_file.txt']['content_type']
+      assert_equal "RmlsZSBjb250ZW50\n", mail.arguments['attachments']['sample_file.txt']['content']
+    end
+
+    def test_create_with_custom_postage_variables
+      mail = Notifier.with_custom_postage_variables
+      args = mail.arguments_to_send
+
+      assert_equal 'custom_uid',      args['uid']
+      assert_equal 'custom_api_key',  args['api_key']
+
+      args = args['arguments']
+
+      assert_equal ({
+        'test1@test.test' => { 'name' => 'Test 1'},
+        'test2@test.test' => { 'name' => 'Test 2'}
+      }), args['recipients']
+
+      assert_equal 'test-template',             args['template']
+      assert_equal ({ 'variable' => 'value' }), args['variables']
+      assert_equal 'CustomValue1',              args['headers']['CustomHeader1']
+      assert_equal 'CustomValue2',              args['headers']['CustomHeader2']
+      assert_equal 'text content',              args['content']['text/plain']
+      assert_equal 'with layout html content',  args['content']['text/html']
+    end
+
+    def test_create_with_recipient_override
+      PostageApp.configuration.recipient_override = 'oleg@test.test'
+      assert mail = Notifier.with_html_and_text_views
+      assert_equal 'test@test.test', mail.arguments['recipients']
+      assert_equal 'oleg@test.test', mail.arguments_to_send['arguments']['recipient_override']
+    end
+
+    def test_deliver_for_test_mailer
+      mail = Notifier.with_simple_view
+      mail.delivery_method(Mail::TestMailer)
+      mail.deliver
+      assert_equal [mail], ActionMailer::Base.deliveries
+    end
+
+  else
+    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
+    def test_nothing ; end
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
   prerelease: 
 platform: ruby
 authors:
-- Oleg Khabarov, The Working Group Inc
+- Oleg Khabarov
+- The Working Group Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -27,37 +28,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Gem that interfaces with PostageApp.com service to send emails from web
   apps
-email: oleg@twg.ca
+email:
+- oleg@khabarov.ca
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
 - .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - generators/postageapp/postageapp_generator.rb
 - generators/postageapp/templates/initializer.rb
 - generators/postageapp/templates/postageapp_tasks.rake
@@ -69,6 +53,7 @@ files:
 - 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
@@ -106,14 +91,14 @@ files:
 - 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
-homepage: http://github.com/postageapp/postageapp-ruby
-licenses:
-- MIT
+homepage: http://github.com/twg/api_docs
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -124,9 +109,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4418215173582441535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/VERSION

@@ -1 +0,0 @@
-1.0.19