rsmp_schema 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f2c2258a47b6f5f29a7f9de6f62662bc46fe864f26667fc462a04c574de418
-  data.tar.gz: 4977f3e203c7ee2e1c53f38574470995492d48390c5d5368d7ad5c5583cc8197
+  metadata.gz: 6b9ab01a29dc881ed7479e69c444a4d2088f51035b406f0b8a2e291030059cf6
+  data.tar.gz: 55f0ff8f40d5cd1bfd46da69fe8f2ecaa72840763595e3728eae6971a41545a6
 SHA512:
-  metadata.gz: 6310c9afa384a30a88419d30194a53bc76bf921d89b3194c4cdf87ac9406f4d6569d7ee965381e4cd14790fe3321de3f046159d0a6928327b03ce8171e15c93e
-  data.tar.gz: c94d8ef1fd954f121519e398f84c138b67cb336beb7165f69781811e1cf8a13d7a5c9520affa3d4b2c0b3fcf61a91206802cf34b8630e6e11e5455469c148a0b
+  metadata.gz: cd7562d99c4875fcaf71e16b969c5aedf9a3c51b711f125253a8e34bf3c2e4f647d0cd42078f1658cbc986271e764d73ea7e85bd37be10810df4111af4ecd309
+  data.tar.gz: ea487a4c39756d34c2282cde57d759776777a61bfa30bd56cf2f3cd8f2072a8b9e0f1dd46b42d0bc0ccfb2513cd38fdbfcd862e64c8ece3ee19ffdbf2e332087

data/.github/workflows/rspec.yaml

@@ -0,0 +1,20 @@
+# Workflow to run RSpec tests
+
+name: RSpec
+on: push
+jobs:
+  test:
+    timeout-minutes: 5
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: ['3.0', '3.1']
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec -f d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.3.2)
+    rsmp_schema (0.4.1)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
 
@@ -12,27 +12,33 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     hana (1.3.7)
-    json_schemer (0.2.21)
+    json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
       uri_template (~> 0.7)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.8.1)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    thor (1.2.1)
+    rspec-support (3.11.1)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
+    thor (1.2.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     uri_template (0.7.0)
 
 PLATFORMS

data/lib/rsmp_schema/convert/export/json_schema.rb

@@ -42,11 +42,11 @@ module RSMP
           when "string", "base64"
             out["type"] = "string"
           when "boolean"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/boolean"
           when "timestamp"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/timestamp"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/timestamp"
           when "integer", "ordinal", "unit", "scale", "long"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/integer"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/integer"
           when 'array'   # a json array
             build_json_array item['items'], out
           else
@@ -88,11 +88,11 @@ module RSMP
         def self.handle_string_list item, out
           case item['type']
           when "boolean_list"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean_list"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/boolean_list"
           when "integer_list"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/integer_list"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/integer_list"
           when "string_list"
-            out["$ref"] = "../../../core/3.1.1/definitions.json#/string_list"
+            out["$ref"] = "../../../core/3.1.2/definitions.json#/string_list"
           else
             raise "Error: List of #{item['type']} is not supported: #{item.inspect}"
           end

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.3.2"
+    VERSION = "0.4.1"
   end
 end

data/schemas/core/{3.1.1 → 3.1.2}/core.json

@@ -2,7 +2,7 @@
   "$schema" : "http://json-schema.org/draft-07/schema#",
   "name" : "core",
   "description" : "Core",
-  "version" : "3.1.1",
+  "version" : "3.1.2",
   "type" :  "object",
   "allOf" : [
     {

data/schemas/core/3.1.2/rsmp.json

@@ -1,3 +1,124 @@
 {
-  "$ref": "../3.1.1/rsmp.json"      // no changes from 3.1.1
+  "allOf": [
+    {
+      "$ref": "core.json"
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "MessageAck" } }
+      },
+      "then": {
+        "$ref": "message_ack.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "MessageNotAck" } }
+      },
+      "then": {
+        "$ref": "message_not_ack.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Version" } }
+      },
+      "then": {
+        "$ref": "version.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "AggregatedStatus" } }
+      },
+      "then": {
+        "$ref": "aggregated_status.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Watchdog" } }
+      },
+      "then": {
+        "$ref": "watchdog.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Alarm" } }
+      },
+      "then": {
+        "$ref": "alarm.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "CommandRequest" } }
+      },
+      "then": {
+        "$ref": "command_request.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "CommandResponse" } }
+      },
+      "then": {
+        "$ref": "command_response.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusRequest" } }
+      },
+      "then": {
+        "$ref": "status_request.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusResponse" } }
+      },
+      "then": {
+        "$ref": "status_response.json"
+      }
+    },
+    {
+      "if": {
+         "required" : ["type"],
+       "properties": { "type": { "const": "StatusSubscribe" } }
+      },
+      "then": {
+        "$ref": "status_subscribe.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusUnsubscribe" } }
+      },
+      "then": {
+        "$ref": "status_unsubscribe.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusUpdate" } }
+      },
+      "then": {
+        "$ref": "status_update.json"
+      }
+    }
+  ]
 }

data/schemas/core/{3.1.1 → 3.1.2}/status_response.json

@@ -15,13 +15,13 @@
           "sCI" : { "$ref": "definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "s" : { "description" : "Value", "type" : "string" },
-          "ageState" : {
+          "q" : {
             "description" : "Value",
             "type" : "string",
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
-        "required" : [ "sCI", "n", "s", "ageState" ],
+        "required" : [ "sCI", "n", "s", "q" ],
         "additionalProperties": false
       }
     }

data/schemas/core/{3.1.1 → 3.1.2}/status_update.json

@@ -15,13 +15,13 @@
           "sCI" : { "$ref": "definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "s" : { "description" : "Value", "type" : "string" },
-          "ageState" : {
+          "q" : {
             "description" : "Value",
             "type" : "string",
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
-        "required" : [ "sCI", "n", "s", "ageState" ],
+        "required" : [ "sCI", "n", "s", "q" ],
         "additionalProperties": false
       }
     }

data/schemas/core/3.1.3/rsmp.json

@@ -1,7 +1,7 @@
 {
   "allOf": [
     {
-      "$ref": "../3.1.1/core.json"
+      "$ref": "../3.1.2/core.json"
     },
     {
       "if": {
@@ -9,7 +9,7 @@
         "properties": { "type": { "const": "MessageAck" } }
       },
       "then": {
-        "$ref": "../3.1.1/message_ack.json"
+        "$ref": "../3.1.2/message_ack.json"
       }
     },
     {
@@ -18,7 +18,7 @@
         "properties": { "type": { "const": "MessageNotAck" } }
       },
       "then": {
-        "$ref": "../3.1.1/message_not_ack.json"
+        "$ref": "../3.1.2/message_not_ack.json"
       }
     },
     {
@@ -27,7 +27,7 @@
         "properties": { "type": { "const": "Version" } }
       },
       "then": {
-        "$ref": "../3.1.1/version.json"
+        "$ref": "../3.1.2/version.json"
       }
     },
     {
@@ -36,7 +36,7 @@
         "properties": { "type": { "const": "AggregatedStatus" } }
       },
       "then": {
-        "$ref": "../3.1.1/aggregated_status.json"
+        "$ref": "../3.1.2/aggregated_status.json"
       }
     },
     {
@@ -45,7 +45,7 @@
         "properties": { "type": { "const": "Watchdog" } }
       },
       "then": {
-        "$ref": "../3.1.1/watchdog.json"
+        "$ref": "../3.1.2/watchdog.json"
       }
     },
     {
@@ -54,7 +54,7 @@
         "properties": { "type": { "const": "Alarm" } }
       },
       "then": {
-        "$ref": "../3.1.1/alarm.json"
+        "$ref": "../3.1.2/alarm.json"
       }
     },
     {
@@ -63,7 +63,7 @@
         "properties": { "type": { "const": "CommandRequest" } }
       },
       "then": {
-        "$ref": "../3.1.1/command_request.json"
+        "$ref": "../3.1.2/command_request.json"
       }
     },
     {
@@ -72,7 +72,7 @@
         "properties": { "type": { "const": "CommandResponse" } }
       },
       "then": {
-        "$ref": "../3.1.1/command_response.json"
+        "$ref": "../3.1.2/command_response.json"
       }
     },
     {
@@ -81,7 +81,7 @@
         "properties": { "type": { "const": "StatusRequest" } }
       },
       "then": {
-        "$ref": "../3.1.1/status_request.json"
+        "$ref": "../3.1.2/status_request.json"
       }
     },
     {
@@ -99,7 +99,7 @@
        "properties": { "type": { "const": "StatusSubscribe" } }
       },
       "then": {
-        "$ref": "../3.1.1/status_subscribe.json"
+        "$ref": "../3.1.2/status_subscribe.json"
       }
     },
     {
@@ -108,7 +108,7 @@
         "properties": { "type": { "const": "StatusUnsubscribe" } }
       },
       "then": {
-        "$ref": "../3.1.1/status_unsubscribe.json"
+        "$ref": "../3.1.2/status_unsubscribe.json"
       }
     },
     {

data/schemas/core/3.1.3/status_response.json

@@ -2,9 +2,9 @@
   "title" :  "StatusResponse",
   "description" :  "Status response",
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" },
-    "sTs" : { "$ref": "../3.1.1/definitions.json#/timestamp" },
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" },
+    "sTs" : { "$ref": "../3.1.2/definitions.json#/timestamp" },
     "sS" : {
       "description" : "Status response arguments",
       "type" : "array",
@@ -12,13 +12,13 @@
       "items" : {
         "type" : "object",
         "properties": {
-          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "s" : { "description" : "Value", "type" : "string" },
-          "q" : {   // changed from "ageState" in 3.1.2 
+          "q" : { 
             "description" : "Value",
             "type" : "string",
-            "enum" : [ "recent", "old", "undefined", "unknown" ]
+            "enum" : [ "recent", "old", "undefined", "unknown" ]  // 'undefined' was added
           }
         },
         "required" : [ "sCI", "n", "s", "q" ],

data/schemas/core/3.1.3/status_update.json

@@ -2,9 +2,9 @@
   "title" :  "StatusUpdate",
   "description" :  "Status update",
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" },
-    "sTs" : { "$ref": "../3.1.1/definitions.json#/timestamp" },
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" },
+    "sTs" : { "$ref": "../3.1.2/definitions.json#/timestamp" },
     "sS" : {
       "description" : "Status update arguments",
       "type" : "array",
@@ -12,13 +12,13 @@
       "items" : {
         "type" : "object",
         "properties": {
-          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "s" : { "description" : "Value", "type" : "string" },
-          "q" : {   // changed from "ageState" in 3.1.2 
+          "q" : {
             "description" : "Value",
             "type" : "string",
-            "enum" : [ "recent", "old", "undefined", "unknown" ]
+            "enum" : [ "recent", "old", "undefined", "unknown" ]  // 'undefined' was addded
           }
         },
         "required" : [ "sCI", "n", "s", "q" ],

data/schemas/core/3.1.5/aggregated_status_request.json

@@ -2,8 +2,8 @@
   "title" :  "Aggregated Status Request",
   "description" :  "Aggregated status request message",
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" }
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" }
   },
   "required" : [ "mId", "cId" ]
 }

data/schemas/core/3.1.5/alarm.json

@@ -2,9 +2,9 @@
   "title" :  "Alarm",
   "description" :  "Alarm messsage",
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" },
-    "aCId" : { "$ref": "../3.1.1/definitions.json#/alarm_code" },
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" },
+    "aCId" : { "$ref": "../3.1.2/definitions.json#/alarm_code" },
     "xACId" : { "description" : "External alarm code id", "type" : "string" },
     "aSp" : {
       "description" : "Alarm specialization",
@@ -23,7 +23,7 @@
                                "issue"] }
         }
       },
-      "then": { "$ref": "../3.1.1/alarm_issue.json" }
+      "then": { "$ref": "../3.1.2/alarm_issue.json" }
     },
     {
       "if": {
@@ -40,7 +40,7 @@
           }
         ]
       },
-      "then": { "$ref": "../3.1.1/alarm_suspend_resume.json" }
+      "then": { "$ref": "../3.1.2/alarm_suspend_resume.json" }
     },
     {
       "if": {
@@ -52,7 +52,7 @@
                               "Suspended", "NotSuspended" ] }
         }
       },
-      "then": { "$ref": "../3.1.1/alarm_suspended_resumed.json" }
+      "then": { "$ref": "../3.1.2/alarm_suspended_resumed.json" }
     },
     {
       "if": {

data/schemas/core/3.1.5/rsmp.json

@@ -9,7 +9,7 @@
         "properties": { "type": { "const": "MessageAck" } }
       },
       "then": {
-        "$ref": "../3.1.1/message_ack.json"
+        "$ref": "../3.1.2/message_ack.json"
       }
     },
     {
@@ -18,7 +18,7 @@
         "properties": { "type": { "const": "MessageNotAck" } }
       },
       "then": {
-        "$ref": "../3.1.1/message_not_ack.json"
+        "$ref": "../3.1.2/message_not_ack.json"
       }
     },
     {
@@ -27,7 +27,7 @@
         "properties": { "type": { "const": "Version" } }
       },
       "then": {
-        "$ref": "../3.1.1/version.json"
+        "$ref": "../3.1.2/version.json"
       }
     },
     {
@@ -36,7 +36,7 @@
         "properties": { "type": { "const": "AggregatedStatus" } }
       },
       "then": {
-        "$ref": "../3.1.1/aggregated_status.json"
+        "$ref": "../3.1.2/aggregated_status.json"
       }
     },
     {
@@ -54,7 +54,7 @@
         "properties": { "type": { "const": "Watchdog" } }
       },
       "then": {
-        "$ref": "../3.1.1/watchdog.json"
+        "$ref": "../3.1.2/watchdog.json"
       }
     },
     {
@@ -72,7 +72,7 @@
         "properties": { "type": { "const": "CommandRequest" } }
       },
       "then": {
-        "$ref": "../3.1.1/command_request.json"
+        "$ref": "../3.1.2/command_request.json"
       }
     },
     {
@@ -81,7 +81,7 @@
         "properties": { "type": { "const": "CommandResponse" } }
       },
       "then": {
-        "$ref": "../3.1.1/command_response.json"
+        "$ref": "../3.1.2/command_response.json"
       }
     },
     {
@@ -90,7 +90,7 @@
         "properties": { "type": { "const": "StatusRequest" } }
       },
       "then": {
-        "$ref": "../3.1.1/status_request.json"
+        "$ref": "../3.1.2/status_request.json"
       }
     },
     {
@@ -117,7 +117,7 @@
         "properties": { "type": { "const": "StatusUnsubscribe" } }
       },
       "then": {
-        "$ref": "../3.1.1/status_unsubscribe.json"
+        "$ref": "../3.1.2/status_unsubscribe.json"
       }
     },
     {

data/schemas/core/3.1.5/status.json

@@ -1,7 +1,7 @@
 {
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" },
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" },
     "sS" : {
       "description" : "Status request arguments",
       "type" : "array",
@@ -9,7 +9,7 @@
       "items" : {
         "type" : "object",
         "properties": {
-          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" }
         },
         "required" : [ "sCI", "n" ],

data/schemas/core/3.1.5/status_subscribe.json

@@ -2,8 +2,8 @@
   "title" :  "StatusSubscribe",
   "description" :  "Status subscribe",
   "properties" : {
-    "mId" : { "$ref": "../3.1.1/definitions.json#/message_id" },
-    "cId" : { "$ref": "../3.1.1/definitions.json#/component_id" },
+    "mId" : { "$ref": "../3.1.2/definitions.json#/message_id" },
+    "cId" : { "$ref": "../3.1.2/definitions.json#/component_id" },
     "sS" : {
       "description" : "Status request arguments",
       "type" : "array",
@@ -11,14 +11,14 @@
       "items" : {
         "type" : "object",
         "properties": {
-          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "uRt" : {
-            "$ref": "../3.1.1/definitions.json#/integer",
+            "$ref": "../3.1.2/definitions.json#/integer",
             "description" : "Update interval in seconds, 0 means send when value changes"
           },
           "sOc" : {
-            "$ref": "../3.1.1/definitions.json#/boolean",
+            "$ref": "../3.1.2/definitions.json#/boolean",
             "description" : "Whether to send an update as soon as the value changes"
           }
         },