rcap 2.4.1 → 2.7.3

data/lib/rcap/extensions/string.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class String
-  CAP_LIST_REGEX = Regexp.new( '"([\w\s]+)"|(\S+)' )
+  CAP_LIST_REGEX = Regexp.new('"([\w\s]+)"|(\S+)')
   WHITESPACE_REGEX = Regexp.new('^\s+$')
 
   # Reformats string for a CAP list. If the string contains whitespace it will
@@ -10,8 +12,8 @@ class String
   #   "one".for_cap_list       # => "one"
   #   "two words".for_cap_list # => "\"two words\""
   def for_cap_list
-    if self =~ /\s/
-      '"'+self+'"'
+    if /\s/.match?(self)
+      '"' + self + '"'
     else
       self
     end
@@ -24,7 +26,7 @@ class String
   #   "one \"two words\" three".unpack_cap_list # => [ "one", "two words", "three" ]
   # @see Array#to_s_for_cap
   def unpack_cap_list
-    self.split( CAP_LIST_REGEX ).reject{ |match| match == "" || match =~ WHITESPACE_REGEX }
+    split(CAP_LIST_REGEX).reject { |match| match == '' || match =~ WHITESPACE_REGEX }
   end
 
   def blank?

data/lib/rcap/extensions/time.rb

@@ -1,16 +1,18 @@
-class Time
+# frozen_string_literal: true
 
+class Time
   # Returns a string representaion of the time suitable for CAP.
   # @return [String]
   # @example
   #   Time.now.to_s_for_cap # => "2011-10-26T21:45:00+02:00"
   def to_s_for_cap
-    t = self.strftime( RCAP::RCAP_TIME_FORMAT ) + format( RCAP::RCAP_ZONE_FORMAT , utc_hours_offset )
+    t = strftime(RCAP::RCAP_TIME_FORMAT) + format(RCAP::RCAP_ZONE_FORMAT, utc_hours_offset)
     t.sub(/\+(00:\d\d)$/, '-\1')
   end
 
   private
+
   def utc_hours_offset
-    self.localtime.utc_offset/3600
+    localtime.utc_offset / 3600
   end
 end

data/lib/rcap/formatters/yaml.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class RCAP::Base::Alert
+  def to_yaml; end
+end

data/lib/rcap/info.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module RCAP
   module Info
-
-    def self.from_h( alert, info_hash )
+    def self.from_h(alert, info_hash)
       case alert.class::CAP_VERSION
       when CAP_1_0::Alert::CAP_VERSION
-        CAP_1_0::Info.from_h( info_hash )
+        CAP_1_0::Info.from_h(info_hash)
       when CAP_1_1::Alert::CAP_VERSION
-        CAP_1_1::Info.from_h( info_hash )
+        CAP_1_1::Info.from_h(info_hash)
       else
-        CAP_1_2::Info.from_h( info_hash )
+        CAP_1_2::Info.from_h(info_hash)
       end
     end
   end

data/lib/rcap/utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ALLOWED_CHARACTERS = /[^\s&<]+/
 
 module RCAP
@@ -15,9 +17,9 @@ module RCAP
   # @param [String] xpath XPath expression
   # @param [String] namespace Namespace in which to do the matching
   # @return [String,nil] Text content of element matching XPath query or nil
-  def self.xpath_text( xml_element, xpath, namespace )
-    element = self.xpath_first( xml_element, xpath, namespace )
-    element.text.strip if element && element.text
+  def self.xpath_text(xml_element, xpath, namespace)
+    element = xpath_first(xml_element, xpath, namespace)
+    element.text.strip if element&.text
   end
 
   # Returns first descendent that matches the given XPath expression.
@@ -26,8 +28,8 @@ module RCAP
   # @param [String] xpath XPath expression
   # @param [String] namespace Namespace in which to do the matching
   # @return [REXML::Element,nil] Element matching XPath query or nil
-  def self.xpath_first( xml_element, xpath, namespace )
-    REXML::XPath.first( xml_element, xpath, { 'cap' => namespace })
+  def self.xpath_first(xml_element, xpath, namespace)
+    REXML::XPath.first(xml_element, xpath,  'cap' => namespace)
   end
 
   # Returns all descendents that match the given XPath expression.
@@ -36,8 +38,8 @@ module RCAP
   # @param [String] xpath XPath expression
   # @param [String] namespace Namespace in which to do the matching
   # @return [Array<REXML::Element>] Collection of elements matching XPath query
-  def self.xpath_match( xml_element, xpath, namespace )
-    REXML::XPath.match( xml_element, xpath, { 'cap' => namespace })
+  def self.xpath_match(xml_element, xpath, namespace)
+    REXML::XPath.match(xml_element, xpath,  'cap' => namespace)
   end
 
   # Formats output for inspect
@@ -56,13 +58,12 @@ module RCAP
   #  # | two   |
   #  # | three |
   #  # '-------'
-  def self.format_lines_for_inspect( header, inspect_string )
-    max_line_length = inspect_string.lines.map{ |line| line.strip.length }.max
-    "\n." + '-' * (max_line_length + 2) + ".\n"+
-      '| ' + header.ljust( max_line_length ) + " |\n"+
-      '|' + '-' * ( max_line_length + 2 ) + "|\n"+
-      inspect_string.lines.map{ |line| '| ' + line.strip.ljust( max_line_length ) +' |'}.join( "\n" ) + "\n" +
-      "'" + '-' * ( max_line_length + 2 ) + "'\n"
+  def self.format_lines_for_inspect(header, inspect_string)
+    max_line_length = inspect_string.lines.map { |line| line.strip.length }.max
+    "\n." + '-' * (max_line_length + 2) + ".\n"\
+      '| ' + header.ljust(max_line_length) + " |\n"\
+      '|' + '-' * (max_line_length + 2) + "|\n" + inspect_string.lines.map { |line| '| ' + line.strip.ljust(max_line_length) + ' |' }.join("\n") + "\n" \
+      "'" + '-' * (max_line_length + 2) + "'\n"
   end
 
   # Converts an array of key value pairs into a hash, excluding any value that is nil.
@@ -72,17 +73,17 @@ module RCAP
   #
   # @example
   #  RCAP.attribute_values_to_hash( ['a', 1], ['b' , nil ]) # => { 'a' => 1 }
-  def self.attribute_values_to_hash( *attribute_values )
-    Hash[ *attribute_values.reject{ |key, value| value.nil? }.flatten( 1 )]
+  def self.attribute_values_to_hash(*attribute_values)
+    Hash[*attribute_values.reject { |_key, value| value.nil? }.flatten(1)]
   end
 
   # Calls #to_s_for_cap on the object it it responds to that otherwise just calls #to_s
   #
   # @param [#to_s, #to_s_for_cap] object
   # @return [String]
-  def self.to_s_for_cap( object )
+  def self.to_s_for_cap(object)
     if object
-      if object.respond_to?( :to_s_for_cap )
+      if object.respond_to?(:to_s_for_cap)
         object.to_s_for_cap
       else
         object.to_s
@@ -94,12 +95,10 @@ module RCAP
   #
   # @param [String] date String to parse
   # @return [String,nil]
-  def self.parse_datetime( date )
+  def self.parse_datetime(date)
     case date
     when String
-      if  !date.empty?
-        DateTime.parse( date.strip )
-      end
+      DateTime.parse(date.strip) unless date.empty?
     when DateTime, Time, Date
       date.to_datetime
     end
@@ -110,7 +109,7 @@ module RCAP
   #
   # @param [String] list List to split
   # @return [Array]
-  def RCAP.unpack_if_given( list )
+  def self.unpack_if_given(list)
     if list
       list.unpack_cap_list
     else
@@ -122,10 +121,8 @@ module RCAP
   #
   # @param [String] string
   # @return [String,nil]
-  def RCAP.strip_if_given( string )
-    if string
-      string.strip
-    end
+  def self.strip_if_given(string)
+    string&.strip
   end
 
   # if the string is given, String#strip and then String#to_f are applied
@@ -133,7 +130,7 @@ module RCAP
   #
   # @param [String] number
   # @return [Float,nil]
-  def RCAP.to_f_if_given( number )
+  def self.to_f_if_given(number)
     if number
       case number
       when String
@@ -145,13 +142,13 @@ module RCAP
       end
     end
   end
-  
+
   # if the string is given, String#strip and then String#to_i are applied
   # otherwise nil is returned.
   #
   # @param [String] number
   # @return [Integer,nil]
-  def RCAP.to_i_if_given( number )
+  def self.to_i_if_given(number)
     if number
       case number
       when String

data/lib/rcap/validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is ripped directly from the no-longer-maintained assistance gem. Other code in that gem
 # was causing issues, so I'm putting the needed code directly in rcap as a workaround.
 
@@ -45,7 +47,7 @@ module Validation
   class Errors
     # Initializes a new instance of validation errors.
     def initialize
-      @errors = Hash.new {|h, k| h[k] = []}
+      @errors = Hash.new { |h, k| h[k] = [] }
     end
 
     # Returns true if no errors are stored.
@@ -62,7 +64,7 @@ module Validation
     def on(att)
       @errors[att]
     end
-    alias_method :[], :on
+    alias [] on
 
     # Adds an error for the given attribute.
     def add(att, msg)
@@ -71,9 +73,9 @@ module Validation
 
     # Returns an array of fully-formatted error messages.
     def full_messages
-      @errors.inject([]) do |m, kv| att, errors = *kv
-        errors.each {|e| m << "#{att} #{e}"}
-        m
+      @errors.each_with_object([]) do |kv, m|
+        att, errors = *kv
+        errors.each { |e| m << "#{att} #{e}" }
       end
     end
   end
@@ -82,7 +84,7 @@ module Validation
   # the validates {} idiom.
   class Generator
     # Initializes a new generator.
-    def initialize(receiver ,&block)
+    def initialize(receiver, &block)
       @receiver = receiver
       instance_eval(&block)
     end
@@ -118,7 +120,7 @@ module Validation
 
     # Returns the validations hash for the class.
     def validations
-      @validations ||= Hash.new {|h, k| h[k] = []}
+      @validations ||= Hash.new { |h, k| h[k] = [] }
     end
 
     # Returns true if validations are defined.
@@ -133,7 +135,7 @@ module Validation
       end
       validations.each do |att, procs|
         v = o.send(att)
-        procs.each {|p| p[o, att, v]}
+        procs.each { |p| p[o, att, v] }
       end
     end
 
@@ -149,15 +151,15 @@ module Validation
     #     object.errors[attribute] << 'is not nice' unless value.nice?
     #   end
     def validates_each(*atts, &block)
-      atts.each {|a| validations[a] << block}
+      atts.each { |a| validations[a] << block }
     end
 
     # Validates acceptance of an attribute.
     def validates_acceptance_of(*atts)
       opts = {
-        :message => 'is not accepted',
-        :allow_nil => true,
-        :accept => '1'
+        message: 'is not accepted',
+        allow_nil: true,
+        accept: '1'
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
@@ -169,7 +171,7 @@ module Validation
     # Validates confirmation of an attribute.
     def validates_confirmation_of(*atts)
       opts = {
-        :message => 'is not confirmed',
+        message: 'is not confirmed'
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
@@ -182,11 +184,11 @@ module Validation
     # Validates the format of an attribute.
     def validates_format_of(*atts)
       opts = {
-        :message => 'is invalid',
+        message: 'is invalid'
       }.merge!(atts.extract_options!)
 
       unless opts[:with].is_a?(Regexp)
-        raise ArgumentError, "A regular expression must be supplied as the :with option of the options hash"
+        raise ArgumentError, 'A regular expression must be supplied as the :with option of the options hash'
       end
 
       validates_each(*atts) do |o, a, v|
@@ -198,9 +200,9 @@ module Validation
     # Validates the length of an attribute.
     def validates_length_of(*atts)
       opts = {
-        :too_long     => 'is too long',
-        :too_short    => 'is too short',
-        :wrong_length => 'is the wrong length'
+        too_long: 'is too long',
+        too_short: 'is too short',
+        wrong_length: 'is the wrong length'
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
@@ -226,7 +228,7 @@ module Validation
     # Validates whether an attribute is a number.
     def validates_numericality_of(*atts)
       opts = {
-        :message => 'is not a number',
+        message: 'is not a number'
       }.merge!(atts.extract_options!)
 
       re = opts[:only_integer] ? INTEGER_RE : NUMBER_RE
@@ -240,7 +242,7 @@ module Validation
     # Validates the presence of an attribute.
     def validates_presence_of(*atts)
       opts = {
-        :message => 'is not present',
+        message: 'is not present'
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
@@ -249,4 +251,3 @@ module Validation
     end
   end
 end
-

data/lib/rcap/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
-  VERSION = '2.4.1'
+  VERSION = '2.7.3'
 end

data/rcap.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.extra_rdoc_files = ['README.md','CHANGELOG.md']
-  s.add_dependency('json', '>= 1.5.1')
-  s.add_dependency('uuidtools', '>= 2.1.2')
+  s.add_dependency('json')
+  s.add_dependency('uuidtools')
 
-  s.add_development_dependency( 'rspec', '>= 2.5.0' )
-  s.add_development_dependency( 'yard' )
-  s.add_development_dependency( 'webmock' )
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('yard')
+  s.add_development_dependency('webmock')
 end

data/spec/alert_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe( RCAP::Alert ) do
-  describe( 'initialising' ) do
+describe(RCAP::Alert) do
+  describe('initialising') do
 
-    context( 'a CAP 1.0 alert' ) do
-      before( :each ) do
+    context('a CAP 1.0 alert') do
+      before(:each) do
         @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
           alert.sender      = 'Sender'
           alert.sent        = DateTime.now
@@ -12,71 +12,71 @@ describe( RCAP::Alert ) do
           alert.scope       = RCAP::CAP_1_0::Alert::SCOPE_PUBLIC
           alert.source      = 'Source'
           alert.restriction = 'No Restriction'
-          [ 'Address 1', 'Address 2'].each do |address|
+          ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          ['Code1', 'Code2'].each do |code|
+          %w(Code1 Code2).each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
-          [ "1.0,1", "1.0,2" ].each do |reference|
+          ['1.0,1', '1.0,2'].each do |reference|
             alert.references << reference
           end
-          [ 'Incident1', 'Incident2' ].each do |incident|
+          %w(Incident1 Incident2).each do |incident|
             alert.incidents << incident
           end
-          2.times{ alert.add_info }
+          2.times { alert.add_info }
         end
       end
 
-      shared_examples_for( 'it has parsed a CAP 1.0 alert correctly' ) do
-        it( 'should use the correct CAP Version' ){ @alert.class.should       == RCAP::CAP_1_0::Alert }
-        it( 'should parse identifier correctly' ) { @alert.identifier.should  == @original_alert.identifier }
-        it( 'should parse sender correctly' )     { @alert.sender.should      == @original_alert.sender }
-        it( 'should parse sent correctly' )       { @alert.sent.should( be_within( 1 ).of( @original_alert.sent ))}
-        it( 'should parse status correctly' )     { @alert.status.should      == @original_alert.status }
-        it( 'should parse msg_type correctly' )   { @alert.msg_type.should    == @original_alert.msg_type }
-        it( 'should parse source correctly' )     { @alert.source.should      == @original_alert.source }
-        it( 'should parse scope correctly' )      { @alert.scope.should       == @original_alert.scope }
-        it( 'should parse restriction correctly' ){ @alert.restriction.should == @original_alert.restriction }
-        it( 'should parse addresses correctly' )  { @alert.addresses.should   == @original_alert.addresses }
-        it( 'should parse code correctly' )       { @alert.codes.should       == @original_alert.codes }
-        it( 'should parse note correctly' )       { @alert.note.should        == @original_alert.note }
-        it( 'should parse references correctly' ) { @alert.references.should  == @original_alert.references }
-        it( 'should parse incidents correctly' )  { @alert.incidents.should   == @original_alert.incidents }
-        it( 'should parse infos correctly' ) do
+      shared_examples_for('it has parsed a CAP 1.0 alert correctly') do
+        it('should use the correct CAP Version') { @alert.class.should      == RCAP::CAP_1_0::Alert }
+        it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
+        it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
+        it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }
+        it('should parse status correctly')     { @alert.status.should      == @original_alert.status }
+        it('should parse msg_type correctly')   { @alert.msg_type.should    == @original_alert.msg_type }
+        it('should parse source correctly')     { @alert.source.should      == @original_alert.source }
+        it('should parse scope correctly')      { @alert.scope.should       == @original_alert.scope }
+        it('should parse restriction correctly') { @alert.restriction.should == @original_alert.restriction }
+        it('should parse addresses correctly')  { @alert.addresses.should   == @original_alert.addresses }
+        it('should parse code correctly')       { @alert.codes.should       == @original_alert.codes }
+        it('should parse note correctly')       { @alert.note.should        == @original_alert.note }
+        it('should parse references correctly') { @alert.references.should  == @original_alert.references }
+        it('should parse incidents correctly')  { @alert.incidents.should   == @original_alert.incidents }
+        it('should parse infos correctly') do
           @alert.infos.size.should == @original_alert.infos.size
-          @alert.infos.each{ |info| info.class.should == RCAP::CAP_1_0::Info }
+          @alert.infos.each { |info| info.class.should == RCAP::CAP_1_0::Info }
         end
       end
 
-      context( 'from XML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_xml( @original_alert.to_xml )
+      context('from XML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_xml(@original_alert.to_xml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.0 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.0 alert correctly')
       end
 
-      context( 'from YAML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_yaml( @original_alert.to_yaml )
+      context('from YAML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_yaml(@original_alert.to_yaml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.0 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.0 alert correctly')
       end
 
-      context( 'from JSON' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_json( @original_alert.to_json )
+      context('from JSON') do
+        before(:each) do
+          @alert = RCAP::Alert.from_json(@original_alert.to_json)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.0 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.0 alert correctly')
       end
     end
 
-    context( 'a CAP 1.1 alert' ) do
-      before( :each ) do
+    context('a CAP 1.1 alert') do
+      before(:each) do
         @original_alert = RCAP::CAP_1_1::Alert.new do |alert|
           alert.sender      = 'Sender'
           alert.sent        = DateTime.now
@@ -84,71 +84,71 @@ describe( RCAP::Alert ) do
           alert.scope       = RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
           alert.source      = 'Source'
           alert.restriction = 'No Restriction'
-          [ 'Address 1', 'Address 2'].each do |address|
+          ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          ['Code1', 'Code2'].each do |code|
+          %w(Code1 Code2).each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
-          [ "1,1,1", "1,1,2" ].each do |reference|
+          ['1,1,1', '1,1,2'].each do |reference|
             alert.references << reference
           end
-          [ 'Incident1', 'Incident2' ].each do |incident|
+          %w(Incident1 Incident2).each do |incident|
             alert.incidents << incident
           end
-          2.times{ alert.add_info }
+          2.times { alert.add_info }
         end
       end
 
-      shared_examples_for( 'it has parsed a CAP 1.1 alert correctly' ) do
-        it( 'should use the correct CAP Version' ){ @alert.class.should       == RCAP::CAP_1_1::Alert }
-        it( 'should parse identifier correctly' ) { @alert.identifier.should  == @original_alert.identifier }
-        it( 'should parse sender correctly' )     { @alert.sender.should      == @original_alert.sender }
-        it( 'should parse sent correctly' )       { @alert.sent.should( be_within( 1 ).of( @original_alert.sent ))}
-        it( 'should parse status correctly' )     { @alert.status.should      == @original_alert.status }
-        it( 'should parse msg_type correctly' )   { @alert.msg_type.should    == @original_alert.msg_type }
-        it( 'should parse source correctly' )     { @alert.source.should      == @original_alert.source }
-        it( 'should parse scope correctly' )      { @alert.scope.should       == @original_alert.scope }
-        it( 'should parse restriction correctly' ){ @alert.restriction.should == @original_alert.restriction }
-        it( 'should parse addresses correctly' )  { @alert.addresses.should   == @original_alert.addresses }
-        it( 'should parse code correctly' )       { @alert.codes.should       == @original_alert.codes }
-        it( 'should parse note correctly' )       { @alert.note.should        == @original_alert.note }
-        it( 'should parse references correctly' ) { @alert.references.should  == @original_alert.references }
-        it( 'should parse incidents correctly' )  { @alert.incidents.should   == @original_alert.incidents }
-        it( 'should parse infos correctly' ) do
+      shared_examples_for('it has parsed a CAP 1.1 alert correctly') do
+        it('should use the correct CAP Version') { @alert.class.should       == RCAP::CAP_1_1::Alert }
+        it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
+        it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
+        it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }
+        it('should parse status correctly')     { @alert.status.should      == @original_alert.status }
+        it('should parse msg_type correctly')   { @alert.msg_type.should    == @original_alert.msg_type }
+        it('should parse source correctly')     { @alert.source.should      == @original_alert.source }
+        it('should parse scope correctly')      { @alert.scope.should       == @original_alert.scope }
+        it('should parse restriction correctly') { @alert.restriction.should == @original_alert.restriction }
+        it('should parse addresses correctly')  { @alert.addresses.should   == @original_alert.addresses }
+        it('should parse code correctly')       { @alert.codes.should       == @original_alert.codes }
+        it('should parse note correctly')       { @alert.note.should        == @original_alert.note }
+        it('should parse references correctly') { @alert.references.should  == @original_alert.references }
+        it('should parse incidents correctly')  { @alert.incidents.should   == @original_alert.incidents }
+        it('should parse infos correctly') do
           @alert.infos.size.should == @original_alert.infos.size
-          @alert.infos.each{ |info| info.class.should == RCAP::CAP_1_1::Info }
+          @alert.infos.each { |info| info.class.should == RCAP::CAP_1_1::Info }
         end
       end
 
-      context( 'from XML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_xml( @original_alert.to_xml )
+      context('from XML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_xml(@original_alert.to_xml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.1 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.1 alert correctly')
       end
 
-      context( 'from YAML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_yaml( @original_alert.to_yaml )
+      context('from YAML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_yaml(@original_alert.to_yaml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.1 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.1 alert correctly')
       end
 
-      context( 'from JSON' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_json( @original_alert.to_json )
+      context('from JSON') do
+        before(:each) do
+          @alert = RCAP::Alert.from_json(@original_alert.to_json)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.1 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.1 alert correctly')
       end
     end
 
-    context( 'a CAP 1.2 alert' ) do
-      before( :each ) do
+    context('a CAP 1.2 alert') do
+      before(:each) do
         @original_alert = RCAP::CAP_1_2::Alert.new do |alert|
           alert.sender      = 'Sender'
           alert.sent        = DateTime.now
@@ -156,108 +156,108 @@ describe( RCAP::Alert ) do
           alert.scope       = RCAP::CAP_1_2::Alert::SCOPE_PUBLIC
           alert.source      = 'Source'
           alert.restriction = 'No Restriction'
-          [ 'Address 1', 'Address 2'].each do |address|
+          ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          ['Code1', 'Code2'].each do |code|
+          %w(Code1 Code2).each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
-          [ "1,1,1", "1,1,2" ].each do |reference|
+          ['1,1,1', '1,1,2'].each do |reference|
             alert.references << reference
           end
-          [ 'Incident1', 'Incident2' ].each do |incident|
+          %w(Incident1 Incident2).each do |incident|
             alert.incidents << incident
           end
-          2.times{ alert.add_info }
+          2.times { alert.add_info }
         end
       end
 
-      shared_examples_for( 'it has parsed a CAP 1.2 alert correctly' ) do
-        it( 'should use the correct CAP Version' ){ @alert.class.should       == RCAP::CAP_1_2::Alert }
-        it( 'should parse identifier correctly' ) { @alert.identifier.should  == @original_alert.identifier }
-        it( 'should parse sender correctly' )     { @alert.sender.should      == @original_alert.sender }
-        it( 'should parse sent correctly' )       { @alert.sent.should( be_within( 1 ).of( @original_alert.sent ))}
-        it( 'should parse status correctly' )     { @alert.status.should      == @original_alert.status }
-        it( 'should parse msg_type correctly' )   { @alert.msg_type.should    == @original_alert.msg_type }
-        it( 'should parse source correctly' )     { @alert.source.should      == @original_alert.source }
-        it( 'should parse scope correctly' )      { @alert.scope.should       == @original_alert.scope }
-        it( 'should parse restriction correctly' ){ @alert.restriction.should == @original_alert.restriction }
-        it( 'should parse addresses correctly' )  { @alert.addresses.should   == @original_alert.addresses }
-        it( 'should parse codes correctly' )      { @alert.codes.should       == @original_alert.codes }
-        it( 'should parse note correctly' )       { @alert.note.should        == @original_alert.note }
-        it( 'should parse references correctly' ) { @alert.references.should  == @original_alert.references }
-        it( 'should parse incidents correctly' )  { @alert.incidents.should   == @original_alert.incidents }
-        it( 'should parse infos correctly' ) do
+      shared_examples_for('it has parsed a CAP 1.2 alert correctly') do
+        it('should use the correct CAP Version') { @alert.class.should       == RCAP::CAP_1_2::Alert }
+        it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
+        it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
+        it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }
+        it('should parse status correctly')     { @alert.status.should      == @original_alert.status }
+        it('should parse msg_type correctly')   { @alert.msg_type.should    == @original_alert.msg_type }
+        it('should parse source correctly')     { @alert.source.should      == @original_alert.source }
+        it('should parse scope correctly')      { @alert.scope.should       == @original_alert.scope }
+        it('should parse restriction correctly') { @alert.restriction.should == @original_alert.restriction }
+        it('should parse addresses correctly')  { @alert.addresses.should   == @original_alert.addresses }
+        it('should parse codes correctly')      { @alert.codes.should       == @original_alert.codes }
+        it('should parse note correctly')       { @alert.note.should        == @original_alert.note }
+        it('should parse references correctly') { @alert.references.should  == @original_alert.references }
+        it('should parse incidents correctly')  { @alert.incidents.should   == @original_alert.incidents }
+        it('should parse infos correctly') do
           @alert.infos.size.should == @original_alert.infos.size
-          @alert.infos.each{ |info| info.class.should == RCAP::CAP_1_2::Info }
+          @alert.infos.each { |info| info.class.should == RCAP::CAP_1_2::Info }
         end
       end
 
-      context( 'from XML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_xml( @original_alert.to_xml )
+      context('from XML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_xml(@original_alert.to_xml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.2 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.2 alert correctly')
       end
 
-      context( 'from YAML' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_yaml( @original_alert.to_yaml )
+      context('from YAML') do
+        before(:each) do
+          @alert = RCAP::Alert.from_yaml(@original_alert.to_yaml)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.2 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.2 alert correctly')
       end
 
-      context( 'from JSON' ) do
-        before( :each ) do
-          @alert = RCAP::Alert.from_json( @original_alert.to_json )
+      context('from JSON') do
+        before(:each) do
+          @alert = RCAP::Alert.from_json(@original_alert.to_json)
         end
 
-        it_should_behave_like( 'it has parsed a CAP 1.2 alert correctly' )
+        it_should_behave_like('it has parsed a CAP 1.2 alert correctly')
       end
     end
   end
 
-  describe( 'external file' ) do
-    def load_file( file_name )
-      File.open( File.join( File.dirname( __FILE__ ), 'assets', file_name )){|f| f.read }
+  describe('external file') do
+    def load_file(file_name)
+      File.open(File.join(File.dirname(__FILE__), 'assets', file_name)) { |f| f.read }
     end
 
-    describe( "'invalid.cap'" ) do
-      before( :each ) do
-        @alert = RCAP::Alert.from_xml( load_file( 'invalid.cap' ))
+    describe("'invalid.cap'") do
+      before(:each) do
+        @alert = RCAP::Alert.from_xml(load_file('invalid.cap'))
       end
 
-      it( 'should not be valid' ) do
-        @alert.should_not( be_valid )
+      it('should not be valid') do
+        @alert.should_not(be_valid)
       end
 
-      it( 'should be invalid because scope is missing' ) do
+      it('should be invalid because scope is missing') do
         @alert.valid?
-        @alert.errors.on( :scope ).should_not( be_empty )
+        @alert.errors.on(:scope).should_not(be_empty)
       end
     end
 
-    describe( "'earthquake.cap'" ) do
-      before( :each ) do
-        @alert = RCAP::Alert.from_xml( load_file( 'earthquake.cap' ))
+    describe("'earthquake.cap'") do
+      before(:each) do
+        @alert = RCAP::Alert.from_xml(load_file('earthquake.cap'))
       end
 
-      it( 'should be valid' ) do
-        @alert.should( be_valid )
+      it('should be valid') do
+        @alert.should(be_valid)
       end
 
-      it( 'should parse the alert correctly' ) do
-        @alert.class.should == RCAP::CAP_1_1::Alert
-        @alert.status.should == RCAP::CAP_1_1::Alert::STATUS_ACTUAL
+      it('should parse the alert correctly') do
+        @alert.class.should    == RCAP::CAP_1_1::Alert
+        @alert.status.should   == RCAP::CAP_1_1::Alert::STATUS_ACTUAL
         @alert.msg_type.should == RCAP::CAP_1_1::Alert::MSG_TYPE_ALERT
-        @alert.scope.should == RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
+        @alert.scope.should    == RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
 
         @alert.infos.size.should == 2
         info = @alert.infos.first
-        info.categories.include?( RCAP::CAP_1_1::Info::CATEGORY_GEO ).should eq true
+        info.categories.include?(RCAP::CAP_1_1::Info::CATEGORY_GEO).should eq true
 
         info.areas.size.should == 1
         area = info.areas.first
@@ -270,21 +270,21 @@ describe( RCAP::Alert ) do
       end
     end
 
-    describe( "'canada.cap'" ) do
-      before( :each ) do
-        @alert = RCAP::Alert.from_xml( load_file( 'canada.cap' ))
+    describe("'canada.cap'") do
+      before(:each) do
+        @alert = RCAP::Alert.from_xml(load_file('canada.cap'))
       end
 
-      it( 'should be valid' ) do
-        @alert.should( be_valid )
+      it('should be valid') do
+        @alert.should(be_valid)
       end
 
-      it( 'should parse the alert correctly' ) do
-        @alert.class.should == RCAP::CAP_1_1::Alert
-        @alert.status.should == RCAP::CAP_1_1::Alert::STATUS_ACTUAL
-        @alert.msg_type.should == RCAP::CAP_1_1::Alert::MSG_TYPE_UPDATE
-        @alert.scope.should == RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
-        @alert.identifier.should == "CA-EC-CWTO-2011-138776"
+      it('should parse the alert correctly') do
+        @alert.class.should      == RCAP::CAP_1_1::Alert
+        @alert.status.should     == RCAP::CAP_1_1::Alert::STATUS_ACTUAL
+        @alert.msg_type.should   == RCAP::CAP_1_1::Alert::MSG_TYPE_UPDATE
+        @alert.scope.should      == RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
+        @alert.identifier.should == 'CA-EC-CWTO-2011-138776'
 
         @alert.infos.size.should == 2
         info = @alert.infos.first