jsondef 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bfc9c6479bc3349fe6297b555e6fac0aa33092
-  data.tar.gz: 38d3754d0e798d338dd8ceb7243b0b56d7371438
+  metadata.gz: 2756f40c259d50404177ef9ea8491267fd606632
+  data.tar.gz: 04cc9e350319ab4aa5232a1b331883ae06dc77e7
 SHA512:
-  metadata.gz: 00eecc2fbdf266d3b618c6746ab2457df4a8dd50ea5a0abc8dd5bb586fa300764adc18d9a7a5bccee2374b7dc323ec534af8a64584057140694492563dfeda58
-  data.tar.gz: 122c33e13f141c29b0e966fd66d87f1297c7cfefe70567cfa85a655a605d64da6e68658184248d41feebbb4de95c6408c0a0aef9a4b4a819bbdda8ea6ecba86a
+  metadata.gz: fac54aa304dee05dc45a9c3f88d0d094c996bf8264014d7f1e124d90999eacf2b630d31ec2d07b97da5a2097a476dbd235a688d997705e38e9ea883cda451af4
+  data.tar.gz: 40c14afd5032a0e1ce96c23011b2168b1d536657d016633ef2d018b483b47a973b4671aa35ed39afef34ce65049332240ee1b4c665d73781aaa3a299a2f0fe57

data/lib/config_reader.rb

@@ -54,21 +54,25 @@ class ConfigReader
 
   def parse_array(conf)
     rule = JsonRuleArray.new
+    min_val = if conf.has_key?('min') then conf['min'] else nil end
+    max_val = if conf.has_key?('max') then conf['max'] else nil end
+    rule.set_count(min_val, max_val)
+    rule.set_rule(parse_element(conf['rule'])) if conf.has_key?('rule')
     rule
   end
 
   def parse_string(conf)
-    rule = JsonRuleString.new
+    rule = JsonRuleString.new(extract_exact_value(conf))
     rule
   end
 
   def parse_number(conf)
-    rule = JsonRuleNumber.new
+    rule = JsonRuleNumber.new(extract_exact_value(conf))
     rule
   end
 
   def parse_boolean(conf)
-    rule = JsonRuleBoolean.new
+    rule = JsonRuleBoolean.new(extract_exact_value(conf))
     rule
   end
 
@@ -76,4 +80,12 @@ class ConfigReader
     JsonRuleNull.new
   end
 
+  def extract_exact_value(conf)
+    if conf.has_key?('value')
+      conf['value']
+    else
+      JsonDef::ANY_VALUE
+    end
+  end
+
 end

data/lib/rules.rb

@@ -27,12 +27,12 @@ end
 
 class JsonRuleObjectKey
 
-  attr_reader :required, :key, :value
+  attr_reader :required, :key, :rule
 
   def initialize(key)
     @key = key
     @required = true
-    @value = JsonDef::ANY_TYPE
+    @rule = JsonDef::ANY_TYPE
   end
 
   # @todo rename it to optional! - might be more ruby-ist
@@ -42,7 +42,7 @@ class JsonRuleObjectKey
   end
 
   def set_rule(rule)
-    @value = rule
+    @rule = rule
     self
   end
 
@@ -50,42 +50,50 @@ end
 
 class JsonRuleArray < JsonRuleBase
 
+  attr_reader :min_count, :max_count, :unified_rule
+
   def initialize
+    @min_count = 0
+    @max_count = -1
+    @unified_rule = nil
+  end
+
+  def set_rule(rule)
+    @unified_rule = rule
+    self
+  end
+
+  def set_count(min = nil, max = nil)
+    @min_count = min unless min == nil
+    @max_count = max unless max == nil
+    self
   end
 
 end
 
 class JsonRuleSingleValue < JsonRuleBase
 
-  def initialize
+  attr_reader :value
+
+  def initialize(value = JsonDef::ANY_VALUE)
+    @value = value
   end
 
 end
 
 class JsonRuleNumber < JsonRuleSingleValue
-
-  def initialize
-  end
-
 end
 
 class JsonRuleString < JsonRuleSingleValue
-
-  def initialize
-  end
-
 end
 
-class JsonRuleNull < JsonRuleSingleValue
-
-  def initialize
-  end
-
+class JsonRuleBoolean < JsonRuleSingleValue
 end
 
-class JsonRuleBoolean < JsonRuleSingleValue
+class JsonRuleNull < JsonRuleSingleValue
 
   def initialize
+    super(nil)
   end
 
 end

data/lib/verify.rb

@@ -3,6 +3,7 @@ require_relative 'rules.rb'
 module JsonDef
 
   ANY_TYPE = :wildcard
+  ANY_VALUE = :any_value
 
   def JsonDef.verify(obj, rule)
     case rule.class.to_s
@@ -23,22 +24,31 @@ module JsonDef
     end
   end
 
+  def JsonDef.verify_single_value(obj, rule)
+    rule.value == JsonDef::ANY_VALUE || rule.value == obj
+  end
+
   def JsonDef.verify_string(obj, rule)
     return false unless obj.kind_of?(String)
+    return false unless JsonDef.verify_single_value(obj, rule)
     true
   end
 
   def JsonDef.verify_number(obj, rule)
     return false unless obj.kind_of?(Numeric)
+    return false unless JsonDef.verify_single_value(obj, rule)
     true
   end
 
   def JsonDef.verify_bool(obj, rule)
-    obj == true || obj == false
+    return false unless obj == true || obj == false
+    return false unless JsonDef.verify_single_value(obj, rule)
+    true
   end
 
   def JsonDef.verify_null(obj, rule)
-    obj == nil
+    return false unless JsonDef.verify_single_value(obj, rule)
+    true
   end
 
   def JsonDef.verify_object(obj, rule)
@@ -49,10 +59,10 @@ module JsonDef
       return true unless obj.has_key?(key_rule.key)
 
       case
-      when key_rule.value == JsonDef::ANY_TYPE
+      when key_rule.rule == JsonDef::ANY_TYPE
         next
-      when key_rule.value.kind_of?(JsonRuleBase)
-        return false unless JsonDef.verify(obj[key_rule.key], key_rule.value)
+      when key_rule.rule.kind_of?(JsonRuleBase)
+        return false unless JsonDef.verify(obj[key_rule.key], key_rule.rule)
       else
         return false
       end
@@ -68,6 +78,13 @@ module JsonDef
 
   def JsonDef.verify_array(obj, rule)
     return false unless obj.kind_of?(Array)
+    return false unless rule.min_count < 0 || obj.count >= rule.min_count
+    return false unless rule.max_count < 0 || obj.count <= rule.max_count
+
+    if rule.unified_rule
+      return false unless obj.all? { |e| JsonDef.verify(e, rule.unified_rule) }
+    end
+
     true
   end
 

metadata

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