rsmp_schemer 0.3.1 → 0.4.1

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.4.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.18
+        version: 0.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.18
+        version: 0.2.21
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,6 @@ files:
 - schemas/core_3.1.2/Gemfile.lock
 - schemas/core_3.1.2/LICENSE
 - schemas/core_3.1.2/README.md
-- schemas/core_3.1.2/examples/validate.rb
 - schemas/core_3.1.2/schema/core/aggregated_status.json
 - schemas/core_3.1.2/schema/core/alarm.json
 - schemas/core_3.1.2/schema/core/command_request.json
@@ -257,12 +256,12 @@ files:
 - schemas/core_3.1.3/spec/spec_helper.rb
 - schemas/core_3.1.3/spec/tlc/M0001_spec.rb
 - schemas/core_3.1.3/spec/tlc/S0007_spec.rb
+- schemas/core_3.1.4/.gitignore
 - schemas/core_3.1.4/.rspec
 - schemas/core_3.1.4/Gemfile
 - schemas/core_3.1.4/Gemfile.lock
 - schemas/core_3.1.4/LICENSE
 - schemas/core_3.1.4/README.md
-- schemas/core_3.1.4/examples/validate.rb
 - schemas/core_3.1.4/schema/core/aggregated_status.json
 - schemas/core_3.1.4/schema/core/alarm.json
 - schemas/core_3.1.4/schema/core/command_request.json
@@ -281,7 +280,6 @@ files:
 - schemas/core_3.1.4/schema/core/version.json
 - schemas/core_3.1.4/schema/core/watchdog.json
 - schemas/core_3.1.4/spec/core/aggregated_status_spec.rb
-- schemas/core_3.1.4/spec/core/alarm_request_spec.rb
 - schemas/core_3.1.4/spec/core/alarm_spec.rb
 - schemas/core_3.1.4/spec/core/command_request_spec.rb
 - schemas/core_3.1.4/spec/core/command_response_spec.rb
@@ -297,15 +295,18 @@ files:
 - schemas/core_3.1.4/spec/core/watchdog_spec.rb
 - schemas/core_3.1.4/spec/schemer_helper.rb
 - schemas/core_3.1.4/spec/spec_helper.rb
+- schemas/core_3.1.5/.gitignore
 - schemas/core_3.1.5/.rspec
 - schemas/core_3.1.5/Gemfile
 - schemas/core_3.1.5/Gemfile.lock
 - schemas/core_3.1.5/LICENSE
 - schemas/core_3.1.5/README.md
-- schemas/core_3.1.5/examples/validate.rb
 - schemas/core_3.1.5/schema/core/aggregated_status.json
 - schemas/core_3.1.5/schema/core/aggregated_status_request.json
 - schemas/core_3.1.5/schema/core/alarm.json
+- schemas/core_3.1.5/schema/core/alarm_issue.json
+- schemas/core_3.1.5/schema/core/alarm_suspend_resume.json
+- schemas/core_3.1.5/schema/core/alarm_suspended_resumed.json
 - schemas/core_3.1.5/schema/core/command_request.json
 - schemas/core_3.1.5/schema/core/command_response.json
 - schemas/core_3.1.5/schema/core/core.json
@@ -322,8 +323,11 @@ files:
 - schemas/core_3.1.5/schema/core/version.json
 - schemas/core_3.1.5/schema/core/watchdog.json
 - schemas/core_3.1.5/spec/core/aggregated_status_spec.rb
-- schemas/core_3.1.5/spec/core/alarm_request_spec.rb
-- schemas/core_3.1.5/spec/core/alarm_spec.rb
+- schemas/core_3.1.5/spec/core/alarm_issue_spec.rb
+- schemas/core_3.1.5/spec/core/alarm_resume_spec.rb
+- schemas/core_3.1.5/spec/core/alarm_resumed_spec.rb
+- schemas/core_3.1.5/spec/core/alarm_suspend_spec.rb
+- schemas/core_3.1.5/spec/core/alarm_suspended_spec.rb
 - schemas/core_3.1.5/spec/core/command_request_spec.rb
 - schemas/core_3.1.5/spec/core/command_response_spec.rb
 - schemas/core_3.1.5/spec/core/core_spec.rb
@@ -501,6 +505,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 +598,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 +698,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 +943,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Validate RSMP message against RSMP JSON Schema.

data/schemas/core_3.1.2/examples/validate.rb

@@ -1,35 +0,0 @@
-require 'json_schemer'
-
-message = {
-  "mType" => "rSMsg",
-  "mId" => "4173c2c8-a933-43cb-9425-66d4613731ed",
-  "type" => "CommandRequest",
-  "siteId" => [
-    { "sId" => "RN+SI0001" }
-  ],
-  "cId" => "O+14439=481WA001",
-  "arg" => [
-    {
-      "n" => "timeplan",
-      "cO" => "setPlan",
-      "v" => "1"
-    }
-  ]
-}
-
-# try validating a message against our schema
-schema_core = Pathname.new('schema/core/rsmp.json')
-schemer_core = JSONSchemer.schema(schema_core)
-
-def validate message, schemer
-  if schemer.valid? message
-    'ok'
-  else
-    schemer.validate(message).map do |item|
-      [item['data_pointer'],item['type'],item['details']].compact.join(' ')
-    end
-  end
-end
-
-puts "core: #{validate message, schemer_core}"
-

data/schemas/core_3.1.4/examples/validate.rb

@@ -1,35 +0,0 @@
-require 'json_schemer'
-
-message = {
-  "mType" => "rSMsg",
-  "mId" => "4173c2c8-a933-43cb-9425-66d4613731ed",
-  "type" => "CommandRequest",
-  "siteId" => [
-    { "sId" => "RN+SI0001" }
-  ],
-  "cId" => "O+14439=481WA001",
-  "arg" => [
-    {
-      "n" => "timeplan",
-      "cO" => "setPlan",
-      "v" => "1"
-    }
-  ]
-}
-
-# try validating a message against our schema
-schema_core = Pathname.new('schema/core/rsmp.json')
-schemer_core = JSONSchemer.schema(schema_core)
-
-def validate message, schemer
-  if schemer.valid? message
-    'ok'
-  else
-    schemer.validate(message).map do |item|
-      [item['data_pointer'],item['type'],item['details']].compact.join(' ')
-    end
-  end
-end
-
-puts "core: #{validate message, schemer_core}"
-

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

@@ -1,72 +0,0 @@
-RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
-  let(:message) {{
-    "mType" => "rSMsg",
-    "type" => "Alarm",
-    "mId" => "E68A0010-C336-41ac-BD58-5C80A72C7092",
-    "cId" => "AB+84001=860SG001",
-    "aCId" => "A0001",
-    "aSp" => "Request"
-  }}
-
-  it 'accepts valid alarm request' do
-    expect( validate(message) ).to be_nil
-  end
-
-
-  it 'catches missing component id' do
-    invalid = message.dup
-    invalid.delete 'cId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["cId"]}]
-    ])
-  end
-
-  it 'catches missing alarm code id' do
-    invalid = message.dup
-    invalid.delete 'aCId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["aCId"]}]
-    ])
-  end
-
-  it 'catches bad alarm code id' do
-    invalid = message.dup
-    invalid['aCId'] = "001"
-    expect( validate(invalid) ).to eq([
-      ["/aCId", "pattern"]
-    ])
-  end
-
-  it 'catches wrong alarm code id type' do
-    invalid = message.dup
-    invalid['aCId'] = 123
-    expect( validate(invalid) ).to eq([
-      ["/aCId", "string"]
-    ])
-  end
-
-  it 'catches missing extended alarm code id' do
-    invalid = message.dup
-    invalid.delete 'xACId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["xACId"]}]
-    ])
-  end
-
-  it 'catches wrong extended alarm code id type' do
-    invalid = message.dup
-    invalid['xACId'] = 123
-    expect( validate(invalid) ).to eq([
-      ["/xACId", "string"]
-    ])
-  end
-
-  it 'catches extraneous alarm code id' do
-    invalid = message.dup
-    invalid['aS'] = 'Active'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["aS"]}]
-    ])
-  end
-
-end

data/schemas/core_3.1.5/examples/validate.rb

@@ -1,35 +0,0 @@
-require 'json_schemer'
-
-message = {
-  "mType" => "rSMsg",
-  "mId" => "4173c2c8-a933-43cb-9425-66d4613731ed",
-  "type" => "CommandRequest",
-  "siteId" => [
-    { "sId" => "RN+SI0001" }
-  ],
-  "cId" => "O+14439=481WA001",
-  "arg" => [
-    {
-      "n" => "timeplan",
-      "cO" => "setPlan",
-      "v" => "1"
-    }
-  ]
-}
-
-# try validating a message against our schema
-schema_core = Pathname.new('schema/core/rsmp.json')
-schemer_core = JSONSchemer.schema(schema_core)
-
-def validate message, schemer
-  if schemer.valid? message
-    'ok'
-  else
-    schemer.validate(message).map do |item|
-      [item['data_pointer'],item['type'],item['details']].compact.join(' ')
-    end
-  end
-end
-
-puts "core: #{validate message, schemer_core}"
-

data/schemas/core_3.1.5/spec/core/alarm_request_spec.rb

@@ -1,72 +0,0 @@
-RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
-  let(:message) {{
-    "mType" => "rSMsg",
-    "type" => "Alarm",
-    "mId" => "E68A0010-C336-41ac-BD58-5C80A72C7092",
-    "cId" => "AB+84001=860SG001",
-    "aCId" => "A0001",
-    "aSp" => "Request"
-  }}
-
-  it 'accepts valid alarm request' do
-    expect( validate(message) ).to be_nil
-  end
-
-
-  it 'catches missing component id' do
-    invalid = message.dup
-    invalid.delete 'cId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["cId"]}]
-    ])
-  end
-
-  it 'catches missing alarm code id' do
-    invalid = message.dup
-    invalid.delete 'aCId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["aCId"]}]
-    ])
-  end
-
-  it 'catches bad alarm code id' do
-    invalid = message.dup
-    invalid['aCId'] = "001"
-    expect( validate(invalid) ).to eq([
-      ["/aCId", "pattern"]
-    ])
-  end
-
-  it 'catches wrong alarm code id type' do
-    invalid = message.dup
-    invalid['aCId'] = 123
-    expect( validate(invalid) ).to eq([
-      ["/aCId", "string"]
-    ])
-  end
-
-  it 'catches missing extended alarm code id' do
-    invalid = message.dup
-    invalid.delete 'xACId'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["xACId"]}]
-    ])
-  end
-
-  it 'catches wrong extended alarm code id type' do
-    invalid = message.dup
-    invalid['xACId'] = 123
-    expect( validate(invalid) ).to eq([
-      ["/xACId", "string"]
-    ])
-  end
-
-  it 'catches extraneous alarm code id' do
-    invalid = message.dup
-    invalid['aS'] = 'Active'
-    expect( validate(invalid) ).to eq([
-      ["", "required", {"missing_keys"=>["aS"]}]
-    ])
-  end
-
-end