postageapp 1.0.16 → 1.0.17

data/VERSION

@@ -1 +1 @@
-1.0.16
+1.0.17

data/lib/postageapp/mailer/mailer_3.rb

@@ -59,6 +59,7 @@ class PostageApp::Mailer < ActionMailer::Base
   
   # 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
@@ -125,41 +126,6 @@ class PostageApp::Mailer < ActionMailer::Base
     m
   end
   
-  # Overriding method to create mesage from the old_api
-  def create_mail
-    m = @_message
-    
-    m.arguments['headers'] ||= { }
-    m.arguments['headers']['from'] = from
-    m.arguments['headers']['subject'] = subject
-    m.arguments['recipients'] = recipients
-    
-    m
-  end
-  
-  # Overriding part assignment from old_api
-  # For now only accepting a hash
-  def part(params)
-    @_message.arguments['content'] ||= { }
-    @_message.arguments['content'][params[:content_type]] = params[:body]
-  end
-  
-  # Overriding attachment assignment from old_api
-  # For now only accepting a hash
-  def attachment(params)
-    @_message.arguments['attachments'] ||= { }
-    @_message.arguments['attachments'][params[:filename]] = {
-      'content_type'  => params[:content_type],
-      'content'       => Base64.encode64(params[:body].to_s)
-    }
-  end
-  
-  # Overriding method in old_api
-  def create_inline_part(body, mime_type = nil)
-    @_message.arguments['content'] ||= { }
-    @_message.arguments['content'][mime_type && mime_type.to_s || 'text/plain'] = body
-  end
-  
 protected
 
   def create_parts_from_responses(m, responses) #:nodoc:

data/postageapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "postageapp"
-  s.version = "1.0.16"
+  s.version = "1.0.17"
 
   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 = "2012-11-13"
+  s.date = "2012-12-20"
   s.description = "Gem that interfaces with PostageApp.com service to send emails from web apps"
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "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",

data/test/mailer/action_mailer_3/layouts/notifier.html.erb

@@ -0,0 +1 @@
+with layout <%= yield %>

data/test/mailer_3_test.rb

@@ -8,11 +8,6 @@ class Mailer3Test < Test::Unit::TestCase
     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_blank
-      mail = Notifier.blank
-      assert mail.is_a?(PostageApp::Request)
-    end
-    
     def test_create_with_no_content
       mail = Notifier.with_no_content
       assert_equal ({}), mail.arguments['content']
@@ -20,7 +15,7 @@ class Mailer3Test < Test::Unit::TestCase
     
     def test_create_with_simple_view
       mail = Notifier.with_simple_view
-      assert_equal 'simple view content', mail.arguments['content']['text/html']
+      assert_equal 'with layout simple view content', mail.arguments['content']['text/html']
     end
     
     def test_create_with_text_only_view
@@ -30,8 +25,8 @@ class Mailer3Test < Test::Unit::TestCase
     
     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 'html content', mail.arguments['content']['text/html']
+      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
@@ -62,13 +57,13 @@ class Mailer3Test < Test::Unit::TestCase
         'test1@test.test' => { 'name' => 'Test 1'},
         'test2@test.test' => { 'name' => 'Test 2'}
       }), mail.arguments['recipients']
-      assert_equal 'test-template', mail.arguments['template']
+      assert_equal 'test-template',             mail.arguments['template']
       assert_equal ({ 'variable' => 'value' }), mail.arguments['variables']
-      assert_equal 'custom_api_key', mail.arguments['api_key']
-      assert_equal 'CustomValue1', mail.arguments['headers']['CustomHeader1']
-      assert_equal 'CustomValue2', mail.arguments['headers']['CustomHeader2']
-      assert_equal 'text content', mail.arguments['content']['text/plain']
-      assert_equal 'html content', mail.arguments['content']['text/html']
+      assert_equal 'custom_api_key',            mail.arguments['api_key']
+      assert_equal 'CustomValue1',              mail.arguments['headers']['CustomHeader1']
+      assert_equal 'CustomValue2',              mail.arguments['headers']['CustomHeader2']
+      assert_equal 'text content',              mail.arguments['content']['text/plain']
+      assert_equal 'with layout html content',  mail.arguments['content']['text/html']
     end
     
     def test_create_with_recipient_override

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -92,6 +92,7 @@ files:
 - 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
@@ -123,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -975248555651660565
+      hash: 3558677056440120512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: