jsondef 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8df428945802e90fdf27e24e2d576aacdfec82d
-  data.tar.gz: b6e23cb1afc34c5c4cf6f5bb6589b937472bca3a
+  metadata.gz: 437c6440ce1877442f035d8c21dcd01f531ed9e8
+  data.tar.gz: 0b0c349bb1096085c4d25698a16def0380af877f
 SHA512:
-  metadata.gz: e718fee725f7dca9c35b839d864a737d1357dcf6007f75bff49ade7fd6e42a6f6b235eb7f7bdee7a1189e3b0379e81002b211a284a682ab9078a455932f20deb
-  data.tar.gz: 41e45435df65bede5ca72820c00e6d993b3c8cc23b0bf92411419a44610964d259f914d1b3118e64b8bc5e6c7ae3e5f0eeeaa35ce26f70eb2d3b1e60ed7eb7e2
+  metadata.gz: ef51c4ca549455f1ef097ddc17c934680091d5aa0c4f9c71dace53bd6217f87f55426dd78a4e3ac86b870156604a17618b8edb7dc1d1d12e249ee1522004e38f
+  data.tar.gz: e7c5784f65f151e0d10f099d3eb9aea4d082c83498159722f49c962741ff21a30d79ba9d3c32e19fa61e70e2e5a2337294fb35bd4b047fceeabdd16cd3a839b3

data/lib/config_reader.rb

@@ -0,0 +1,66 @@
+require 'yaml'
+require 'pp'
+require_relative 'jsondef.rb'
+
+module ConfigReaderFactory
+
+  def ConfigReaderFactory.fromJsonFile(path)
+    ConfigReader.new(YAML.load(IO.read(path)))
+  end
+
+end
+
+class ConfigReader
+
+  attr_reader :rule
+
+  def initialize(conf)
+    @rule = parse_element(conf['rule'])
+  end
+
+  def parse_element(conf)
+    case conf['type']
+    when 'object'
+      parse_object(conf)
+    when 'array'
+      parse_array(conf)
+    when 'string'
+      parse_string(conf)
+    when 'number'
+      parse_number(conf)
+    else
+      raise "Unknown rule type: " + conf['type']
+    end
+  end
+
+  def parse_object(conf)
+    rule = JsonRuleObject.new
+    conf['keys'].each { |k, v| rule.add_key_rule(parse_object_key(k, v)) } if conf.has_key?('keys')
+
+    rule.disallow_other_keys if conf.has_key?('disallow_other_keys') && conf['disallow_other_keys']
+    rule
+  end
+
+  def parse_object_key(key, conf)
+    rule = JsonRuleObjectKey.new(key)
+    rule.set_optional if conf.has_key?('optional') && conf['optional']
+    rule.set_rule(parse_element(conf['rule'])) if conf.has_key?('rule')
+    rule
+  end
+
+  def parse_array(conf)
+    rule = JsonRuleArray.new
+    rule
+  end
+
+  def parse_string(conf)
+    rule = JsonRuleString.new
+    rule
+  end
+
+  def parse_number(conf)
+    rule = JsonRuleNumber.new
+    rule
+  end
+
+end

data/lib/jsondef.rb

@@ -1,30 +1,30 @@
 module JsonDef
 
+  ANY_TYPE = :wildcard
+
   def JsonDef.verify(obj, rule)
     case rule.class.to_s
     when 'JsonRuleObject'
       JsonDef.verify_object(obj, rule)
+    when 'JsonRuleArray'
+      JsonDef.verify_array(obj, rule)
+    when 'JsonRuleString'
+      JsonDef.verify_string(obj, rule)
+    when 'JsonRuleNumber'
+      JsonDef.verify_number(obj, rule)
     else
-      raise 'Unknown rule at [verify] level'
+      raise "Unknown rule at [verify] level: #{rule.class}"
     end
   end
 
-  def JsonDef.verify_value_type(value, type)
-    case type
-    when :object
-      value.kind_of?(Hash)
-    when :number
-      value.kind_of?(Numeric)
-    when :string
-      value.kind_of?(String)
-    when :array
-      value.kind_of?(Array)
-    when :wildcard
-      # Land of satisfaction.
-      true
-    else
-      raise 'Unknown value type declaration'
-    end
+  def JsonDef.verify_string(obj, rule)
+    return false unless obj.kind_of?(String)
+    true
+  end
+
+  def JsonDef.verify_number(obj, rule)
+    return false unless obj.kind_of?(Numeric)
+    true
   end
 
   def JsonDef.verify_object(obj, rule)
@@ -35,23 +35,17 @@ module JsonDef
       return true unless obj.has_key?(key_rule.key)
 
       case
-      when key_rule.value.kind_of?(Symbol)
-        return false unless JsonDef.verify_value_type(obj[key_rule.key], key_rule.value)
-
-      when key_rule.value.kind_of?(JsonRuleObject)
-        return false unless JsonDef.verify_object(obj[key_rule.key], key_rule.value)
-
-      when key_rule.value.kind_of?(JsonRuleArray)
-        return false unless JsonDef.verify_array(obj[key_rule.key], key_rule.value)
-
+      when key_rule.value == JsonDef::ANY_TYPE
+        next
+      when key_rule.value.kind_of?(JsonRuleBase)
+        return false unless JsonDef.verify(obj[key_rule.key], key_rule.value)
       else
-        # Expected an exact value given.
-        return false unless obj[key_rule.key] == key_rule.value
+        return false
       end
     end
 
-    # @todo In case of strict, check if there are other not-allowed keys.
-    if rule.strict?
+    # @todo In case of not allowing other keys, check if there are other not-allowed keys.
+    if !rule.allow_other_keys
       obj.each { |k, v| return false unless rule.keys.member?(k) }
     end
 
@@ -59,28 +53,27 @@ module JsonDef
   end
 
   def JsonDef.verify_array(obj, rule)
-    return false if obj.kind_of?(Array)
+    return false unless obj.kind_of?(Array)
     true
   end
 
 end
 
-class JsonRuleObject
+class JsonRuleBase
+end
 
-  attr_reader :key_rules, :keys
+class JsonRuleObject < JsonRuleBase
+
+  attr_reader :key_rules, :keys, :allow_other_keys
 
   def initialize()
-    @strict = false
+    @allow_other_keys = true
     @key_rules = []
     @keys = []
   end
 
-  def strict?
-    @strict
-  end
-
-  def set_strict
-    @strict = true
+  def disallow_other_keys
+    @allow_other_keys = false
     self
   end
 
@@ -92,13 +85,6 @@ class JsonRuleObject
 
 end
 
-class JsonRuleArray
-
-  def initialize
-  end
-
-end
-
 class JsonRuleObjectKey
 
   attr_reader :required, :key, :value
@@ -106,22 +92,26 @@ class JsonRuleObjectKey
   def initialize(key)
     @key = key
     @required = true
-    @value = :wildcard
+    @value = JsonDef::ANY_TYPE
   end
 
-  def set_optional()
+  def set_optional
     @required = false
     self
   end
 
-  def set_value_type(type)
-    @value = type
-    self
-  end
-
-  def set_value_rule(rule)
+  def set_rule(rule)
     @value = rule
     self
   end
 
 end
+
+class JsonRuleArray < JsonRuleBase
+end
+
+class JsonRuleNumber < JsonRuleBase
+end
+
+class JsonRuleString < JsonRuleBase
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsondef
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Peter Arato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies: []
 description: Can create JSON descriptor and verify if a given object satisfy it.
 email: it.arato@gmail.com
@@ -16,6 +16,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/config_reader.rb
 - lib/jsondef.rb
 homepage: http://itarato.com
 licenses: