postageapp 1.0.24 → 1.2.0

data/test/mailer/action_mailer_2/notifier.rb

@@ -1,10 +1,9 @@
 # Test mailer for ActionMailer 2
 class Notifier < PostageApp::Mailer
-  
-  self.template_root = File.expand_path('../', __FILE__)
-  
+  self.template_root = File.dirname(__FILE__)
+
   def blank
-    # ... nothing to see here
+    # Empty method
   end
   
   def with_no_content
@@ -25,43 +24,53 @@ class Notifier < PostageApp::Mailer
   
   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'
+
+    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'
+
+    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'
+    postageapp_template 'test-template'
+    postageapp_variables 'variable' => 'value'
+    postageapp_uid 'custom_uid'
+    postageapp_api_key 'custom_api_key'
     
-    from    'test@test.test'
+    from 'sender@example.com'
     subject 'Test Email'
     
-    recipients ({
-      'test1@test.text' => { 'name' => 'Test 1' },
-      'test2@test.text' => { 'name' => 'Test 2' }
-    })
+    recipients(
+      'test1@example.net' => { 'name' => 'Test 1' },
+      'test2@example.net' => { 'name' => 'Test 2' }
+    )
   end
   
 private
-  
   def setup_headers
-    recipients 'test@test.test'
-    from       'text@test.test'
-    subject    'Test Email'
+    recipients 'recipient@example.net'
+    from 'sender@example.com'
+    subject 'Test Email'
   end
-  
 end

data/test/mailer/action_mailer_3/notifier.rb

@@ -1,7 +1,7 @@
-# Test mailer for ActionMailer 3
-class Notifier < PostageApp::Mailer
+# Test mailer for ActionMailer 3 and 4
 
-  self.append_view_path(File.expand_path('../', __FILE__))
+class Notifier < PostageApp::Mailer
+  self.append_view_path(File.dirname(__FILE__))
 
   def blank
     # ... nothing to see here
@@ -14,6 +14,7 @@ class Notifier < PostageApp::Mailer
   def with_no_subject
     hash_without_subject = headers_hash
     hash_without_subject.delete(:subject)
+
     mail(hash_without_subject)
   end
 
@@ -34,18 +35,24 @@ class Notifier < PostageApp::Mailer
 
   def with_body_and_attachment_as_file
     attachments['sample_file.txt'] = 'File content'
+
     mail(headers_hash) do |format|
-      format.html { render :text => 'manual body text'}
+      format.html do
+        render(:text => 'manual body text')
+      end
     end
   end
 
   def with_body_and_attachment_as_hash
     attachments['sample_file.txt'] = {
       :content_type => 'text/rich',
-      :body         => 'File content'
+      :body => 'File content'
     }
+
     mail(headers_hash) do |format|
-      format.html { render :text => 'manual body text'}
+      format.html do
+        render(:text => 'manual body text')
+      end
     end
   end
 
@@ -53,28 +60,27 @@ class Notifier < PostageApp::Mailer
     headers['CustomHeader1'] = 'CustomValue1'
     headers 'CustomHeader2' => 'CustomValue2'
 
-    postageapp_template   'test-template'
-    postageapp_variables  'variable' => 'value'
-    postageapp_api_key    'custom_api_key'
-    postageapp_uid        'custom_uid'
+    postageapp_template 'test-template'
+    postageapp_variables 'variable' => 'value'
+    postageapp_api_key 'custom_api_key'
+    postageapp_uid 'custom_uid'
 
     mail(
-      :from     => 'test@test.test',
-      :subject  => 'Test Message',
-      :to       => {
-        'test1@test.test' => { 'name' => 'Test 1' },
-        'test2@test.test' => { 'name' => 'Test 2' }
+      :from => 'sender@example.com',
+      :subject => 'Test Message',
+      :to => {
+        'test1@example.net' => { 'name' => 'Test 1' },
+        'test2@example.net' => { 'name' => 'Test 2' }
       }
     )
   end
 
 private
-
-  def headers_hash(options = {})
-    { :from     => 'sender@test.test',
-      :subject  => 'Test Message',
-      :to       => 'test@test.test'
+  def headers_hash(options = { })
+    {
+      :from => 'sender@example.com',
+      :to => 'recipient@example.net',
+      :subject => 'Test Message'
     }.merge(options)
   end
-
-end
+end

data/test/mailer_2_test.rb

@@ -1,15 +1,15 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
 # tests for ActionMailer bundled with Rails 2
-class Mailer2Test < Minitest::Test
-  case (ActionMailer::VERSION::MAJOR)
-  when 2
-    require File.expand_path('../mailer/action_mailer_2/notifier', __FILE__)
+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?
@@ -17,18 +17,21 @@ class Mailer2Test < Minitest::Test
     
     def test_create_with_no_content
       assert mail = Notifier.create_with_no_content
-      assert_equal 'test@test.test', mail.arguments['recipients']
-      assert_equal ({ 'from' => 'text@test.test', 'subject' => 'Test Email' }), mail.arguments['headers']
+
+      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
@@ -37,6 +40,7 @@ class Mailer2Test < Minitest::Test
       mock_successful_send
       
       assert response = Notifier.deliver_with_html_and_text_views
+
       assert response.is_a?(PostageApp::Response)
       assert response.ok?
     end
@@ -48,6 +52,7 @@ class Mailer2Test < Minitest::Test
     
     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?
@@ -57,6 +62,7 @@ class Mailer2Test < Minitest::Test
     
     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']
@@ -67,26 +73,24 @@ class Mailer2Test < Minitest::Test
     
     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@test.text' => { 'name' => 'Test 2'}, 
-                      'test1@test.text' => { 'name' => 'Test 1'}}), mail.arguments['recipients']
+      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 = 'oleg@test.test'
+      PostageApp.configuration.recipient_override = 'override@example.net'
+
       assert mail = Notifier.create_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
-  else
-    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
 
-    def test_nothing
+      assert_equal 'recipient@example.net', mail.arguments['recipients']
+      assert_equal 'override@example.net', mail.arguments_to_send['arguments']['recipient_override']
     end
   end
 end

data/test/mailer_3_test.rb

@@ -1,10 +1,9 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
 # tests for ActionMailer bundled with Rails 3
-class Mailer3Test < Minitest::Test
-  case (ActionMailer::VERSION::MAJOR)
-  when 3
-    require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+class Mailer3Test < MiniTest::Test
+  require_action_mailer(3) do
+    require File.expand_path('mailer/action_mailer_3/notifier', File.dirname(__FILE__))
 
     puts "\e[0m\e[32mRunning #{File.basename(__FILE__)} for action_mailer #{ActionMailer::VERSION::STRING}\e[0m"
 
@@ -35,8 +34,8 @@ class Mailer3Test < Minitest::Test
     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']
+      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
@@ -74,25 +73,25 @@ class Mailer3Test < Minitest::Test
       args = args['arguments']
 
       assert_equal ({
-        'test1@test.test' => { 'name' => 'Test 1'},
-        'test2@test.test' => { 'name' => 'Test 2'}
+        'test1@example.net' => { 'name' => 'Test 1'},
+        'test2@example.net' => { 'name' => 'Test 2'}
       }), args['recipients']
 
-      assert_equal 'test-template',             args['template']
+      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']
+      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'
+      PostageApp.configuration.recipient_override = 'override@example.net'
 
       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']
+      assert_equal 'recipient@example.net', mail.arguments['recipients']
+      assert_equal 'override@example.net', mail.arguments_to_send['arguments']['recipient_override']
     end
 
     def test_deliver_for_test_mailer
@@ -113,10 +112,5 @@ class Mailer3Test < Minitest::Test
 
       assert_equal [ ], ActionMailer::Base.deliveries
     end
-  else
-    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
-
-    def test_nothing
-    end
   end
 end

data/test/mailer_4_test.rb

@@ -1,16 +1,15 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
 # tests for ActionMailer bundled with Rails 3
-class Mailer4Test < Minitest::Test
-  case (ActionMailer::VERSION::MAJOR)
-  when 4
-    require File.expand_path('../mailer/action_mailer_3/notifier', __FILE__)
+class Mailer4Test < MiniTest::Test
+  require_action_mailer(4) do
+    require File.expand_path('mailer/action_mailer_3/notifier', File.dirname(__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']
+      assert_equal ({ }), mail.arguments['content']
     end
 
     def test_create_with_no_subject
@@ -30,8 +29,8 @@ class Mailer4Test < Minitest::Test
 
     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']
+      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
@@ -60,49 +59,50 @@ class Mailer4Test < Minitest::Test
       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']
+      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({
+        'test1@example.net' => { 'name' => 'Test 1' },
+        'test2@example.net' => { 'name' => 'Test 2' }
+      }, args['recipients'])
 
-      assert_equal 'test-template',             args['template']
+      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']
+      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'
+      PostageApp.configuration.recipient_override = 'override@example.org'
+
       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']
+
+      assert_equal 'recipient@example.net', mail.arguments['recipients']
+      assert_equal 'override@example.org', 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
+
+      assert_equal [ mail ], ActionMailer::Base.deliveries
     end
 
     def test_deliver_for_not_performing_deliveries_with_test_mailer
       mail = Notifier.with_simple_view
+
       mail.perform_deliveries = false
       mail.delivery_method(Mail::TestMailer)
       mail.deliver
-      assert_equal [], ActionMailer::Base.deliveries
-    end
-  else
-    puts "\e[0m\e[31mSkipping #{File.basename(__FILE__)}\e[0m"
 
-    def test_nothing
+      assert_equal [ ], ActionMailer::Base.deliveries
     end
   end
 end