rsmp_schema 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5718eb96e00289525b0997cc296fcc93b029966d40c80a544d7b075d4c870b
-  data.tar.gz: c64cabf0d6cf081bd1434401eb9794691ac126dcf2fe64316ddbfe3fbef31f5e
+  metadata.gz: da6aa7917da1551ed490189b8b6d782c9ae6c6d4baf4b46adabcc21cc801cc19
+  data.tar.gz: a916a1d6fbc64fcdc050f1be7a4d6c2a603497c54e73baa58c7d775c8c39c803
 SHA512:
-  metadata.gz: 454414a51cf1e8ffa4f978a997ca702726058d82a0e1e0e6645fc74122e945d42584b38926a97a464ecbb591ec3afaf23e85a4639f704815abf431895c3e2f52
-  data.tar.gz: a48f7a8aa43283cd5448376c7f26f7c060d10fda7caf7e95f1b0f6e54c81432af867a9cbfa25ff6cb7608d1868e04fa1c9b6b5677e7550358e11073b18539634
+  metadata.gz: 675151863b4bbbffa9d6598e833dcda25d48cf0ce332c9ce05e035fe7f6567269e1b180032182335eeeaf2ae915fc78a75478116f21fcfa496809cffdbeeaf49
+  data.tar.gz: baf90db70f6950c2a7c20bec201d4b347fd478e5716f71fdef263db690edf8423df45ad0531fef3a26b8ade57eec0eacfb3ac1004dde88420f197a9740345285

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.2.2)
+    rsmp_schema (0.2.5)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
 

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

@@ -108,13 +108,19 @@ module RSMP
         # convert yaml values to jsons schema enum
         def self.handle_enum item, out
           if item["values"]
-            case item["values"]
+            out["enum"] = case item["values"]
             when Hash
-              out["enum"] = item["values"].keys.sort
+              item["values"].keys.sort
             when Array
-              out["enum"] = item["values"].sort
+              item["values"].sort
             else
-              raise "Error: Values must be specified as either a Hash or an Array"
+              raise "Error: Values must be specified as either a Hash or an Array, got #{item["values"].class}"
+            end.map do |v|
+              if v.is_a?(Integer) || v.is_a?(Float)
+                v.to_s
+              else
+                v
+              end
             end
           end
         end

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.2.2"
+    VERSION = "0.2.5"
   end
 end

data/schemas/core/3.2/rsmp.json

@@ -99,7 +99,7 @@
         "properties": { "type": { "const": "StatusResponse" } }
       },
       "then": {
-        "$ref": "../3.1.3/status_response.json"
+        "$ref": "../3.2/status_response.json"
       }
     },
     {
@@ -126,7 +126,7 @@
         "properties": { "type": { "const": "StatusUpdate" } }
       },
       "then": {
-        "$ref": "../3.1.3/status_update.json"
+        "$ref": "../3.2/status_update.json"
       }
     }
   ]

data/schemas/core/3.2/status_response.json

@@ -0,0 +1,30 @@
+{
+  "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" },
+    "sS" : {
+      "description" : "Status response arguments",
+      "type" : "array",
+      "minItems": 1,
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "s" : { "description" : "Value", "type" : ["string"," array"] },  // 3.2 allow arrays
+          "q" : { 
+            "description" : "Value",
+            "type" : "string",
+            "enum" : [ "recent", "old", "undefined", "unknown" ]
+          }
+        },
+        "required" : [ "sCI", "n", "s", "q" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "sTs", "sS" ]
+}

data/schemas/core/3.2/status_update.json

@@ -0,0 +1,30 @@
+ {
+  "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" },
+    "sS" : {
+      "description" : "Status update arguments",
+      "type" : "array",
+      "minItems": 1,
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "sCI" : { "$ref": "../3.1.1/definitions.json#/status_code" },
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "s" : { "description" : "Value", "type" : ["string","array"] },   // array is allowed from 3.2
+          "q" : {
+            "description" : "Value",
+            "type" : "string",
+            "enum" : [ "recent", "old", "undefined", "unknown" ]
+          }
+        },
+        "required" : [ "sCI", "n", "s", "q" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "sTs", "sS" ]
+}

data/schemas/tlc/1.1/statuses/S0091.json

@@ -26,11 +26,10 @@
           "s" : {
             "allOf" : [
               {
-                "description" : "0: Nobody logged in \n1: Operator logged in at level 1 (read only) \n2: Operator logged in at level 2 (read/write)",
                 "enum" : [
-                  0,
-                  1,
-                  2
+                  "0",
+                  "1",
+                  "2"
                 ]
               },
               {

data/schemas/tlc/1.1/statuses/S0092.json

@@ -26,11 +26,10 @@
           "s" : {
             "allOf" : [
               {
-                "description" : "0: Nobody logged in \n1: Operator logged in at level 1 (read only) \n2: Operator logged in at level 2 (read/write)",
                 "enum" : [
-                  0,
-                  1,
-                  2
+                  "0",
+                  "1",
+                  "2"
                 ]
               },
               {

data/schemas/tlc/1.1/sxl.yaml

@@ -781,8 +781,7 @@ objects:
         arguments:
           user:
             type: integer
-            values: [0,1,2]
-            description: |-
+            values:
               0: Nobody logged in 
               1: Operator logged in at level 1 (read only) 
               2: Operator logged in at level 2 (read/write)
@@ -793,8 +792,7 @@ objects:
         arguments:
           user:
             type: integer
-            values: [0,1,2]
-            description: |-
+            values:
               0: Nobody logged in 
               1: Operator logged in at level 1 (read only) 
               2: Operator logged in at level 2 (read/write)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -155,6 +155,8 @@ files:
 - schemas/core/3.2/alarm.json
 - schemas/core/3.2/core.json
 - schemas/core/3.2/rsmp.json
+- schemas/core/3.2/status_response.json
+- schemas/core/3.2/status_update.json
 - schemas/tlc/1.0.10/alarms/A0001.json
 - schemas/tlc/1.0.10/alarms/A0002.json
 - schemas/tlc/1.0.10/alarms/A0003.json