rcap 2.5.0 → 2.7.4

data/lib/rcap/extensions/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Array
   # Formats an array into a string suitable for a CAP message.
   #

data/lib/rcap/extensions/date.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Date
-  alias_method :inspect, :to_s
+  alias inspect to_s
 
   # Returns a string representaion of the time suitable for CAP.
   # @return [String]

data/lib/rcap/extensions/date_time.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class DateTime
-  alias_method :inspect, :to_s
+  alias inspect to_s
 
   # Returns a string representaion of the time suitable for CAP.
   # @return [String]
@@ -15,6 +17,7 @@ class DateTime
   end
 
   private
+
   def utc_hours_offset
     offset * 24
   end

data/lib/rcap/extensions/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Float
   def blank?
     false

data/lib/rcap/extensions/integer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Integer
+  def blank?
+    false
+  end
+end

data/lib/rcap/extensions/nil_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NilClass
   def blank?
     true

data/lib/rcap/extensions/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   CAP_LIST_REGEX = Regexp.new('"([\w\s]+)"|(\S+)')
   WHITESPACE_REGEX = Regexp.new('^\s+$')
@@ -10,7 +12,7 @@ class String
   #   "one".for_cap_list       # => "one"
   #   "two words".for_cap_list # => "\"two words\""
   def for_cap_list
-    if self =~ /\s/
+    if /\s/.match?(self)
       '"' + self + '"'
     else
       self

data/lib/rcap/extensions/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Time
   # Returns a string representaion of the time suitable for CAP.
   # @return [String]
@@ -9,6 +11,7 @@ class Time
   end
 
   private
+
   def utc_hours_offset
     localtime.utc_offset / 3600
   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,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Info
     def self.from_h(alert, info_hash)

data/lib/rcap/utilities.rb

@@ -1,4 +1,6 @@
-ALLOWED_CHARACTERS = /[^\s&<]+/
+# frozen_string_literal: true
+
+ALLOWED_CHARACTERS = /[^\s&<]+/.freeze
 
 module RCAP
   # Returns a randomly generated UUID string
@@ -17,7 +19,7 @@ module RCAP
   # @return [String,nil] Text content of element matching XPath query or nil
   def self.xpath_text(xml_element, xpath, namespace)
     element = xpath_first(xml_element, xpath, namespace)
-    element.text.strip if element && element.text
+    element.text.strip if element&.text
   end
 
   # Returns first descendent that matches the given XPath expression.
@@ -60,8 +62,8 @@ module RCAP
     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"
+      '|' + '-' * (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.
@@ -96,9 +98,7 @@ module RCAP
   def self.parse_datetime(date)
     case date
     when String
-      unless  date.empty?
-        DateTime.parse(date.strip)
-      end
+      DateTime.parse(date.strip) unless date.empty?
     when DateTime, Time, Date
       date.to_datetime
     end
@@ -122,9 +122,7 @@ module RCAP
   # @param [String] string
   # @return [String,nil]
   def self.strip_if_given(string)
-    if string
-      string.strip
-    end
+    string&.strip
   end
 
   # if the string is given, String#strip and then String#to_f are applied

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.
 
@@ -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.reduce([]) 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
@@ -128,9 +130,7 @@ module Validation
 
     # Validates the given instance.
     def validate(o)
-      if superclass.respond_to?(:validate) && !@skip_superclass_validations
-        superclass.validate(o)
-      end
+      superclass.validate(o) if superclass.respond_to?(:validate) && !@skip_superclass_validations
       validations.each do |att, procs|
         v = o.send(att)
         procs.each { |p| p[o, att, v] }
@@ -162,6 +162,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v == opts[:accept]
       end
     end
@@ -169,11 +170,12 @@ 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|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         c = o.send(:"#{a}_confirmation")
         o.errors[a] << opts[:message] unless v == c
       end
@@ -182,15 +184,16 @@ 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)
-        fail 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|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v.to_s =~ opts[:with]
       end
     end
@@ -205,6 +208,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         if m = opts[:maximum]
           o.errors[a] << (opts[:message] || opts[:too_long]) unless v && v.size <= m
         end
@@ -220,19 +224,20 @@ module Validation
       end
     end
 
-    NUMBER_RE = /^\d*\.{0,1}\d+$/
-    INTEGER_RE = /\A[+-]?\d+\Z/
+    NUMBER_RE = /^\d*\.{0,1}\d+$/.freeze
+    INTEGER_RE = /\A[+-]?\d+\Z/.freeze
 
     # 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
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v.to_s =~ re
       end
     end
@@ -240,7 +245,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|

data/lib/rcap/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
-  VERSION = '2.5.0'
+  VERSION = '2.7.4'
 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

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe(RCAP::Alert) do
   describe('initialising') do
-
     context('a CAP 1.0 alert') do
       before(:each) do
         @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
@@ -15,14 +14,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(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|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -87,14 +86,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(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|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -102,7 +101,7 @@ describe(RCAP::Alert) do
       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 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)) }
@@ -159,14 +158,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(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|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -174,7 +173,7 @@ describe(RCAP::Alert) do
       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 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)) }

data/spec/cap_1_0/alert_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe(RCAP::CAP_1_0::Alert) do
   context('on initialisation') do
-    before(:each)  do
+    before(:each) do
       @alert = RCAP::CAP_1_0::Alert.new
 
       @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
@@ -15,17 +15,17 @@ describe(RCAP::CAP_1_0::Alert) do
         ['Address 1', 'Address 2'].each do |address|
           alert.addresses << address
         end
-        %w(Code1 Code2).each do |code|
+        %w[Code1 Code2].each do |code|
           alert.codes << code
         end
         alert.note = 'Note'
-        %w(Sender1 Sender2).each do |sender|
+        %w[Sender1 Sender2].each do |sender|
           a = RCAP::CAP_1_0::Alert.new do |a|
             a.sender = sender
           end
           alert.references << a.to_reference
         end
-        %w(Incident1 Incident2).each do |incident|
+        %w[Incident1 Incident2].each do |incident|
           alert.incidents << incident
         end
         2.times { alert.add_info }
@@ -75,7 +75,6 @@ describe(RCAP::CAP_1_0::Alert) do
       end
 
       it_should_behave_like('a successfully parsed CAP 1.0 alert')
-
     end
 
     context('from YAML') do

data/spec/cap_1_0/area_spec.rb

@@ -66,9 +66,8 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from XML') do
       before(:each) do
-
         @alert = RCAP::CAP_1_0::Alert.new
-        @alert.add_info.areas <<  @original_area
+        @alert.add_info.areas << @original_area
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new(@xml_string)
         @info_xml_element = RCAP.xpath_first(@xml_document.root, RCAP::CAP_1_0::Info::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
@@ -81,7 +80,6 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from YAML Data') do
       before(:each) do
-
         @area = RCAP::CAP_1_0::Area.from_yaml_data(YAML.load(@original_area.to_yaml))
       end
 
@@ -90,7 +88,6 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from a hash') do
       before(:each) do
-
         @area = RCAP::CAP_1_0::Area.from_h(@original_area.to_h)
       end
 
@@ -129,27 +126,27 @@ describe(RCAP::CAP_1_0::Area) do
       end
 
       it('should export the area description correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::AREA_DESC_KEY].should == @area.area_desc
+        @area_hash[RCAP::CAP_1_0::Area::AREA_DESC_KEY].should == @area.area_desc
       end
 
       it('should export the altitude correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::ALTITUDE_KEY].should == @area.altitude
+        @area_hash[RCAP::CAP_1_0::Area::ALTITUDE_KEY].should == @area.altitude
       end
 
       it('should set the ceiling correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::CEILING_KEY].should == @area.ceiling
+        @area_hash[RCAP::CAP_1_0::Area::CEILING_KEY].should == @area.ceiling
       end
 
       it('should export the circles correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
+        @area_hash[RCAP::CAP_1_0::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
       end
 
       it('should export the geocodes correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
+        @area_hash[RCAP::CAP_1_0::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
       end
 
       it('should export the polygons correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
+        @area_hash[RCAP::CAP_1_0::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
       end
     end
   end