rsmp_schema 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0960742756c8124a5d31ca1a1ee65fc8c6faa241b691dc9be4d5b812f4f2fb
-  data.tar.gz: d24862d2695c62725873055904d0352c7649d4950eb5a6cc3300fc9f4338234e
+  metadata.gz: 32d15bd696be18d414974b0c0a03f1e4a99af8c08e32e1a35cc3fe7f435de6a5
+  data.tar.gz: 9ff9aa8acd817779eb03a4c6a4d041c49254e3e004afcbcd15c53866a82e4d20
 SHA512:
-  metadata.gz: 55df0fef4fb8d993aff660f35f896baaddc853a1c478c2a6badb887bc79d7759fd8bf11402d99c9cc420bc408e1fc262bf16e22804dab21af95bc29de6f0a247
-  data.tar.gz: 46200e23da9f07f2774ccbd303d5693c382004689ebf0508d914918a6089513cc92e5d573ebfbcae1d433ea16d313fdb7a637b154428206a23c6a8dc57152cbc
+  metadata.gz: 3db348308f9ba82724cdd44446747fc03b1bca8deb7179c15de9ae45cf132027aeb8157400b493b8b6e60f6da802cb0ad85bbc44788c685f7c5da4a5d7950fe8
+  data.tar.gz: 50e280d38a9ce66fdcb0aaecfede0541868333e29c6de07c84ff2dc2abbeda270766089d54d9d547f326567e6676b30f5a3b1b26678d905271959c6cdab52dae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.4.2)
+    rsmp_schema (0.4.4)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
 
@@ -29,7 +29,7 @@ GEM
     rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.1)

data/lib/rsmp_schema/convert/export/json_schema.rb

@@ -25,7 +25,6 @@ module RSMP
         def self.build_value item
           out = {}
           out['description'] = item['description'] if item['description']
-
           if item['type'] =~/_list$/
             handle_string_list item, out
           else
@@ -110,6 +109,11 @@ module RSMP
           if item["values"]
             out["enum"] = case item["values"]
             when Hash
+              item["values"].each_pair do |k,v|
+                if v=='' or v==nil
+                  raise "Error: '#{k}' has empty value in #{item}. (When using a hash to specify 'values', the hash values cannot be empty.)"
+                end
+              end
               item["values"].keys.sort
             when Array
               item["values"].sort
@@ -134,6 +138,10 @@ module RSMP
         def self.build_item item, property_key: 'v'
           json = { "allOf" => [ { "description" => item['description'] } ] }
           if item['arguments']
+            json["allOf"] << {
+              "if"=> { "required" => ["q"], "properties" => { "q"=> { "const" => "undefined" }}},
+              "then" => { "s" => nil }
+            }
             json["allOf"].first["properties"] = { "n" => { "enum" => item['arguments'].keys.sort } }
             item['arguments'].each_pair do |key,argument|
               json["allOf"] << {
@@ -185,7 +193,7 @@ module RSMP
 
         # convert a status to json schema
         def self.output_status out, key, item
-          json = build_item item, property_key:'s'
+          json = build_item item, property_key: 's'
           out["statuses/#{key}.json"] = output_json json
         end
 

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.4.2"
+    VERSION = "0.4.4"
   end
 end

data/schemas/core/3.1.2/status_response.json

@@ -16,7 +16,7 @@
           "n" : { "description" : "Unique reference of the value", "type" : "string" },
           "s" : { "description" : "Value", "type" : "string" },
           "q" : {
-            "description" : "Value",
+            "description" : "Quality",
             "type" : "string",
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }

data/schemas/core/3.1.3/status_response.json

@@ -11,18 +11,35 @@
       "minItems": 1,
       "items" : {
         "type" : "object",
-        "properties": {
-          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
-          "n" : { "description" : "Unique reference of the value", "type" : "string" },
-          "s" : { "description" : "Value", "type" : "string" },
-          "q" : { 
-            "description" : "Value",
-            "type" : "string",
-            "enum" : [ "recent", "old", "undefined", "unknown" ]  // 'undefined' was added
+        "oneOf" : [
+          {
+            "properties": {
+              "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
+              "n" : { "description" : "Unique reference of the value", "type" : "string" },
+              "s" : { "description" : "Value", "type" : "string" },
+              "q" : { 
+                "description" : "Value",
+                "type" : "string",
+                "enum" : [ "recent", "old", "unknown" ]
+              }
+            },
+            "additionalProperties" : false
+          },
+          {
+            "properties": {
+              "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
+              "n" : { "description" : "Unique reference of the value", "type" : "string" },
+              "s" : { "description" : "Null when q=undefined", "type" : "null" },
+              "q" : { 
+                "description" : "Quality",
+                "type" : "string",
+                "const" : "undefined"       // 'undefined' was added
+              }
+            },
+            "additionalProperties" : false
           }
-        },
-        "required" : [ "sCI", "n", "s", "q" ],
-        "additionalProperties": false
+        ],
+        "required" : [ "sCI", "n", "s", "q" ]
       }
     }
   },

data/schemas/core/3.2/status_response.json

@@ -11,18 +11,35 @@
       "minItems": 1,
       "items" : {
         "type" : "object",
-        "properties": {
-          "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
-          "n" : { "description" : "Unique reference of the value", "type" : "string" },
-          "s" : { "description" : "Value", "type" : ["string"," array"] },  // 3.2 allow arrays
-          "q" : { 
-            "description" : "Value",
-            "type" : "string",
-            "enum" : [ "recent", "old", "undefined", "unknown" ]
+        "oneOf" : [
+          {
+            "properties": {
+              "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
+              "n" : { "description" : "Unique reference of the value", "type" : "string" },
+              "s" : { "description" : "Value", "type" : ["string"," array"] },      // 3.2 allows array
+              "q" : { 
+                "description" : "Value",
+                "type" : "string",
+                "enum" : [ "recent", "old", "unknown" ]
+              }
+            },
+            "additionalProperties" : false
+          },
+          {
+            "properties": {
+              "sCI" : { "$ref": "../3.1.2/definitions.json#/status_code" },
+              "n" : { "description" : "Unique reference of the value", "type" : "string" },
+              "s" : { "description" : "Null when q=undefined", "type" : "null" },
+              "q" : { 
+                "description" : "Quality",
+                "type" : "string",
+                "const" : "undefined"
+              }
+            },
+            "additionalProperties" : false
           }
-        },
-        "required" : [ "sCI", "n", "s", "q" ],
-        "additionalProperties": false
+        ],
+        "required" : [ "sCI", "n", "s", "q" ]
       }
     }
   },

data/schemas/tlc/1.0.10/alarms/A0008.json

@@ -10,6 +10,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/alarms/A0201.json

@@ -10,6 +10,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/alarms/A0202.json

@@ -10,6 +10,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/alarms/A0301.json

@@ -13,6 +13,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/alarms/A0302.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0001.json

@@ -16,6 +16,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0002.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0003.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0004.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0005.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0006.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0007.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0008.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0010.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0011.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0012.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0013.json

@@ -14,6 +14,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0019.json

@@ -16,6 +16,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0103.json

@@ -15,6 +15,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/commands/M0104.json

@@ -19,6 +19,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [

data/schemas/tlc/1.0.10/statuses/S0001.json

@@ -13,6 +13,21 @@
         }
       }
     },
+    {
+      "if" : {
+        "required" : [
+          "q"
+        ],
+        "properties" : {
+          "q" : {
+            "const" : "undefined"
+          }
+        }
+      },
+      "then" : {
+        "s" : null
+      }
+    },
     {
       "if" : {
         "required" : [