rsmp 0.42.2 → 0.42.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c61e299fa55246bbee0c3c0bbd28f294dc652fdcb754020292738bdd4b7e2f
-  data.tar.gz: 688d17de1f51cfd5a82b7c71b4d49db20365fdace976d481eaae93973400edd1
+  metadata.gz: 642a7e572bea5e012126d27c26b33aaf4bff8cb750550e7cb4e83d3ee5563709
+  data.tar.gz: 272d4be237cd10b677e5c63ff76fd10bea27b303a505e5ff1ea66806786efbcc
 SHA512:
-  metadata.gz: 981237d8987c178ef8a9bca82ad3c6735553bc04165680da82b4b60cef9f40db4349db5ab9faa7fd10612516796e1ea33759e12578d6e0a165b4d0c3a36666d8
-  data.tar.gz: 2a0832841d760be46b2d507b391726734a1036dc191545c33f380fd27a3f4cce58e78272067ffaa51aebd97333c495b8624122055b0f89bef9df80df15f37b53
+  metadata.gz: 1bf67a5afb33d8c22e91be19f512f34d835685e1776c1a9448be55235ff5fbec1672bf5c5500ff1db62b3c08a7c47a5a22115c56da81a26cf51e0cdaa4e4ab8c
+  data.tar.gz: 33dff3c7525579871d731686fb3b4ba1e7890637132839e25b28d192280c4264720a39716fc8e329856d65c33f9f1fbbbec8463b6130885518a46eafa214e05b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.42.2)
+    rsmp (0.42.4)
       async (~> 2.32)
       colorize (~> 1.1)
       io-endpoint (~> 0.15)

data/lib/rsmp/collect/distributor.rb

@@ -3,10 +3,8 @@ module RSMP
   module Distributor
     attr_reader :receivers
 
-    include Inspect
-
     def inspect
-      "#<#{self.class.name}:#{object_id}, #{inspector(:@receivers)}>"
+      "#<#{self.class.name}:#{object_id}}>"
     end
 
     def initialize_distributor

data/lib/rsmp/collect/receiver.rb

@@ -2,7 +2,9 @@ module RSMP
   # Receives items from a Distributor when included as a receiver.
   # Optionally filter messages using a Filter.
   module Receiver
-    include Inspect
+    def inspect
+      "#<#{self.class.name}:#{object_id}>"
+    end
 
     def initialize_receiver(distributor, filter: nil)
       @distributor = distributor

data/lib/rsmp/component/component_base.rb

@@ -1,8 +1,6 @@
 module RSMP
   # RSMP component base class.
   class ComponentBase
-    include Inspect
-
     attr_reader :c_id, :ntsoid, :xnid, :node, :alarms, :statuses,
                 :aggregated_status, :aggregated_status_bools, :grouped
 
@@ -30,6 +28,10 @@ module RSMP
       @alarms = {}
     end
 
+    def inspect
+      "#<#{self.class.name}:#{object_id}:#{object_id} c_id:#{@c_id}>"
+    end
+
     def now
       node.now
     end

data/lib/rsmp/log/archive.rb

@@ -2,8 +2,6 @@ module RSMP
   # Archive of log items, which can be messages or info items.
   # All items are timestamped, and stored chronologically.
   class Archive
-    include Inspect
-
     attr_reader :items
 
     @index = 0

data/lib/rsmp/message.rb

@@ -4,8 +4,6 @@ require 'rsmp_schema'
 module RSMP
   # Base RSMP message class used to represent parsed and built messages.
   class Message
-    include Inspect
-
     attr_reader :now, :attributes, :out, :timestamp # this is an internal timestamp recording when we receive/send
     attr_accessor :json, :direction
 
@@ -82,6 +80,10 @@ module RSMP
       end
     end
 
+    def inspect
+      "#<#{self.class.name}:#{object_id} m_id: #{m_id_short}>"
+    end
+
     def type
       @attributes['type']
     end
@@ -91,6 +93,8 @@ module RSMP
     end
 
     def self.shorten_m_id(m_id, length = 4)
+      return nil unless m_id
+
       m_id[0..(length - 1)]
     end
 

data/lib/rsmp/node/node.rb

@@ -2,7 +2,6 @@ module RSMP
   # Base class for sites and supervisors.
   class Node
     include Logging
-    include Inspect
     include Task
 
     attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock, :collector
@@ -17,6 +16,10 @@ module RSMP
       @collect = options[:collect]
     end
 
+    def inspect
+      "#<#{self.class.name}:#{object_id} id: #{site_id}}>"
+    end
+
     def now
       clock.now
     end

data/lib/rsmp/proxy/proxy.rb

@@ -8,7 +8,6 @@ module RSMP
 
     include Logging
     include Distributor
-    include Inspect
     include Task
     include Modules::State
     include Modules::Watchdogs
@@ -32,6 +31,10 @@ module RSMP
       @state_condition = Async::Notification.new
     end
 
+    def inspect
+      "#<#{self.class.name}:#{object_id} state:#{state}}>"
+    end
+
     def now
       node.now
     end
@@ -159,12 +162,6 @@ module RSMP
       @collector.start
     end
 
-    def inspect
-      "#<#{self.class.name}:#{object_id}, #{inspector(
-        :@acknowledgements, :@settings, :@site_settings
-      )}>"
-    end
-
     def clock
       @node.clock
     end

data/lib/rsmp/proxy/site/modules/status.rb

@@ -144,7 +144,7 @@ module RSMP
         # unsubscribes to all statuses (with all attributes) defined in the used SXL
         def unsubscribe_from_all(component: nil)
           component ||= main.c_id
-          catalogue = RSMP::Schema.status_catalogue(@sxl, sxl_version)
+          catalogue = RSMP::Schema.status_catalogue(@sxl, RSMP::Schema.sanitize_version(sxl_version))
           status_list = catalogue.flat_map do |status_code_id, names|
             names.map { |name| { 'sCI' => status_code_id.to_s, 'n' => name.to_s } }
           end

data/lib/rsmp/proxy/site/site_proxy.rb

@@ -38,12 +38,6 @@ module RSMP
       @settings = @supervisor.supervisor_settings.clone
     end
 
-    def inspect
-      "#<#{self.class.name}:#{object_id}, #{inspector(
-        :@acknowledgements, :@settings, :@site_settings, :@components
-      )}>"
-    end
-
     def node
       supervisor
     end
@@ -125,12 +119,12 @@ module RSMP
       # note that the type comes from the site config, while the version
       # comes from the Version message send by the site
       type = @site_settings['sxl']
-      version = RSMP::Schema.sanitize_version(message.attribute('SXL'))
-      RSMP::Schema.find_schema! type, version
+      sanitized_version = RSMP::Schema.sanitize_version(message.attribute('SXL'))
+      RSMP::Schema.find_schema! type, sanitized_version
 
-      # store sanitized sxl version requested by site
+      # store raw sxl version from site (may be 2-part like "1.2"), so we echo it back unchanged
       # TODO should check agaist site settings
-      @site_sxl_version = version
+      @site_sxl_version = message.attribute('SXL')
     rescue RSMP::Schema::UnknownSchemaError => e
       dont_acknowledge message, "Rejected #{message.type} message,", e.to_s
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.42.2'.freeze
+  VERSION = '0.42.4'.freeze
 end

data/lib/rsmp.rb

@@ -17,7 +17,6 @@ require_relative 'rsmp/command_list'
 require_relative 'rsmp/helpers/clock'
 require_relative 'rsmp/helpers/deep_merge'
 require_relative 'rsmp/helpers/error'
-require_relative 'rsmp/helpers/inspect'
 require_relative 'rsmp/log/logging'
 require_relative 'rsmp/log/archive'
 require_relative 'rsmp/log/filtering'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.42.2
+  version: 0.42.4
 platform: ruby
 authors:
 - Emil Tin
@@ -173,7 +173,6 @@ files:
 - lib/rsmp/helpers/clock.rb
 - lib/rsmp/helpers/deep_merge.rb
 - lib/rsmp/helpers/error.rb
-- lib/rsmp/helpers/inspect.rb
 - lib/rsmp/log/archive.rb
 - lib/rsmp/log/colorization.rb
 - lib/rsmp/log/filtering.rb

data/lib/rsmp/helpers/inspect.rb

@@ -1,41 +0,0 @@
-module RSMP
-  # Custom inspect, to reduce noise
-  #
-  # Instance variables of classes starting with Async or RSMP are shown
-  # with only their class name and object id, which reduces output,
-  # especially for deep object structures.
-  # Additionally, a list of variables to shown in short format can be passed.
-  #
-  # The short form is generated by using to_s() insted of inspect()
-  #
-  # Array#to_s and Hash#to_s usually show items, but here we show just number
-  # of items, when the short form is requested.
-  module Inspect
-    def inspector(*short_items)
-      instance_variables.map do |var_name|
-        var = instance_variable_get(var_name)
-        class_name = var.class.name
-
-        short = short_items.include?(var_name) ||
-                class_name.start_with?('Async') ||
-                class_name.start_with?('RSMP')
-
-        if short
-          if var.is_a?(Array) || var.is_a?(Hash)
-            "#{var_name}: #<#{class_name}:#{class_name.object_id}, #{var.size} items>"
-          else
-            "#{var_name}: #{var}"
-          end
-        else
-          "#{var_name}: #{var.inspect}"
-        end
-      end.join(', ')
-    end
-
-    # override this if you want additional variable to be shown in the short format,
-    # or ottherwise change the inspect format
-    def inspect
-      "#<#{self.class.name}:#{object_id}, #{inspector}>"
-    end
-  end
-end