rsmp_schemer 0.2.0 → 0.3.2

data/schemas/tlc_1.0.13/schema/tlc/alarms/A0302.json

@@ -97,7 +97,7 @@
         "properties" : {
           "v" : {
             "description" : "Manually controlled detector logic (True/False)",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0002.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Controller uses time plan according to programming\nTrue: Controller uses time plan according to command",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0003.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Controller uses traffic situation according to own programming\nTrue: Controller uses traffic situation according to command",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0004.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "True: Restart controller",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0005.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Activate emergency route\nTrue: Deactivate emergency route",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0006.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate input\nTrue: Activate input",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0007.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate fixed time control\nTrue: Activate fixed time control",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0008.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate manual control of detector logic\nTrue: Activate manual control of detector logic",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }
@@ -70,7 +70,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate detector logic\nTrue: Activate detector logic",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0010.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: No command (default)\nTrue: Order a signal group to green",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0011.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: No command (default)\nTrue: Order a signal group to red",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/commands/M0019.json

@@ -31,7 +31,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Force input\nTrue: Release input",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }
@@ -91,7 +91,7 @@
         "properties" : {
           "v" : {
             "description" : "False: input forced to False\nTrue: input forced to True",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/statuses/S0001.json

@@ -29,7 +29,7 @@
           "s" : {
             "description" : "Signal group status as text field",
             "type" : "string",
-            "pattern" : "^[a-hA-G0-9N-P]+$"
+            "pattern" : "^[a-hA-G0-9N-P]*$"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/statuses/S0005.json

@@ -25,7 +25,7 @@
         "properties" : {
           "s" : {
             "description" : "False: Controller is not in start up mode\nTrue: Controller is currently in start up mode",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/statuses/S0006.json

@@ -26,7 +26,7 @@
         "properties" : {
           "s" : {
             "description" : "False: Emergency stage inactive\nTrue: Emergency stage active",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/statuses/S0023.json

@@ -26,7 +26,7 @@
           "s" : {
             "description" : "Dynamic bands.\nEach dynamic band are written as pp-dd-ee where:\npp=Time plan\ndd=Dynamic band number (from 1-10)\nee=Extension in seconds in this band\n\nEach dynamic band is separated with a comma.\n\nE.g.\npp-dd-ee,pp-dd-ee",
             "type" : "string",
-            "pattern" : "^(\\d{1,2}\\-\\d{1,2}-\\d{1,2})(?:,(\\d{1,2}\\-\\d{1,2}-\\d{1,2}))*$"
+            "pattern" : "(^$)|(^(?<item>(\\d{1,2})\\-\\d{1,2}-\\d{1,2})(,\\g<item>)*$)"
           }
         }
       }

data/schemas/tlc_1.0.13/schema/tlc/statuses/statuses.json

@@ -36,22 +36,14 @@
                   "S0027",
                   "S0028",
                   "S0029",
-                  "S0030",
-                  "S0031",
                   "S0091",
                   "S0092",
                   "S0095",
                   "S0096",
-                  "S0097",
-                  "S0098",
                   "S0201",
                   "S0202",
                   "S0203",
-                  "S0204",
-                  "S0205",
-                  "S0206",
-                  "S0207",
-                  "S0208"
+                  "S0204"
                 ]
               }
             }
@@ -491,36 +483,6 @@
               "$ref" : "S0029.json"
             }
           },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0030"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0030.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0031"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0031.json"
-            }
-          },
           {
             "if" : {
               "required" : [
@@ -670,66 +632,6 @@
             "then" : {
               "$ref" : "S0204.json"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0205"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0205.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0206"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0206.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0207"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0207.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0208"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0208.json"
-            }
           }
         ]
       }

data/schemas/tlc_1.0.13/spec/tlc/S0023_spec.rb

@@ -0,0 +1,96 @@
+RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
+	let(:message) {{
+	  "mType" => "rSMsg",
+	  "mId" => "4173c2c8-a933-43cb-9425-66d4613731ed",
+	  "type" => "StatusResponse",
+	  "cId" => "O+14439=481WA001",
+	  "sTs" => "2015-06-08T09:15:18.266Z",
+      "sS" => [
+	    { "sCI" => "S0023", "n" => "status", "s" => "", "q" => "recent" }
+	   ]
+	}}
+
+	it 'accepts empty list' do
+		message["sS"][0]['s'] = ''
+		expect( validate(message) ).to be_nil
+	end
+	it 'accepts one digit' do
+		message["sS"][0]['s'] = '1-1-0'
+		expect( validate(message) ).to be_nil
+	end
+
+	it 'accepts two digits' do
+		message["sS"][0]['s'] = '01-01-20'
+		expect( validate(message) ).to be_nil
+	end
+
+	it 'rejects three digits or more' do
+		message["sS"][0]['s'] = '01-01-100'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '100-01-01'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'accepts comma-separated items' do
+		message["sS"][0]['s'] = '1-1-0,1-2-0'
+		expect( validate(message) ).to be_nil
+
+		message["sS"][0]['s'] = '1-1-0,1-2-0,2-4-5'
+		expect( validate(message) ).to be_nil
+	end
+
+	it 'rejects comma-separated lists with spaces' do
+		message["sS"][0]['s'] = '1-1-0, 1-2-0'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-1-0 ,1-2-0'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'rejects comma-separated lists with trailing comma' do
+		message["sS"][0]['s'] = '1-1-0,'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'rejects comma-separated lists with leading comma' do
+		message["sS"][0]['s'] = ',1-1-0'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'rejects comma-separated lists with empty items' do
+		message["sS"][0]['s'] = '1-1-0,,1-2-0'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'rejects negatives' do
+		message["sS"][0]['s'] = '-1-2-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1--2-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-2--3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+
+	it 'rejects floats' do
+		message["sS"][0]['s'] = '.1-2-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-.2-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-2-.3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1.-2-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-2.-3'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+
+		message["sS"][0]['s'] = '1-2-3.'
+		expect( validate(message) ).to eq([["/sS/0/s", "pattern"]])
+	end
+end

data/schemas/tlc_1.0.14/schema/tlc/alarms/A0301.json

@@ -96,7 +96,7 @@
         "properties" : {
           "v" : {
             "description" : "Manually controlled detector logic (True/False)",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/alarms/A0302.json

@@ -97,7 +97,7 @@
         "properties" : {
           "v" : {
             "description" : "Manually controlled detector logic (True/False)",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0002.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Controller uses time plan according to programming\nTrue: Controller uses time plan according to command",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0003.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Controller uses traffic situation according to own programming\nTrue: Controller uses traffic situation according to command",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0004.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "True: Restart controller",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0005.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Activate emergency route\nTrue: Deactivate emergency route",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0006.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate input\nTrue: Activate input",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0007.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate fixed time control\nTrue: Activate fixed time control",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0008.json

@@ -30,7 +30,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate manual control of detector logic\nTrue: Activate manual control of detector logic",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }
@@ -70,7 +70,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Deactivate detector logic\nTrue: Activate detector logic",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0010.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: No command (default)\nTrue: Order a signal group to green",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0011.json

@@ -29,7 +29,7 @@
         "properties" : {
           "v" : {
             "description" : "False: No command (default)\nTrue: Order a signal group to red",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/commands/M0019.json

@@ -31,7 +31,7 @@
         "properties" : {
           "v" : {
             "description" : "False: Force input\nTrue: Release input",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }
@@ -91,7 +91,7 @@
         "properties" : {
           "v" : {
             "description" : "False: input forced to False\nTrue: input forced to True",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/statuses/S0001.json

@@ -29,7 +29,7 @@
           "s" : {
             "description" : "Signal group status as text field",
             "type" : "string",
-            "pattern" : "^[a-hA-G0-9N-P]+$"
+            "pattern" : "^[a-hA-G0-9N-P]*$"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/statuses/S0005.json

@@ -25,7 +25,7 @@
         "properties" : {
           "s" : {
             "description" : "False: Controller is not in start up mode\nTrue: Controller is currently in start up mode",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/statuses/S0006.json

@@ -26,7 +26,7 @@
         "properties" : {
           "s" : {
             "description" : "False: Emergency stage inactive\nTrue: Emergency stage active",
-            "type" : "boolean"
+            "$ref" : "../../core/definitions.json#/boolean"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/statuses/S0023.json

@@ -26,7 +26,7 @@
           "s" : {
             "description" : "Dynamic bands.\nEach dynamic band are written as pp-dd-ee where:\npp=Time plan\ndd=Dynamic band number (from 1-10)\nee=Extension in seconds in this band\n\nEach dynamic band is separated with a comma.\n\nE.g.\npp-dd-ee,pp-dd-ee",
             "type" : "string",
-            "pattern" : "^(\\d{1,2}\\-\\d{1,2}-\\d{1,2})(?:,(\\d{1,2}\\-\\d{1,2}-\\d{1,2}))*$"
+            "pattern" : "(^$)|(^(?<item>(\\d{1,2})\\-\\d{1,2}-\\d{1,2})(,\\g<item>)*$)"
           }
         }
       }

data/schemas/tlc_1.0.14/schema/tlc/statuses/statuses.json

@@ -36,14 +36,10 @@
                   "S0027",
                   "S0028",
                   "S0029",
-                  "S0030",
-                  "S0031",
                   "S0091",
                   "S0092",
                   "S0095",
                   "S0096",
-                  "S0097",
-                  "S0098",
                   "S0201",
                   "S0202",
                   "S0203",
@@ -491,36 +487,6 @@
               "$ref" : "S0029.json"
             }
           },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0030"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0030.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0031"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0031.json"
-            }
-          },
           {
             "if" : {
               "required" : [