rsmp_schemer 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d922949f9fd92682d6f3af16ddebbb63c339724b397ced40ddc3406493f3853
-  data.tar.gz: 92185faeffff9f0c2be6178cf784baf171e8bf9897a2e6a89407cceb25612133
+  metadata.gz: a5ded20247c8a17c4c9408c1936de71fe1782041241280ea9e0dcc352e67649f
+  data.tar.gz: 85829fef328b91fa96068d01f6b8410370ec34393a2cf631f67f37c2901c9f8d
 SHA512:
-  metadata.gz: 7dfdee34f17658596adee8541f650e6fa018f3aa1571c50c019d0944c100465e775baed876bf9d855b1830e5198f7cf2cc0cec810b73113b53e215ada168230c
-  data.tar.gz: 9278d033f5ed1b1f7211b8e5392bf8c1b2ed2e364abb0b1f39715adba339c9b3b6ac48b1dc342783b0523080e0e2a1b40d3e959492e1a49b14e2ec9611baf7db
+  metadata.gz: e670455f64901cb3cff4b9445309f57f143865dbd67a08f628f0d541aa0b1f934914829d7d85f2f4e5c19a8db8968599ca29005c8ab1f7a8522988b4846b3863
+  data.tar.gz: 1fcabd99fd4dcff846fa372e1f6c928a1edeacfc06a0c25014a676e7c5369052f0b502fc21b91aa6ad504981052f080b053b8c78726bc48ab912e86e701eb25f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schemer (0.3.1)
+    rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
 
 GEM

data/lib/rsmp_schemer/version.rb

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

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/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/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/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.15/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.15/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp_schemer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -501,6 +501,7 @@ files:
 - schemas/tlc_1.0.13/spec/spec_helper.rb
 - schemas/tlc_1.0.13/spec/tlc/M0001_spec.rb
 - schemas/tlc_1.0.13/spec/tlc/S0007_spec.rb
+- schemas/tlc_1.0.13/spec/tlc/S0023_spec.rb
 - schemas/tlc_1.0.14/.gitignore
 - schemas/tlc_1.0.14/.rspec
 - schemas/tlc_1.0.14/Gemfile
@@ -593,6 +594,7 @@ files:
 - schemas/tlc_1.0.14/spec/spec_helper.rb
 - schemas/tlc_1.0.14/spec/tlc/M0001_spec.rb
 - schemas/tlc_1.0.14/spec/tlc/S0007_spec.rb
+- schemas/tlc_1.0.14/spec/tlc/S0023_spec.rb
 - schemas/tlc_1.0.15/.gitignore
 - schemas/tlc_1.0.15/.rspec
 - schemas/tlc_1.0.15/Gemfile
@@ -692,6 +694,7 @@ files:
 - schemas/tlc_1.0.15/spec/spec_helper.rb
 - schemas/tlc_1.0.15/spec/tlc/M0001_spec.rb
 - schemas/tlc_1.0.15/spec/tlc/S0007_spec.rb
+- schemas/tlc_1.0.15/spec/tlc/S0023_spec.rb
 - schemas/tlc_1.0.7/.gitignore
 - schemas/tlc_1.0.7/.rspec
 - schemas/tlc_1.0.7/Gemfile
@@ -936,7 +939,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Validate RSMP message against RSMP JSON Schema.