postmark 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1079afd6778085afa9f62fe85bb8e3cc43af05b2
+  data.tar.gz: d3f376703b377cd3ebe1befa1a21f0119888341f
+SHA512:
+  metadata.gz: 2154a90bdf624d656668b68f347b2c5e75c02fc3130c7edcf39a808fabb8324aa1d232b69224e23120eb32e40191fc364e2cb521777916777647db0217d0697e
+  data.tar.gz: 9206abd5fbef93c472bd2ecd51358b0f0c3512e98d1222ec8f310ee6377231297de1bc9bb5abb950bc6e314c4ca425ae6ce3e6fa6c82f962c75e9b45bed9ab11

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+before_install:
+  - gem update --system 2.1.11
+  - gem --version
 rvm:
   - "1.8.7"
   - "1.9.2"

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.0.2
+
+* Removed metaprogramming executed at runtime. [#37]
+* Fixed invalid check for a blank recipient. [#38]
+
 == 1.0.1
 
 * Fixed an issue causing recipient names to disappear from "To", "Cc" and "Reply-To" headers when using with Mail library.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/postmark.rb

@@ -5,6 +5,7 @@ require 'thread' unless defined? Mutex # For Ruby 1.8.7
 require 'postmark/inflector'
 require 'postmark/helpers/hash_helper'
 require 'postmark/helpers/message_helper'
+require 'postmark/mail_message_converter'
 require 'postmark/bounce'
 require 'postmark/inbound'
 require 'postmark/json'

data/lib/postmark/api_client.rb

@@ -34,10 +34,10 @@ module Postmark
       data = serialize(message.to_postmark_hash)
 
       with_retries do
-        take_response_of { http_client.post("email", data) }.to do |response|
-          update_message(message, response)
-          format_response response, true
-        end
+        response, error = take_response_of { http_client.post("email", data) }
+        update_message(message, response)
+        raise error if error
+        format_response(response, true)
       end
     end
 
@@ -131,21 +131,9 @@ module Postmark
     end
 
     def take_response_of
-      define_singleton_method(:to, yield)
+      [yield, nil]
     rescue DeliveryError => e
-      define_singleton_method(:to, e.full_response || {}) do
-        raise e
-      end
-    end
-
-    def define_singleton_method(name, object)
-      singleton_class = class << object; self; end
-      singleton_class.send(:define_method, name) do |&b|
-        ret = b.call(self) if b
-        yield if block_given?
-        ret
-      end
-      object
+      [e.full_response || {}, e]
     end
 
     def format_response(response, compatible = false)

data/lib/postmark/mail_message_converter.rb

@@ -0,0 +1,46 @@
+module Postmark
+
+  class MailMessageConverter
+
+    def initialize(message)
+      @message = message
+    end
+
+    def run
+      delete_blank_fields(convert)
+    end
+
+    protected
+
+    def convert
+      headers_part.merge(content_part)
+    end
+
+    def delete_blank_fields(message_hash)
+      message_hash.delete_if { |k, v| v.nil? || v.empty? }
+    end
+
+    def headers_part
+      {
+        'From' => @message['from'].to_s,
+        'To' => @message['to'].to_s,
+        'ReplyTo' => @message['reply_to'].to_s,
+        'Cc' => @message['cc'].to_s,
+        'Bcc' => @message['bcc'].to_s,
+        'Subject' => @message.subject,
+        'Headers' => @message.export_headers,
+        'Tag' => @message.tag.to_s
+      }
+    end
+
+    def content_part
+      {
+        'Attachments' => @message.export_attachments,
+        'HtmlBody' => @message.body_html,
+        'TextBody' => @message.body_text
+      }
+    end
+
+  end
+
+end

data/lib/postmark/message_extensions/mail.rb

@@ -40,25 +40,7 @@ module Mail
     end
 
     def to_postmark_hash
-      options = Hash.new
-      headers = self.export_headers
-      attachments = self.export_attachments
-
-      options["From"] = self['from'].to_s if self.from
-      options["Subject"] = self.subject
-      options["Attachments"] = attachments unless attachments.empty?
-      options["Headers"] = headers if headers.size > 0
-      options["HtmlBody"] = self.body_html
-      options["TextBody"] = self.body_text
-      options["Tag"] = self.tag.to_s if self.tag
-
-      %w(to reply_to cc bcc).each do |field|
-        next unless self.send(field)
-        value = self[field.to_s]
-        options[::Postmark::Inflector.to_postmark(field)] = Array[value].flatten.join(", ")
-      end
-
-      options.delete_if { |k,v| v.nil? || v.empty? }
+      ::Postmark::MailMessageConverter.new(self).run
     end
 
   protected
@@ -79,9 +61,9 @@ module Mail
         date         content-type
         cc           bcc
         subject      tag
-        attachment
+        attachment   to
       ]
     end
 
   end
-end
+end

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/postmark.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version          = Postmark::VERSION
   s.homepage         = "http://postmarkapp.com"
   s.platform         = Gem::Platform::RUBY
+  s.license          = 'MIT'
 
   s.authors          = ["Petyo Ivanov", "Ilya Sabanin", "Artem Chistyakov"]
   s.email            = "ilya@wildbit.com"

data/spec/unit/postmark/api_client_spec.rb

@@ -110,7 +110,7 @@ describe Postmark::ApiClient do
       subject.deliver_message(message)
     end
 
-    it "should retry 3 times" do
+    it "retries 3 times" do
       2.times do
         http_client.should_receive(:post).and_raise(Postmark::InternalServerError)
       end
@@ -118,12 +118,17 @@ describe Postmark::ApiClient do
       expect { subject.deliver_message(message) }.not_to raise_error
     end
 
-    it "should retry on timeout" do
+    it "retries on timeout" do
       http_client.should_receive(:post).and_raise(Postmark::TimeoutError)
       http_client.should_receive(:post)
       expect { subject.deliver_message(message) }.not_to raise_error
     end
 
+    it "proxies errors" do
+      http_client.stub(:post).and_raise(Postmark::TimeoutError)
+      expect { subject.deliver_message(message) }.to raise_error(Postmark::TimeoutError)
+    end
+
   end
 
   describe "#deliver_messages" do

data/spec/unit/postmark/mail_message_converter_spec.rb

@@ -0,0 +1,155 @@
+require 'spec_helper'
+
+describe Postmark::MailMessageConverter do
+
+  subject { Postmark::MailMessageConverter }
+
+  let(:mail_message) do
+    Mail.new do
+      from    "sheldon@bigbangtheory.com"
+      to      "lenard@bigbangtheory.com"
+      subject "Hello!"
+      body    "Hello Sheldon!"
+    end
+  end
+
+  let(:mail_html_message) do
+    mail = Mail.new do
+      from          "sheldon@bigbangtheory.com"
+      to            "lenard@bigbangtheory.com"
+      subject       "Hello!"
+      content_type 'text/html; charset=UTF-8'
+      body "<b>Hello Sheldon!</b>"
+    end
+  end
+
+
+  let(:tagged_mail_message) do
+    Mail.new do
+      from    "sheldon@bigbangtheory.com"
+      to      "lenard@bigbangtheory.com"
+      subject "Hello!"
+      body    "Hello Sheldon!"
+      tag     "sheldon"
+    end
+  end
+
+  let(:mail_message_without_body) do
+    Mail.new do
+      from    "sheldon@bigbangtheory.com"
+      to      "lenard@bigbangtheory.com"
+      subject "Hello!"
+    end
+  end
+
+  let(:mail_multipart_message) do
+    mail = Mail.new do
+      from          "sheldon@bigbangtheory.com"
+      to            "lenard@bigbangtheory.com"
+      subject       "Hello!"
+      text_part do
+        body        "Hello Sheldon!"
+      end
+      html_part do
+        body        "<b>Hello Sheldon!</b>"
+      end
+    end
+  end
+
+  let(:mail_message_with_attachment) do
+    Mail.new do
+      from    "sheldon@bigbangtheory.com"
+      to      "lenard@bigbangtheory.com"
+      subject "Hello!"
+      body    "Hello Sheldon!"
+      add_file empty_gif_path
+    end
+  end
+
+  let(:mail_message_with_named_addresses) do
+    Mail.new do
+      from    "Sheldon <sheldon@bigbangtheory.com>"
+      to      "\"Leonard Hofstadter\" <leonard@bigbangtheory.com>"
+      subject "Hello!"
+      body    "Hello Sheldon!"
+      reply_to 'Penny "The Neighbor" <penny@bigbangtheory.com>'
+    end
+  end
+
+  it 'converts plain text messages correctly' do
+    subject.new(mail_message).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "TextBody" => "Hello Sheldon!",
+        "To" => "lenard@bigbangtheory.com"}
+  end
+
+  it 'converts tagged text messages correctly' do
+    subject.new(tagged_mail_message).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "TextBody" => "Hello Sheldon!",
+        "Tag" => "sheldon",
+        "To"=>"lenard@bigbangtheory.com"}
+  end
+
+  it 'converts plain text messages without body correctly' do
+    subject.new(mail_message_without_body).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "To" => "lenard@bigbangtheory.com"}
+  end
+
+  it 'converts html messages correctly' do
+    subject.new(mail_html_message).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "HtmlBody" => "<b>Hello Sheldon!</b>",
+        "To" => "lenard@bigbangtheory.com"}
+  end
+
+  it 'converts multipart messages correctly' do
+    subject.new(mail_multipart_message).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "HtmlBody" => "<b>Hello Sheldon!</b>",
+        "TextBody" => "Hello Sheldon!",
+        "To" => "lenard@bigbangtheory.com"}
+  end
+
+  it 'converts messages with attachments correctly' do
+    subject.new(mail_message_with_attachment).run.should == {
+        "From" => "sheldon@bigbangtheory.com",
+        "Subject" => "Hello!",
+        "Attachments" => [{"Name"=>"empty.gif",
+                           "Content"=>encoded_empty_gif_data,
+                           "ContentType"=>"image/gif"}],
+        "TextBody"=>"Hello Sheldon!",
+        "To"=>"lenard@bigbangtheory.com"}
+  end
+
+  it 'converts messages with named addresses correctly' do
+    subject.new(mail_message_with_named_addresses).run.should == {
+        "From" => "Sheldon <sheldon@bigbangtheory.com>",
+        "Subject" => "Hello!",
+        "TextBody" => "Hello Sheldon!",
+        "To" => "Leonard Hofstadter <leonard@bigbangtheory.com>",
+        "ReplyTo" => "\"Penny \\\"The Neighbor\\\"\" <penny@bigbangtheory.com>"
+    }
+  end
+
+  context 'when bcc is empty' do
+    it 'excludes bcc from message' do
+      mail_message.bcc = nil
+      mail_message.to_postmark_hash.keys.should_not include('Bcc')
+    end
+  end
+
+  context 'when cc is empty' do
+    it 'excludes cc from message' do
+      mail_message.cc = nil
+      mail_message.to_postmark_hash.keys.should_not include('Cc')
+    end
+  end
+
+end

data/spec/unit/postmark/message_extensions/mail_spec.rb

@@ -14,24 +14,6 @@ describe Mail::Message do
     end
   end
 
-  let(:tagged_mail_message) do
-    Mail.new do
-      from    "sheldon@bigbangtheory.com"
-      to      "lenard@bigbangtheory.com"
-      subject "Hello!"
-      body    "Hello Sheldon!"
-      tag     "sheldon"
-    end
-  end
-
-  let(:mail_message_without_body) do
-    Mail.new do
-      from    "sheldon@bigbangtheory.com"
-      to      "lenard@bigbangtheory.com"
-      subject "Hello!"
-    end
-  end
-
   let(:mail_html_message) do
     mail = Mail.new do
       from          "sheldon@bigbangtheory.com"
@@ -42,38 +24,21 @@ describe Mail::Message do
     end
   end
 
-  let(:mail_multipart_message) do
-    mail = Mail.new do
-      from          "sheldon@bigbangtheory.com"
-      to            "lenard@bigbangtheory.com"
-      subject       "Hello!"
-      text_part do
-        body        "Hello Sheldon!"
-      end
-      html_part do
-        body        "<b>Hello Sheldon!</b>"
-      end
-    end
-  end
-
-  let(:mail_message_with_attachment) do
-    Mail.new do
-      from    "sheldon@bigbangtheory.com"
-      to      "lenard@bigbangtheory.com"
-      subject "Hello!"
-      body    "Hello Sheldon!"
-      add_file empty_gif_path
-    end
-  end
-
-  let(:mail_message_with_named_addresses) do
-    Mail.new do
-      from    "Sheldon <sheldon@bigbangtheory.com>"
-      to      "\"Leonard Hofstadter\" <leonard@bigbangtheory.com>"
-      subject "Hello!"
-      body    "Hello Sheldon!"
-      reply_to 'Penny "The Neighbor" <penny@bigbangtheory.com>'
-    end
+  let(:mail_message_with_bogus_headers) do
+    mail_message.header['Return-Path'] = 'bounce@wildbit.com'
+    mail_message.header['From'] = 'info@wildbit.com'
+    mail_message.header['Sender'] = 'info@wildbit.com'
+    mail_message.header['Received'] = 'from mta.pstmrk.it ([72.14.252.155]:54907)'
+    mail_message.header['Date'] = 'January 25, 2013 3:30:58 PM PDT'
+    mail_message.header['Content-Type'] = 'application/json'
+    mail_message.header['To'] = 'lenard@bigbangtheory.com'
+    mail_message.header['Cc'] = 'sheldon@bigbangtheory.com'
+    mail_message.header['Bcc'] = 'penny@bigbangtheory.com'
+    mail_message.header['Subject'] = 'You want not to use a bogus header'
+    mail_message.header['Tag'] = 'bogus-tag'
+    mail_message.header['Attachment'] = 'anydatahere'
+    mail_message.header['Allowed-Header'] = 'value'
+    mail_message
   end
 
   describe "#html?" do
@@ -159,67 +124,16 @@ describe Mail::Message do
     end
   end
 
-  describe "#to_postmark_hash" do
-    it 'converts plain text messages correctly' do
-      mail_message.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "TextBody" => "Hello Sheldon!",
-          "To" => "lenard@bigbangtheory.com"}
-    end
-
-    it 'converts tagged text messages correctly' do
-      tagged_mail_message.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "TextBody" => "Hello Sheldon!",
-          "Tag" => "sheldon",
-          "To"=>"lenard@bigbangtheory.com"}
-    end
-
-    it 'converts plain text messages without body correctly' do
-      mail_message_without_body.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "To" => "lenard@bigbangtheory.com"}
-    end
-
-    it 'converts html messages correctly' do
-      mail_html_message.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "HtmlBody" => "<b>Hello Sheldon!</b>",
-          "To" => "lenard@bigbangtheory.com"}
-    end
-
-    it 'converts multipart messages correctly' do
-      mail_multipart_message.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "HtmlBody" => "<b>Hello Sheldon!</b>",
-          "TextBody" => "Hello Sheldon!",
-          "To" => "lenard@bigbangtheory.com"}
-    end
+  describe "#export_headers" do
+    let(:headers) { mail_message_with_bogus_headers.export_headers }
+    let(:header_names) { headers.map { |h| h['Name'] } }
 
-    it 'converts messages with attachments correctly' do
-      mail_message_with_attachment.to_postmark_hash.should == {
-          "From" => "sheldon@bigbangtheory.com",
-          "Subject" => "Hello!",
-          "Attachments" => [{"Name"=>"empty.gif",
-                             "Content"=>encoded_empty_gif_data,
-                             "ContentType"=>"image/gif"}],
-          "TextBody"=>"Hello Sheldon!",
-          "To"=>"lenard@bigbangtheory.com"}
-    end
+    specify { header_names.should include('Allowed-Header') }
+    specify { header_names.count.should == 1 }
+  end
 
-    it 'converts messages with named addresses correctly' do
-      mail_message_with_named_addresses.to_postmark_hash.should == {
-          "From" => "Sheldon <sheldon@bigbangtheory.com>",
-          "Subject" => "Hello!",
-          "TextBody" => "Hello Sheldon!",
-          "To" => "Leonard Hofstadter <leonard@bigbangtheory.com>",
-          "ReplyTo" => "\"Penny \\\"The Neighbor\\\"\" <penny@bigbangtheory.com>"
-      }
-    end
+  describe "#to_postmark_hash" do
+    # See mail_message_converter_spec.rb
   end
-end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Petyo Ivanov
@@ -11,60 +10,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: mail
   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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,17 +71,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   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: Use this gem to send emails through Postmark HTTP API and retrieve info
@@ -124,6 +113,7 @@ files:
 - lib/postmark/inbound.rb
 - lib/postmark/inflector.rb
 - lib/postmark/json.rb
+- lib/postmark/mail_message_converter.rb
 - lib/postmark/message_extensions/mail.rb
 - lib/postmark/message_extensions/shared.rb
 - lib/postmark/response_parsers/active_support.rb
@@ -147,11 +137,14 @@ files:
 - spec/unit/postmark/inbound_spec.rb
 - spec/unit/postmark/inflector_spec.rb
 - spec/unit/postmark/json_spec.rb
+- spec/unit/postmark/mail_message_converter_spec.rb
 - spec/unit/postmark/message_extensions/mail_spec.rb
 - spec/unit/postmark_spec.rb
 homepage: http://postmarkapp.com
-licenses: []
-post_install_message: ! "\n    ==================\n    Thanks for installing the postmark
+licenses:
+- MIT
+metadata: {}
+post_install_message: "\n    ==================\n    Thanks for installing the postmark
   gem. If you don't have an account, please\n    sign up at http://postmarkapp.com/.\n\n
   \   Review the README.md for implementation details and examples.\n    ==================\n
   \ "
@@ -160,25 +153,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2741501783398035661
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Official Postmark API wrapper.
 test_files:
 - spec/data/empty.gif
@@ -197,5 +185,6 @@ test_files:
 - spec/unit/postmark/inbound_spec.rb
 - spec/unit/postmark/inflector_spec.rb
 - spec/unit/postmark/json_spec.rb
+- spec/unit/postmark/mail_message_converter_spec.rb
 - spec/unit/postmark/message_extensions/mail_spec.rb
 - spec/unit/postmark_spec.rb