easy_json_matcher 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a0d1798ca42d453ea4ec8997c8a66c482c6d8f
-  data.tar.gz: 306a4d081f0dc1f6886bab938e121b5a43428c7b
+  metadata.gz: f5594d2bf04fe24083c5ffe568e88f22accbee84
+  data.tar.gz: 19de26378a180c35d80ffc5c21fa4cff5064ceb5
 SHA512:
-  metadata.gz: 9cef9865bdd10d6e3c7127743f682ee7918a3ab4a98e695f5b012728e74edfd8fcb59c249a4f2f47671243c96a52d47fcc39672c3cbb70e76cf7277a1aabab69
-  data.tar.gz: a5a1888234ab415e6f2a09da2ff720d5913fa50302904d80abc86d346f5495fee5acfd1d81ca825fbc48a628ac30a5421873ffbdf907367562a2366e1c665fd6
+  metadata.gz: 9934c3a54200cc1b4ceb0de8a25ef45509445df8330820db4324270967437038ec48964a7bc91fb9be4c0e2a86bf96ead52e0209d1e0fbb15185632202073713
+  data.tar.gz: 44fb3187668459fd709e3a916668411f1f7749ebcad47d32d717ec870fa983bfd800557d5be2e1b2d98343788d44ede157fce4317a7387e40bcee7922bc188ba

data/lib/easy_json_matcher/array_generator.rb

@@ -1,5 +1,3 @@
-require "easy_json_matcher/array_validator"
-
 module EasyJSONMatcher
   class ArrayGenerator
     include AutoInject.kwargs[:array_validator]

data/lib/easy_json_matcher/attribute_type_methods.rb

@@ -1,5 +1,6 @@
 module AttributeTypeMethods
 
+
     def has_boolean(key:, opts: [])
       has_attribute(key: key, opts: opts + [:boolean])
     end
@@ -48,8 +49,14 @@ module AttributeTypeMethods
       mass_assign(keys: keys, opts: opts, meth: :has_date)
     end
 
-
     def mass_assign(keys:, opts: [], meth:)
       keys.each { |k| self.send(meth, { key: k, opts: opts }) }
     end
+
+    alias_method :boolean, :has_boolean
+    alias_method :number, :has_number
+    alias_method :date, :has_date
+    alias_method :object, :has_object
+    alias_method :value, :has_value
+    alias_method :string, :has_string
 end

data/lib/easy_json_matcher/node.rb

@@ -1,5 +1,3 @@
-require "easy_json_matcher/validation_step"
-
 module EasyJSONMatcher
   class Node 
     include AutoInject.kwargs[:node_content_validator, :chain_factory]

data/lib/easy_json_matcher/node_generator.rb

@@ -1,9 +1,4 @@
-require "easy_json_matcher/validation_chain_factory"
-require "easy_json_matcher/node"
-require "easy_json_matcher/schema_library"
 require "easy_json_matcher/attribute_type_methods"
-require "easy_json_matcher/attribute_generator"
-require "easy_json_matcher/array_generator"
 
 module EasyJSONMatcher
   class NodeGenerator
@@ -29,15 +24,14 @@ module EasyJSONMatcher
       validators[key] = validator.generate_attribute
     end
 
-    def contains_node(key:, opts: [])
-      generator = self.class.new(opts: opts, global_opts: global_opts)
-      yield generator if block_given?
+    def contains_node(key:, opts: [], &block)
+      generator = self.class.new(opts: opts, global_opts: global_opts, &block)
       validators[key] = generator.generate_node
     end
 
-    def contains_array(key:, opts: [])
+    def contains_array(key:, opts: [], &block)
       validator = array_generator.new(local_opts: opts, global_opts: global_opts)
-      yield validator if block_given?
+      validator.instance_eval &block if block_given?
       validators[key] = validator.generate_array
     end
 

data/lib/easy_json_matcher/schema_generator.rb

@@ -12,54 +12,19 @@ module EasyJSONMatcher
 
     attr_reader :node, :glob_opts, :att_glob_opts
 
-    def initialize(opts: [], global_opts: [], **args)
+    def initialize(opts: [], global_opts: [], **args, &block)
       super(**args)
       @glob_opts = global_opts
       @att_glob_opts = glob_opts.dup
       @att_glob_opts.delete(:strict)
       @node = new_node_generator(opts: opts, globals: global_opts)
-      yield node if block_given?
+      node.instance_eval &block if block_given?
     end
 
     def create_node(opts:)
       node.new(opts: opts)
     end
 
-    def has_attribute(key:, opts:)
-      opts = override_globals(local_opts: opts)
-      opts = opts - [:strict]
-      validator = validation_chain_factory.get_chain(steps: opts)
-      node.add_validator key: key, validator: validator
-    end
-
-    # TODO pretty hacky but can be cleaned later
-    def override_globals(local_opts:)
-      if local_opts.include?(:not_required) && glob_opts.include?(:required)
-         (local_opts + (glob_opts - [:required]))
-      else
-        local_opts + glob_opts
-      end
-    end
-
-    ################ Methods for adding specific attribute types ##############
-
-    def contains_node(key:, opts: [])
-      generator = new_node_generator(opts: opts)
-      yield generator if block_given?
-      node.add_validator key: key, validator: generator.node
-    end
-
-    def contains_array(key:, opts: [], with_content:)
-      array_validator = array_validator.new opts: opts, verify_content_as: with_content
-      yield array_validator if block_given?
-      node.add_validator key: key, validator: array_validator
-    end
-
-    def has_schema(key:, name:)
-      schema = schema_library.get_schema(name: name)
-      node.add_validator key: key, validator: schema
-    end
-
     ################ Methods for generating the schema #########################
 
     def generate_node

data/lib/easy_json_matcher/validation_rules.rb

@@ -33,7 +33,7 @@ module EasyJSONMatcher
   },
     boolean: ->(value, errors){
     clazz = value.class
-    unless (clazz == TrueClass) || (clazz == FalseClass)
+    unless [ TrueClass, FalseClass].include? clazz
       errors << "#{value} is not a Boolean"
       false
     end

data/lib/easy_json_matcher/validator.rb

@@ -1,5 +1,3 @@
-require 'easy_json_matcher/json_coercer'
-
 module EasyJSONMatcher
   class Validator
     include AutoInject.kwargs[:coercer]

data/lib/easy_json_matcher/version.rb

@@ -1,3 +1,3 @@
 module EasyJSONMatcher
-  VERSION = "0.3.4".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/easy_json_matcher.rb

@@ -7,4 +7,5 @@ module EasyJSONMatcher
 
   TYPES = [:number, :object, :value, :string, :boolean, :date, :array]
 
+  IMPORT = Dry::AutoInject(Container)
 end

data/test/custom_validations_test.rb

@@ -5,8 +5,8 @@ module EasyJSONMatcher
   describe "Custom Validations" do
 
     subject { 
-      SchemaGenerator.new { |sc|
-        sc.has_attribute key: "val", 
+      SchemaGenerator.new {
+        has_attribute key: "val", 
           opts: [
             :required,
             ->(value, errors) { errors << "value was false" unless value === true }

data/test/global_validation_options_test.rb

@@ -6,11 +6,11 @@ module EasyJSONMatcher
 
 
     subject {  
-      SchemaGenerator.new(global_opts: [ :required ]) { |schema|
-        schema.has_boolean key: "implicitly_required"
-        schema.contains_node key: "also_implicitly_required" do |n|
-          n.has_boolean key: "nested_implicitly_required"
-          n.has_boolean key: "not_required", opts: [:not_required]
+      SchemaGenerator.new(global_opts: [ :required ]) {
+        has_boolean key: "implicitly_required"
+        contains_node key: "also_implicitly_required" do 
+          has_boolean key: "nested_implicitly_required"
+          has_boolean key: "not_required", opts: [:not_required]
         end
       }.generate_schema
     }

data/test/managing_schemas_test.rb

@@ -6,9 +6,10 @@ module EasyJSONMatcher
 
     setup do
       @name = :test
-      SchemaGenerator.new { |schema|
-        schema.has_attribute(key: "name", opts: [ :string, :required ])
-      }.register(as: @name)
+      sc = SchemaGenerator.new { 
+        has_attribute(key: "name", opts: [ :string, :required ])
+      }
+      sc.register(as: @name)
     end
 
     test "As a user I want to be able to register a Schema so I can reuse it later" do
@@ -16,12 +17,12 @@ module EasyJSONMatcher
     end
 
     test "The order in which schemas are defined should not matter" do
-      test_schema = SchemaGenerator.new { |sc|
-        sc.has_schema key: "lazy", name: :lazily_evaluated
+      test_schema = SchemaGenerator.new { 
+        has_schema key: "lazy", name: :lazily_evaluated
       }.register as: :outer
 
-      lazy = SchemaGenerator.new { |sc|
-        sc.has_attribute key: "val"
+      SchemaGenerator.new {
+        has_attribute key: "val"
       }.register as: :lazily_evaluated
 
       valid_json = {
@@ -58,9 +59,9 @@ module EasyJSONMatcher
     end
 
     test "As a user I want to reuse a schema within another schema" do
-      test_schema = SchemaGenerator.new { |s|
-        s.has_boolean key: "is_present", opts: [ :required ]
-        s.has_schema key: @name, name: @name
+      test_schema = SchemaGenerator.new {
+        has_boolean key: "is_present", opts: [ :required ]
+        has_schema key: :test, name: :test
       }.generate_schema
 
       invalid_json = {
@@ -76,17 +77,17 @@ module EasyJSONMatcher
     end
 
     test "It can validate JSON Schema payloads" do
-      SchemaGenerator.new { |country|
-        country.has_attribute key: "id", opts: [:number, :required]
-        country.contains_node(key: "attributes") do |atts|
-          atts.has_attribute key: "alpha_2",  opts: [ :string, :required ]
-          atts.has_attribute key: "alpha_3",  opts: [ :string, :required ]
-          atts.has_attribute key: "name",     opts: [ :string, :required ]
+      SchemaGenerator.new { 
+        has_attribute key: "id", opts: [:number, :required]
+        contains_node(key: "attributes") do 
+          has_attribute key: "alpha_2",  opts: [ :string, :required ]
+          has_attribute key: "alpha_3",  opts: [ :string, :required ]
+          has_attribute key: "name",     opts: [ :string, :required ]
         end
       }.register(as: :country)
 
-      country_payload = SchemaGenerator.new {|country_payload|
-        country_payload.has_schema(key: "data", name: :country)
+      country_payload = SchemaGenerator.new {
+        has_schema(key: "data", name: :country)
       }.register(as: :country_payload)
 
       valid_json = "{\"data\":{\"id\":\"4376\",\"type\":\"countries\",\"attributes\":{\"alpha_2\":\"GB\",\"alpha_3\":\"GBR\",\"name\":\"United Kingdom of Great Britain and Northern Ireland\"}}}"

data/test/primitives_boolean_test.rb

@@ -9,8 +9,8 @@ module EasyJSONMatcher
   describe "Boolean Primitive Test" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_boolean key: "boolean"
+      @test_schema = SchemaGenerator.new {
+        has_boolean key: "boolean"
       }.generate_schema
     end
 

data/test/primitives_date_test.rb

@@ -10,8 +10,8 @@ module EasyJSONMatcher
   describe "Date primitive" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_date key: "date"
+      @test_schema = SchemaGenerator.new {
+        has_date key: "date"
       }.generate_schema
     end
 

data/test/primitives_number_test.rb

@@ -9,8 +9,8 @@ module EasyJSONMatcher
   describe "Number Validations" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_number key: "number"
+      @test_schema = SchemaGenerator.new {
+        has_number key: "number"
       }.generate_schema
     end
 

data/test/primitives_object_test.rb

@@ -9,8 +9,8 @@ module EasyJSONMatcher
   describe "Object primitive test" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_object key: "object"
+      @test_schema = SchemaGenerator.new {
+        has_object key: "object"
       }.generate_schema
     end
 

data/test/primitives_string_test.rb

@@ -9,8 +9,8 @@ module EasyJSONMatcher
   describe "Primitive String Validation" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_string key: "string"
+      @test_schema = SchemaGenerator.new {
+        has_string key: "string"
       }.generate_schema
     end
 

data/test/primtives_value_test.rb

@@ -9,8 +9,8 @@ module EasyJSONMatcher
   describe "Value primitive test" do
 
     before do
-      @test_schema = SchemaGenerator.new { |g|
-        g.has_boolean key: :value
+      @test_schema = SchemaGenerator.new {
+        has_boolean key: :value
       }.generate_schema
     end
 

data/test/required_validation_test.rb

@@ -3,9 +3,9 @@ require 'test_helper'
 class RequireValidationTest < ActiveSupport::TestCase
 
   test "As a user I want to insist that a value is present" do
-    astronaut_schema = EasyJSONMatcher::SchemaGenerator.new { |s|
-      s.has_attribute key: "has_oxygen", opts: [:boolean, :required]
-      s.has_attribute key: "name", opts: [:string]
+    astronaut_schema = EasyJSONMatcher::SchemaGenerator.new {
+      has_attribute key: "has_oxygen", opts: [:boolean, :required]
+      has_attribute key: "name", opts: [:string]
     }.generate_schema
 
     valid_astronaut = {
@@ -23,9 +23,9 @@ class RequireValidationTest < ActiveSupport::TestCase
   end
 
   test "As a user I want validations to pass if the value is not present and I have not required it to be there" do
-    astronaut_schema = EasyJSONMatcher::SchemaGenerator.new { |s|
-      s.has_attribute key: "has_oxygen", opts: [:boolean]
-      s.has_attribute key: "name", opts: [:string]
+    astronaut_schema = EasyJSONMatcher::SchemaGenerator.new {
+      has_attribute key: "has_oxygen", opts: [:boolean]
+      has_attribute key: "name", opts: [:string]
     }.generate_schema
 
     valid_astronaut = {

data/test/shortened_names_test.rb

@@ -0,0 +1,29 @@
+require "test_helper"
+
+module EasyJSONMatcher
+
+  describe "Shortened Names" do
+
+    it "should allow the user to require attributes wihout has_" do
+      schema = EasyJSONMatcher::SchemaGenerator.new do |sc|
+        sc.boolean key: "bool"
+        sc.number  key: "num"
+        sc.date    key: "date"
+        sc.object  key: "object"
+        sc.value   key: "val"
+        sc.string  key: "string"
+      end.generate_schema
+
+      valid = {
+        bool: true,
+        num: 1,
+        date: "2015-01-15",
+        object: {},
+        value: nil,
+        string: "hello"
+      }.to_json
+
+      schema.valid?(candidate: valid).must_be :==, true
+    end
+  end
+end

data/test/strict_mode_test.rb

@@ -5,9 +5,9 @@ module EasyJSONMatcher
   describe "Strict Mode" do
 
     subject {
-      SchemaGenerator.new(global_opts: [ :strict ]) { |s|
-        s.has_attribute key: "a", opts: []
-        s.has_attribute key: "b", opts: []
+      SchemaGenerator.new(global_opts: [ :strict ]) {
+        has_attribute key: "a", opts: []
+        has_attribute key: "b", opts: []
       }.generate_schema
     }
 

data/test/validating_arrays_test.rb

@@ -6,24 +6,24 @@ module EasyJSONMatcher
   describe ArrayValidator do
 
     before do
-      SchemaGenerator.new {|s|
-        s.has_attribute key: "name", opts: [:string, :required]
-        s.has_attribute key: "spouse", opts: [:string, :required]
+      SchemaGenerator.new {
+        has_attribute key: "name", opts: [:string, :required]
+        has_attribute key: "spouse", opts: [:string, :required]
       }.register as: :greek_hero
     end 
 
     subject{
-      test_schema = SchemaGenerator.new {|s|
-        s.contains_array(key: "data") do |a|
-          a.elements_should be: [:greek_hero]
+      SchemaGenerator.new {
+        contains_array(key: "data") do 
+          elements_should be: [:greek_hero]
         end
       }.generate_schema
     }
 
     it "should validate each value in the array" do
-      validator = SchemaGenerator.new { |s|
-        s.contains_array(key: "array") do |a|
-          a.elements_should be: [:number]
+      validator = SchemaGenerator.new {
+        contains_array(key: "array") do
+          elements_should be: [:number]
         end
       }.generate_schema
       candidate = { array: [1,2,3,4,"oops"] }.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_json_matcher
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - WJD Hamilton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 description: Test your JSON output in Ruby, with a DSL that makes reasoning about
   your JSON very straightforward. See the Homepage for docs.
 email:
@@ -89,6 +89,7 @@ files:
 - test/primtives_value_test.rb
 - test/required_validation_test.rb
 - test/schema_generator_test.rb
+- test/shortened_names_test.rb
 - test/strict_mode_test.rb
 - test/test_helper.rb
 - test/validating_arrays_test.rb
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily test your JSON output with templates and Schemas
@@ -147,6 +148,7 @@ test_files:
 - test/primtives_value_test.rb
 - test/required_validation_test.rb
 - test/schema_generator_test.rb
+- test/shortened_names_test.rb
 - test/strict_mode_test.rb
 - test/test_helper.rb
 - test/validating_arrays_test.rb
@@ -164,4 +166,3 @@ test_files:
 - test/validation_step_value_test.rb
 - test/validator_set_test.rb
 - test/validator_test.rb
-has_rdoc: