jsondef 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d05b8439f93fa6b9ddd50761c1e914ba344a94
-  data.tar.gz: bc9aaab652ecd1e496f0adafc634e4777d08b23e
+  metadata.gz: 27bfc9c6479bc3349fe6297b555e6fac0aa33092
+  data.tar.gz: 38d3754d0e798d338dd8ceb7243b0b56d7371438
 SHA512:
-  metadata.gz: ed8a2302c9c9f5c636a5539d087e3aa8c3d30a56b864cfa3fc7be6142c01b4a48a8d9c15d7b6cb1c19c0807aa26fe81b121f61838ae0f99c03d4476c3c380171
-  data.tar.gz: 7d209081b8ef4143d36d604a6acfbcc6ab949443ed3a2312e7cf29ffca55803a64282945433aeddca4d1407e77c4455c100f159bc8e138f46af9a1797872ee00
+  metadata.gz: 00eecc2fbdf266d3b618c6746ab2457df4a8dd50ea5a0abc8dd5bb586fa300764adc18d9a7a5bccee2374b7dc323ec534af8a64584057140694492563dfeda58
+  data.tar.gz: 122c33e13f141c29b0e966fd66d87f1297c7cfefe70567cfa85a655a605d64da6e68658184248d41feebbb4de95c6408c0a0aef9a4b4a819bbdda8ea6ecba86a

data/lib/config_reader.rb

@@ -28,8 +28,12 @@ class ConfigReader
       parse_string(conf)
     when 'number'
       parse_number(conf)
+    when 'boolean'
+      parse_boolean(conf)
+    when 'nullval'
+      parse_null(conf)
     else
-      raise "Unknown rule type: " + conf['type']
+      raise "Unknown rule type: #{conf['type']}"
     end
   end
 
@@ -63,4 +67,13 @@ class ConfigReader
     rule
   end
 
+  def parse_boolean(conf)
+    rule = JsonRuleBoolean.new
+    rule
+  end
+
+  def parse_null(conf)
+    JsonRuleNull.new
+  end
+
 end

data/lib/rules.rb

@@ -35,6 +35,7 @@ class JsonRuleObjectKey
     @value = JsonDef::ANY_TYPE
   end
 
+  # @todo rename it to optional! - might be more ruby-ist
   def set_optional
     @required = false
     self
@@ -48,10 +49,43 @@ class JsonRuleObjectKey
 end
 
 class JsonRuleArray < JsonRuleBase
+
+  def initialize
+  end
+
+end
+
+class JsonRuleSingleValue < JsonRuleBase
+
+  def initialize
+  end
+
+end
+
+class JsonRuleNumber < JsonRuleSingleValue
+
+  def initialize
+  end
+
+end
+
+class JsonRuleString < JsonRuleSingleValue
+
+  def initialize
+  end
+
 end
 
-class JsonRuleNumber < JsonRuleBase
+class JsonRuleNull < JsonRuleSingleValue
+
+  def initialize
+  end
+
 end
 
-class JsonRuleString < JsonRuleBase
+class JsonRuleBoolean < JsonRuleSingleValue
+
+  def initialize
+  end
+
 end

data/lib/verify.rb

@@ -14,6 +14,10 @@ module JsonDef
       JsonDef.verify_string(obj, rule)
     when 'JsonRuleNumber'
       JsonDef.verify_number(obj, rule)
+    when 'JsonRuleBoolean'
+      JsonDef.verify_bool(obj, rule)
+    when 'JsonRuleNull'
+      JsonDef.verify_null(obj, rule)
     else
       raise "Unknown rule at [verify] level: #{rule.class}"
     end
@@ -29,6 +33,14 @@ module JsonDef
     true
   end
 
+  def JsonDef.verify_bool(obj, rule)
+    obj == true || obj == false
+  end
+
+  def JsonDef.verify_null(obj, rule)
+    obj == nil
+  end
+
   def JsonDef.verify_object(obj, rule)
     return false unless obj.kind_of?(Hash)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsondef
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Arato