easy_json_matcher 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d89a8713abb0a107d389588fc6ab8276b97a73e
-  data.tar.gz: 1a984ae9ebf4154fe92ed59b4d551aed3d31949d
+  metadata.gz: 2fc40b15589acbb444020f137e9e079241f73ee9
+  data.tar.gz: 05197c5eac34a9b66d83405debaf0d17ce1b0602
 SHA512:
-  metadata.gz: 3859e9e26ccd582d6cd76438b7dfb27f852211dcce7e2863050e1f48981de0539ff3835571b02fe1de45ade149f11cc46c31ec776d403d80e315d0dbd81a758c
-  data.tar.gz: 4f9486b504b527d7ab1a081538cdfa5e401c7a69ebf3b3ecbe3ed187a9dd0616828fe5958679f2e3d4c91031c2c6846f79a5f745dd4a1b4a3406d4c121048f3a
+  metadata.gz: 448e3d74f73b2abbe9dd43256c06bbd3bee7ce29c29789b95672b32a314af43af6878b5d49b7a17780f96fdfe2d26d3609243cae4e8a1b2e66fb3b829b54ea9b
+  data.tar.gz: 51c81f2acd450002ce9f50c703613cefb43390aad04b8802b411d75c883d23bfca153b9d78420edb73116a3c7939c748569c9a5896e5b90a798a0fb6e39f98cf

data/lib/easy_json_matcher/json_coercer.rb

@@ -7,21 +7,11 @@ module EasyJSONMatcher
     def coerce(json:)
       begin
         coerced = JSON.parse(json)
-        symbolize_keys(hash: coerced)
       rescue JSON::ParserError, TypeError
         raise CoercionError.new invalid_string: json
       end
     end
 
-    def symbolize_keys(hash:)
-      hash.keys.each do |key|
-        value = hash.delete(key)
-        convert_value(value)
-        hash[key.to_sym] = value
-      end
-      hash
-    end
-
     def convert_value(value)
       case value
       when Hash

data/lib/easy_json_matcher/version.rb

@@ -1,3 +1,3 @@
 module EasyJSONMatcher
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/test/custom_validations_test.rb

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

data/test/global_validation_options_test.rb

@@ -7,10 +7,10 @@ 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]
+        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]
         end
       }.generate_schema
     }

data/test/managing_schemas_test.rb

@@ -7,7 +7,7 @@ module EasyJSONMatcher
     setup do
       @name = :test
       SchemaGenerator.new { |schema|
-        schema.has_attribute(key: :name, opts: [ :string, :required ])
+        schema.has_attribute(key: "name", opts: [ :string, :required ])
       }.register(as: @name)
     end
 
@@ -31,7 +31,7 @@ module EasyJSONMatcher
 
     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_boolean key: "is_present", opts: [ :required ]
         s.has_schema key: @name, name: @name
       }.generate_schema
 
@@ -49,16 +49,16 @@ module EasyJSONMatcher
 
     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 ]
+        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 ]
         end
       }.register(as: :country)
 
       country_payload = SchemaGenerator.new {|country_payload|
-        country_payload.has_schema(key: :data, name: :country)
+        country_payload.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/node_test.rb

@@ -12,14 +12,14 @@ module EasyJSONMatcher
       end
 
       it "should send call to its own validator" do
-        test_value = { a: 1, b: 2, c: 3 }
-        validators = (:a..:c).each_with_object({}) do |n, h|
+        test_value = { "a" => 1, "b" => 2, "c" => 3 }
+        validators = ("a".."c").each_with_object({}) do |n, h|
           h[n] = ValidationChainFactory.get_chain(steps: [:string])
         end
         node = Node.new(opts: [:required], validators: validators)
-        expected = [{a: ["1 is not a String"],
-                     b: ["2 is not a String"],
-                     c: ["3 is not a String"]
+        expected = [{"a" => ["1 is not a String"],
+                     "b" => ["2 is not a String"],
+                     "c" => ["3 is not a String"]
         }]
         node.check(value: test_value).must_be :==, expected
       end

data/test/primitives_boolean_test.rb

@@ -10,7 +10,7 @@ module EasyJSONMatcher
 
     before do
       @test_schema = SchemaGenerator.new { |g|
-        g.has_boolean key: :boolean
+        g.has_boolean key: "boolean"
       }.generate_schema
     end
 

data/test/primitives_date_test.rb

@@ -11,7 +11,7 @@ module EasyJSONMatcher
 
     before do
       @test_schema = SchemaGenerator.new { |g|
-        g.has_date key: :date
+        g.has_date key: "date"
       }.generate_schema
     end
 

data/test/primitives_number_test.rb

@@ -10,7 +10,7 @@ module EasyJSONMatcher
 
     before do
       @test_schema = SchemaGenerator.new { |g|
-        g.has_number key: :number
+        g.has_number key: "number"
       }.generate_schema
     end
 

data/test/primitives_object_test.rb

@@ -10,7 +10,7 @@ module EasyJSONMatcher
 
     before do
       @test_schema = SchemaGenerator.new { |g|
-        g.has_object key: :object
+        g.has_object key: "object"
       }.generate_schema
     end
 

data/test/primitives_string_test.rb

@@ -6,11 +6,11 @@ require 'json'
 
 module EasyJSONMatcher
 
-  describe "Basic Type Validations" do
+  describe "String Primitives" do
 
     before do
       @test_schema = SchemaGenerator.new { |g|
-        g.has_string key: :string
+        g.has_string key: "string"
       }.generate_schema
     end
 

data/test/required_validation_test.rb

@@ -4,8 +4,8 @@ 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]
+      s.has_attribute key: "has_oxygen", opts: [:boolean, :required]
+      s.has_attribute key: "name", opts: [:string]
     }.generate_schema
 
     valid_astronaut = {
@@ -24,8 +24,8 @@ class RequireValidationTest < ActiveSupport::TestCase
 
   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]
+      s.has_attribute key: "has_oxygen", opts: [:boolean]
+      s.has_attribute key: "name", opts: [:string]
     }.generate_schema
 
     valid_astronaut = {

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]) { |s|
+        s.has_attribute key: "a", opts: []
+        s.has_attribute key: "b", opts: []
       }.generate_schema
     }
 

data/test/validating_arrays_test.rb

@@ -7,14 +7,14 @@ module EasyJSONMatcher
 
     before do
       SchemaGenerator.new {|s|
-        s.has_attribute key: :name, opts: [:string, :required]
-        s.has_attribute key: :spouse, opts: [:string, :required]
+        s.has_attribute key: "name", opts: [:string, :required]
+        s.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|
+        s.contains_array(key: "data") do |a|
           a.elements_should be: [:greek_hero]
         end
       }.generate_schema
@@ -22,7 +22,7 @@ module EasyJSONMatcher
 
     it "should validate each value in the array" do
       validator = SchemaGenerator.new { |s|
-        s.contains_array(key: :array) do |a|
+        s.contains_array(key: "array") do |a|
           a.elements_should be: [:number]
         end
       }.generate_schema

data/test/validator_set_test.rb

@@ -11,6 +11,14 @@ module EasyJSONMatcher
       subject.validators.values.include?(test_val).must_be :==, true
     end
 
+    it "should validate with keys and symbols" do
+      mock_validators = { key_1: mock_validator, "key_2" => mock_validator }
+      subject = ValidatorSet.new validators: mock_validators
+      test_val = { "key_1" => 1, key_2: 2 }
+      subject.check(value: test_val)
+      mock_validators.each_value(&:verify)
+    end
+
     it "should return true if all its validators validate their candidates" do
       mock_validators = { key1: mock_validator, key2: mock_validator }
       subject = ValidatorSet.new validators: mock_validators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_json_matcher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - WJD Hamilton