jsi 0.0.4 → 0.4.0

data/test/spreedly_openapi_test.rb

@@ -0,0 +1,8 @@
+require_relative 'test_helper'
+
+require 'spreedly_openapi'
+describe 'spreedly openapi' do
+  it 'instantiates the spreedly openapi doc' do
+    SpreedlyOpenAPI::Document.inspect
+  end
+end

data/test/test_helper.rb

@@ -2,8 +2,12 @@ require 'coveralls'
 if Coveralls.will_run?
   Coveralls.wear!
 end
-
 require 'simplecov'
+
+require 'bundler/setup'
+
+require 'byebug'
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'jsi'
 
@@ -16,8 +20,6 @@ require 'minitest/reporters'
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
-require 'byebug'
-
 class JSISpec < Minitest::Spec
   if ENV['JSI_TEST_ALPHA']
     # :nocov:
@@ -26,9 +28,41 @@ class JSISpec < Minitest::Spec
   end
 
   def assert_equal exp, act, msg = nil
-    msg = message(msg, E) { diff exp, act }
+    msg = message(msg, E) do
+      [].tap do |ms|
+        ms << diff(exp, act)
+        ms << "#{ANSI.red   { 'expected' }}: #{exp.inspect}"
+        ms << "#{ANSI.green { 'actual' }}:   #{act.inspect}"
+        if exp.respond_to?(:to_str) && act.respond_to?(:to_str)
+          ms << "#{ANSI.red { 'expected (str)' }}:"
+          ms << exp
+          ms << "#{ANSI.green { 'actual (str)' }}:"
+          ms << act
+        end
+      end.join("\n")
+    end
     assert exp == act, msg
   end
+
+  def assert_match matcher, obj, msg = nil
+    msg = message(msg) do
+      [].tap do |ms|
+        ms << "Expected match."
+        ms << "#{ANSI.red   { 'matcher' }}: #{mu_pp matcher}"
+        ms << "#{ANSI.green { 'object' }}:  #{mu_pp obj}"
+        ms << "#{ANSI.yellow { 'escaped' }}: #{Regexp.new(Regexp.escape(obj)).inspect}" if obj.is_a?(String)
+      end.join("\n")
+    end
+    assert_respond_to matcher, :"=~"
+    matcher = Regexp.new Regexp.escape matcher if String === matcher
+    assert matcher =~ obj, msg
+  end
+
+  def assert_is_a mod, obj, msg = nil
+    msg = message(msg) { "Expected instance of #{mod}. received #{obj.class}: #{mu_pp(obj)}" }
+
+    assert obj.is_a?(mod), msg
+  end
 end
 
 # register this to be the base class for specs instead of Minitest::Spec
@@ -42,8 +76,8 @@ class SortOfHash
   def to_hash
     @hash
   end
-  include JSI::FingerprintHash
-  def fingerprint
+  include JSI::Util::FingerprintHash
+  def jsi_fingerprint
     {class: self.class, hash: @hash}
   end
 end
@@ -56,8 +90,8 @@ class SortOfArray
   def to_ary
     @ary
   end
-  include JSI::FingerprintHash
-  def fingerprint
+  include JSI::Util::FingerprintHash
+  def jsi_fingerprint
     {class: self.class, ary: @ary}
   end
 end

data/test/util_test.rb

@@ -6,24 +6,24 @@ describe JSI::Util do
       assert_equal({'a' => 'b', 'c' => 'd', nil => 3}, JSI.stringify_symbol_keys({a: 'b', 'c' => 'd', nil => 3}))
     end
     it 'stringifies HashNode keys' do
-      actual = JSI.stringify_symbol_keys(JSI::JSON::HashNode.new({a: 'b', 'c' => 'd', nil => 3}, []))
-      expected = JSI::JSON::HashNode.new({'a' => 'b', 'c' => 'd', nil => 3}, [])
+      actual = JSI.stringify_symbol_keys(JSI::JSON::Node.new_doc({a: 'b', 'c' => 'd', nil => 3}))
+      expected = JSI::JSON::Node.new_doc({'a' => 'b', 'c' => 'd', nil => 3})
       assert_equal(expected, actual)
     end
     it 'stringifies JSI hash keys' do
-      klass = JSI.class_for_schema(type: 'object')
-      expected = JSI.stringify_symbol_keys(klass.new(JSI::JSON::HashNode.new({a: 'b', 'c' => 'd', nil => 3}, [])))
-      actual = klass.new(JSI::JSON::HashNode.new({'a' => 'b', 'c' => 'd', nil => 3}, []))
+      schema = JSI::Schema.new({type: 'object'})
+      expected = JSI.stringify_symbol_keys(schema.new_jsi({a: 'b', 'c' => 'd', nil => 3}))
+      actual = schema.new_jsi({'a' => 'b', 'c' => 'd', nil => 3})
       assert_equal(expected, actual)
     end
     describe 'non-hash-like argument' do
       it 'errors' do
         err = assert_raises(ArgumentError) { JSI.stringify_symbol_keys(nil) }
         assert_equal("expected argument to be a hash; got NilClass: nil", err.message)
-        err = assert_raises(ArgumentError) { JSI.stringify_symbol_keys(JSI::JSON::Node.new(3, [])) }
-        assert_equal("expected argument to be a hash; got JSI::JSON::Node: #<JSI::JSON::Node fragment=\"#\" 3>", err.message)
-        err = assert_raises(ArgumentError) { JSI.stringify_symbol_keys(JSI.class_for_schema({}).new(JSI::JSON::Node.new(3, []))) }
-        assert_match(%r(\Aexpected argument to be a hash; got JSI::SchemaClasses\["[^"]+#"\]: #<JSI::SchemaClasses\["[^"]+#"\]\n  #<JSI::JSON::Node fragment="#" 3>\n>\z)m, err.message)
+        err = assert_raises(ArgumentError) { JSI.stringify_symbol_keys(JSI::JSON::Node.new_doc(3)) }
+        assert_equal("expected argument to be a hash; got JSI::JSON::Node: #<JSI::JSON::Node # 3>", err.message)
+        err = assert_raises(ArgumentError) { JSI.stringify_symbol_keys(JSI::Schema.new({}).new_jsi(3)) }
+        assert_equal("expected argument to be a hash; got (JSI Schema Class: #): #<JSI 3>", err.message)
       end
     end
   end
@@ -48,14 +48,14 @@ describe JSI::Util do
       assert_equal(expected, actual)
     end
     it 'deep stringifies HashNode keys' do
-      actual = JSI.deep_stringify_symbol_keys(JSI::JSON::HashNode.new({a: 'b', 'c' => {d: 0}, nil => 3}, []))
-      expected = JSI::JSON::HashNode.new({'a' => 'b', 'c' => {'d' => 0}, nil => 3}, [])
+      actual = JSI.deep_stringify_symbol_keys(JSI::JSON::Node.new_doc({a: 'b', 'c' => {d: 0}, nil => 3}))
+      expected = JSI::JSON::Node.new_doc({'a' => 'b', 'c' => {'d' => 0}, nil => 3})
       assert_equal(expected, actual)
     end
     it 'deep stringifies JSI instance' do
-      klass = JSI.class_for_schema(type: 'object')
-      actual = JSI.deep_stringify_symbol_keys(klass.new(JSI::JSON::HashNode.new({a: 'b', 'c' => {d: 0}, nil => 3}, [])))
-      expected = klass.new(JSI::JSON::HashNode.new({'a' => 'b', 'c' => {'d' => 0}, nil => 3}, []))
+      schema = JSI::Schema.new(type: 'object')
+      actual = JSI.deep_stringify_symbol_keys(schema.new_jsi(JSI::JSON::Node.new_doc({a: 'b', 'c' => {d: 0}, nil => 3})))
+      expected = schema.new_jsi(JSI::JSON::Node.new_doc({'a' => 'b', 'c' => {'d' => 0}, nil => 3}))
       assert_equal(expected, actual)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -28,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-around
   requirement: !ruby/object:Gem::Requirement
@@ -80,10 +80,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: JSI represents json-schemas as ruby classes and json-schema instances
-  as instances of those classes
+- !ruby/object:Gem::Dependency
+  name: scorpio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: JSI offers an Object-Oriented representation for JSON data using JSON
+  Schemas
 email:
-- ethan@unth
+- ethan.jsi@unth.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,37 +105,49 @@ files:
 - ".simplecov"
 - ".yardopts"
 - CHANGELOG.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile.rb
 - jsi.gemspec
 - lib/jsi.rb
 - lib/jsi/base.rb
 - lib/jsi/base/to_rb.rb
+- lib/jsi/jsi_coder.rb
 - lib/jsi/json-schema-fragments.rb
 - lib/jsi/json.rb
 - lib/jsi/json/node.rb
+- lib/jsi/json/pointer.rb
+- lib/jsi/metaschema.rb
+- lib/jsi/metaschema_node.rb
+- lib/jsi/pathed_node.rb
 - lib/jsi/schema.rb
-- lib/jsi/schema_instance_json_coder.rb
-- lib/jsi/struct_json_coder.rb
+- lib/jsi/schema_classes.rb
+- lib/jsi/simple_wrap.rb
 - lib/jsi/typelike_modules.rb
 - lib/jsi/util.rb
 - lib/jsi/version.rb
+- lib/schemas/json-schema.org/draft-04/schema.rb
+- lib/schemas/json-schema.org/draft-06/schema.rb
+- resources/icons/AGPL-3.0.png
 - test/base_array_test.rb
 - test/base_hash_test.rb
 - test/base_test.rb
+- test/jsi_coder_test.rb
 - test/jsi_json_arraynode_test.rb
 - test/jsi_json_hashnode_test.rb
 - test/jsi_json_node_test.rb
+- test/jsi_json_pointer_test.rb
 - test/jsi_test.rb
-- test/schema_instance_json_coder_test.rb
+- test/jsi_typelike_as_json_test.rb
+- test/metaschema_node_test.rb
+- test/schema_module_test.rb
 - test/schema_test.rb
-- test/struct_json_coder_test.rb
+- test/spreedly_openapi_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 homepage: https://github.com/notEthan/jsi
 licenses:
-- MIT
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -138,21 +164,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: 'JSI: JSON-Schema instantiation'
+summary: 'JSI: JSON Schema Instantiation'
 test_files:
 - test/base_array_test.rb
 - test/base_hash_test.rb
 - test/base_test.rb
+- test/jsi_coder_test.rb
 - test/jsi_json_arraynode_test.rb
 - test/jsi_json_hashnode_test.rb
 - test/jsi_json_node_test.rb
+- test/jsi_json_pointer_test.rb
 - test/jsi_test.rb
-- test/schema_instance_json_coder_test.rb
+- test/jsi_typelike_as_json_test.rb
+- test/metaschema_node_test.rb
+- test/schema_module_test.rb
 - test/schema_test.rb
-- test/struct_json_coder_test.rb
+- test/spreedly_openapi_test.rb
 - test/test_helper.rb
 - test/util_test.rb

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ethan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/jsi/schema_instance_json_coder.rb

@@ -1,83 +0,0 @@
-module JSI
-  # this is a ActiveRecord serialization class intended to store JSON in the
-  # database column and expose a ruby class once loaded on a model instance.
-  # this allows for better ruby idioms to access to properties, and definition
-  # of related methods on the loaded class.
-  #
-  # the first argument, `loaded_class`, is the class which will be used to
-  # instantiate the column data. properties of the loaded class will correspond
-  # to keys of the json object in the database.
-  #
-  # the column data may be either a single instance of the loaded class
-  # (represented as one json object) or an array of them (represented as a json
-  # array of json objects), indicated by the keyword argument `array`.
-  #
-  # the column behind the attribute may be an actual JSON column (postgres json
-  # or jsonb - hstore should work too if you only have string attributes) or a
-  # serialized string, indicated by the keyword argument `string`.
-  class ObjectJSONCoder
-    class Error < StandardError
-    end
-    class LoadError < Error
-    end
-    class DumpError < Error
-    end
-
-    def initialize(loaded_class, string: false, array: false, next_coder: nil)
-      @loaded_class = loaded_class
-      # this notes the order of the keys as they were in the json, used by dump_object to generate
-      # json that is equivalent to the json/jsonifiable that came in, so that AR's #changed_attributes
-      # can tell whether the attribute has been changed.
-      @loaded_class.send(:attr_accessor, :object_json_coder_keys_order)
-      @string = string
-      @array = array
-      @next_coder = next_coder
-    end
-
-    def load(column_data)
-      return nil if column_data.nil?
-      data = @string ? ::JSON.parse(column_data) : column_data
-      object = if @array
-        unless data.respond_to?(:to_ary)
-          raise TypeError, "expected array-like column data; got: #{data.class}: #{data.inspect}"
-        end
-        data.map { |el| load_object(el) }
-      else
-        load_object(data)
-      end
-      object = @next_coder.load(object) if @next_coder
-      object
-    end
-
-    def dump(object)
-      object = @next_coder.dump(object) if @next_coder
-      return nil if object.nil?
-      jsonifiable = begin
-        if @array
-          unless object.respond_to?(:to_ary)
-            raise DumpError, "expected array-like attribute; got: #{object.class}: #{object.inspect}"
-          end
-          object.map do |el|
-            dump_object(el)
-          end
-        else
-          dump_object(object)
-        end
-      end
-      @string ? ::JSON.generate(jsonifiable) : jsonifiable
-    end
-  end
-  # this is a ActiveRecord serialization class intended to store JSON in the
-  # database column and expose a given JSI::Base subclass once loaded
-  # on a model instance.
-  class SchemaInstanceJSONCoder < ObjectJSONCoder
-    private
-    def load_object(data)
-      @loaded_class.new(data)
-    end
-
-    def dump_object(object)
-      JSI::Typelike.as_json(object)
-    end
-  end
-end

data/lib/jsi/struct_json_coder.rb

@@ -1,30 +0,0 @@
-module JSI
-  # this is a ActiveRecord serialization class intended to store JSON in the
-  # database column and expose a Struct subclass once loaded on a model instance.
-  class StructJSONCoder < ObjectJSONCoder
-    private
-    def load_object(data)
-      if data.is_a?(Hash)
-        good_keys = @loaded_class.members.map(&:to_s)
-        bad_keys = data.keys - good_keys
-        unless bad_keys.empty?
-          raise LoadError, "expected keys #{good_keys}; got unrecognized keys: #{bad_keys}"
-        end
-        instance = @loaded_class.new(*@loaded_class.members.map { |m| data[m.to_s] })
-        instance.object_json_coder_keys_order = data.keys
-        instance
-      else
-        raise LoadError, "expected instance(s) of #{Hash}; got: #{data.class}: #{data.inspect}"
-      end
-    end
-
-    def dump_object(object)
-      if object.is_a?(@loaded_class)
-        keys = (object.object_json_coder_keys_order || []) | @loaded_class.members.map(&:to_s)
-        keys.map { |member| {member => object[member]} }.inject({}, &:update)
-      else
-        raise TypeError, "expected instance(s) of #{@loaded_class}; got: #{object.class}: #{object.inspect}"
-      end
-    end
-  end
-end