json_matchers 0.9.0 → 0.10.0

data/spec/support/fake_response.rb

@@ -3,7 +3,7 @@ FakeResponse = Struct.new(:body) do
     JSON.parse(body)
   end
 
-  def to_json
+  def to_json(*)
     body
   end
 end

data/spec/support/file_helpers.rb

@@ -2,7 +2,6 @@ require "fileutils"
 
 module FileHelpers
   def setup_fixtures(*pathnames)
-    JSON::Validator.clear_cache
     original_schema_root = JsonMatchers.schema_root
 
     JsonMatchers.schema_root = File.join(*pathnames)

data/test/json_matchers/minitest/assertions_test.rb

@@ -21,34 +21,42 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "fails when the body contains a property with the wrong type" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
 
     refute_matches_json_schema(json, schema)
   end
 
   test "fails when the body is missing a required property" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
     json = build(:response, {})
 
     refute_matches_json_schema(json, schema)
   end
 
+  test "can reference a schema in a directory" do
+    create(:schema, :location, name: "api/v1/schema")
+
+    json = build(:response, :location)
+
+    assert_matches_json_schema(json, "api/v1/schema")
+  end
+
   test "when passed a Hash, validates that the schema matches" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
     json_as_hash = json.to_h
 
     assert_matches_json_schema(json_as_hash, schema)
   end
 
   test "when passed a Hash, fails with message when negated" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
     json_as_hash = json.to_h
 
     assert_raises_error_containing(schema) do
@@ -57,27 +65,27 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "when passed a Array, validates a root-level Array in the JSON" do
-    schema = create(:schema, :array_of, :objects)
+    schema = create(:schema, :array_of, :locations)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
     json_as_array = [json.to_h]
 
     assert_matches_json_schema(json_as_array, schema)
   end
 
   test "when passed a Array, refutes a root-level Array in the JSON" do
-    schema = create(:schema, :array_of, :objects)
+    schema = create(:schema, :array_of, :locations)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
     json_as_array = [json.to_h]
 
     refute_matches_json_schema(json_as_array, schema)
   end
 
   test "when passed a Array, fails with message when negated" do
-    schema = create(:schema, :array_of, :object)
+    schema = create(:schema, :array_of, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
     json_as_array = [json.to_h]
 
     assert_raises_error_containing(schema) do
@@ -86,18 +94,18 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "when JSON is a string, validates that the schema matches" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
     json_as_string = json.to_json
 
     assert_matches_json_schema(json_as_string, schema)
   end
 
   test "when JSON is a string, fails with message when negated" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
     json_as_string = json.to_json
 
     assert_raises_error_containing(schema) do
@@ -106,9 +114,9 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "the failure message contains the body" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
 
     assert_raises_error_containing(json) do
       assert_matches_json_schema(json, schema)
@@ -116,9 +124,9 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "the failure message contains the schema" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
 
     assert_raises_error_containing(schema) do
       assert_matches_json_schema(json, schema)
@@ -126,9 +134,9 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "the failure message when negated, contains the body" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
 
     assert_raises_error_containing(json) do
       refute_matches_json_schema(json, schema)
@@ -136,9 +144,9 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "the failure message when negated, contains the schema" do
-    schema = create(:schema, :object)
+    schema = create(:schema, :location)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
 
     assert_raises_error_containing(schema) do
       refute_matches_json_schema(json, schema)
@@ -146,23 +154,41 @@ class AssertResponseMatchesSchemaTest < JsonMatchers::TestCase
   end
 
   test "asserts valid JSON against a schema that uses $ref" do
-    schema = create(:schema, :referencing_objects)
+    schema = create(:schema, :referencing_locations)
 
-    json = build(:response, :object)
+    json = build(:response, :location)
     json_as_array = [json.to_h]
 
     assert_matches_json_schema(json_as_array, schema)
   end
 
   test "refutes valid JSON against a schema that uses $ref" do
-    schema = create(:schema, :referencing_objects)
+    schema = create(:schema, :referencing_locations)
 
-    json = build(:response, :invalid_object)
+    json = build(:response, :invalid_location)
     json_as_array = [json.to_h]
 
     refute_matches_json_schema(json_as_array, schema)
   end
 
+  test "validates against a schema referencing with 'definitions'" do
+    schema = create(:schema, :referencing_definitions)
+
+    json = build(:response, :location)
+    json_as_hash = { "locations" => [json] }
+
+    assert_matches_json_schema(json_as_hash, schema)
+  end
+
+  test "fails against a schema referencing with 'definitions'" do
+    schema = create(:schema, :referencing_definitions)
+
+    json = build(:response, :invalid_location)
+    json_as_hash = { "locations" => [json] }
+
+    refute_matches_json_schema(json_as_hash, schema)
+  end
+
   def assert_raises_error_containing(schema_or_body)
     raised_error = assert_raises(Minitest::Assertion) do
       yield

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: json_matchers
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Sean Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,19 +145,17 @@ files:
 - json_matchers.gemspec
 - lib/json_matchers.rb
 - lib/json_matchers/assertion.rb
-- lib/json_matchers/configuration.rb
 - lib/json_matchers/errors.rb
 - lib/json_matchers/matcher.rb
 - lib/json_matchers/minitest/assertions.rb
+- lib/json_matchers/parser.rb
 - lib/json_matchers/payload.rb
 - lib/json_matchers/rspec.rb
 - lib/json_matchers/validator.rb
 - lib/json_matchers/version.rb
 - spec/factories.rb
-- spec/json_matchers/configuration_spec.rb
 - spec/json_matchers/match_json_schema_spec.rb
 - spec/spec_helper.rb
-- spec/support/configuration.rb
 - spec/support/factory_bot.rb
 - spec/support/fake_response.rb
 - spec/support/fake_schema.rb
@@ -186,16 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Validate your Rails JSON API's JSON
 test_files:
 - spec/factories.rb
-- spec/json_matchers/configuration_spec.rb
 - spec/json_matchers/match_json_schema_spec.rb
 - spec/spec_helper.rb
-- spec/support/configuration.rb
 - spec/support/factory_bot.rb
 - spec/support/fake_response.rb
 - spec/support/fake_schema.rb

data/lib/json_matchers/configuration.rb

@@ -1,27 +0,0 @@
-module JsonMatchers
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
-  def self.configure
-    warn <<-WARN
-DEPRECATION: `JsonMatchers.configure`
-  After `json_matchers@0.9.x`, JsonMatchers.configure will be removed.
-
-  See https://github.com/thoughtbot/json_matchers/pull/31 for more information.
-
-WARN
-
-    yield(configuration)
-  end
-
-  class Configuration
-    def initialize
-      @options = {}
-    end
-
-    def options
-      @options.merge!(record_errors: true)
-    end
-  end
-end

data/spec/json_matchers/configuration_spec.rb

@@ -1,9 +0,0 @@
-describe JsonMatchers, ".configure" do
-  it "ignores :record_errors configuration" do
-    with_options(record_errors: false) do
-      configured_options = JsonMatchers.configuration.options
-
-      expect(configured_options).to include(record_errors: true)
-    end
-  end
-end

data/spec/support/configuration.rb

@@ -1,20 +0,0 @@
-module ConfigurationHelpers
-  def with_options(options)
-    original_options = JsonMatchers.configuration.options.dup
-
-    JsonMatchers.configure do |config|
-      config.options.merge!(options)
-    end
-
-    yield
-
-    JsonMatchers.configure do |config|
-      config.options.clear
-      config.options.merge!(original_options)
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include ConfigurationHelpers
-end