tms_client 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f2987f06ad23d327d06b2d38eb054259045dd6
-  data.tar.gz: 76870cb343e8a97e0303908a24191cea6bb9915b
+  metadata.gz: 740e4fe3e5d3a7641f97b2375077d7da15c15770
+  data.tar.gz: 91eb64507a4f94d0238f8a56cd915fdc7fbc8b62
 SHA512:
-  metadata.gz: 4d2e771630e5b9f77af2edf27a5ed9276d1ebced7d8f47cd74ff660088aa09dc03176cb73a26d525e41be72171e18b293852519abf827c88812670a36a9c5860
-  data.tar.gz: d0263120ec36f712428cc97de967153c4706ee5610560cf8cabfecf5680e1bc8f4bbd7bf9fae02f61b4b275f05b29cabdeade2b212a82b267eec9d5370d39c17
+  metadata.gz: f7aeff2e142de5e638f6369e3730df7182b70f64ffec8c3a96456c5cbb0f29b7e96224c612fa0af599b2318f2e63c3e35a875a8130eff0ca5beb54855dfda370
+  data.tar.gz: 852af2b4dbe19ef2f4548f17c3f957b6d4d73747f137998832854f9087059a26f42a299586e2814a4e46162977a3b53fea7aa95008041df6eb9a81add9cef7fb

data/lib/tms_client/errors.rb

@@ -36,7 +36,7 @@ module TMS
       def initialize(record_or_string)
         if record_or_string.respond_to?(:href)
           @record = record_or_string
-          super("Couldn't POST #{record.class} to #{record.href}: #{record.errors.join(', ')}")
+          super("Couldn't POST #{record.class} to #{record.href}: #{record.errors.map { |k, v| "#{k} #{v.join(' and ')}" }.join(', ')}")
         else
           super(record_or_string)
         end

data/lib/tms_client/mail/delivery_method.rb

@@ -24,15 +24,23 @@ module TMS
       attr_accessor :settings
 
       def deliver!(mail)
-        #check_params(mail)
         raise TMS::Errors::NoRelation.new('email_messages', client) unless client.respond_to?(:email_messages)
 
         envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
 
+        body = case
+                 when mail.html_part
+                   mail.html_part.body
+                 when mail.text_part
+                   mail.text_part.body
+                 else
+                   mail.body
+               end.decoded
+
         tms_message = client.email_messages.build(
           :from_name => mail[:from].display_names.first,
           :subject => mail.subject,
-          :body => (mail.body || mail.html_part.body || mail.text_part.body).to_s
+          :body => body
         )
 
         mail.to.each { |recip| tms_message.recipients.build(:email => recip) }

data/lib/tms_client/util/hal_link_parser.rb

@@ -31,7 +31,7 @@ module TMS::Util
             subresources[rel] = klass.new(self.client, href)
             setup_subresource(link)
           else
-            puts "Don't know what to do with link rel '#{rel}' for class #{self.class.to_s}!"
+            logger.info("Don't know what to do with link rel '#{rel}' for class #{self.class.to_s}!") if self.respond_to?(:logger)
           end
 
         end

data/lib/tms_client/version.rb

@@ -1,3 +1,3 @@
 module TMS #:nodoc:
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/errors_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe TMS::Errors do
+  context "an errors hash" do
+    let(:object_with_errors) do
+      double('instance', href: 'href', errors: {"body" => ["can't be blank"], "subject" => ["can't be blank"]})
+    end
+    subject { TMS::Errors::InvalidVerb.new(object_with_errors) }
+    it 'should work' do
+      subject.message.should =~ /body can't be blank, subject can't be blank/
+    end
+  end
+end

data/spec/mail/delivery_method_spec.rb

@@ -17,10 +17,33 @@ describe TMS::Mail::DeliveryMethod do
     client.stub(:email_messages).and_return(email_messages)
     subject.stub(:client).and_return(client)
     email_messages.should_receive(:build).with(
-      :from_name => mail[:from].display_names.first,
-      :subject => mail.subject,
-      :body => mail.body.to_s || mail.html_part.body.to_s || mail.text_part.body.to_s
-    ).and_return(tms_message)
+        :from_name => mail[:from].display_names.first,
+        :subject   => mail.subject,
+        :body      => '<blink>HI</blink>'
+      ).and_return(tms_message)
+    tms_message.should_receive(:post!).and_return(true)
+
+    subject.deliver!(mail)
+  end
+
+  it 'should work with a multipart Mail::Message' do
+    mail = Mail.new do
+      subject 'hi'
+      from '"My mom" <my@mom.com>'
+      to '"A Nice Fellow" <tyler@sink.govdelivery.com>'
+
+      html_part do
+        content_type 'text/html; charset=UTF-8'
+        body '<blink>HTML</blink>'
+      end
+    end
+    client.stub(:email_messages).and_return(email_messages)
+    subject.stub(:client).and_return(client)
+    email_messages.should_receive(:build).with(
+        :from_name => mail[:from].display_names.first,
+        :subject   => mail.subject,
+        :body      => '<blink>HTML</blink>'
+      ).and_return(tms_message)
     tms_message.should_receive(:post!).and_return(true)
 
     subject.deliver!(mail)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tms_client
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - GovDelivery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,7 @@ files:
 - spec/client_spec.rb
 - spec/command_types_spec.rb
 - spec/email_message_spec.rb
+- spec/errors_spec.rb
 - spec/inbound_sms_messages_spec.rb
 - spec/instance_resource_spec.rb
 - spec/ipaws_acknowledgement_spec.rb
@@ -169,6 +170,7 @@ test_files:
 - spec/client_spec.rb
 - spec/command_types_spec.rb
 - spec/email_message_spec.rb
+- spec/errors_spec.rb
 - spec/inbound_sms_messages_spec.rb
 - spec/instance_resource_spec.rb
 - spec/ipaws_acknowledgement_spec.rb