rsmp_schemer 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed88025943afac975e48c5ce3345ea888651d74c3b71eca02d20e46448690ec
-  data.tar.gz: 9cb403404dad2d438eb2b5c51eb14eca7c4d937fb3d610cbd2186725e4de6b33
+  metadata.gz: a5ded20247c8a17c4c9408c1936de71fe1782041241280ea9e0dcc352e67649f
+  data.tar.gz: 85829fef328b91fa96068d01f6b8410370ec34393a2cf631f67f37c2901c9f8d
 SHA512:
-  metadata.gz: 374ff54aa6b69e4c3b865e2bae151f0706a908187940fac4ad41971bc3b7d32cee7c3966eb8d5746a2aa8c5289c269367784bd64429a58e5c81d8f92b146afb9
-  data.tar.gz: e97c1b45d3f90baf44deeee5359263fb8bbc653b1121a7a1f4dbda74f73cf87d0da92d68752bd80a092bb55c1d46b7630e2b15bf4a274e40241d5af70fb81faa
+  metadata.gz: e670455f64901cb3cff4b9445309f57f143865dbd67a08f628f0d541aa0b1f934914829d7d85f2f4e5c19a8db8968599ca29005c8ab1f7a8522988b4846b3863
+  data.tar.gz: 1fcabd99fd4dcff846fa372e1f6c928a1edeacfc06a0c25014a676e7c5369052f0b502fc21b91aa6ad504981052f080b053b8c78726bc48ab912e86e701eb25f

data/CHANGELOG.md

@@ -5,3 +5,10 @@
 
 ## [0.2.0] - 2021-05-19
 - Updated interface
+
+## [0.2.1] - 2021-06-17
+- Updated schemas
+
+## [0.2.2] - 2021-06-18
+- Option for lenient version string parsing
+ 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schemer (0.2.0)
+    rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
 
 GEM
@@ -22,15 +22,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.4)
     uri_template (0.7.0)
 
 PLATFORMS

data/lib/rsmp_schemer/schemer.rb

@@ -52,35 +52,44 @@ module RSMP::Schemer
     schemas
   end
 
-  def self.find_schema type, version
+  def self.find_schema type, version, options={}
     raise ArgumentError.new("version missing") unless version
-    schemas = find_schemas type
-    if schemas
-      schemas[version] 
-    else
-      nil
+    version = sanitize_version version if options[:lenient]
+    if version
+      schemas = find_schemas type
+      return schemas[version] if schemas
     end
+    nil
   end
 
-  def self.find_schema! type, version
+  def self.sanitize_version version
+    matched = /^\d+\.\d+\.\d+/.match version
+    matched.to_s if matched
+  end
+
+  def self.find_schema! type, version, options={}
+    schema = find_schema type, version, options
     raise ArgumentError.new("version missing") unless version
-    schemas = find_schemas! type
-    schema = schemas[version]
-    raise UnknownSchemaVersionError.new("Unknown schema version #{type} #{version}") unless schema
-    schema
+    version = sanitize_version version if options[:lenient]
+    if version
+      schemas = find_schemas! type
+      schema = schemas[version]
+      return schema if schema
+    end
+    raise UnknownSchemaVersionError.new("Unknown schema version #{type} #{version}")
   end
 
-  def self.has_schema? type, version
-    find_schema(type,version) != nil
+  def self.has_schema? type, version, options={}
+    find_schema(type,version, options) != nil
   end
 
-  def self.validate message, schemas
+  def self.validate message, schemas, options={}
     raise ArgumentError.new("message missing") unless message
     raise ArgumentError.new("schemas missing") unless schemas
     raise ArgumentError.new("schemas must be a Hash") unless schemas.is_a?(Hash)
     raise ArgumentError.new("schemas cannot be empty") unless schemas.any?
     errors = schemas.flat_map do |type, version|
-      schema = find_schema! type, version
+      schema = find_schema! type, version, options
       validate_using_schema(message, schema)
     end
     return nil if errors.empty?

data/lib/rsmp_schemer/version.rb

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

data/schemas/tlc_1.0.10/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.10/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.10/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.10/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.10/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.10/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.10/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.10/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.10/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.10/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.10/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.10/schema/tlc/commands/M0019.json

@@ -0,0 +1,100 @@
+{
+  "allOf" : [
+    {
+      "description" : "Force input\n\nForce a given input (1-255) of the controllers general purpose I/O to either True or False. Can be used for all types of input where the traffic light controller must react to external control.\n\nCan be used for bus priority, coordination between traffic controllers, external control systems, and much more.\n\nRequires security code 2.",
+      "properties" : {
+        "n" : {
+          "enum" : [
+            "input",
+            "inputValue",
+            "securityCode",
+            "status"
+          ]
+        },
+        "cO" : {
+          "const" : "setInput"
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "n"
+        ],
+        "properties" : {
+          "n" : {
+            "const" : "status"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "False: Force input\nTrue: Release input",
+            "$ref" : "../../core/definitions.json#/boolean"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "n"
+        ],
+        "properties" : {
+          "n" : {
+            "const" : "securityCode"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Security code 2",
+            "type" : "string"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "n"
+        ],
+        "properties" : {
+          "n" : {
+            "const" : "input"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Number of Input",
+            "$ref" : "../../core/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "required" : [
+          "n"
+        ],
+        "properties" : {
+          "n" : {
+            "const" : "inputValue"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "False: input forced to False\nTrue: input forced to True",
+            "$ref" : "../../core/definitions.json#/boolean"
+          }
+        }
+      }
+    }
+  ]
+}

data/schemas/tlc_1.0.10/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.10/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.10/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.10/schema/tlc/statuses/statuses.json

@@ -28,30 +28,14 @@
                   "S0019",
                   "S0020",
                   "S0021",
-                  "S0022",
-                  "S0023",
-                  "S0024",
-                  "S0025",
-                  "S0026",
-                  "S0027",
-                  "S0028",
-                  "S0029",
-                  "S0030",
-                  "S0031",
                   "S0091",
                   "S0092",
                   "S0095",
                   "S0096",
-                  "S0097",
-                  "S0098",
                   "S0201",
                   "S0202",
                   "S0203",
-                  "S0204",
-                  "S0205",
-                  "S0206",
-                  "S0207",
-                  "S0208"
+                  "S0204"
                 ]
               }
             }
@@ -371,156 +355,6 @@
               "$ref" : "S0021.json"
             }
           },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0022"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0022.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0023"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0023.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0024"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0024.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0025"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0025.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0026"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0026.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0027"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0027.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0028"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0028.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0029"
-                }
-              }
-            },
-            "then" : {
-              "$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" : [
@@ -581,36 +415,6 @@
               "$ref" : "S0096.json"
             }
           },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0097"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0097.json"
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "sCI"
-              ],
-              "properties" : {
-                "sCI" : {
-                  "const" : "S0098"
-                }
-              }
-            },
-            "then" : {
-              "$ref" : "S0098.json"
-            }
-          },
           {
             "if" : {
               "required" : [
@@ -670,66 +474,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/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"
           }
         }
       }