govdelivery-tms 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520742183591839f3f51140b34e2d96e740c1171
-  data.tar.gz: f9ceb6d7d7fbd7a0ebb12ed4a9a16cc08e0c7833
+  metadata.gz: a7269ba85a59ca7423d2c9cd28d18fa4a3506bd1
+  data.tar.gz: 199987cd9eb5fcd4151d35d795342df16f28bd5c
 SHA512:
-  metadata.gz: 5db5dc48b49fc4f8ac19e031eebe91bb2fed6819a58c97935136f226c4e04141b59acf2e84b148b329d8e9d0d462f52ff46936d0165d9769afb0a873af2c0877
-  data.tar.gz: 81e2c0be20ad23096cd623b852e557545e37edcbe1ec7db633c81fda9b9f46794771cbe583a85abd0bc1ed26610a5bf96b89094788bd907ca16ccfa4bbca52c1
+  metadata.gz: ef42c0a9d0d7d3b5a695e30c7ad4e60c20dc7e6c29caa4e6e13badd8b68e3a7c31270773a76a8c2293adfce9acf23af8ee27ced70f94da0f0d39f308c23505b6
+  data.tar.gz: c70613ea0c76272620f62253bf4d34f0fc7c819e85415c8b0931acebc963cb469f789dfe7b27e4350a4ded0e727c7db41891f2794c616a1decc46442e0e11851

data/lib/govdelivery/tms/instance_resource.rb

@@ -162,11 +162,11 @@ module GovDelivery::TMS::InstanceResource
       self.class.collection_attributes.each do |coll|
         json_hash[coll] = send(coll).to_json
       end
-      self.class.linkable_attributes.each do |attr|
-        json_hash[:_links] ||= {}
+      self.class.linkable_attributes.reject { |attr| @links[attr].nil? }.each do |attr|
+        json_hash[:_links]       ||= {}
         json_hash[:_links][attr] = @links[attr]
       end
-      json_hash
+      json_hash.reject { |_, value| value.nil? }
     end
 
     protected

data/lib/govdelivery/tms/mail/delivery_method.rb

@@ -28,12 +28,12 @@ module GovDelivery::TMS
         fail GovDelivery::TMS::Errors::NoRelation.new('email_messages', client) unless client.respond_to?(:email_messages)
 
         body = case
-                 when mail.html_part
-                   mail.html_part.body
-                 when mail.text_part
-                   mail.text_part.body
-                 else
-                   mail.body
+               when mail.html_part
+                 mail.html_part.body
+               when mail.text_part
+                 mail.text_part.body
+               else
+                 mail.body
                end.decoded
 
         message_params              = {
@@ -45,7 +45,6 @@ module GovDelivery::TMS
 
         tms_message = client.email_messages.build(message_params)
 
-
         mail.to.each { |recip| tms_message.recipients.build(email: recip) }
         tms_message.post!
         tms_message
@@ -60,6 +59,6 @@ end
 
 if defined?(ActionMailer)
   ActionMailer::Base.add_delivery_method :govdelivery_tms, GovDelivery::TMS::Mail::DeliveryMethod, auth_token: nil,
-                                         logger:                                                               ActionMailer::Base.logger,
-                                         api_root:                                                             GovDelivery::TMS::Client::DEFAULTS[:api_root]
+                                                                                                   logger:                                                               ActionMailer::Base.logger,
+                                                                                                   api_root:                                                             GovDelivery::TMS::Client::DEFAULTS[:api_root]
 end

data/lib/govdelivery/tms/resource/email_message.rb

@@ -76,5 +76,7 @@ module GovDelivery::TMS #:nodoc:
     ##
     # A CollectionResource of EmailRecipients that failed, not neccessarily bounced
     collection_attribute :failed, 'EmailRecipients'
+
+    linkable_attributes :email_template
   end
 end

data/lib/govdelivery/tms/resource/email_template.rb

@@ -7,7 +7,7 @@ module GovDelivery::TMS #:nodoc:
 
     linkable_attributes :from_address
 
-    # @!parse attr_reader :created_at
+    # @!parse attr_reader :id, :created_at
     readonly_attributes :id, :created_at
 
     collection_attribute :from_address, 'FromAddress'

data/lib/govdelivery/tms/resource/from_address.rb

@@ -5,6 +5,7 @@ module GovDelivery::TMS #:nodoc:
     # @!parse attr_accessor :from_email, :reply_to_email, :bounce_email, :is_default
     writeable_attributes :from_email, :reply_to_email, :bounce_email, :is_default
 
-    readonly_attributes :created_at
+    # @!parse attr_reader :id, :created_at
+    readonly_attributes :id, :created_at
   end
 end

data/lib/govdelivery/tms/version.rb

@@ -1,5 +1,5 @@
 module GovDelivery
   module TMS #:nodoc:
-    VERSION = '0.8.5'
+    VERSION = '0.8.7'
   end
 end

data/spec/email_message_spec.rb

@@ -79,13 +79,15 @@ describe GovDelivery::TMS::EmailMessage do
       @message = GovDelivery::TMS::EmailMessage.new(client, '/messages/99', {})
     end
     it 'should GET cleanly' do
-      response = { body: 'processed',
-                   subject:    'hey',
-                   from_email: 'eric@evotest.govdelivery.com',
-                   errors_to:  'errors@evotest.govdelivery.com',
-                   reply_to:   'replyto@evotest.govdelivery.com',
-                   recipients: [{ email: 'billy@evotest.govdelivery.com' }],
-                   created_at: 'time' }
+      response = { 'body'       => 'processed',
+                   'subject'    => 'hey',
+                   'from_email' => 'eric@evotest.govdelivery.com',
+                   'errors_to'  => 'errors@evotest.govdelivery.com',
+                   'reply_to'   => 'replyto@evotest.govdelivery.com',
+                   'recipients' => [{ email: 'billy@evotest.govdelivery.com' }],
+                   'created_at' => 'time',
+                   '_links'     => { 'self' => '/messages/email/1', 'email_template' => '/templates/email/1' }
+                  }
       expect(@message.client).to receive('get').with(@message.href).and_return(double('response', status: 200, body: response))
       @message.get
       expect(@message.body).to eq('processed')
@@ -94,6 +96,7 @@ describe GovDelivery::TMS::EmailMessage do
       expect(@message.reply_to).to eq('replyto@evotest.govdelivery.com')
       expect(@message.errors_to).to eq('errors@evotest.govdelivery.com')
       expect(@message.created_at).to eq('time')
+      expect(@message.email_template).to be_a(GovDelivery::TMS::EmailTemplate)
     end
   end
 end

data/spec/email_template_spec.rb

@@ -56,7 +56,7 @@ describe GovDelivery::TMS::EmailTemplate do
       expect(@template.client).to receive('post').with(@template).and_return(double('response', status: 201, body: {}))
       @template.post
       links = @template.to_json[:_links]
-      expect(links[:from_address]).to be_nil
+      expect(links).to be_nil
     end
 
     it 'should not clear the links property after an invalid post' do

data/spec/from_address_spec.rb

@@ -15,6 +15,7 @@ describe GovDelivery::TMS::FromAddress do
         'reply_to_email'  => 'something@evotest.govdelivery.com',
         'bounce_email'    => 'something@evotest.govdelivery.com',
         'is_default'      => true,
+        'id'              => '1',
         'created_at'      => 'sometime',
         '_links'          => { 'self' => '/from_addresses/1' }
       }]

data/spec/instance_resource_spec.rb

@@ -30,6 +30,11 @@ describe GovDelivery::TMS::InstanceResource do
       expect(@instance_resource.shah.class).to eq(GovDelivery::TMS::EmailMessage)
     end
 
+    it 'should ignore nils in to_json' do
+      @instance_resource.bar = nil
+      expect(@instance_resource.to_json).to eq({blah: {recipients: [], opened: [], clicked: [], sent: [], failed: []}})
+    end
+
     it 'should not GET on initialization' do
       expect(client).not_to receive(:get)
       Foo.new(client, 'https://example.com/foos/1')

data/spec/mail/delivery_method_spec.rb

@@ -13,22 +13,22 @@ describe GovDelivery::TMS::Mail::DeliveryMethod do
   end
 
   context 'a basic Mail::Message with all options' do
-    let(:mail) {
+    let(:mail) do
       Mail.new do
         subject 'hi'
         from '"My mom" <my@mom.com>'
         to '"A Nice Fellow" <tyler@sink.govdelivery.com>'
         body '<blink>HI</blink>'
       end
-    }
+    end
 
     it 'should get sent' do
       expect(email_messages).to receive(:build).with(
-                                  from_name:  mail[:from].display_names.first,
-                                  from_email: mail.from.first,
-                                  subject:    mail.subject,
-                                  body:       '<blink>HI</blink>'
-                                ).and_return(tms_message)
+        from_name:  mail[:from].display_names.first,
+        from_email: mail.from.first,
+        subject:    mail.subject,
+        body:       '<blink>HI</blink>'
+      ).and_return(tms_message)
       expect(tms_message).to receive(:post!).and_return(true)
 
       subject.deliver!(mail)
@@ -36,27 +36,27 @@ describe GovDelivery::TMS::Mail::DeliveryMethod do
   end
 
   context 'a basic Mail::Message with minimal options' do
-    let(:mail) {
+    let(:mail) do
       Mail.new do
         subject 'hi'
         to '"A Nice Fellow" <tyler@sink.govdelivery.com>'
         body '<blink>HI</blink>'
       end
-    }
+    end
 
     it 'should get sent' do
       expect(email_messages).to receive(:build).with(
-                                  subject: mail.subject,
-                                  body:    '<blink>HI</blink>'
-                                ).and_return(tms_message)
+        subject: mail.subject,
+        body:    '<blink>HI</blink>'
+      ).and_return(tms_message)
       expect(tms_message).to receive(:post!).and_return(true)
 
       subject.deliver!(mail)
     end
   end
 
-  context "a multipart Mail::Message" do
-    let(:mail) {
+  context 'a multipart Mail::Message' do
+    let(:mail) do
       Mail.new do
         subject 'hi'
         from '"My mom" <my@mom.com>'
@@ -67,15 +67,15 @@ describe GovDelivery::TMS::Mail::DeliveryMethod do
           body '<blink>HTML</blink>'
         end
       end
-    }
+    end
 
     it 'should send' do
       expect(email_messages).to receive(:build).with(
-                                  from_name:  mail[:from].display_names.first,
-                                  from_email: mail.from.first,
-                                  subject:    mail.subject,
-                                  body:       '<blink>HTML</blink>'
-                                ).and_return(tms_message)
+        from_name:  mail[:from].display_names.first,
+        from_email: mail.from.first,
+        subject:    mail.subject,
+        body:       '<blink>HTML</blink>'
+      ).and_return(tms_message)
       expect(tms_message).to receive(:post!).and_return(true)
 
       subject.deliver!(mail)

metadata

@@ -1,60 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: govdelivery-tms
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - GovDelivery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: "A reference implementation, written in Ruby,\n                     to
-  interact with GovDelivery's TMS API. The client is\n                     compatible
-  with Ruby 1.9 and 2.0. "
+  type: :runtime
+description: "A reference implementation, written in Ruby,\n                     to\
+  \ interact with GovDelivery's TMS API. The client is\n                     compatible\
+  \ with Ruby 1.9 and 2.0. "
 email:
 - support@govdelivery.com
 executables: []
@@ -74,6 +74,7 @@ files:
 - lib/govdelivery/tms/instance_resource.rb
 - lib/govdelivery/tms/link_header.rb
 - lib/govdelivery/tms/logger.rb
+- lib/govdelivery/tms/version.rb
 - lib/govdelivery/tms/mail/delivery_method.rb
 - lib/govdelivery/tms/resource/collections.rb
 - lib/govdelivery/tms/resource/command.rb
@@ -92,7 +93,6 @@ files:
 - lib/govdelivery/tms/resource/webhook.rb
 - lib/govdelivery/tms/util/core_ext.rb
 - lib/govdelivery/tms/util/hal_link_parser.rb
-- lib/govdelivery/tms/version.rb
 - spec/client_spec.rb
 - spec/command_types_spec.rb
 - spec/email_message_spec.rb
@@ -111,24 +111,24 @@ files:
 homepage: http://govdelivery.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: A ruby client to interact with the GovDelivery TMS REST API.
 test_files:
@@ -147,4 +147,4 @@ test_files:
 - spec/sms_messages_spec.rb
 - spec/spec_helper.rb
 - spec/tms_spec.rb
-has_rdoc: 
+has_rdoc: