postmark 0.9.17 → 0.9.18

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = Changelog
 
+== 0.9.18
+
+* Fixed regression introduced by removing ActiveSupport#wrap in case when a Hash instance is passed.
+* Fixed broken Ruby 1.8.7 support (uninitialized constant Postmark::HttpClient::Mutex (NameError)).
+* Added unit tests for attachments handling.
+* Removed unneeded debug output from shared RSpec examples.
+
 == 0.9.17
 
 * Removed date from gemspec.

data/VERSION

@@ -1 +1 @@
-0.9.17
+0.9.18

data/lib/postmark/http_client.rb

@@ -1,3 +1,4 @@
+require 'thread' unless defined? Mutex # For Ruby 1.8.7
 require 'cgi'
 
 module Postmark

data/lib/postmark/message_extensions/shared.rb

@@ -10,7 +10,7 @@ module Postmark
     end
 
     def postmark_attachments=(value)
-      @_attachments = Array[*value]
+      @_attachments = wrap_in_array(value)
     end
 
     def postmark_attachments
@@ -29,5 +29,18 @@ module Postmark
       end
     end
 
+    protected
+
+    # From ActiveSupport (Array#wrap)
+    def wrap_in_array(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
+
   end
 end

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 end

data/spec/postmark_spec.rb

@@ -20,7 +20,7 @@ describe Postmark do
       mail.content_type = "text/html"
     end
   end
-  
+
   let :mail_message do
     Mail.new do
       from    "sheldon@bigbangtheory.com"
@@ -40,7 +40,7 @@ describe Postmark do
       end
     end
   end
-  
+
   let :mail_multipart_message do
     mail = Mail.new do
       from          "sheldon@bigbangtheory.com"
@@ -103,7 +103,7 @@ describe Postmark do
 
     it "should retry 3 times" do
       FakeWeb.register_uri(:post, "http://api.postmarkapp.com/email",
-                          [ 
+                          [
                             { :status => [ 500, "Internal Server Error" ], :body => response_body(500, 'Internal Server Error') },
                             { :status => [ 500, "Internal Server Error" ], :body => response_body(500, 'Internal Server Error')  },
                             { :body => response_body(500, 'Internal Server Error')  }
@@ -134,9 +134,9 @@ describe Postmark do
   context "tmail parse", :ruby => 1.8 do
     require 'tmail'
     subject { tmail_message }
-    it_behaves_like :mail    
+    it_behaves_like :mail
   end
-  
+
   context "when mail parse" do
     subject { mail_message }
     it_behaves_like :mail
@@ -148,21 +148,21 @@ describe Postmark do
     it "should encode custom headers properly" do
       subject.header["CUSTOM-HEADER"] = "header"
       subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
-    end    
+    end
   end
-  
+
   context "mail delivery method" do
     it "should be able to set delivery_method" do
       mail_message.delivery_method Mail::Postmark
     end
-    
+
     it "should wrap Postmark.send_through_postmark" do
       message = mail_message
       Postmark.should_receive(:send_through_postmark).with(message)
       mail_message.delivery_method Mail::Postmark
       mail_message.deliver
     end
-    
+
     it "should allow setting of api_key" do
       mail_message.delivery_method Mail::Postmark, {:api_key => 'api-key'}
       mail_message.delivery_method.settings[:api_key].should == 'api-key'
@@ -182,11 +182,33 @@ describe Postmark do
       mail_message.deliver!
     end
 
-    it "should run postmark attachments hook when using deliver method" do      
+    it "should run postmark attachments hook when using deliver method" do
       mail_message.deliver
     end
+  end
+
+  context "attachments setter", :ruby => 1.9 do
+    let(:attached_hash) { { "Name" => "picture.jpeg", "ContentType" => "image/jpeg" } }
+    let(:attached_file) { mock("file") }
+
+    it "should store attachments as array" do
+      mail_message.postmark_attachments = attached_hash
+      mail_message.postmark_attachments.should be_kind_of(Array)
+    end
 
-    
+    it "should save the attachments in attachments array" do
+      mail_message.postmark_attachments = [attached_hash, attached_file]
+
+      attached_file.stub(:is_a?) { |arg| arg == File ? true : false }
+      attached_file.stub(:path) { '/tmp/file.jpeg' }
+      IO.should_receive(:read).with("/tmp/file.jpeg").and_return("")
+
+      mail_message.postmark_attachments = [attached_hash, attached_file]
+      attachments = mail_message.postmark_attachments.map { |a| a['Name'] }
+
+      attachments.should include('picture.jpeg')
+      attachments.should include('file.jpeg')
+    end
   end
 
   context "JSON library support" do

data/spec/shared_examples.rb

@@ -2,7 +2,7 @@ shared_examples :mail do
   it "should set text body for plain message" do
     Postmark.send(:convert_message_to_options_hash, subject)['TextBody'].should_not be_nil
   end
-  
+
   it "should encode from properly when name is used" do
     subject.from = "Sheldon Lee Cooper <sheldon@bigbangtheory.com>"
     subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
@@ -12,22 +12,22 @@ shared_examples :mail do
     subject.reply_to = ['a@a.com', 'b@b.com']
     subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
-  
+
   it "should encode tag" do
     subject.tag = "invite"
     subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
-  
+
   it "should encode multiple recepients (TO)" do
     subject.to = ['a@a.com', 'b@b.com']
     subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
   end
-  
+
   it "should encode multiple recepients (CC)" do
     subject.cc = ['a@a.com', 'b@b.com']
     subject.should be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
-  
+
   it "should encode multiple recepients (BCC)" do
     subject.bcc = ['a@a.com', 'b@b.com']
     subject.should be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
@@ -35,7 +35,6 @@ shared_examples :mail do
 
   it "should accept string as reply_to field" do
     subject.reply_to = ['Anton Astashov <b@b.com>']
-    puts subject.reply_to.inspect
     subject.should be_serialized_to %q[{"From": "sheldon@bigbangtheory.com", "ReplyTo": "b@b.com", "To": "lenard@bigbangtheory.com", "Subject": "Hello!", "TextBody": "Hello Sheldon!"}]
   end
 end

metadata

@@ -1,187 +1,176 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: postmark
-version: !ruby/object:Gem::Version
-  version: 0.9.17
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 18
+  version: 0.9.18
 platform: ruby
-authors:
+authors: 
 - Petyo Ivanov
 - Ilya Sabanin
 - Artem Chistyakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 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'
+
+date: 2013-01-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :runtime
+  name: rake
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   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
+  name: json
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tmail
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: tmail
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: mail
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :development
+  name: activesupport
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: fakeweb
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb-matcher
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: fakeweb-matcher
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: timecop
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !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
-  about bounces.
+  name: yajl-ruby
+  requirement: *id010
+description: Use this gem to send emails through Postmark HTTP API and retrieve info about bounces.
 email: ilya@wildbit.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .document
 - .gitignore
 - .rake_tasks
@@ -213,36 +202,40 @@ files:
 - spec/spec_helper.rb
 homepage: http://postmarkapp.com
 licenses: []
-post_install_message: ! "\n    ==================\n    Thanks for installing the postmark
-  gem. If you don't have an account, please sign up at http://postmarkapp.com/.\n
-  \   Review the README.md for implementation details and examples.\n    ==================\n
-  \ "
-rdoc_options:
+
+post_install_message: "\n    ==================\n    Thanks for installing the postmark gem. If you don't have an account, please sign up at http://postmarkapp.com/.\n    Review the README.md for implementation details and examples.\n    ==================\n  "
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 153664990772119829
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 21
+      segments: 
+      - 1
+      - 3
+      - 7
       version: 1.3.7
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Official Postmark API wrapper.
-test_files:
+test_files: 
 - spec/bounce_spec.rb
 - spec/postmark_spec.rb
 - spec/shared_examples.rb