postageapp 1.0.21 → 1.0.22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6380fa116f59e249ad1fce5897f34d160708caef
+  data.tar.gz: 87c9ee3959cc3d6f1b2b68a22b74e8367dfa89b5
+SHA512:
+  metadata.gz: 280c702bde5cd63bf66c9b05fd8beac698cf9e2ad201416bc1ee542e122048d971ddf0b0c4aaf1b4bc512a874e4b1f9b6910253af8eab413486ef128c7aac67f
+  data.tar.gz: 0eb12f766ca5cc385e88ffb5aceacd4d10469ba920541fcdac36f6f0fdcccb234c689aa52523f055691755e1a28bae74418185055820f02b2ca2f3396016fb0d

data/lib/postageapp/mailer/mailer_3.rb

@@ -3,9 +3,9 @@
 # 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(
@@ -27,7 +27,7 @@
 #   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' => {
@@ -35,12 +35,12 @@ class PostageApp::Mailer < ActionMailer::Base
   #    '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)
@@ -56,81 +56,80 @@ class PostageApp::Mailer < ActionMailer::Base
       }
     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 
+
+  # 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|
       v.respond_to?(:call) ? v.bind(self).call : v
     end
-    
+
     # Handle defaults
     headers = headers.reverse_merge(default_values)
-    headers[:subject] ||= default_i18n_subject
-    
+
     # 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:
@@ -139,16 +138,16 @@ protected
       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,
                 :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
@@ -158,10 +157,10 @@ class PostageApp::Request
       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/mailer/mailer_4.rb

@@ -112,7 +112,6 @@ class PostageApp::Mailer < ActionMailer::Base
 
     # 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]

data/lib/postageapp/version.rb

@@ -1,3 +1,3 @@
 module PostageApp
-  VERSION = "1.0.21"
+  VERSION = "1.0.22"
 end

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

@@ -3,6 +3,6 @@ source 'http://rubygems.org'
 gem 'json'
 
 group :test do
-  gem 'rails', '~> 4.0.0.rc2'
+  gem 'rails', '~> 4.0.0'
   gem 'mocha'
 end

data/test/mailer/action_mailer_3/notifier.rb

@@ -1,38 +1,44 @@
 # Test mailer for ActionMailer 3
 class Notifier < PostageApp::Mailer
-  
+
   self.append_view_path(File.expand_path('../', __FILE__))
-  
+
   def blank
     # ... nothing to see here
   end
-  
+
   def with_no_content
     mail(headers_hash)
   end
-  
+
+  def with_no_subject
+    hash_without_subject = headers_hash
+    hash_without_subject.delete(:subject)
+    mail(hash_without_subject)
+  end
+
   def with_text_only_view
     mail(headers_hash)
   end
-  
+
   def with_html_and_text_views
     mail(headers_hash) do |format|
       format.text
       format.html
     end
   end
-  
+
   def with_simple_view
     mail(headers_hash)
   end
-  
+
   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'}
     end
   end
-  
+
   def with_body_and_attachment_as_hash
     attachments['sample_file.txt'] = {
       :content_type => 'text/rich',
@@ -42,16 +48,16 @@ class Notifier < PostageApp::Mailer
       format.html { render :text => 'manual body text'}
     end
   end
-  
+
   def with_custom_postage_variables
     headers['CustomHeader1'] = 'CustomValue1'
     headers 'CustomHeader2' => 'CustomValue2'
-    
+
     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',
@@ -61,14 +67,14 @@ class Notifier < PostageApp::Mailer
       }
     )
   end
-  
+
 private
-  
+
   def headers_hash(options = {})
     { :from     => 'sender@test.test',
       :subject  => 'Test Message',
       :to       => 'test@test.test'
     }.merge(options)
   end
-  
+
 end

data/test/mailer_3_test.rb

@@ -13,6 +13,11 @@ class Mailer3Test < Test::Unit::TestCase
       assert_equal ({}), mail.arguments['content']
     end
 
+    def test_create_with_no_subject
+      mail = Notifier.with_no_subject
+      assert mail.arguments['headers'][:subject].nil?
+    end
+
     def test_create_with_simple_view
       mail = Notifier.with_simple_view
       assert_equal 'with layout simple view content', mail.arguments['content']['text/html']

data/test/mailer_4_test.rb

@@ -12,6 +12,11 @@ class Mailer4Test < Test::Unit::TestCase
       mail = Notifier.with_no_content
       assert_equal ({}), mail.arguments['content']
     end
+    
+    def test_create_with_no_subject
+      mail = Notifier.with_no_subject
+      assert mail.arguments['headers'][:subject].nil?
+    end
 
     def test_create_with_simple_view
       mail = Notifier.with_simple_view

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postageapp
 version: !ruby/object:Gem::Version
-  version: 1.0.21
-  prerelease: 
+  version: 1.0.22
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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
@@ -99,26 +96,25 @@ files:
 - test/response_test.rb
 homepage: http://github.com/postageapp/postageapp-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easier way to send email from web apps
 test_files: []