postmark 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/postmark.rb

@@ -133,7 +133,14 @@ module Postmark
     end
 
     def convert_tmail(message)
-      options = { "From" => message['from'].to_s, "To" => message['to'].to_s, "Subject" => message.subject, "Headers" => extract_headers(message) }
+      options = { "From" => message['from'].to_s, "To" => message['to'].to_s, "Subject" => message.subject }
+
+      headers = extract_headers(message)
+      options["Headers"] = headers unless headers.length == 0
+
+      options["Tag"] = message.tag.to_s unless message.tag.nil?
+
+      options["Cc"] = message['cc'].to_s unless message.cc.nil?
 
       if reply_to = message['reply-to']
         options["ReplyTo"] = reply_to.to_s
@@ -175,6 +182,7 @@ module Postmark
         cc
         bcc
         subject
+        tag
       ]
     end
 

data/lib/postmark/tmail_mail_extension.rb

@@ -14,6 +14,14 @@
 module TMail
   class Mail
 
+    def tag
+      self["TAG"]
+    end
+
+    def tag=(value)
+      self["TAG"] = value
+    end
+
     #
     # returs an String with just the html part of the body
     # or nil if there is not any html part
@@ -57,7 +65,7 @@ module TMail
       end
       result
     end
-    
+
     #
     # This is only for develop.
     # print on output all the parts of the Mail with some details
@@ -67,14 +75,14 @@ module TMail
       puts "content_type: #{content_type}"
       puts "body: #{body}"
       puts "parts.size: #{parts.size}"
-    
+
       if multipart?
         parts.each_with_index do |part, index|
           puts ""
           puts "  parts[#{index}]"
           puts "    content_type: #{part.content_type}"
           puts "    multipart? #{part.multipart?}"
-          
+
           header = part["content-type"]
 
           if part.multipart?
@@ -94,16 +102,16 @@ module TMail
             puts "    --no multipart, no header nil, attachment--"
             puts "     content_type: #{part.content_type}"
           end
-        
+
         end
       else
         puts "  --no multipart--"
         puts "    content_type: #{content_type}"
         puts "    body: #{unquoted_body}"
       end
-      
+
       puts "END"
     end
-    
+
   end
 end

data/postmark.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postmark}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2010-02-26}
+  s.date = %q{2010-03-18}
   s.description = %q{Ruby gem for sending emails through http://postmarkapp.com HTTP API. It relieas on TMail::Mail for message construction.}
   s.email = %q{underlog@gmail.com}
   s.extra_rdoc_files = [

data/spec/postmark_spec.rb

@@ -73,24 +73,35 @@ describe "Postmark" do
     end
   end
 
-  context "custom headers" do
-
-    let :message_with_headers do
-      TMail::Mail.new.tap do |mail|
-        mail.from = "sheldon@bigbangtheory.com"
-        mail.to = "lenard@bigbangtheory.com"
-        mail.subject = "Hello!"
-        mail.body = "Hello Sheldon!"
-        mail['CUSTOM-HEADER'] = "header"
-        mail.reply_to = ['a@a.com', 'b@b.com']
-      end
+  def be_serialized_to(json)
+    simple_matcher "be serialized to #{json}" do |message|
+      Postmark.convert_tmail(message).should == JSON.parse(json)
     end
+  end
 
-    it "should encode headers properly" do
-      json = %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!", "Headers":[{"Name":"Custom-Header", "Value":"header"}]}]
-      result = Postmark.convert_tmail(message_with_headers)
-      result.should == JSON.parse(json)
-    end
+  it "should encode custom headers headers properly" do
+    message["CUSTOM-HEADER"] = "header"
+    message.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
+
+  it "should encode reply to" do
+    message.reply_to = ['a@a.com', 'b@b.com']
+    message.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
+    message.tag = "invite"
+    message.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
+    message.to = ['a@a.com', 'b@b.com']
+    message.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
+    message.cc = ['a@a.com', 'b@b.com']
+    message.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
 
   context "JSON library support" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +02:00
+date: 2010-03-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency