govdelivery-tms 0.8.2 → 0.8.3

data/lib/govdelivery/tms/link_header.rb

@@ -1,5 +1,5 @@
 # link_header, Copyright (c) 2009 Mike Burrows
- 
+
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
- 
+
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
- 
+
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -19,17 +19,16 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require "strscan"
+require 'strscan'
 
 #
 # Represents an HTTP link header of the form described in the draft spec http://tools.ietf.org/id/draft-nottingham-http-link-header-06.txt.
 # It is simply a list of LinkHeader::Link objects and some conversion functions.
 #
 class LinkHeader
- 
   # An array of Link objects
   attr_reader :links
-  
+
   #
   # Initialize from a collection of either LinkHeader::Link objects or data from which Link objects can be created.
   #
@@ -47,14 +46,14 @@ class LinkHeader
   #
   # See also LinkHeader.parse
   #
-  def initialize(links=[])
+  def initialize(links = [])
     if links
-      @links = links.map{|l| l.kind_of?(Link) ? l : Link.new(*l)}
+      @links = links.map { |l| l.is_a?(Link) ? l : Link.new(*l) }
     else
       @links = []
     end
   end
-  
+
   #
   # Convert to a JSON-friendly array
   #
@@ -63,9 +62,9 @@ class LinkHeader
   #        ["http://example.com/", [["rel", "up"]]]]
   #
   def to_a
-    links.map{|l| l.to_a}
+    links.map(&:to_a)
   end
-  
+
   #
   # Convert to string representation as per the link header spec
   #
@@ -77,7 +76,7 @@ class LinkHeader
   def to_s
     links.join(', ')
   end
-  
+
   #
   # Regexes for link header parsing.  TOKEN and QUOTED in particular should conform to RFC2616.
   #
@@ -100,7 +99,7 @@ class LinkHeader
   #
   def self.parse(link_header)
     return new unless link_header
-    
+
     scanner = StringScanner.new(link_header)
     links = []
     while scanner.scan(HREF)
@@ -117,7 +116,7 @@ class LinkHeader
 
     new(links)
   end
-  
+
   #
   # Find a member link that has the given attributes
   #
@@ -126,14 +125,14 @@ class LinkHeader
       !attr_pairs.detect do |pair|
         !link.attr_pairs.include?(pair)
       end
-    end 
+    end
   end
-  
+
   #
   # Render as a list of HTML link elements
   #
-  def to_html(separator="\n")
-    links.map{|link| link.to_html}.join(separator)
+  def to_html(separator = "\n")
+    links.map(&:to_html).join(separator)
   end
 
   #
@@ -150,7 +149,7 @@ class LinkHeader
     #   => 'http://example.com/foo>'
     #
     attr_reader :href
-    
+
     #
     # The link's attributes, an array of key-value pairs
     #
@@ -158,7 +157,7 @@ class LinkHeader
     #   => [["rel", "self"], ["rel", "canonical"]]
     #
     attr_reader :attr_pairs
-    
+
     #
     # Initialize a Link from an href and attribute list
     #
@@ -168,7 +167,7 @@ class LinkHeader
     def initialize(href, attr_pairs)
       @href, @attr_pairs = href, attr_pairs
     end
-    
+
     #
     # Lazily convert the attribute list to a Hash
     #
@@ -180,14 +179,14 @@ class LinkHeader
     def attrs
       @attrs ||= Hash[*attr_pairs.flatten]
     end
-    
+
     #
     # Access #attrs by key
     #
     def [](key)
       attrs[key]
     end
-    
+
     #
     # Convert to a JSON-friendly Array
     #
@@ -197,7 +196,7 @@ class LinkHeader
     def to_a
       [href, attr_pairs]
     end
-    
+
     #
     # Convert to string representation as per the link header spec.  This includes backspace-escaping doublequote characters in
     # quoted attribute values.
@@ -208,16 +207,16 @@ class LinkHeader
     #   #=> '<http://example.com/foo>; rel="self"'
     #
     def to_s
-      (["<#{href}>"] + attr_pairs.map{|k, v| "#{k}=\"#{v.gsub(/"/, '\"')}\""}).join('; ')
+      (["<#{href}>"] + attr_pairs.map { |k, v| "#{k}=\"#{v.gsub(/"/, '\"')}\"" }).join('; ')
     end
-    
+
     #
     # Bonus!  Render as an HTML link element
     #
     #   LinkHeader::Link.new(["http://example.com/foo", [["rel", "self"]]]).to_html
     #   #=> '<link href="http://example.com/foo" rel="self">'
     def to_html
-      ([%Q(<link href="#{href}")] + attr_pairs.map{|k, v| "#{k}=\"#{v.gsub(/"/, '\"')}\""}).join(' ')
+      ([%(<link href="#{href}")] + attr_pairs.map { |k, v| "#{k}=\"#{v.gsub(/"/, '\"')}\"" }).join(' ')
     end
   end
-end
+end

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

@@ -24,17 +24,15 @@ module GovDelivery::TMS
       attr_accessor :settings
 
       def deliver!(mail)
-        raise GovDelivery::TMS::Errors::NoRelation.new('email_messages', client) unless client.respond_to?(:email_messages)
-
-        envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
+        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
 
         tms_message = client.email_messages.build(
@@ -56,8 +54,7 @@ module GovDelivery::TMS
 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]}
-end
+  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]
+end

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

@@ -60,26 +60,6 @@ class GovDelivery::TMS::CommandActions
   include GovDelivery::TMS::CollectionResource
 end
 
-class GovDelivery::TMS::IpawsEventCodes
-  include GovDelivery::TMS::CollectionResource
-end
-
-class GovDelivery::TMS::IpawsCategories
-  include GovDelivery::TMS::CollectionResource
-end
-
-class GovDelivery::TMS::IpawsResponseTypes
-  include GovDelivery::TMS::CollectionResource
-end
-
-class GovDelivery::TMS::IpawsAlerts
-  include GovDelivery::TMS::CollectionResource
-end
-
-class GovDelivery::TMS::IpawsNwemAreas
-  include GovDelivery::TMS::CollectionResource
-end
-
 class GovDelivery::TMS::Webhooks
   include GovDelivery::TMS::CollectionResource
 end

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

@@ -20,6 +20,5 @@ module GovDelivery::TMS #:nodoc:
 
     # @!parse attr_reader :created_at, :updated_at
     readonly_attributes :created_at, :updated_at
-
   end
-end
+end

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

@@ -14,4 +14,4 @@ module GovDelivery::TMS #:nodoc:
 
     readonly_attributes :status, :content_type, :response_body, :created_at
   end
-end
+end

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

@@ -2,19 +2,18 @@ module GovDelivery::TMS #:nodoc:
   # CommandType is a pair of values (name, string_fields, array_fields) that can be attached
   # to a Keyword (in a Command object).
   #
-  # This resource is read-only. 
+  # This resource is read-only.
   #
   # @attr name [String] The name of the CommandType.
-  # @attr string_fields [Array] An Array of strings representing the different string_fields on this 
-  #   CommandType.  Field values will always be strings.  
-  # @attr array_fields [Array] An array of strings representing the different array fields on this 
-  #   CommandType.  Field values will always be arrays of strings. 
-  #  
+  # @attr string_fields [Array] An Array of strings representing the different string_fields on this
+  #   CommandType.  Field values will always be strings.
+  # @attr array_fields [Array] An array of strings representing the different array fields on this
+  #   CommandType.  Field values will always be arrays of strings.
+  #
   class CommandType
-
     include InstanceResource
-    
+
     # @!parse attr_reader :string_fields, :array_fields, :name
     readonly_attributes :name, :string_fields, :array_fields
   end
-end
+end

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

@@ -54,7 +54,6 @@ module GovDelivery::TMS #:nodoc:
                          :reply_to,
                          :subject
 
-
     # @!parse attr_reader :created_at, :status
     readonly_attributes :created_at, :status
 

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

@@ -3,7 +3,7 @@ module GovDelivery::TMS #:nodoc:
   #
   # @attr email [String] The recipient email address
   # @attr macros [Hash] A dictionary of key/value pairs to resolve in the subject and body as macros. This value can be nil.
-  # 
+  #
   # @example Sending a message
   #    email_message = client.email_messages.build(:subject => "Great news!", :body => "You win! <a href='http://example.com/'>click here</a>.")
   #    email_message.recipients.build(:email => "john@example.com")

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

@@ -5,6 +5,6 @@ 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
+    readonly_attributes :created_at
   end
 end

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

@@ -1,7 +1,7 @@
 module GovDelivery::TMS #:nodoc:
   class InboundSmsMessage
     include InstanceResource
-    
+
     # @!parse attr_reader :created_at, :completed_at, :from, :body, :to, :command_status
     readonly_attributes :created_at, :completed_at, :from, :body, :to, :command_status, :keyword_response
   end

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

@@ -1,14 +1,14 @@
 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 
+  # 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
-  # immediately with the given text. 
+  # immediately with the given text.
   #
-  # @attr name [String] The name of the keyword.  The system will scan an incoming SMS for this string (in a case-insensitive manner). 
+  # @attr name [String] The name of the keyword.  The system will scan an incoming SMS for this string (in a case-insensitive manner).
   # @attr response_text [String] (Optional) The static text with which to reply to an SMS to this keyword.
-  #   This value can be blank, in which case the handset user will not receive a response. 
+  #   This value can be blank, in which case the handset user will not receive a response.
   #   Note that all keyword commands will be executed, regardless of the value of response_text.
-  #  
+  #
   # @example
   #   keyword = client.keywords.build(:name => "HOWDY")
   #   keyword.post
@@ -25,6 +25,5 @@ module GovDelivery::TMS #:nodoc:
     ##
     # A CollectionResource of Command objects
     collection_attributes :commands
-
   end
-end
+end

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

@@ -7,4 +7,4 @@ module GovDelivery::TMS #:nodoc:
     # @!parse attr_reader :formatted_phone, :error_message, :status, :completed_at
     readonly_attributes :formatted_phone, :error_message, :status, :completed_at
   end
-end
+end

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

@@ -30,6 +30,5 @@ module GovDelivery::TMS #:nodoc:
     ##
     # A CollectionResource of Recipients that failed
     collection_attribute :failed, 'Recipients'
-
   end
 end

data/lib/govdelivery/tms/util/core_ext.rb

@@ -10,8 +10,8 @@ module GovDelivery::TMS::CoreExt
   end
 
   def singularize(str)
-      ActiveSupport::Inflector.singularize(str)
-    end
+    ActiveSupport::Inflector.singularize(str)
+  end
 
   def pluralize(str)
     ActiveSupport::Inflector.pluralize(str)
@@ -24,4 +24,4 @@ module GovDelivery::TMS::CoreExt
   def instance_class(klass)
     ActiveSupport::Inflector.constantize(singularize(klass.to_s))
   end
-end
+end

data/lib/govdelivery/tms/util/hal_link_parser.rb

@@ -1,11 +1,10 @@
 module GovDelivery::TMS::Util
   module HalLinkParser
-
-    def parse_links(_links)
+    def parse_links(links)
       @resources = {}
-      return if _links.nil?
-      parse_link(_links) and return if _links.is_a?(Hash)
-      _links.each { |link| parse_link(link) }
+      return if links.nil?
+      parse_link(links) && return if links.is_a?(Hash)
+      links.each { |link| parse_link(link) }
     end
 
     def subresources
@@ -15,8 +14,8 @@ module GovDelivery::TMS::Util
     protected
 
     def metaclass
-      @metaclass ||= class << self;
-        self;
+      @metaclass ||= class << self
+        self
       end
     end
 
@@ -26,12 +25,12 @@ module GovDelivery::TMS::Util
           self.href = href
         else
           klass = relation_class(rel)
-          klass = self.class if ['first', 'prev', 'next', 'last'].include?(rel)
+          klass = self.class if %w(first prev next last).include?(rel)
           if klass
-            subresources[rel] = klass.new(self.client, href)
+            subresources[rel] = klass.new(client, href)
             setup_subresource(link)
           else
-            logger.info("Don't know what to do with link rel '#{rel}' for class #{self.class.to_s}!") if self.respond_to?(:logger)
+            logger.info("Don't know what to do with link rel '#{rel}' for class #{self.class}!") if self.respond_to?(:logger)
           end
 
         end
@@ -44,7 +43,7 @@ module GovDelivery::TMS::Util
 
     def setup_subresource(link)
       return unless link
-      link.each { |rel, href| self.metaclass.send(:define_method, rel.to_sym, &lambda { subresources[rel] }) unless rel == 'self' }
+      link.each { |rel, _href| metaclass.send(:define_method, rel.to_sym, &lambda { subresources[rel] }) unless rel == 'self' }
     end
   end
-end
+end