easy_json_matcher 0.0.1 → 0.0.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac9b53dc002894d4415c88923b7f544248cd5b0
-  data.tar.gz: f349d7f0b70b34acf537985638f92a97c7a3d27f
+  metadata.gz: 08815b61dd12963ba183f268f8ed79ef4871e942
+  data.tar.gz: 70c09b58d1a58df1310b78f92ac7f12f8ea6c22e
 SHA512:
-  metadata.gz: bb28de637e864eb7288282cdeb00dff395c7590bb392fdf108a75b086e6fa8ad215359256cddbee96753678648d8232ec95e0e2b93435498aea1c7b976b9d80f
-  data.tar.gz: cb7da7f775d5d35786f54f9de63d3cbdfb0ac3dae8e42293abd9ee6fa39b8d622d674985ffa9b6ec09eb97c622aaf2fc10cc36dc0695a235d0928c50814191d5
+  metadata.gz: d2415e588006089aab89ef53870839493258f6bd5d71d9573d515c6ee10aacbb3f6dd3db1b979d5c843a07e52356d75456e72242b2ee2706093c8da78a2c1d6c
+  data.tar.gz: 954f6c4a709230a0e8d8250e6a3a4f020fbd723071a741fb478a968bd008077c6cc587b42819d179038fce6ae48db62089227614fe2fdbc2db7f669b3fcb5a42

data/lib/easy_json_matcher/array_validator.rb

@@ -1,8 +1,53 @@
 require 'easy_json_matcher/validator'
 module EasyJSONMatcher
   class ArrayValidator < Validator
+    attr_reader :validators, :validator_results
+
     def _validate
+      return false unless _content_is_array?
+      _validate_content
+    end
+
+    def _content_is_array?
       content.is_a? Array
     end
+
+    def _validate_content
+      validators.each do |val|
+        _run_validator(val)
+      end
+      _validation_result
+    end
+
+    def should_only_contain(type:,opts: {})
+      _clear_validators
+      _add_validator(_create_validator(type: type, opts: opts))
+    end
+
+    def _clear_validators
+      validators.clear
+    end
+
+    def _add_validator(validator)
+      validators << validator
+    end
+
+    def validators
+      @validators ||= []
+    end
+
+    def _run_validator(v)
+      content.each do |value|
+        validator_results << v.valid?(value)
+      end
+    end
+
+    def _validation_result
+      !validator_results.include? false
+    end
+
+    def validator_results
+      @validator_results ||= []
+    end
   end
 end

data/lib/easy_json_matcher/date_validator.rb

@@ -8,7 +8,7 @@ module EasyJSONMatcher
     def initialize(opts = {})
       super(opts)
       @date_format = opts[:format]
-      @string_validator = ValidatorFactory.create({type: :string})
+      @string_validator = _create_validator(type: :string)
     end
 
     def _validate

data/lib/easy_json_matcher/exceptions.rb

@@ -0,0 +1,9 @@
+require 'easy_json_matcher'
+module EasyJSONMatcher
+  # Override of Ruby error for namespacing
+  class Error < RuntimeError; end
+
+  # Exception thrown by SchemaLibrary when a Schema is requested that has not
+  # already been registered
+  class MissingSchemaException < Error; end
+end

data/lib/easy_json_matcher/number_validator.rb

@@ -6,7 +6,9 @@ module EasyJSONMatcher
       begin
         Kernel::Float(content)
         true
-      rescue ArgumentError => e
+      rescue ArgumentError
+        false
+      rescue TypeError
         false
       end
     end

data/lib/easy_json_matcher/schema_generator.rb

@@ -1,5 +1,7 @@
 require 'easy_json_matcher/validator_factory'
 require 'easy_json_matcher/node'
+require 'easy_json_matcher/schema_library'
+require 'easy_json_matcher/exceptions'
 module EasyJSONMatcher
   class SchemaGenerator
 
@@ -12,22 +14,46 @@ module EasyJSONMatcher
     end
 
     def contains_node(key:, opts: {})
-      generator = _node_generator validator_opts(key, opts)
+      generator = _node_generator _validator_opts(key, opts)
       yield generator if block_given?
       node.add_validator generator.generate_node
     end
 
     def has_attribute(key:, opts: {})
-      node.add_validator(_create_validator(validator_opts(key, opts)))
+      node.add_validator(_create_validator(key, opts))
     end
 
-    def validator_opts(key, opts)
+    def contains_schema(schema_name:, opts: {})
+      key = opts[:key] || schema_name
+      schema = _create_validator(key, _prep_schema_opts(schema_name, opts))
+      _set_validator_key(schema, opts[:key] || schema_name)
+      node.add_validator schema
+    end
+
+    def _prep_schema_opts(schema_name, opts)
+      opts[:type] = :schema
+      opts[:name] = schema_name
+      opts
+    end
+
+    def _set_validator_key(validator, key)
+      validator.key = key
+    end
+
+    def contains_array(key:, opts: {})
+      opts.merge!({type: :array})
+      array_validator = _create_validator(key, opts)
+      yield array_validator if block_given?
+      node.add_validator array_validator
+    end
+
+    def _validator_opts(key, opts)
       opts[:key] = key
       opts
     end
 
-    def _create_validator(opts)
-      ValidatorFactory.create opts
+    def _create_validator(key, opts)
+      ValidatorFactory.get_instance type: opts[:type], opts: _validator_opts(key, opts)
     end
 
     def _node_generator(opts = {})
@@ -39,11 +65,11 @@ module EasyJSONMatcher
     end
 
     def register(schema_name:)
-      EasyJSONMatcher.add_schema(name: schema_name, schema: generate_node)
+      SchemaLibrary.add_schema(name: schema_name, schema: generate_node)
     end
 
     def node
-      @node ||= Node.new(opts: validator_opts(name, {}))
+      @node ||= Node.new(opts: _validator_opts(name, {}))
     end
   end
 end

data/lib/easy_json_matcher/schema_library.rb

@@ -0,0 +1,35 @@
+require 'easy_json_matcher'
+module EasyJSONMatcher
+  class SchemaLibrary
+
+    SCHEMAS = {}
+    private_constant :SCHEMAS
+    class << self
+      def available_schemas
+        schemas.keys
+      end
+
+      def schema_for(name)
+        schemas[name]
+      end
+
+      def add_schema(name:, schema:)
+        schemas[name] = schema
+      end
+
+      def schemas
+        SCHEMAS
+      end
+
+      def get_schema(name)
+         _find_and_clone_schema(name) or raise MissingSchemaException.new("No schema with #{name} has been registered")
+      end
+
+      def _find_and_clone_schema(name)
+        s = SCHEMAS[name]
+        return s.dup if s
+        nil
+      end
+    end
+  end
+end

data/lib/easy_json_matcher/validator.rb

@@ -1,19 +1,32 @@
 module EasyJSONMatcher
   class Validator
 
-    attr_reader :content, :key
+    attr_reader :content, :required
+    attr_accessor :key
 
     def initialize(options: {})
       @key = options[:key]
+      @required = options[:required]
     end
 
     def valid?(candidate)
       _set_content(candidate)
+      if content.nil?
+        return true unless _check_required?
+      end
       _validate
     end
 
     def _set_content(candidate)
       @content = key ? candidate[key.to_s] : candidate
     end
+
+    def _check_required?
+      required
+    end
+
+    def _create_validator(type:, opts: {})
+      ValidatorFactory.get_instance(type: type, opts: opts)
+    end
   end
 end

data/lib/easy_json_matcher/validator_factory.rb

@@ -9,9 +9,14 @@ module EasyJSONMatcher
   class ValidatorFactory
 
     class << self
-      def create(opts)
-        validator_class = get_type(opts[:type])
-        validator_class.new options: opts
+      def get_instance(type:, opts: {})
+        raise "Type must be specified" unless type
+        if type == :schema
+          SchemaLibrary.get_schema(opts[:name])
+        else
+          validator_class = get_type(type)
+          validator_class.new options: opts
+        end
       end
 
       def get_type(name)

data/lib/easy_json_matcher/version.rb

@@ -1,3 +1,3 @@
 module JsonapiMatcher
-  VERSION = "0.0.1"
+  VERSION = "0.0.2-1"
 end

data/lib/easy_json_matcher.rb

@@ -2,26 +2,4 @@ require 'easy_json_matcher/node'
 require 'easy_json_matcher/schema_generator'
 module EasyJSONMatcher
 
-    SCHEMAS = {}
-    private_constant :SCHEMAS
-  class << self
-    def available_schemas
-      schemas.keys
-    end
-
-    def schema_for(name)
-      schemas[name]
-    end
-
-    def add_schema(name:, schema:)
-      schemas[name] = schema
-    end
-
-    def schemas
-      SCHEMAS
-    end
-  end
-
-  # Override of Ruby error for namespacing
-  class Error < RuntimeError; end
 end