postageapp 1.0.14 → 1.0.15

data/README.md

@@ -3,7 +3,7 @@
 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/faqs/api) • [PostageApp FAQs](http://help.postageapp.com/faqs) • [PostageApp Help Portal](http://help.postageapp.com)
+### [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)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.0.15

data/lib/postageapp/mailer/mailer_2.rb

@@ -31,6 +31,7 @@ class PostageApp::Mailer < ActionMailer::Base
   
   adv_attr_accessor :postageapp_template
   adv_attr_accessor :postageapp_variables
+  adv_attr_accessor :postageapp_api_key
   
   def perform_delivery_postage(mail)
     mail.send
@@ -73,6 +74,7 @@ class PostageApp::Mailer < ActionMailer::Base
     
     params['template'] = self.postageapp_template unless self.postageapp_template.blank?
     params['variables'] = self.postageapp_variables unless self.postageapp_variables.blank?
+    params['api_key'] = self.postageapp_api_key unless self.postageapp_api_key.blank?
     
     params.delete('headers')     if params['headers'].blank?
     params.delete('content')     if params['content'].blank?

data/lib/postageapp/mailer/mailer_3.rb

@@ -74,6 +74,10 @@ class PostageApp::Mailer < ActionMailer::Base
     value ? @_message.arguments['variables'] = value : @_message.arguments['variables']
   end
   
+  def postageapp_api_key(value = nil)
+    value ? @_message.arguments['api_key'] = value : @_message.arguments['api_key']
+  end
+  
   def attachments
     @_attachments ||= Attachments.new(@_message)
   end

data/lib/postageapp/request.rb

@@ -17,9 +17,13 @@ class PostageApp::Request
   # A list of arguments in a Hash format passed along with the request
   attr_accessor :arguments
   
+  # Ability to set api_key with eash request
+  attr_accessor :api_key
+  
   def initialize(method, arguments = {})
     @method     = method
     @uid        = arguments.delete(:uid)
+    @api_key    = arguments.delete(:api_key) || PostageApp.configuration.api_key
     @arguments  = arguments
   end
   
@@ -77,7 +81,7 @@ class PostageApp::Request
   
   # Arguments need to be appended with some some stuff before it's ready to be send out
   def arguments_to_send
-    hash = { 'uid' => self.uid, 'api_key' => PostageApp.configuration.api_key }
+    hash = { 'uid' => self.uid, 'api_key' => self.api_key }
     
     if !self.arguments.nil? && !self.arguments.empty?
       if !PostageApp.configuration.recipient_override.nil? && self.method.to_sym == :send_message

data/postageapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "postageapp"
-  s.version = "1.0.14"
+  s.version = "1.0.15"
 
   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 = "2011-11-15"
+  s.date = "2012-09-13"
   s.description = "Gem that interfaces with PostageApp.com service to send emails from web apps"
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/postageapp/postageapp-ruby"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "Easier way to send email from web apps"
 
   if s.respond_to? :specification_version then

data/test/mailer/action_mailer_2/notifier.rb

@@ -51,6 +51,7 @@ class Notifier < PostageApp::Mailer
     })
     postageapp_template 'test-template'
     postageapp_variables 'variable' => 'value'
+    postageapp_api_key 'custom_api_key'
   end
   
 private

data/test/mailer/action_mailer_3/notifier.rb

@@ -49,6 +49,7 @@ class Notifier < PostageApp::Mailer
     
     postageapp_template 'test-template'
     postageapp_variables 'variable' => 'value'
+    postageapp_api_key 'custom_api_key'
     
     mail(
       :from     => 'test@test.test',
@@ -60,35 +61,6 @@ class Notifier < PostageApp::Mailer
     )
   end
   
-  def with_old_api
-    from    'test@test.test'
-    subject 'Test Email'
-    recipients 'test@test.test'
-  end
-  
-  def with_old_api_and_manual_parts
-    from    'test@test.test'
-    subject 'Test Email'
-    
-    headers ({'custom_header' => 'value'})
-    
-    recipients ({
-      'test1@test.test' => { 'name' => 'Test 1' },
-      'test2@test.test' => { 'name' => 'Test 2' }
-    })
-    
-    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'
-    
-    postageapp_template 'test-template'
-    postageapp_variables 'variable' => 'value'
-  end
-  
 private
   
   def headers_hash(options = {})

data/test/mailer_2_test.rb

@@ -68,6 +68,7 @@ class Mailer2Test < Test::Unit::TestCase
     def test_create_with_custom_postage_variables
       assert mail = Notifier.create_with_custom_postage_variables
       assert_equal 'test-template', mail.arguments['template']
+      assert_equal 'custom_api_key', mail.arguments['api_key']
       assert_equal ({ 'variable' => 'value' }), mail.arguments['variables']
       assert_equal ({ 'test2@test.text' => { 'name' => 'Test 2'}, 
                       'test1@test.text' => { 'name' => 'Test 1'}}), mail.arguments['recipients']

data/test/mailer_3_test.rb

@@ -64,36 +64,13 @@ class Mailer3Test < Test::Unit::TestCase
       }), mail.arguments['recipients']
       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']
     end
     
-    def test_create_with_old_api
-      mail = Notifier.with_old_api
-      assert_equal 'test@test.test', mail.arguments['headers']['from']
-      assert_equal 'Test Email', mail.arguments['headers']['subject']
-      assert_equal 'test@test.test', mail.arguments['recipients']
-      assert_equal 'html content', mail.arguments['content']['text/html']
-      assert_equal 'text content', mail.arguments['content']['text/plain']
-    end
-    
-    def test_create_with_old_api_and_manual_parts
-      mail = Notifier.with_old_api_and_manual_parts
-      assert_equal ({
-        'test2@test.test' => { 'name' => 'Test 2'},
-        'test1@test.test' => { 'name' => 'Test 1'}
-      }), mail.arguments['recipients']
-      assert_equal 'test@test.test', mail.arguments['headers']['from']
-      assert_equal 'Test Email', mail.arguments['headers']['subject']
-      assert_equal 'value', mail.arguments['headers']['custom_header']
-      assert_equal 'html content', mail.arguments['content']['text/html']
-      assert_equal 'text content', mail.arguments['content']['text/plain']
-      assert_equal 'image/jpeg', mail.arguments['attachments']['foo.jpg']['content_type']
-      assert_equal "MTIzNDU2Nzg5\n", mail.arguments['attachments']['foo.jpg']['content']
-    end
-    
     def test_create_with_recipient_override
       PostageApp.configuration.recipient_override = 'oleg@test.test'
       assert mail = Notifier.with_html_and_text_views

data/test/request_test.rb

@@ -57,6 +57,14 @@ class RequestTest < Test::Unit::TestCase
     assert_equal ({:data => 'value'}), request.arguments
   end
   
+  def test_api_key
+    request = PostageApp::Request.new(:test_method)
+    assert_equal PostageApp.configuration.api_key, request.api_key
+    
+    request = PostageApp::Request.new(:test_method, {:api_key => 'custom_api_key'})
+    assert_equal 'custom_api_key', request.api_key
+  end
+  
   def test_send
     mock_successful_send
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70110451984120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70110451984120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70110451982980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70110451982980
+  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
@@ -113,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2753693682518228981
+      hash: 2813224235193032805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easier way to send email from web apps