rsmp_schema 0.5.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a691ae7bb6527605f2ccee89b3826ff2cba1d87d788c412c9f7841c3d377d4a
-  data.tar.gz: ac7ec47c472f4a4423e207878eca887d8c895235e6bcb3215975553233df428e
+  metadata.gz: 80ee43a9c5a077e3cbd2bc73ec372dfda6afedc990734a4098d8c113e46c93c0
+  data.tar.gz: 15bdb8670621917247d5c7a4e9fdc76b5ad4af8926c5f5f84824d05f46c23d50
 SHA512:
-  metadata.gz: c42a89bd38fe2e58c705db83d7638d5b6353a15524760ccc33d3af32634e5063509577da4da74c778e00a9451e43f15f1f915e987b0cb062a8f941a9d63402df
-  data.tar.gz: 3bef2fd0a7300f1b105948017ec88cc922c270288ff000506f49cc3b120acebe837b90386046a3be6bd4d891c7db50fe2838f6af3d0a5662ad6cf5336871342b
+  metadata.gz: a2410215ae0fcc8aca6022ff59c9f43a4223b38f4142251ec737b68d2b13baae63763cb85f93ce137e353db3dfcd564c227f19c4a7ab5285e90a2b0e533fb1ff
+  data.tar.gz: 7ef596b859a54bd47e79b0ff8efca265ce37ca64221add1f0c72c2e37bbef01c66e55350fc96f8511f4f1d181e42840094d60d79949e43ebd52ad25138a6ad70

data/.github/workflows/rspec.yaml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: ['3.0', '3.1', '3.2']
+        ruby: ['3.1', '3.2', '3.3']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.3.2

data/Gemfile.lock

@@ -1,37 +1,39 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.5.3)
-      json_schemer (~> 2.1.0)
-      thor (~> 1.3.0)
+    rsmp_schema (0.7.0)
+      json_schemer (~> 2.3.0)
+      thor (~> 1.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
+    bigdecimal (3.1.8)
+    diff-lcs (1.5.1)
     hana (1.3.7)
-    json_schemer (2.1.0)
+    json_schemer (2.3.0)
+      bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    rake (13.1.0)
+    rake (13.2.1)
     regexp_parser (2.8.2)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    thor (1.3.0)
+    thor (1.3.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
@@ -40,10 +42,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 13.1.0)
+  rake (~> 13.2.1)
   rsmp_schema!
-  rspec (~> 3.12.0)
-  rspec-expectations (~> 3.12.3)
+  rspec (~> 3.13.0)
+  rspec-expectations (~> 3.13.0)
 
 BUNDLED WITH
-   2.4.22
+   2.5.11

data/examples/validate.rb

@@ -19,7 +19,7 @@ message = {
 }
 
 # try validating a message against our schema
-schema = Pathname.new('schema/tlc/1.1/rsmp.json')
+schema = Pathname.new('schema/tlc/1.2.1/rsmp.json')
 schemer = JSONSchemer.schema(schema)
 if schemer.valid? message
   puts 'ok'

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.5.3"
+    VERSION = "0.7.0"
   end
 end

data/rsmp_schema.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "json_schemer", "~> 2.1.0"
-  spec.add_dependency "thor", "~> 1.3.0"
+  spec.add_dependency "json_schemer", "~> 2.3.0"
+  spec.add_dependency "thor", "~> 1.3.1"
 
-  spec.add_development_dependency "rake", "~> 13.1.0"
-  spec.add_development_dependency "rspec", "~> 3.12.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.12.3"
+  spec.add_development_dependency "rake", "~> 13.2.1"
+  spec.add_development_dependency "rspec", "~> 3.13.0"
+  spec.add_development_dependency "rspec-expectations", "~> 3.13.0"
 end

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/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/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/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/status_update.json"
+      }
+    }
+  ]
+}

data/schemas/tlc/1.2/statuses/S0006.json

@@ -1,5 +1,5 @@
 {
-  "description" : "Emergency stage.\nThe status is active during emergency prioritization.\nUsed in situations where full priority is given in the emergency vehicle program\nor for other types of priority in some cases.\n\nIf no emergency route is active, status should be set to False, and emergencystage to zero.\n\nDeprecated, use S0035 instead.",
+  "description" : "Emergency route.\nThe status is active during emergency prioritization.\nUsed in situations where full priority is given in the emergency vehicle program\nor for other types of priority in some cases.\n\nIf no emergency route is active, status should be set to False, and emergencystage to zero.\n\nDeprecated, use S0035 instead.",
   "allOf" : [
     {
       "properties" : {
@@ -45,7 +45,7 @@
                 "s" : {
                   "allOf" : [
                     {
-                      "description" : "False: Emergency stage inactive\nTrue: Emergency stage active"
+                      "description" : "False: Emergency route inactive\nTrue: Emergency route active"
                     },
                     {
                       "$ref" : "../../../core/3.1.2/definitions.json#/boolean"
@@ -71,7 +71,7 @@
                 "s" : {
                   "allOf" : [
                     {
-                      "description" : "Number of emergency stage (set to zero if no route is active)"
+                      "description" : "Number of emergency route (set to zero if no route is active)"
                     },
                     {
                       "$ref" : "../../../core/3.1.2/definitions.json#/integer"

data/schemas/tlc/1.2/sxl.yaml

@@ -216,7 +216,7 @@ objects:
                 description: Start up mode
       S0006:
         description: |-
-          Emergency stage.
+          Emergency route.
           The status is active during emergency prioritization.
           Used in situations where full priority is given in the emergency vehicle program
           or for other types of priority in some cases.
@@ -229,12 +229,12 @@ objects:
             type: boolean
             deprecated: true
             description: |-
-              False: Emergency stage inactive
-              True: Emergency stage active
+              False: Emergency route inactive
+              True: Emergency route active
           emergencystage:
             type: integer
             deprecated: true
-            description: Number of emergency stage (set to zero if no route is active)
+            description: Number of emergency route (set to zero if no route is active)
             min: 0
             max: 255
       S0007:

data/schemas/tlc/1.2.1/alarms/A0001.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Serious hardware error.\nIs a \"major fault\" defined according to 3.8 i EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0002.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Less serious hardware error.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0003.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Serious configuration error.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0004.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Less serious configuration error.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0005.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Synchronisation error (coordination).\nIs a \"minor fault\" defined according to 3.11 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0006.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Safety error\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0007.json

@@ -0,0 +1,59 @@
+{
+  "description" : "Communication error.\nUsed for communication errors with the central system. Includes NTP connection loss if the TLC is configured to use NTP.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
+  "allOf" : [
+    {
+      "properties" : {
+        "n" : {
+          "enum" : [
+            "protocol"
+          ]
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : {
+          "type" : "null"
+        }
+      },
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "protocol"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Type of communication error, e.g. NTP or RSMP",
+                  "type" : "string",
+                  "enum" : [
+                    "ntp",
+                    "rsmp"
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

data/schemas/tlc/1.2.1/alarms/A0008.json

@@ -0,0 +1,61 @@
+{
+  "description" : "Dead lock error.\nUsed for dead lock errors.\nFor instance; a signal group has requested green but is unable to switch due to a conflicting signal group for an extended period of time. At some point the request times out and the controller goes failure mode. The cause for this error is due to configuration errors or external sources.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
+  "allOf" : [
+    {
+      "properties" : {
+        "n" : {
+          "enum" : [
+            "timeplan"
+          ]
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : {
+          "type" : "null"
+        }
+      },
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "timeplan"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "allOf" : [
+                    {
+                      "description" : "Current time plan"
+                    },
+                    {
+                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

data/schemas/tlc/1.2.1/alarms/A0009.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Other error.\nUsed for other errors not covered by any other alarm type.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
+}

data/schemas/tlc/1.2.1/alarms/A0010.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Door open.\nUsed for open door (room or cabinet)."
+}

data/schemas/tlc/1.2.1/alarms/A0101.json

@@ -0,0 +1,3 @@
+{
+  "description" : "Pushbutton error.\nUsed for push buttons."
+}

data/schemas/tlc/1.2.1/alarms/A0201.json

@@ -0,0 +1,60 @@
+{
+  "description" : "Serious lamp error.\nUsed for lamp errors.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
+  "allOf" : [
+    {
+      "properties" : {
+        "n" : {
+          "enum" : [
+            "color"
+          ]
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : {
+          "type" : "null"
+        }
+      },
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "color"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Color of lamp",
+                  "type" : "string",
+                  "enum" : [
+                    "green",
+                    "red",
+                    "yellow"
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

data/schemas/tlc/1.2.1/alarms/A0202.json

@@ -0,0 +1,60 @@
+{
+  "description" : "Less serious lamp error.\nUsed for lamp errors.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
+  "allOf" : [
+    {
+      "properties" : {
+        "n" : {
+          "enum" : [
+            "color"
+          ]
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : {
+          "type" : "null"
+        }
+      },
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "color"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Color of lamp",
+                  "type" : "string",
+                  "enum" : [
+                    "green",
+                    "red",
+                    "yellow"
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}