jsondef 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e61692a7bf9b0059a307c7efa749e64b984aff
-  data.tar.gz: 7415972dd3234d6bf359e2c748abee3f13b14ebf
+  metadata.gz: 46d05b8439f93fa6b9ddd50761c1e914ba344a94
+  data.tar.gz: bc9aaab652ecd1e496f0adafc634e4777d08b23e
 SHA512:
-  metadata.gz: 55cede1c3b7fb534dcccfb9eb867853fd851799820b7af724f936c3ffdd219580c1da5ed2daab798f1d6a14960ce957b08aacaec4b62f5111937db13e75459d4
-  data.tar.gz: 26aeacd7d8b87254e5a12e81492a555117e515abe018dcfc40b9c3e7f7265d8fcf1f21566199f018bbc77b50a4b86a17686b73dc467f606eeb3288c6012b9a9a
+  metadata.gz: ed8a2302c9c9f5c636a5539d087e3aa8c3d30a56b864cfa3fc7be6142c01b4a48a8d9c15d7b6cb1c19c0807aa26fe81b121f61838ae0f99c03d4476c3c380171
+  data.tar.gz: 7d209081b8ef4143d36d604a6acfbcc6ab949443ed3a2312e7cf29ffca55803a64282945433aeddca4d1407e77c4455c100f159bc8e138f46af9a1797872ee00

data/lib/config_reader.rb

@@ -4,7 +4,7 @@ require_relative 'jsondef.rb'
 
 module ConfigReaderFactory
 
-  def ConfigReaderFactory.fromJsonFile(path)
+  def ConfigReaderFactory.fromYamlFile(path)
     ConfigReader.new(YAML.load(IO.read(path)))
   end
 

data/lib/jsondef.rb

@@ -1,117 +1,3 @@
-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: #{rule.class}"
-    end
-  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)
-    return false unless obj.kind_of?(Hash)
-
-    rule.key_rules.each do |key_rule|
-      return false if key_rule.required && !obj.has_key?(key_rule.key)
-      return true unless obj.has_key?(key_rule.key)
-
-      case
-      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
-        return false
-      end
-    end
-
-    # @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
-
-    true
-  end
-
-  def JsonDef.verify_array(obj, rule)
-    return false unless obj.kind_of?(Array)
-    true
-  end
-
-end
-
-class JsonRuleBase
-end
-
-class JsonRuleObject < JsonRuleBase
-
-  attr_reader :key_rules, :keys, :allow_other_keys
-
-  def initialize()
-    @allow_other_keys = true
-    @key_rules = []
-    @keys = []
-  end
-
-  def disallow_other_keys
-    @allow_other_keys = false
-    self
-  end
-
-  def add_key_rule(rule)
-    @key_rules.push(rule)
-    @keys.push(rule.key)
-    self
-  end
-
-end
-
-class JsonRuleObjectKey
-
-  attr_reader :required, :key, :value
-
-  def initialize(key)
-    @key = key
-    @required = true
-    @value = JsonDef::ANY_TYPE
-  end
-
-  def set_optional
-    @required = false
-    self
-  end
-
-  def set_rule(rule)
-    @value = rule
-    self
-  end
-
-end
-
-class JsonRuleArray < JsonRuleBase
-end
-
-class JsonRuleNumber < JsonRuleBase
-end
-
-class JsonRuleString < JsonRuleBase
-end
+require_relative 'verify.rb'
+require_relative 'config_reader.rb'
+require_relative 'rules.rb'

data/lib/rules.rb

@@ -0,0 +1,57 @@
+
+class JsonRuleBase
+end
+
+class JsonRuleObject < JsonRuleBase
+
+  attr_reader :key_rules, :keys, :allow_other_keys
+
+  def initialize()
+    @allow_other_keys = true
+    @key_rules = []
+    @keys = []
+  end
+
+  def disallow_other_keys
+    @allow_other_keys = false
+    self
+  end
+
+  def add_key_rule(rule)
+    @key_rules.push(rule)
+    @keys.push(rule.key)
+    self
+  end
+
+end
+
+class JsonRuleObjectKey
+
+  attr_reader :required, :key, :value
+
+  def initialize(key)
+    @key = key
+    @required = true
+    @value = JsonDef::ANY_TYPE
+  end
+
+  def set_optional
+    @required = false
+    self
+  end
+
+  def set_rule(rule)
+    @value = rule
+    self
+  end
+
+end
+
+class JsonRuleArray < JsonRuleBase
+end
+
+class JsonRuleNumber < JsonRuleBase
+end
+
+class JsonRuleString < JsonRuleBase
+end

data/lib/verify.rb

@@ -0,0 +1,62 @@
+require_relative 'rules.rb'
+
+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: #{rule.class}"
+    end
+  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)
+    return false unless obj.kind_of?(Hash)
+
+    rule.key_rules.each do |key_rule|
+      return false if key_rule.required && !obj.has_key?(key_rule.key)
+      return true unless obj.has_key?(key_rule.key)
+
+      case
+      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
+        return false
+      end
+    end
+
+    # @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
+
+    true
+  end
+
+  def JsonDef.verify_array(obj, rule)
+    return false unless obj.kind_of?(Array)
+    true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsondef
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Peter Arato
@@ -18,7 +18,9 @@ extra_rdoc_files: []
 files:
 - lib/config_reader.rb
 - lib/jsondef.rb
-homepage: http://itarato.com
+- lib/rules.rb
+- lib/verify.rb
+homepage: https://github.com/itarato/JsonDefRuby
 licenses:
 - MIT
 metadata: {}