rcap 2.7.0 → 2.7.3

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

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
+
 class RCAP::Base::Alert
-  def to_yaml
-  end
+  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,3 +1,5 @@
+# frozen_string_literal: true
+
 ALLOWED_CHARACTERS = /[^\s&<]+/
 
 module RCAP
@@ -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
@@ -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)
-        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|
@@ -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|

data/lib/rcap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcap
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.3
 platform: ruby
 authors:
 - Farrel Lifson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rcap
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: CAP(Common Alerting Protocol) API
@@ -276,4 +276,3 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/validations_spec.rb
-has_rdoc: