rsmp_schema 0.5 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0fe667b2e56247b88fa296646f5722440c9e8e6fa39b1df0a100ac9e41428b0
-  data.tar.gz: e15a00378c0e0d111f5fb2e7a9c4a36b6ade8b5ff81ac228dd6d47ef29dca223
+  metadata.gz: d56697bd07d0433d3c87794ba60633b668ccb4973e80efa8733a6990e8aed9cf
+  data.tar.gz: d781453ca631feac00eea1e3c03e4fd8cf9205415b3329ed24872b220baefbc9
 SHA512:
-  metadata.gz: ebae7d8552ff121ed8c6e7f33b7c71d16aba8a344daf9d74d9cceddb701400f6117f8a49e97b996a190bce7adc115132e1d940114f95bd8f71446c6ca9300eee
-  data.tar.gz: f3a2b02f947c1da1bb3081898e16d0c5669bfbb3f4a97c220f0eeb1db435186cd61c911504af584b5c2bdb62ec89ed8645d00c42cf59458f6dfdef34d1b4f82f
+  metadata.gz: a56ae1db79d6061a5afbd1bdd3c90d690e4ff4747c362755da9bfea43297e553d1eca2da77900b939cebac595f1c5c4b7e25775f2f4c0136c6466200745fbca6
+  data.tar.gz: 98cc8cb64e54023328fafc831686f7c7590f0ab61da5e0b4e74670f6b8611eb21a9b9c6b6ca0894dedbba6fa16da2dbbdfb1bee83ba08a9adbbb4b309f61f2ba

data/Gemfile.lock

@@ -1,55 +1,49 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.5)
-      json_schemer (~> 0.2.21)
-      thor (~> 1.2.1)
+    rsmp_schema (0.5.2)
+      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.4.20
+   2.4.22

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.5"
+    VERSION = "0.5.2"
   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.2/alarm.json

@@ -53,6 +53,15 @@
         }
       },
       "then": { "$ref": "alarm_suspended_resumed.json" }
+    },
+    {
+      "if": {
+        "required" : [ "aSp" ],
+        "properties" : {
+          "aSp" : { "enum" : [ "Acknowledge"] }
+        }
+      },
+      "then": { "$ref": "alarm_acknowledge.json" }
     }
   ]
 }

data/schemas/core/3.1.2/alarm_acknowledge.json

@@ -0,0 +1,12 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
+    },
+    "aTs" : { "$ref": "definitions.json#/timestamp" }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "aTs" ]
+}

data/schemas/core/3.1.5/alarm.json

@@ -54,6 +54,15 @@
       },
       "then": { "$ref": "../3.1.2/alarm_suspended_resumed.json" }
     },
+    {
+      "if": {
+        "required" : [ "aSp" ],
+        "properties" : {
+          "aSp" : { "enum" : [ "Acknowledge"] }
+        }
+      },
+      "then": { "$ref": "../3.1.2/alarm_acknowledge.json" }
+    },
     {
       "if": {
         "required" : [ "aSp" ],

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/alarm.json

@@ -21,7 +21,7 @@
           "aSp" : { "enum" : [ "Issue"] }
         }
       },
-      "then": { "$ref": "../3.1.2/alarm_issue.json" }
+      "then": { "$ref": "../3.2/alarm_issue.json" }
     },
     {
       "if": {
@@ -47,7 +47,7 @@
           "sS" : { "enum" : [ "suspended", "notSuspended"] }
         }
       },
-      "then": { "$ref": "../3.1.2/alarm_suspended_resumed.json" }
+      "then": { "$ref": "../3.2/alarm_suspended_resumed.json" }
     },
     {
       "if": {
@@ -57,6 +57,15 @@
         }
       },
       "then": { "$ref": "../3.1.5/alarm_request.json" }
+    },
+    {
+      "if": {
+        "required" : [ "aSp" ],
+        "properties" : {
+          "aSp" : { "enum" : [ "Acknowledge"] }
+        }
+      },
+      "then": { "$ref": "../3.2/alarm_acknowledge.json" }
     }
    ]
 }

data/schemas/core/3.2/alarm_acknowledge.json

@@ -0,0 +1,11 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged" ]
+    },
+    "aTs" : { "$ref": "../3.1.2/definitions.json#/timestamp" }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "aTs" ]
+}

data/schemas/core/3.2/alarm_issue.json

@@ -0,0 +1,44 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged" ]
+    },
+    "aS" : {
+      "description" : "Active status",
+      "type" : "string",
+      "enum" : [ "inActive", "Active" ]
+    },
+    "sS" : {
+      "description" : "Suspend status",
+      "type" : "string",
+      "enum" : [ "suspended", "notSuspended" ]
+    },
+    "aTs" : { "$ref": "../3.1.2/definitions.json#/timestamp" },
+    "cat" : {
+      "description" : "Category",
+      "type" : "string",
+      "enum" : [ "T", "D" ]
+    },
+    "pri" : {
+      "description" : "Priority",
+      "type" : "string",
+      "enum" : [ "1", "2", "3" ]
+    },
+    "rvs" : {
+      "description" : "Return values",
+      "type" : "array",
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "v" : { "description" : "Value", "type" : "string" }
+        },
+        "required" : [ "n", "v" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+}

data/schemas/core/3.2/alarm_suspended_resumed.json

@@ -0,0 +1,44 @@
+x{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged" ]
+    },
+    "aS" : {
+      "description" : "Active status",
+      "type" : "string",
+      "enum" : [ "inActive", "Active" ]
+    },
+    "sS" : {
+      "description" : "Suspend status",
+      "type" : "string",
+      "enum" : [ "Suspended", "notSuspended" ]
+    },
+    "aTs" : { "$ref": "definitions.json#/timestamp" },
+    "cat" : {
+      "description" : "Category",
+      "type" : "string",
+      "enum" : [ "T", "D" ]
+    },
+    "pri" : {
+      "description" : "Priority",
+      "type" : "string",
+      "enum" : [ "1", "2", "3" ]
+    },
+    "rvs" : {
+      "description" : "Return values",
+      "type" : "array",
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "v" : { "description" : "Value", "type" : "string" }
+        },
+        "required" : [ "n", "v" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+}

data/schemas/tlc/1.2/rsmp.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp_schema
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -16,84 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.21
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.21
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.19
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.19
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.3
 description: Validate RSMP message against RSMP JSON Schema. Support validating against
   core and different SXL's, in different versions.
 email:
@@ -124,6 +110,7 @@ files:
 - rsmp_schema.gemspec
 - schemas/core/3.1.2/aggregated_status.json
 - schemas/core/3.1.2/alarm.json
+- schemas/core/3.1.2/alarm_acknowledge.json
 - schemas/core/3.1.2/alarm_issue.json
 - schemas/core/3.1.2/alarm_suspend_resume.json
 - schemas/core/3.1.2/alarm_suspended_resumed.json
@@ -156,6 +143,9 @@ files:
 - schemas/core/3.2.1/core.json
 - schemas/core/3.2.1/rsmp.json
 - schemas/core/3.2/alarm.json
+- schemas/core/3.2/alarm_acknowledge.json
+- schemas/core/3.2/alarm_issue.json
+- schemas/core/3.2/alarm_suspended_resumed.json
 - schemas/core/3.2/core.json
 - schemas/core/3.2/rsmp.json
 - schemas/core/3.2/status_response.json
@@ -886,7 +876,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Validate RSMP message against RSMP JSON Schema.