rsmp_schemer 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d922949f9fd92682d6f3af16ddebbb63c339724b397ced40ddc3406493f3853
-  data.tar.gz: 92185faeffff9f0c2be6178cf784baf171e8bf9897a2e6a89407cceb25612133
+  metadata.gz: 82a864ad0c18ba82e9aed1074af548dac54e6a0e396cb2d7b567cf0bec629c24
+  data.tar.gz: 7fb5c1565865a0833e8a555131e46e604d93a20e5c118218abb95b6c8730541c
 SHA512:
-  metadata.gz: 7dfdee34f17658596adee8541f650e6fa018f3aa1571c50c019d0944c100465e775baed876bf9d855b1830e5198f7cf2cc0cec810b73113b53e215ada168230c
-  data.tar.gz: 9278d033f5ed1b1f7211b8e5392bf8c1b2ed2e364abb0b1f39715adba339c9b3b6ac48b1dc342783b0523080e0e2a1b40d3e959492e1a49b14e2ec9611baf7db
+  metadata.gz: b36b9110c2c9cad63986e2bb8979f875cff92675abc989b77bb021ae159bb271f9d818258f1d3187c8461e90392cde2cb2221a4f9566d221c39ce20bf809f7a0
+  data.tar.gz: 9c0f371915fac4a32f8fa2cc4795aab5ce86864283facc15426911fd3e23d90c6e6cc974b76f853d8b4d671e834d97a0981e83d4ebda1a724c6d3ec3753f0909

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    rsmp_schemer (0.3.1)
-      json_schemer (~> 0.2.18)
+    rsmp_schemer (0.4.1)
+      json_schemer (~> 0.2.21)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
-    ecma-re-validator (0.3.0)
-      regexp_parser (~> 2.0)
+    diff-lcs (1.5.0)
+    ecma-re-validator (0.4.0)
+      regexp_parser (~> 2.2)
     hana (1.3.7)
-    json_schemer (0.2.18)
+    json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -35,6 +35,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
 
 DEPENDENCIES
   rake (~> 13.0)
@@ -43,4 +44,4 @@ DEPENDENCIES
   rspec-expectations (~> 3.9.1)
 
 BUNDLED WITH
-   2.2.15
+   2.3.5

data/lib/rsmp_schemer/version.rb

@@ -2,6 +2,6 @@
 
 module RSMP
 	module Schemer
-  	VERSION = "0.3.1"
+  	VERSION = "0.4.1"
 	end
 end

data/rsmp_schemer.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "json_schemer", "~> 0.2.18"
+  spec.add_dependency "json_schemer", "~> 0.2.21"
 
   spec.add_development_dependency "rspec", "~> 3.9.0"
   spec.add_development_dependency "rspec-expectations", "~> 3.9.1"

data/schemas/core_3.1.2/schema/core/alarm.json

@@ -9,22 +9,26 @@
     "aSp" : {
       "description" : "Alarm message variant",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume" ]
+      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume",
+                 "issue", "acknowledge", "suspend", "resume" ]
     },
     "ack" : {
       "description" : "Acknowledgement",
       "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
     },
     "aS" : {
       "description" : "Status",
       "type" : "string",
-      "enum" : [ "inActive", "Active" ]
+      "enum" : [ "inActive", "Active",
+                 "InActive", "active" ]
     },
     "sS" : {
       "description" : "Suspended",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "suspended", "notSuspended",
+                 "Suspended", "NotSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core_3.1.2/spec/core/alarm_spec.rb

@@ -89,6 +89,21 @@ RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
 	  ])
 	end
 
+  it 'accept states with first letter in lowercase' do
+		invalid = message.dup
+		invalid['aSp'] = "issue"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "acknowledge"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "suspend"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "resume"
+	  expect( validate(invalid) ).to be_nil
+	end
+
   it 'catches wrong state type' do
 		invalid = message.dup
 		invalid['aSp'] = 123

data/schemas/core_3.1.4/.gitignore

@@ -0,0 +1 @@
+.DS_Store

data/schemas/core_3.1.4/schema/core/alarm.json

@@ -9,22 +9,26 @@
     "aSp" : {
       "description" : "Alarm message variant",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume" ]
+      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume",
+                 "issue", "acknowledge", "suspend", "resume" ]
     },
     "ack" : {
       "description" : "Acknowledgement",
       "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
     },
     "aS" : {
       "description" : "Status",
       "type" : "string",
-      "enum" : [ "inActive", "Active" ]
+      "enum" : [ "inActive", "Active",
+                 "InActive", "active" ]
     },
     "sS" : {
       "description" : "Suspended",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "suspended", "notSuspended",
+                 "Suspended", "NotSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core_3.1.4/spec/core/alarm_spec.rb

@@ -89,6 +89,21 @@ RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
 	  ])
 	end
 
+  it 'accept states with first letter in lowercase' do
+		invalid = message.dup
+		invalid['aSp'] = "issue"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "acknowledge"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "suspend"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "resume"
+	  expect( validate(invalid) ).to be_nil
+	end
+
   it 'catches wrong state type' do
 		invalid = message.dup
 		invalid['aSp'] = 123

data/schemas/core_3.1.4/spec/core/version_spec.rb

@@ -10,9 +10,10 @@ RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
 	    { "vers" => "3.1.1" },
 	    { "vers" => "3.1.2" },
 	    { "vers" => "3.1.3" },
-	    { "vers" => "3.1.4" }
+	    { "vers" => "3.1.4" },
+	    { "vers" => "3.1.5" }
 	  ],
-	  "SXL" => "1.1"
+	  "SXL" => "1.0.15"
 	}}
 
 	it 'accepts valid message' do

data/schemas/core_3.1.5/.gitignore

@@ -0,0 +1 @@
+.DS_Store

data/schemas/core_3.1.5/schema/core/alarm.json

@@ -7,49 +7,48 @@
     "aCId" : { "$ref": "definitions.json#/alarm_code" },
     "xACId" : { "description" : "External alarm code id", "type" : "string" },
     "aSp" : {
-      "description" : "Alarm message variant",
+      "description" : "Alarm specialization",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume", "Request" ]
-    },
-    "ack" : {
-      "description" : "Acknowledgement",
-      "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]
-    },
-    "aS" : {
-      "description" : "Status",
-      "type" : "string",
-      "enum" : [ "inActive", "Active" ]
-    },
-    "sS" : {
-      "description" : "Suspended",
-      "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
-    },
-    "aTs" : { "$ref": "definitions.json#/timestamp" },
-    "cat" : {
-      "description" : "Category",
-      "type" : "string",
-      "enum" : [ "T", "D" ]
+      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume", "Request",
+                 "issue", "acknowledge", "suspend", "resume", "request" ]
+    }
+  },
+  "required" : [ "aSp"],
+  "allOf" : [
+    {
+      "if": {
+        "required" : [ "aSp" ],
+        "properties" : { "aSp" : { "const" : "Issue" } }
+      },
+      "then": { "$ref": "alarm_issue.json" }
     },
-    "pri" : {
-      "description" : "Priority",
-      "type" : "string",
-      "enum" : [ "1", "2", "3" ]
+    {
+      "if": {
+        "allOf" : [
+          {
+            "required" : [ "aSp" ],
+            "properties" : {
+              "aSp" : { "enum" : [ "Suspend","Resume",
+                                   "suspend", "resume"]  }
+            }
+          },
+          {
+            "not": { "required" : [ "sS" ] }
+          }
+        ]
+      },
+      "then": { "$ref": "alarm_suspend_resume.json" }
     },
-    "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" ],
-        "additionProperties": false
-      }
+    {
+      "if": {
+        "required" : [ "aSp", "sS" ],
+        "properties" : {
+          "aSp" : { "const" : "Suspend" },
+          "sS" : { "enum" : [ "suspended", "notSuspended",
+                              "Suspended", "NotSuspended" ] }
+        }
+      },
+      "then": { "$ref": "alarm_suspended_resumed.json" }
     }
-  },
-  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+  ]
 }

data/schemas/core_3.1.5/schema/core/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": "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.1.5/schema/core/alarm_suspend_resume.json

@@ -0,0 +1,3 @@
+{
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp" ]
+}

data/schemas/core_3.1.5/schema/core/alarm_suspended_resumed.json

@@ -0,0 +1,47 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
+    },
+    "aS" : {
+      "description" : "Active status",
+      "type" : "string",
+      "enum" : [ "inActive", "Active",
+                 "InActive", "active" ]
+    },
+    "sS" : {
+      "description" : "Suspend status",
+      "type" : "string",
+      "enum" : [ "suspended", "notSuspended",
+                 "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/core_3.1.5/schema/core/command_response.json

@@ -26,7 +26,7 @@
           }
         },
         "required" : [ "cCI", "n", "v", "age" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },

data/schemas/core_3.1.5/schema/core/status_response.json

@@ -22,7 +22,7 @@
         }
         },
         "required" : [ "sCI", "n", "s", "q" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },

data/schemas/core_3.1.5/schema/core/status_update.json

@@ -22,7 +22,7 @@
         }
         },
         "required" : [ "sCI", "n", "s", "q" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },