test/base_test.rb in jsi-0.2.1 vs test/base_test.rb in jsi-0.3.0

@@ -1,42 +1,43 @@
 require_relative 'test_helper'
 
-NamedSchemaInstance = JSI.class_for_schema({id: 'https://schemas.jsi.unth.net/test/base/named_schema'})
+NamedSchemaInstance = JSI::Schema.new({id: 'https://schemas.jsi.unth.net/test/base/named_schema'}).jsi_schema_class
 
+# hitting .tap(&:name) causes JSI to assign a constant name from the ID,
+# meaning the name NamedSchemaInstanceTwo is not known.
+NamedSchemaInstanceTwo = JSI::Schema.new({id: 'https://schemas.jsi.unth.net/test/base/named_schema_two'}).jsi_schema_class.tap(&:name)
+
 describe JSI::Base do
-  let(:document) { {} }
-  let(:path) { [] }
-  let(:pointer) { JSI::JSON::Pointer.new(path) }
-  let(:instance) { JSI::JSON::Node.new_by_type(document, pointer) }
   let(:schema_content) { {} }
   let(:schema) { JSI::Schema.new(schema_content) }
-  let(:subject) { JSI.class_for_schema(schema).new(instance) }
-  describe 'class .inspect + .to_s' do
+  let(:instance) { {} }
+  let(:subject) { schema.new_jsi(instance) }
+  describe 'class .inspect' do
     it 'is the same as Class#inspect on the base' do
       assert_equal('JSI::Base', JSI::Base.inspect)
-      assert_equal('JSI::Base', JSI::Base.to_s)
     end
-    it 'is SchemaClasses[] for generated subclass without id' do
-      assert_match(%r(\AJSI::SchemaClasses\["[a-f0-9\-]+#"\]\z), subject.class.inspect)
-      assert_match(%r(\AJSI::SchemaClasses\["[a-f0-9\-]+#"\]\z), subject.class.to_s)
+    it 'is (JSI Schema Class) for generated subclass without id' do
+      assert_equal("(JSI Schema Class: #)", subject.class.inspect)
     end
     describe 'with schema id' do
       let(:schema_content) { {'id' => 'https://jsi/foo'} }
-      it 'is SchemaClasses[] for generated subclass with id' do
-        assert_equal(%q(JSI::SchemaClasses["https://jsi/foo#"]), subject.class.inspect)
-        assert_equal(%q(JSI::SchemaClasses["https://jsi/foo#"]), subject.class.to_s)
+      it 'is (JSI Schema Class: ...) for generated subclass with id' do
+        assert_equal("(JSI Schema Class: https://jsi/foo#)", subject.class.inspect)
       end
     end
-    it 'is the constant name (plus id for .inspect) for a class assigned to a constant' do
+    it 'is the constant name plus id for a class assigned to a constant' do
       assert_equal(%q(NamedSchemaInstance (https://schemas.jsi.unth.net/test/base/named_schema#)), NamedSchemaInstance.inspect)
-      assert_equal(%q(NamedSchemaInstance), NamedSchemaInstance.to_s)
     end
+    it 'is not the constant name when the constant name has been generated from the schema_id' do
+      assert_equal("JSI::SchemaClasses::Xhttps___schemas_jsi_unth_net_test_base_named_schema_two_", NamedSchemaInstanceTwo.name)
+      assert_equal("(JSI Schema Class: https://schemas.jsi.unth.net/test/base/named_schema_two#)", NamedSchemaInstanceTwo.inspect)
+    end
   end
   describe 'class name' do
     let(:schema_content) { {'id' => 'https://jsi/BaseTest'} }
     it 'generates a class name from schema_id' do
-      assert_equal('JSI::SchemaClasses::Https___jsi_BaseTest_', subject.class.name)
+      assert_equal('JSI::SchemaClasses::Xhttps___jsi_BaseTest_', subject.class.name)
     end
     it 'uses an existing name' do
       assert_equal('NamedSchemaInstance', NamedSchemaInstance.name)
     end
   end
@@ -50,55 +51,38 @@
       assert_equal(schema.schema_id, JSI.class_for_schema(schema).schema_id)
     end
   end
   describe 'module for schema .inspect' do
     it '.inspect' do
-      assert_match(%r(\A#<Module for Schema: .+#>\z), JSI::SchemaClasses.module_for_schema(schema).inspect)
+      assert_equal("(JSI Schema Module: #)", JSI::SchemaClasses.module_for_schema(schema).inspect)
     end
   end
   describe 'module for schema .schema' do
     it '.schema' do
       assert_equal(schema, JSI::SchemaClasses.module_for_schema(schema).schema)
     end
   end
-  describe 'SchemaClasses[]' do
-    it 'stores the class for the schema' do
-      assert_equal(JSI.class_for_schema(schema), JSI::SchemaClasses[schema.schema_id])
-    end
-  end
   describe '.class_for_schema' do
     it 'returns a class from a schema' do
       class_for_schema = JSI.class_for_schema(schema)
       # same class every time
       assert_equal(JSI.class_for_schema(schema), class_for_schema)
       assert_operator(class_for_schema, :<, JSI::Base)
     end
     it 'returns a class from a hash' do
-      assert_equal(JSI.class_for_schema(schema), JSI.class_for_schema(schema.schema_node.content))
+      assert_equal(JSI.class_for_schema(schema), JSI.class_for_schema(schema_content))
     end
-    it 'returns a class from a schema node' do
-      assert_equal(JSI.class_for_schema(schema), JSI.class_for_schema(schema.schema_node))
-    end
-    it 'returns a class from a Base' do
-      assert_equal(JSI.class_for_schema(schema), JSI.class_for_schema(JSI.class_for_schema({}).new(schema.schema_node)))
-    end
   end
   describe 'JSI::SchemaClasses.module_for_schema' do
     it 'returns a module from a schema' do
       module_for_schema = JSI::SchemaClasses.module_for_schema(schema)
       # same module every time
       assert_equal(JSI::SchemaClasses.module_for_schema(schema), module_for_schema)
     end
     it 'returns a module from a hash' do
-      assert_equal(JSI::SchemaClasses.module_for_schema(schema), JSI::SchemaClasses.module_for_schema(schema.schema_node.content))
+      assert_equal(JSI::SchemaClasses.module_for_schema(schema), JSI::SchemaClasses.module_for_schema(schema.jsi_instance))
     end
-    it 'returns a module from a schema node' do
-      assert_equal(JSI::SchemaClasses.module_for_schema(schema), JSI::SchemaClasses.module_for_schema(schema.schema_node))
-    end
-    it 'returns a module from a Base' do
-      assert_equal(JSI::SchemaClasses.module_for_schema(schema), JSI::SchemaClasses.module_for_schema(JSI.class_for_schema({}).new(schema.schema_node)))
-    end
   end
   describe 'initialization' do
     describe 'on Base' do
       it 'errors' do
         err = assert_raises(TypeError) { JSI::Base.new({}) }
@@ -106,105 +90,105 @@
       end
     end
     describe 'nil' do
       let(:instance) { nil }
       it 'initializes with nil instance' do
-        assert_equal(nil, subject.instance)
+        assert_equal(nil, subject.jsi_instance)
         assert(!subject.respond_to?(:to_ary))
         assert(!subject.respond_to?(:to_hash))
       end
     end
     describe 'arbitrary instance' do
       let(:instance) { Object.new }
       it 'initializes' do
-        assert_equal(instance, subject.instance)
+        assert_equal(instance, subject.jsi_instance)
         assert(!subject.respond_to?(:to_ary))
         assert(!subject.respond_to?(:to_hash))
       end
     end
     describe 'hash' do
       let(:instance) { {'foo' => 'bar'} }
       let(:schema_content) { {'type' => 'object'} }
       it 'initializes' do
-        assert_equal({'foo' => 'bar'}, subject.instance)
+        assert_equal({'foo' => 'bar'}, subject.jsi_instance)
         assert(!subject.respond_to?(:to_ary))
         assert(subject.respond_to?(:to_hash))
       end
     end
-    describe 'JSI::JSON::Hashnode' do
-      let(:document) { {'foo' => 'bar'} }
+    describe 'JSI::JSON::HashNode' do
+      let(:instance) { JSI::JSON::HashNode.new({'foo' => 'bar'}, JSI::JSON::Pointer.new([])) }
       let(:schema_content) { {'type' => 'object'} }
       it 'initializes' do
-        assert_equal(JSI::JSON::HashNode.new({'foo' => 'bar'}, JSI::JSON::Pointer.new([])), subject.instance)
+        assert_equal(JSI::JSON::HashNode.new({'foo' => 'bar'}, JSI::JSON::Pointer.new([])), subject.jsi_instance)
         assert(!subject.respond_to?(:to_ary))
         assert(subject.respond_to?(:to_hash))
       end
     end
     describe 'array' do
       let(:instance) { ['foo'] }
       let(:schema_content) { {'type' => 'array'} }
       it 'initializes' do
-        assert_equal(['foo'], subject.instance)
+        assert_equal(['foo'], subject.jsi_instance)
         assert(subject.respond_to?(:to_ary))
         assert(!subject.respond_to?(:to_hash))
       end
     end
-    describe 'JSI::JSON::Arraynode' do
-      let(:document) { ['foo'] }
+    describe 'JSI::JSON::ArrayNode' do
+      let(:instance) { JSI::JSON::ArrayNode.new(['foo'], JSI::JSON::Pointer.new([])) }
       let(:schema_content) { {'type' => 'array'} }
       it 'initializes' do
-        assert_equal(JSI::JSON::ArrayNode.new(['foo'], JSI::JSON::Pointer.new([])), subject.instance)
+        assert_equal(JSI::JSON::ArrayNode.new(['foo'], JSI::JSON::Pointer.new([])), subject.jsi_instance)
         assert(subject.respond_to?(:to_ary))
         assert(!subject.respond_to?(:to_hash))
       end
     end
     describe 'another JSI::Base invalid' do
       let(:schema_content) { {'type' => 'object'} }
-      let(:instance) { JSI.class_for_schema(schema).new({'foo' => 'bar'}) }
+      let(:instance) { schema.new_jsi({'foo' => 'bar'}) }
       it 'initializes with an error' do
         err = assert_raises(TypeError) { subject }
-        assert_match(%r(\Aassigning another JSI::Base instance to JSI::SchemaClasses\[\".*#\"\] instance is incorrect. received: #\{<JSI::SchemaClasses\[.*\] Hash>\s*"foo" => "bar"\s*\}\z)m, err.message)
+        assert_equal("assigning another JSI::Base instance to a (JSI Schema Class: #) instance is incorrect. received: \#{<JSI> \"foo\" => \"bar\"}", err.message)
       end
     end
     describe 'Schema invalid' do
       let(:instance) { JSI::Schema.new({}) }
       it 'initializes with an error' do
         err = assert_raises(TypeError) { subject }
-        assert_match(%r(\Aassigning a schema to JSI::SchemaClasses\[\".*#\"\] instance is incorrect. received: #<JSI::Schema schema_id=.*>\z)m, err.message)
+        assert_equal("assigning a schema to a (JSI Schema Class: #) instance is incorrect. received: \#{<JSI (JSI::JSONSchemaOrgDraft06) Schema>}", err.message)
       end
     end
   end
   describe '#parent_jsis, #parent_jsi' do
     let(:schema_content) { {'properties' => {'foo' => {'properties' => {'bar' => {'properties' => {'baz' => {}}}}}}} }
-    let(:document) { {'foo' => {'bar' => {'baz' => {}}}} }
+    let(:instance) { {'foo' => {'bar' => {'baz' => {}}}} }
     describe 'no parent_jsis' do
       it 'has none' do
         assert_equal([], subject.parents)
-        assert_equal([], subject.parent_jsis.to_a)
+        assert_equal([], subject.parent_jsis)
         assert_equal(nil, subject.parent)
         assert_equal(nil, subject.parent_jsi)
       end
     end
     describe 'one parent_jsi' do
       it 'has one' do
         assert_equal([subject], subject.foo.parents)
-        assert_equal([subject], subject.foo.parent_jsis.to_a)
+        assert_equal([subject], subject.foo.parent_jsis)
         assert_equal(subject, subject.foo.parent)
         assert_equal(subject, subject.foo.parent_jsi)
       end
     end
     describe 'more parent_jsis' do
       it 'has more' do
         assert_equal([subject.foo.bar, subject.foo, subject], subject.foo.bar.baz.parents)
-        assert_equal([subject.foo.bar, subject.foo, subject], subject.foo.bar.baz.parent_jsis.to_a)
+        assert_equal([subject.foo.bar, subject.foo, subject], subject.foo.bar.baz.parent_jsis)
         assert_equal(subject.foo.bar, subject.foo.bar.baz.parent)
         assert_equal(subject.foo.bar, subject.foo.bar.baz.parent_jsi)
       end
     end
   end
   describe '#each, Enumerable methods' do
-    let(:document) { 'a string' }
+    let(:instance) { 'a string' }
     it "raises NoMethodError calling each or Enumerable methods" do
       assert_raises(NoMethodError) { subject.each { nil } }
       assert_raises(NoMethodError) { subject.map { nil } }
     end
   end
@@ -215,31 +199,31 @@
         new_instance = Object.new
         modified = subject.modified_copy do |o|
           assert_equal(instance, o)
           new_instance
         end
-        assert_equal(new_instance, modified.instance)
-        assert_equal(instance, subject.instance)
+        assert_equal(new_instance, modified.jsi_instance)
+        assert_equal(instance, subject.jsi_instance)
         refute_equal(instance, modified)
       end
     end
     describe 'with an instance that does have #modified_copy' do
       it 'yields the instance to modify' do
         modified = subject.modified_copy do |o|
           assert_equal({}, o)
           {'a' => 'b'}
         end
-        assert_equal({'a' => 'b'}, modified.instance.content)
-        assert_equal({}, subject.instance.content)
+        assert_equal({'a' => 'b'}, modified.jsi_instance)
+        assert_equal({}, subject.jsi_instance)
         refute_equal(instance, modified)
       end
     end
     describe 'no modification' do
       it 'yields the instance to modify' do
         modified = subject.modified_copy { |o| o }
         # this doesn't really need to be tested but ... whatever
-        assert_equal(subject.instance.content.object_id, modified.instance.content.object_id)
+        assert_equal(subject.jsi_instance.object_id, modified.jsi_instance.object_id)
         assert_equal(subject, modified)
         refute_equal(subject.object_id, modified.object_id)
       end
     end
     describe 'resulting in a different type' do
@@ -247,22 +231,19 @@
       it 'works' do
         # I'm not really sure the best thing to do here, but this is how it is for now. this is subject to change.
         modified = subject.modified_copy do |o|
           o.to_s
         end
-        assert_equal('{}', modified.instance.content)
-        assert_equal({}, subject.instance.content)
+        assert_equal('{}', modified.jsi_instance)
+        assert_equal({}, subject.jsi_instance)
         refute_equal(instance, modified)
         # interesting side effect
         assert(subject.respond_to?(:to_hash))
         assert(!modified.respond_to?(:to_hash))
-        assert_equal(JSI::JSON::HashNode, subject.instance.class)
-        assert_equal(JSI::JSON::Node, modified.instance.class)
       end
     end
   end
-  it('#fragment') { assert_equal('#', subject.fragment) }
   describe 'validation' do
     describe 'without errors' do
       it '#fully_validate' do
         assert_equal([], subject.fully_validate)
       end
@@ -271,10 +252,98 @@
       end
       it '#validate!' do
         assert_equal(true, subject.validate!)
       end
     end
+    describe 'with errors' do
+      let(:schema_content) {
+        {
+          'id' => 'https://schemas.jsi.unth.net/test/JSI::Base::validation::with errors',
+          'type' => 'object',
+          'properties' => {
+            'some_number' => {
+              'type' => 'number'
+            },
+            'a_required_property' => {
+              'type' => 'string'
+            }
+          }
+        }
+      }
+      let(:instance) { "this is a string" }
+
+      it '#validate' do
+        assert_equal(false, subject.validate)
+      end
+      it '#validate!' do
+        assert_raises JSON::Schema::ValidationError do
+          subject.validate!
+        end
+      end
+      describe 'fully_validate' do
+        it '#fully_validate ' do
+          assert_equal(["The property '#/' of type string did not match the following type: object in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::with errors"], subject.fully_validate)
+        end
+        it '#fully_validate :errors_as_objects' do
+          expected = [
+            {
+              :schema => Addressable::URI.parse('https://schemas.jsi.unth.net/test/JSI::Base::validation::with errors'),
+              :fragment => "#/",
+              :message => "The property '#/' of type string did not match the following type: object in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::with errors",
+              :failed_attribute=>"TypeV4"
+            }
+          ]
+          assert_equal(expected, subject.fully_validate(:errors_as_objects => true))
+        end
+      end
+    end
+    describe 'at a depth' do
+      let(:schema_content) do
+        {
+          'id' => 'https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth',
+          'description' => 'hash schema',
+          'type' => 'object',
+          'properties' => {
+            'foo' => {'type' => 'object'},
+            'bar' => {},
+            'baz' => {'type' => 'array'},
+          },
+          'additionalProperties' => {'not' => {}},
+        }
+      end
+
+      describe 'without errors' do
+        let(:instance) { {'foo' => {'x' => 'y'}, 'bar' => [9], 'baz' => [true]} }
+
+        it '#fully_validate' do
+          assert_equal([], subject.foo.fully_validate)
+          assert_equal([], subject.bar.fully_validate)
+        end
+        it '#validate' do
+          assert_equal(true, subject.foo.validate)
+          assert_equal(true, subject.bar.validate)
+        end
+      end
+      describe 'with errors' do
+        let(:instance) { {'foo' => [true], 'bar' => [9], 'baz' => {'x' => 'y'}, 'more' => {}} }
+
+        it '#fully_validate' do
+          assert_equal(["The property '#/' of type array did not match the following type: object in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth"], subject.foo.fully_validate)
+          assert_equal([], subject.bar.fully_validate)
+          assert_equal(["The property '#/' of type object did not match the following type: array in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth"], subject.baz.fully_validate)
+          assert_equal(["The property '#/' of type object matched the disallowed schema in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth"], subject['more'].fully_validate)
+          assert_equal(["The property '#/foo' of type array did not match the following type: object in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth", "The property '#/baz' of type object did not match the following type: array in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth", "The property '#/more' of type object matched the disallowed schema in schema https://schemas.jsi.unth.net/test/JSI::Base::validation::at a depth"], subject.fully_validate)
+        end
+        it '#validate' do
+          assert_equal(false, subject.foo.validate)
+          assert_equal(true, subject.bar.validate)
+          assert_equal(false, subject.baz.validate)
+          assert_equal(false, subject['more'].validate)
+          assert_equal(false, subject.validate)
+        end
+      end
+    end
   end
   describe 'property accessors' do
     let(:schema_content) do
       {
         'type' => 'object',
@@ -283,21 +352,21 @@
           'bar' => {'type' => 'array'},
           'baz' => {},
         },
       }
     end
-    let(:document) do
+    let(:instance) do
       {'foo' => {'x' => 'y'}, 'bar' => [3.14159], 'baz' => true, 'qux' => []}
     end
     describe 'readers' do
       it 'reads attributes described as properties' do
         assert_equal({'x' => 'y'}, subject.foo.as_json)
-        assert_instance_of(JSI.class_for_schema(schema.schema_node['properties']['foo']), subject.foo)
+        assert_is_a(schema.properties['foo'].jsi_schema_module, subject.foo)
         assert_respond_to(subject.foo, :to_hash)
         refute_respond_to(subject.foo, :to_ary)
         assert_equal([3.14159], subject.bar.as_json)
-        assert_instance_of(JSI.class_for_schema(schema.schema_node['properties']['bar']), subject.bar)
+        assert_is_a(schema.properties['bar'].jsi_schema_module, subject.bar)
         refute_respond_to(subject.bar, :to_hash)
         assert_respond_to(subject.bar, :to_ary)
         assert_equal(true, subject.baz)
         refute_respond_to(subject.baz, :to_hash)
         refute_respond_to(subject.baz, :to_ary)
@@ -305,11 +374,11 @@
       end
       describe 'when the instance is not hashlike' do
         let(:instance) { nil }
         it 'errors' do
           err = assert_raises(NoMethodError) { subject.foo }
-          assert_match(%r(\Aschema instance of class .* does not respond to \[\]; cannot call reader 'foo'. instance is )m, err.message)
+          assert_equal(%q(cannot subcript (using token: "foo") from instance: nil), err.message)
         end
       end
       describe 'properties with the same names as instance methods' do
         let(:schema_content) do
           {
@@ -320,41 +389,40 @@
               'inspect' => {},        # Base
               'pretty_inspect' => {}, # Kernel
               'as_json' => {},        # Base::OverrideFromExtensions, extended on initialization
               'each' => {},           # BaseHash / BaseArray
               'instance_exec' => {},  # BasicObject
-              'instance' => {},       # Base
+              'jsi_instance' => {},   # Base
               'schema' => {},         # module_for_schema singleton definition
             },
           }
         end
-        let(:document) do
+        let(:instance) do
           {
             'foo' => 'bar',
             'initialize' => 'hi',
             'inspect' => 'hi',
             'pretty_inspect' => 'hi',
             'as_json' => 'hi',
             'each' => 'hi',
             'instance_exec' => 'hi',
-            'instance' => 'hi',
+            'jsi_instance' => 'hi',
             'schema' => 'hi',
           }
         end
         it 'does not define readers' do
-          assert_equal('bar', subject.foo)
-          assert_equal(JSI::SchemaClasses.module_for_schema(subject.schema, conflicting_modules: [JSI::Base, JSI::BaseArray, JSI::BaseHash]), subject.method(:foo).owner)
+          assert_equal('bar', subject.foo) # this one is defined
 
           assert_equal(JSI::Base, subject.method(:initialize).owner)
           assert_equal('hi', subject['initialize'])
-          assert_match(%r(\A#\{<JSI::SchemaClasses\[".*#"\].*}\z)m, subject.inspect)
+          assert_equal(%q(#{<JSI> "foo" => "bar", "initialize" => "hi", "inspect" => "hi", "pretty_inspect" => "hi", "as_json" => "hi", "each" => "hi", "instance_exec" => "hi", "jsi_instance" => "hi", "schema" => "hi"}), subject.inspect)
           assert_equal('hi', subject['inspect'])
-          assert_match(%r(\A#\{<JSI::SchemaClasses\[".*#"\].*}\Z)m, subject.pretty_inspect)
-          assert_equal(document, subject.as_json)
+          assert_equal(%Q(\#{<JSI>\n  "foo" => "bar",\n  "initialize" => "hi",\n  "inspect" => "hi",\n  "pretty_inspect" => "hi",\n  "as_json" => "hi",\n  "each" => "hi",\n  "instance_exec" => "hi",\n  "jsi_instance" => "hi",\n  "schema" => "hi"\n}\n), subject.pretty_inspect)
+          assert_equal(instance, subject.as_json)
           assert_equal(subject, subject.each { })
           assert_equal(2, subject.instance_exec { 2 })
-          assert_equal(instance, subject.instance)
+          assert_equal(instance, subject.jsi_instance)
           assert_equal(schema, subject.schema)
         end
       end
     end
     describe 'writers' do
@@ -362,51 +430,52 @@
         orig_foo = subject.foo
 
         subject.foo = {'y' => 'z'}
 
         assert_equal({'y' => 'z'}, subject.foo.as_json)
-        assert_instance_of(JSI.class_for_schema(schema.schema_node['properties']['foo']), orig_foo)
-        assert_instance_of(JSI.class_for_schema(schema.schema_node['properties']['foo']), subject.foo)
+        assert_is_a(schema.properties['foo'].jsi_schema_module, orig_foo)
+        assert_is_a(schema.properties['foo'].jsi_schema_module, subject.foo)
       end
       it 'modifies the instance, visible to other references to the same instance' do
-        orig_instance = subject.instance
+        orig_instance = subject.jsi_instance
 
         subject.foo = {'y' => 'z'}
 
-        assert_equal(orig_instance, subject.instance)
-        assert_equal({'y' => 'z'}, orig_instance['foo'].as_json)
-        assert_equal({'y' => 'z'}, subject.instance['foo'].as_json)
-        assert_equal(orig_instance.class, subject.instance.class)
+        assert_equal(orig_instance, subject.jsi_instance)
+        assert_equal({'y' => 'z'}, orig_instance['foo'])
+        assert_equal({'y' => 'z'}, subject.jsi_instance['foo'])
+        assert_equal(orig_instance.class, subject.jsi_instance.class)
       end
       describe 'when the instance is not hashlike' do
         let(:instance) { nil }
         it 'errors' do
           err = assert_raises(NoMethodError) { subject.foo = 0 }
-          assert_match(%r(\Aschema instance of class .* does not respond to \[\]=; cannot call writer 'foo='. instance is )m, err.message)
+          assert_equal('cannot assign subcript (using token: "foo") to instance: nil', err.message)
         end
       end
     end
   end
   describe '#inspect' do
     # if the instance is hash-like, #inspect gets overridden
-    let(:document) { Object.new }
+    let(:instance) { Object.new }
     it 'inspects' do
-      assert_match(%r(\A#<JSI::SchemaClasses\["[^"]+#"\] #<JSI::JSON::Node fragment="#" #<Object:[^<>]*>>>\z), subject.inspect)
+      assert_match(%r(\A\#<JSI\ \#<Object:[^<>]*>>\z), subject.inspect)
     end
   end
   describe '#pretty_print' do
     # if the instance is hash-like, #pretty_print gets overridden
-    let(:document) { Object.new }
+    let(:instance) { Object.new }
     it 'pretty_prints' do
-      assert_match(%r(\A#<JSI::SchemaClasses\["[^"]+#"\]\n  #<JSI::JSON::Node fragment="#" #<Object:[^<>]*>>\n>\z), subject.pretty_inspect.chomp)
+      assert_match(%r(\A\#<JSI\ \#<Object:[^<>]*>>\z), subject.pretty_inspect.chomp)
     end
   end
   describe '#as_json' do
     it '#as_json' do
-      assert_equal({'a' => 'b'}, JSI.class_for_schema({}).new(JSI::JSON::Node.new_doc({'a' => 'b'})).as_json)
-      assert_equal({'a' => 'b'}, JSI.class_for_schema({'type' => 'object'}).new(JSI::JSON::Node.new_doc({'a' => 'b'})).as_json)
-      assert_equal(['a', 'b'], JSI.class_for_schema({'type' => 'array'}).new(JSI::JSON::Node.new_doc(['a', 'b'])).as_json)
-      assert_equal(['a'], JSI.class_for_schema({}).new(['a']).as_json(some_option: true))
+      assert_equal({'a' => 'b'}, JSI::Schema.new({}).new_jsi({'a' => 'b'}).as_json)
+      assert_equal({'a' => 'b'}, JSI::Schema.new({}).new_jsi(JSI::JSON::Node.new_doc({'a' => 'b'})).as_json)
+      assert_equal({'a' => 'b'}, JSI::Schema.new({'type' => 'object'}).new_jsi(JSI::JSON::Node.new_doc({'a' => 'b'})).as_json)
+      assert_equal(['a', 'b'], JSI::Schema.new({'type' => 'array'}).new_jsi(JSI::JSON::Node.new_doc(['a', 'b'])).as_json)
+      assert_equal(['a'], JSI::Schema.new({}).new_jsi(['a']).as_json(some_option: true))
     end
   end
   describe 'equality between different classes of JSI::Base subclasses' do
     let(:subject_subclass) { Class.new(JSI.class_for_schema(schema)).new(instance) }