rsmp_schema 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b211065c7c90beae96f574d33dcc03a1bb55fdfe5e91b4a0a65e69cefd4a02
-  data.tar.gz: 64dfc50cf0e66d9ab485a091f5f03b352f82b2ee8528d1b27d3863be2954e7ad
+  metadata.gz: 92349304b2fa548c7495ff1bd83bd9890d7aab5886e87a213f1c11bd767fa944
+  data.tar.gz: 9da5dcebad4286a2dd161ee06ef7eaa7351b0f4dbdddd0b7ca5d5c1d9fc49271
 SHA512:
-  metadata.gz: cda9a42c4cbafe91b0469428e5870ad0028c30509854d968580048a6539e92dc244a215ccb124b97d5b560d19fbaeb91d308ae29ad1370f696e43aa5757f1ccc
-  data.tar.gz: ae3fc23d082eae7e9136bcc40e2863c1e2df5cb85e8c7679d1ab733d4008232ecc08deb772ee991458c24cea852ee7c24793962e21d2d97cc695ed05f0faab44
+  metadata.gz: 3effc2a2059a58a223e13b357d9995be1f28cbe162e742993ef06b3b0bd6559f64dda2eff1e34b670f907fbc55835fe7a5b4a49b2b6139a8e76b0c9ea0bdc0aa
+  data.tar.gz: 7093b400bd752a9defb3bece6ef8db540b3bec84d861cc5d88dee594f4ce8ad5387c1a730a179aa04ebf366d2e70ea5ca8b12644086a0105dbab750e134a45b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.6.0)
+    rsmp_schema (0.8.0)
       json_schemer (~> 2.3.0)
       thor (~> 1.3.1)
 

data/README.md

@@ -25,7 +25,7 @@ rsmp.json
     M0001.json
 ```
 
-##  Usage
+## Usage
 The JSON Schema can be used from any language that provides a suitable JSON Schema validation library.
 
 For example, to validate a JSON message with Ruby using the json_schemer gem:
@@ -52,7 +52,7 @@ message = {
 }
 
 # try validating a message against our schema
-schema = Pathname.new('schemas/tlc/1.1/rsmp.json')
+schema = Pathname.new('schemas/tlc/1.1.0/rsmp.json')
 schemer = JSONSchemer.schema(schema)
 puts schemer.valid? message     # => true
 ```

data/lib/rsmp_schema/schema.rb

@@ -139,8 +139,13 @@ module RSMP::Schema
   #   3.1A3r3 >= 3.1
   # return nil if string doesn't match
   def self.sanitize_version version
-    matched = /^\d+\.\d+(\.\d+)?/.match version
+    # match normal z.y.z format
+    matched = /^\d+\.\d+\.\d+/.match version
     matched.to_s if matched
+
+    # match x.y format, and add patch version zero to get z.y.0
+    matched = /^\d+\.\d+/.match version
+    "#{matched.to_s}.0" if matched
   end
 
   # find schema for a particular schema and version

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
   end
 end

data/schemas/core/{3.2 → 3.2.0}/alarm.json

@@ -21,7 +21,7 @@
           "aSp" : { "enum" : [ "Issue"] }
         }
       },
-      "then": { "$ref": "../3.2/alarm_issue.json" }
+      "then": { "$ref": "../3.2.0/alarm_issue.json" }
     },
     {
       "if": {
@@ -47,7 +47,7 @@
           "sS" : { "enum" : [ "suspended", "notSuspended"] }
         }
       },
-      "then": { "$ref": "../3.2/alarm_suspended_resumed.json" }
+      "then": { "$ref": "../3.2.0/alarm_suspended_resumed.json" }
     },
     {
       "if": {
@@ -65,7 +65,7 @@
           "aSp" : { "enum" : [ "Acknowledge"] }
         }
       },
-      "then": { "$ref": "../3.2/alarm_acknowledge.json" }
+      "then": { "$ref": "../3.2.0/alarm_acknowledge.json" }
     }
    ]
 }

data/schemas/core/{3.2 → 3.2.0}/core.json

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

data/schemas/core/{3.2 → 3.2.0}/rsmp.json

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

data/schemas/core/{3.2 → 3.2.0}/status_update.json

@@ -14,7 +14,7 @@
         "properties": {
           "sCI" : { "$ref": "../3.1.2/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
+          "s" : { "description" : "Value", "type" : ["string","array"] },   // array is allowed from 3.2.0
           "q" : {
             "description" : "Value",
             "type" : "string",

data/schemas/core/3.2.1/rsmp.json

@@ -1,7 +1,7 @@
 {
   "allOf": [
     {
-      "$ref": "../3.2/core.json"
+      "$ref": "../3.2.0/core.json"
     },
     {
       "if": {
@@ -63,7 +63,7 @@
         "properties": { "type": { "const": "Alarm" } }
       },
       "then": {
-        "$ref": "../3.2/alarm.json"
+        "$ref": "../3.2.0/alarm.json"
       }
     },
     {
@@ -99,7 +99,7 @@
         "properties": { "type": { "const": "StatusResponse" } }
       },
       "then": {
-        "$ref": "../3.2/status_response.json"
+        "$ref": "../3.2.0/status_response.json"
       }
     },
     {
@@ -126,7 +126,7 @@
         "properties": { "type": { "const": "StatusUpdate" } }
       },
       "then": {
-        "$ref": "../3.2/status_update.json"
+        "$ref": "../3.2.0/status_update.json"
       }
     }
   ]

data/schemas/core/3.2.2/core.json

@@ -0,0 +1,39 @@
+{
+  "$schema" : "http://json-schema.org/draft-07/schema#",
+  "name" : "core",
+  "description" : "Core",
+  "version" : "3.2.2",
+  "type" :  "object",
+  "allOf" : [
+    {
+      "properties" : {
+        "mType" : {
+          "description" : "Supported RSMP versions",
+          "type" : "string",
+          "const" : "rSMsg"
+        },
+        "type" : {
+          "description" : "Type of RMSP message",
+          "type" : "string",
+          "enum" : [
+            "MessageAck",
+            "MessageNotAck",
+            "Version",
+            "AggregatedStatus",
+            "AggregatedStatusRequest",
+            "Watchdog",
+            "Alarm",
+            "CommandRequest",
+            "CommandResponse",
+            "StatusRequest",
+            "StatusResponse",
+            "StatusSubscribe",
+            "StatusUnsubscribe",
+            "StatusUpdate"
+          ]
+        }
+      },
+      "required" : [ "mType", "type" ]
+    }
+  ]
+}

data/schemas/core/3.2.2/rsmp.json

@@ -0,0 +1,133 @@
+{
+  "allOf": [
+    {
+      "$ref": "../3.2.0/core.json"
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "MessageAck" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/message_ack.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "MessageNotAck" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/message_not_ack.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Version" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/version.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "AggregatedStatus" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/aggregated_status.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "AggregatedStatusRequest" } }
+      },
+      "then": {
+        "$ref": "../3.1.5/aggregated_status_request.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Watchdog" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/watchdog.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "Alarm" } }
+      },
+      "then": {
+        "$ref": "../3.2.0/alarm.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "CommandRequest" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/command_request.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "CommandResponse" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/command_response.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusRequest" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/status_request.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusResponse" } }
+      },
+      "then": {
+        "$ref": "../3.2.0/status_response.json"
+      }
+    },
+    {
+      "if": {
+         "required" : ["type"],
+       "properties": { "type": { "const": "StatusSubscribe" } }
+      },
+      "then": {
+        "$ref": "../3.1.5/status_subscribe.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusUnsubscribe" } }
+      },
+      "then": {
+        "$ref": "../3.1.2/status_unsubscribe.json"
+      }
+    },
+    {
+      "if": {
+        "required" : ["type"],
+        "properties": { "type": { "const": "StatusUpdate" } }
+      },
+      "then": {
+        "$ref": "../3.2.0/status_update.json"
+      }
+    }
+  ]
+}

data/schemas/tlc/{1.1 → 1.1.0}/rsmp.json

@@ -1,7 +1,7 @@
 {
   "name" : "tlc",
   "description" : "Traffic Light Controllers",
-  "version" : 1.1,
+  "version" : "1.1.0",
   "allOf" : [
     {
       "if" : {

data/schemas/tlc/{1.1 → 1.1.0}/sxl.yaml

@@ -2,7 +2,7 @@
 meta:
   name: tlc
   description: Traffic Light Controllers
-  version: 1.1
+  version: 1.1.0
 objects:
   Traffic Light Controller:
     description:

data/schemas/tlc/{1.2 → 1.2.0}/rsmp.json

@@ -1,7 +1,7 @@
 {
   "name" : "tlc",
   "description" : "Traffic Light Controllers",
-  "version" : 1.2,
+  "version" : "1.2.0",
   "allOf" : [
     {
       "if" : {

data/schemas/tlc/{1.2 → 1.2.0}/sxl.yaml

@@ -2,7 +2,7 @@
 meta:
   name: tlc
   description: Traffic Light Controllers
-  version: 1.2
+  version: 1.2.0
 objects:
   Traffic Light Controller:
     description: