govdelivery-tms 0.8.0 → 0.8.1

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_category.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsCategory
 
     include IpawsStaticResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_cog_profile.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsCogProfile
 
     include InstanceResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_event_code.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsEventCode
 
     include IpawsStaticResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_nwem_area.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsNwemArea
 
     include InstanceResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_nwem_authorization.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsNwemAuthorization
 
     include InstanceResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_nwem_auxilary_data.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsNwemAuxilaryData
 
     include InstanceResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_response_type.rb

@@ -1,4 +1,4 @@
-module TMS
+module GovDelivery::TMS
   class IpawsResponseType
 
     include IpawsStaticResource

data/lib/{govdelivery-tms → govdelivery/tms}/resource/ipaws_static_resource.rb

@@ -1,7 +1,7 @@
-module TMS
+module GovDelivery::TMS
   module IpawsStaticResource
     def self.included(base)
-      base.send(:include, TMS::InstanceResource)
+      base.send(:include, GovDelivery::TMS::InstanceResource)
       base.readonly_attributes :value, :description, :cap_exchange, :core_ipaws_profile, :nwem, :eas_and_public, :cmas
     end
   end

data/lib/{govdelivery-tms → govdelivery/tms}/resource/keyword.rb

@@ -1,4 +1,4 @@
-module TMS #:nodoc:
+module GovDelivery::TMS #:nodoc:
   # A Keyword is a word that TMS will detect in an incoming SMS message.  Keywords can have Commands, and
   # when an incoming text message has a keyword, TMS will execute the keyword's Commands.  Keywords may 
   # also have a response text field.  If the response text is not blank, the system will send an SMS reply to the user

data/lib/{govdelivery-tms → govdelivery/tms}/resource/recipient.rb

@@ -1,4 +1,4 @@
-module TMS #:nodoc:
+module GovDelivery::TMS #:nodoc:
   class Recipient
     include InstanceResource
     # @!parse attr_accessor :phone

data/lib/{govdelivery-tms → govdelivery/tms}/resource/sms_message.rb

@@ -1,4 +1,4 @@
-module TMS #:nodoc:
+module GovDelivery::TMS #:nodoc:
   # An SMSMessage is used to create and send a text message to a collection of Recipient
   # objects.
   #

data/lib/{govdelivery-tms → govdelivery/tms}/resource/webhook.rb

@@ -1,4 +1,4 @@
-module TMS #:nodoc:
+module GovDelivery::TMS #:nodoc:
   #  A Webhook gets invoked when a recipient enters a queued or final state
   #
   # @attr url [String] The URL to POST webhooks to

data/lib/{govdelivery-tms → govdelivery/tms}/util/core_ext.rb

@@ -1,6 +1,6 @@
 require 'active_support/inflector'
 
-module TMS::CoreExt
+module GovDelivery::TMS::CoreExt
   def demodulize(path)
     ActiveSupport::Inflector.demodulize(path)
   end

data/lib/{govdelivery-tms → govdelivery/tms}/util/hal_link_parser.rb

@@ -1,4 +1,4 @@
-module TMS::Util
+module GovDelivery::TMS::Util
   module HalLinkParser
 
     def parse_links(_links)
@@ -39,7 +39,7 @@ module TMS::Util
     end
 
     def relation_class(rel)
-      ::TMS.const_get(classify(rel)) rescue nil
+      ::GovDelivery::TMS.const_get(classify(rel)) rescue nil
     end
 
     def setup_subresource(link)

data/lib/govdelivery/tms/version.rb

@@ -0,0 +1,5 @@
+module GovDelivery
+  module TMS #:nodoc:
+    VERSION = "0.8.1"
+  end
+end

data/lib/govdelivery-tms/instance_resource.rb

@@ -1,4 +1,4 @@
-module TMS::InstanceResource
+module GovDelivery::TMS::InstanceResource
   def self.included(base)
     base.send(:include, TMS::Base)
     base.extend(ClassMethods)
@@ -73,12 +73,12 @@ module TMS::InstanceResource
     def collection_attribute(attr, tms_class)
       @collection_attributes ||= []
       @collection_attributes.push(attr).uniq!
-      setup_collection(attr, TMS.const_get(tms_class))
+      setup_collection(attr, GovDelivery::TMS.const_get(tms_class))
     end
 
     ##
-    # Read-only collection attributes don't get POSTed. 
-    # Use this for collections that are represented as attributes, but cannot be modified. 
+    # Read-only collection attributes don't get POSTed.
+    # Use this for collections that are represented as attributes, but cannot be modified.
     #
     # @example
     #      readonly_collection_attribute :opens
@@ -86,7 +86,7 @@ module TMS::InstanceResource
     def readonly_collection_attribute(attr, tms_class)
       @readonly_collection_attributes ||= []
       @readonly_collection_attributes.push(attr).uniq!
-      setup_collection(attr, TMS.const_get(tms_class))
+      setup_collection(attr, GovDelivery::TMS.const_get(tms_class))
     end
 
     def setup_attributes(attrs, readonly=false)
@@ -100,7 +100,7 @@ module TMS::InstanceResource
       if klass
         custom_class_names[property] = klass
       else
-        klass ||= TMS.const_get(property.to_s.capitalize)
+        klass ||= GovDelivery::TMS.const_get(property.to_s.capitalize)
       end
 
       self.send :define_method, property.to_sym, &lambda { @attributes[property] ||= klass.new(self.client, nil, nil) }
@@ -205,7 +205,7 @@ module TMS::InstanceResource
     def set_attributes_from_hash(hash)
       hash.reject { |k, _| k=~/^_/ }.each do |property, value|
         if self.class.collection_attributes.include?(property.to_sym)
-          klass                        = self.class.custom_class_names[property] || TMS.const_get(property.to_s.capitalize)
+          klass                        = self.class.custom_class_names[property] || GovDelivery::TMS.const_get(property.to_s.capitalize)
           @attributes[property.to_sym] = klass.new(client, nil, value)
         else
           @attributes[property.to_sym] = value

data/lib/govdelivery-tms.rb

@@ -1,43 +1,45 @@
-module TMS #:nodoc:
+module GovDelivery
+  module TMS #:nodoc:
+  end
 end
 
 require 'active_support/core_ext/hash'
-require 'govdelivery-tms/version'
+require 'govdelivery/tms/version'
 require 'faraday'
 require 'faraday_middleware'
 
-require 'govdelivery-tms/link_header'
-require 'govdelivery-tms/util/hal_link_parser'
-require 'govdelivery-tms/util/core_ext'
-require 'govdelivery-tms/connection'
-require 'govdelivery-tms/client'
-require 'govdelivery-tms/logger'
-require 'govdelivery-tms/base'
-require 'govdelivery-tms/instance_resource'
-require 'govdelivery-tms/collection_resource'
-require 'govdelivery-tms/errors'
+require 'govdelivery/tms/link_header'
+require 'govdelivery/tms/util/hal_link_parser'
+require 'govdelivery/tms/util/core_ext'
+require 'govdelivery/tms/connection'
+require 'govdelivery/tms/client'
+require 'govdelivery/tms/logger'
+require 'govdelivery/tms/base'
+require 'govdelivery/tms/instance_resource'
+require 'govdelivery/tms/collection_resource'
+require 'govdelivery/tms/errors'
 
-require 'govdelivery-tms/resource/collections'
-require 'govdelivery-tms/resource/recipient'
-require 'govdelivery-tms/resource/email_recipient'
-require 'govdelivery-tms/resource/email_recipient_open'
-require 'govdelivery-tms/resource/email_recipient_click'
-require 'govdelivery-tms/resource/from_address'
-require 'govdelivery-tms/resource/email_template'
-require 'govdelivery-tms/resource/sms_message'
-require 'govdelivery-tms/resource/email_message'
-require 'govdelivery-tms/resource/inbound_sms_message'
-require 'govdelivery-tms/resource/command_type'
-require 'govdelivery-tms/resource/command_action'
-require 'govdelivery-tms/resource/command'
-require 'govdelivery-tms/resource/keyword'
-require 'govdelivery-tms/resource/ipaws_static_resource'
-require 'govdelivery-tms/resource/ipaws_category'
-require 'govdelivery-tms/resource/ipaws_event_code'
-require 'govdelivery-tms/resource/ipaws_response_type'
-require 'govdelivery-tms/resource/ipaws_acknowledgement'
-require 'govdelivery-tms/resource/ipaws_cog_profile'
-require 'govdelivery-tms/resource/ipaws_nwem_authorization'
-require 'govdelivery-tms/resource/ipaws_nwem_area'
-require 'govdelivery-tms/resource/ipaws_alert'
-require 'govdelivery-tms/resource/webhook'
+require 'govdelivery/tms/resource/collections'
+require 'govdelivery/tms/resource/recipient'
+require 'govdelivery/tms/resource/email_recipient'
+require 'govdelivery/tms/resource/email_recipient_open'
+require 'govdelivery/tms/resource/email_recipient_click'
+require 'govdelivery/tms/resource/from_address'
+require 'govdelivery/tms/resource/email_template'
+require 'govdelivery/tms/resource/sms_message'
+require 'govdelivery/tms/resource/email_message'
+require 'govdelivery/tms/resource/inbound_sms_message'
+require 'govdelivery/tms/resource/command_type'
+require 'govdelivery/tms/resource/command_action'
+require 'govdelivery/tms/resource/command'
+require 'govdelivery/tms/resource/keyword'
+require 'govdelivery/tms/resource/ipaws_static_resource'
+require 'govdelivery/tms/resource/ipaws_category'
+require 'govdelivery/tms/resource/ipaws_event_code'
+require 'govdelivery/tms/resource/ipaws_response_type'
+require 'govdelivery/tms/resource/ipaws_acknowledgement'
+require 'govdelivery/tms/resource/ipaws_cog_profile'
+require 'govdelivery/tms/resource/ipaws_nwem_authorization'
+require 'govdelivery/tms/resource/ipaws_nwem_area'
+require 'govdelivery/tms/resource/ipaws_alert'
+require 'govdelivery/tms/resource/webhook'

data/spec/client_spec.rb

@@ -1,41 +1,41 @@
 require 'spec_helper'
-describe TMS::Client do
+describe GovDelivery::TMS::Client do
   context "creating a new client" do
     before do
-      response = double('response', :status => 200, :body => {"_links" => [{"self" => "/"}, {"horse" => "/horses/new"}, {"rabbits" => "/rabbits"}]})
-      @raw_connection = double('raw_connection', :get => response)
-      @connection = TMS::Connection.stub(:new).and_return(double('connection', :connection => @raw_connection))
-      @client = TMS::Client.new('auth_token', :api_root => 'null_url')
+      response = double('response', status: 200, body: {"_links" => [{"self" => "/"}, {"horse" => "/horses/new"}, {"rabbits" => "/rabbits"}]})
+      @raw_connection = double('raw_connection', get: response)
+      @connection = allow(GovDelivery::TMS::Connection).to receive(:new).and_return(double('connection', connection: @raw_connection))
+      @client = GovDelivery::TMS::Client.new('auth_token', api_root: 'null_url')
     end
     it 'should set up logging' do
-      @client.logger.should_not be_nil
-      @client.logger.level.should eq(Logger::INFO)
+      expect(@client.logger).not_to be_nil
+      expect(@client.logger.level).to eq(Logger::INFO)
     end
     it 'should discover endpoints for known services' do
-      @client.horse.should be_kind_of(TMS::Horse)
-      @client.rabbits.should be_kind_of(TMS::Rabbits)
+      expect(@client.horse).to be_kind_of(GovDelivery::TMS::Horse)
+      expect(@client.rabbits).to be_kind_of(GovDelivery::TMS::Rabbits)
     end
     it 'should handle 4xx responses' do
-      @raw_connection.stub(:get).and_return(double('response', :status => 404, :body => {'message' => 'hi'}))
-      expect { @client.get('/blargh') }.to raise_error(TMS::Request::Error)
+      allow(@raw_connection).to receive(:get).and_return(double('response', status: 404, body: {'message' => 'hi'}))
+      expect { @client.get('/blargh') }.to raise_error(GovDelivery::TMS::Request::Error)
     end
     it 'should handle 5xx responses' do
-      @raw_connection.stub(:get).and_return(double('response', :status => 503, :body => {'message' => 'oops'}))
-      expect { @client.get('/blargh') }.to raise_error(TMS::Request::Error)
+      allow(@raw_connection).to receive(:get).and_return(double('response', status: 503, body: {'message' => 'oops'}))
+      expect { @client.get('/blargh') }.to raise_error(GovDelivery::TMS::Request::Error)
     end
     it 'should handle 202 responses' do
-      @raw_connection.stub(:get).and_return(double('response', :status => 202, :body => {'message' => 'hi'}))
-      expect { @client.get('/blargh') }.to raise_error(TMS::Request::InProgress)
+      allow(@raw_connection).to receive(:get).and_return(double('response', status: 202, body: {'message' => 'hi'}))
+      expect { @client.get('/blargh') }.to raise_error(GovDelivery::TMS::Request::InProgress)
     end
 
     context 'creating a new client without output' do
-      subject { TMS::Client.new('auth_token', api_root: 'null_url', logger: false) }
+      subject { GovDelivery::TMS::Client.new('auth_token', api_root: 'null_url', logger: false) }
       its(:logger){ should be_falsey }
-      its(:horse) { should be_kind_of(TMS::Horse) }
+      its(:horse) { should be_kind_of(GovDelivery::TMS::Horse) }
     end
 
     it 'defaults to the public API URL' do
-      expect(TMS::Client.new('auth_token').api_root).to eq('https://tms.govdelivery.com')
+      expect(GovDelivery::TMS::Client.new('auth_token').api_root).to eq('https://tms.govdelivery.com')
     end
   end
 end

data/spec/command_types_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe TMS::CommandTypes do
+describe GovDelivery::TMS::CommandTypes do
   context "loading command types" do
     let(:client) do
       double('client')
     end
     before do
-      @command_types = TMS::CommandTypes.new(client, '/command_types')
+      @command_types = GovDelivery::TMS::CommandTypes.new(client, '/command_types')
     end
     it 'should GET ok' do
       body = [{"name"=>"dcm_unsubscribe",
@@ -18,12 +18,12 @@ describe TMS::CommandTypes do
               {"name"=>"forward",
                "string_fields"=>["http_method", "username", "password", "url"],
                "array_fields"=>[]}] 
-      @command_types.client.should_receive(:get).and_return(double('response', :body => body, :status => 200, :headers => {}))
+      expect(@command_types.client).to receive(:get).and_return(double('response', body: body, status: 200, headers: {}))
       @command_types.get
-      @command_types.collection.length.should == 3
+      expect(@command_types.collection.length).to eq(3)
       ct = @command_types.collection.find{|c| c.name == "dcm_subscribe"}
-      ct.array_fields.should eq(["dcm_topic_codes"])
-      ct.string_fields.should eq(["dcm_account_code"])
+      expect(ct.array_fields).to eq(["dcm_topic_codes"])
+      expect(ct.string_fields).to eq(["dcm_account_code"])
     end
   end
 end

data/spec/email_message_spec.rb

@@ -1,72 +1,72 @@
 require 'spec_helper'
 
-describe TMS::EmailMessage do
+describe GovDelivery::TMS::EmailMessage do
   context "creating a new message" do
     let(:client) do
       double('client')
     end
     before do
-      @message = TMS::EmailMessage.new(client, '/messages/email', {
-        :body       => '12345678',
-        :subject    => 'blah',
-        :created_at => 'BAAAAAD',
-        :from_email => 'eric@evotest.govdelivery.com',
-        :errors_to  => 'errors@evotest.govdelivery.com',
-        :reply_to   => 'replyto@evotest.govdelivery.com'})
+      @message = GovDelivery::TMS::EmailMessage.new(client, '/messages/email', {
+        body:       '12345678',
+        subject:    'blah',
+        created_at: 'BAAAAAD',
+        from_email: 'eric@evotest.govdelivery.com',
+        errors_to:  'errors@evotest.govdelivery.com',
+        reply_to:   'replyto@evotest.govdelivery.com'})
     end
     it 'should not render readonly attrs in json hash' do
-      @message.to_json[:body].should == '12345678'
-      @message.to_json[:created_at].should == nil
+      expect(@message.to_json[:body]).to eq('12345678')
+      expect(@message.to_json[:created_at]).to eq(nil)
     end
     it 'should initialize with attrs and collections' do
-      @message.body.should             == '12345678'
-      @message.subject.should          == 'blah'
-      @message.from_email.should       == 'eric@evotest.govdelivery.com'
-      @message.reply_to.should         == 'replyto@evotest.govdelivery.com'
-      @message.errors_to.should        == 'errors@evotest.govdelivery.com'
-      @message.recipients.class.should == TMS::EmailRecipients
+      expect(@message.body).to             eq('12345678')
+      expect(@message.subject).to          eq('blah')
+      expect(@message.from_email).to       eq('eric@evotest.govdelivery.com')
+      expect(@message.reply_to).to         eq('replyto@evotest.govdelivery.com')
+      expect(@message.errors_to).to        eq('errors@evotest.govdelivery.com')
+      expect(@message.recipients.class).to eq(GovDelivery::TMS::EmailRecipients)
     end
     it 'should post successfully' do
       response = {
-          :body       => 'processed',
-          :subject    => 'blah',
-          :from_email => 'eric@evotest.govdelivery.com',
-          :errors_to  => 'errors@evotest.govdelivery.com',
-          :reply_to   => 'replyto@evotest.govdelivery.com',
-          :recipients => [{:email => 'billy@evotest.govdelivery.com'}],
-          :failed => [{:email => 'billy@evotest.govdelivery.com'}],
-          :sent => [{:email => 'billy@evotest.govdelivery.com'}],
-          :created_at => 'time'
+          body:       'processed',
+          subject:    'blah',
+          from_email: 'eric@evotest.govdelivery.com',
+          errors_to:  'errors@evotest.govdelivery.com',
+          reply_to:   'replyto@evotest.govdelivery.com',
+          recipients: [{email: 'billy@evotest.govdelivery.com'}],
+          failed: [{email: 'billy@evotest.govdelivery.com'}],
+          sent: [{email: 'billy@evotest.govdelivery.com'}],
+          created_at: 'time'
       }
-      @message.client.should_receive('post').with(@message).and_return(double('response', :status => 201, :body => response))
+      expect(@message.client).to receive('post').with(@message).and_return(double('response', status: 201, body: response))
       @message.post
-      @message.body.should                              == 'processed'
-      @message.created_at.should                        == 'time'
-      @message.from_email.should                        == 'eric@evotest.govdelivery.com'
-      @message.reply_to.should                          == 'replyto@evotest.govdelivery.com'
-      @message.errors_to.should                         == 'errors@evotest.govdelivery.com'
-      @message.recipients.class.should                  == TMS::EmailRecipients
-      @message.recipients.collection.first.class.should == TMS::EmailRecipient
-      @message.sent.class.should == TMS::EmailRecipients
-      @message.sent.collection.first.class.should == TMS::EmailRecipient
-      @message.failed.class.should == TMS::EmailRecipients
-      @message.failed.collection.first.class.should == TMS::EmailRecipient
+      expect(@message.body).to                              eq('processed')
+      expect(@message.created_at).to                        eq('time')
+      expect(@message.from_email).to                        eq('eric@evotest.govdelivery.com')
+      expect(@message.reply_to).to                          eq('replyto@evotest.govdelivery.com')
+      expect(@message.errors_to).to                         eq('errors@evotest.govdelivery.com')
+      expect(@message.recipients.class).to                  eq(GovDelivery::TMS::EmailRecipients)
+      expect(@message.recipients.collection.first.class).to eq(GovDelivery::TMS::EmailRecipient)
+      expect(@message.sent.class).to eq(GovDelivery::TMS::EmailRecipients)
+      expect(@message.sent.collection.first.class).to eq(GovDelivery::TMS::EmailRecipient)
+      expect(@message.failed.class).to eq(GovDelivery::TMS::EmailRecipients)
+      expect(@message.failed.collection.first.class).to eq(GovDelivery::TMS::EmailRecipient)
     end
     it 'should handle errors' do
-      response = {'errors' => {:body => "can't be nil"}}
-      @message.client.should_receive('post').with(@message).and_return(double('response', :status => 422, :body => response))
+      response = {'errors' => {body: "can't be nil"}}
+      expect(@message.client).to receive('post').with(@message).and_return(double('response', status: 422, body: response))
       @message.post
-      @message.body.should == '12345678'
-      @message.errors.should == {:body => "can't be nil"}
+      expect(@message.body).to eq('12345678')
+      expect(@message.errors).to eq({body: "can't be nil"})
     end
 
     it 'should handle 401 errors' do
-      @message.client.should_receive('post').with(@message).and_return(double('response', :status => 401))
+      expect(@message.client).to receive('post').with(@message).and_return(double('response', status: 401))
       expect {@message.post}.to raise_error(StandardError, "401 Not Authorized")
     end
 
     it 'should handle 404 errors' do
-      @message.client.should_receive('post').with(@message).and_return(double('response', :status => 404))
+      expect(@message.client).to receive('post').with(@message).and_return(double('response', status: 404))
       expect {@message.post}.to raise_error(StandardError, "Can't POST to /messages/email")
     end
   end
@@ -77,24 +77,24 @@ describe TMS::EmailMessage do
     end
     before do
       # blank hash prevents the client from doing a GET in the initialize method
-      @message = TMS::EmailMessage.new(client, '/messages/99', {})
+      @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'}
-      @message.client.should_receive('get').with(@message.href).and_return(double('response', :status => 200, :body => response))
+      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'}
+      expect(@message.client).to receive('get').with(@message.href).and_return(double('response', status: 200, body: response))
       @message.get
-      @message.body.should       == 'processed'
-      @message.subject.should    == 'hey'
-      @message.from_email.should == 'eric@evotest.govdelivery.com'
-      @message.reply_to.should   == 'replyto@evotest.govdelivery.com'
-      @message.errors_to.should  == 'errors@evotest.govdelivery.com'
-      @message.created_at.should == 'time'
+      expect(@message.body).to       eq('processed')
+      expect(@message.subject).to    eq('hey')
+      expect(@message.from_email).to eq('eric@evotest.govdelivery.com')
+      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')
     end
   end