rsmp_schema 0.4.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c357f707bd7797ccad36b5b4a86d1599d2b8b1351007037a87ea1e56b2601a7
-  data.tar.gz: 41c02d05f87b281b4bff551ca790458ab2a860c459a59ca34c1f5d1f9bfb3ec1
+  metadata.gz: c72738e0163582165219b6739632af5b7352bc2e850d40d436c775bee9251ccb
+  data.tar.gz: 0f39e6046772ff3d3c455ae26741411e80a75e7d43eca97a590084241e48faac
 SHA512:
-  metadata.gz: 3e7254f157c26648285d3a7e44f921023fe3233792d5207e9b6081d4a849f0357e0a46971e93b642133d1f180d962f466fd08dea901768c4a83cc038dbe2229f
-  data.tar.gz: 6bc084b220bcf1b9d2dea02c7bba7c296c5b64c204d4e4641972fc4f6a99c86e52944fbc176d137f59ed1251d89b910d3bc1e9e8a8aa8780b98495d82ca80c62
+  metadata.gz: 107f7a7078abe046f782dd6bb15db8cbdefe14e3b6d377b6ea50db6e67118438a8813b5bf0c374f27f4b580f23e5a70677a3f30e76c3962895da6a1d7630c1bc
+  data.tar.gz: ee079987f915f6f1f2f649d03ab23695f67d271349284653a8e734f33e2f30684a4acdcd2e1f1f9118ff888601f7f2927d5d22301c42fe2dc45d0b401f536744

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']
+        ruby: ['3.0', '3.1', '3.2']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

data/Gemfile.lock

@@ -1,55 +1,49 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.4.5)
-      json_schemer (~> 0.2.21)
-      thor (~> 1.2.1)
+    rsmp_schema (0.5.1)
+      json_schemer (~> 2.1.0)
+      thor (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
-    ecma-re-validator (0.4.0)
-      regexp_parser (~> 2.2)
     hana (1.3.7)
-    json_schemer (0.2.25)
-      ecma-re-validator (~> 0.3)
+    json_schemer (2.1.0)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-      uri_template (~> 0.7)
-    rake (13.0.6)
-    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.1)
+    rake (13.1.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    thor (1.2.2)
+    thor (1.3.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
-    uri_template (0.7.0)
+    unf_ext (0.0.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.3.19)
-  rake (~> 13.0.6)
+  rake (~> 13.1.0)
   rsmp_schema!
-  rspec (~> 3.11.0)
-  rspec-expectations (~> 3.11.0)
+  rspec (~> 3.12.0)
+  rspec-expectations (~> 3.12.3)
 
 BUNDLED WITH
-   2.3.19
+   2.4.22

data/lib/rsmp_schema/schema.rb

@@ -30,9 +30,12 @@ module RSMP::Schema
     @@schemas[type] = {}
     Dir.glob("#{type_path}/*").select {|f| File.directory? f}.each do |schema_path|
       version = File.basename(schema_path)
-      @@schemas[type][version] = JSONSchemer.schema(
-        Pathname.new(File.join(schema_path,'rsmp.json'))
-      )
+      file_path = File.join(schema_path,'rsmp.json')
+      if File.exist? file_path
+        @@schemas[type][version] = JSONSchemer.schema(
+          Pathname.new(File.join(schema_path,'rsmp.json'))
+        )
+      end
     end
   end
 

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.4.5"
+    VERSION = "0.5.1"
   end
 end

data/rsmp_schema.gemspec

@@ -30,11 +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", "~> 0.2.21"
-  spec.add_dependency "thor", "~> 1.2.1"
+  spec.add_dependency "json_schemer", "~> 2.1.0"
+  spec.add_dependency "thor", "~> 1.3.0"
 
-  spec.add_development_dependency "bundler", "~> 2.3.19"
-  spec.add_development_dependency "rake", "~> 13.0.6"
-  spec.add_development_dependency "rspec", "~> 3.11.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.11.0"
+  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"
 end

data/schemas/core/3.1.5/status_subscribe.json

@@ -18,7 +18,7 @@
             "description" : "Update interval in seconds, 0 means send when value changes"
           },
           "sOc" : {
-            "$ref": "../3.1.2/definitions.json#/boolean",
+            "type": "boolean",
             "description" : "Whether to send an update as soon as the value changes"
           }
         },

data/schemas/core/3.2/status_response.json

@@ -17,7 +17,7 @@
             "additionalProperties" : false,
             "properties": {
               "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
-              "n" : { "description" : "Value name", "type" : "string" },
+              "n" : { "description" : "Unique reference of the value", "type" : "string" },
               "q" : { "description" : "Quality", "type" : "string" },
               "s" : { "description" : "Value" }
             }

data/schemas/core/3.2.1/core.json

@@ -0,0 +1,39 @@
+{
+  "$schema" : "http://json-schema.org/draft-07/schema#",
+  "name" : "core",
+  "description" : "Core",
+  "version" : "3.2.1",
+  "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.1/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/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/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/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/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/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/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/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/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/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/alarms/A0010.json

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

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

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

data/schemas/tlc/1.2/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/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"
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}