rsmp_schema 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80ee43a9c5a077e3cbd2bc73ec372dfda6afedc990734a4098d8c113e46c93c0
-  data.tar.gz: 15bdb8670621917247d5c7a4e9fdc76b5ad4af8926c5f5f84824d05f46c23d50
+  metadata.gz: 92349304b2fa548c7495ff1bd83bd9890d7aab5886e87a213f1c11bd767fa944
+  data.tar.gz: 9da5dcebad4286a2dd161ee06ef7eaa7351b0f4dbdddd0b7ca5d5c1d9fc49271
 SHA512:
-  metadata.gz: a2410215ae0fcc8aca6022ff59c9f43a4223b38f4142251ec737b68d2b13baae63763cb85f93ce137e353db3dfcd564c227f19c4a7ab5285e90a2b0e533fb1ff
-  data.tar.gz: 7ef596b859a54bd47e79b0ff8efca265ce37ca64221add1f0c72c2e37bbef01c66e55350fc96f8511f4f1d181e42840094d60d79949e43ebd52ad25138a6ad70
+  metadata.gz: 3effc2a2059a58a223e13b357d9995be1f28cbe162e742993ef06b3b0bd6559f64dda2eff1e34b670f907fbc55835fe7a5b4a49b2b6139a8e76b0c9ea0bdc0aa
+  data.tar.gz: 7093b400bd752a9defb3bece6ef8db540b3bec84d861cc5d88dee594f4ce8ad5387c1a730a179aa04ebf366d2e70ea5ca8b12644086a0105dbab750e134a45b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.7.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.7.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/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/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: