ur 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e517b90ad97d890764bc228d8836e7e48d7f8250ed7c3a4878368b77b2deb2'
-  data.tar.gz: e87aedb3a622a5606bff0370cc1a06f43d98be53488389c1902e989226760cd1
+  metadata.gz: 1161e5f2e2219053fc4c54e541feb0d4c6efa1c1af930365e526a88bc0973e1b
+  data.tar.gz: b42e166ae62f0a651d5425147e64b1d200c09862869188b8f95e52454f7b8e97
 SHA512:
-  metadata.gz: '069f50e6768b41beb13830308fd3a3d18845c32fc38f6e95755b8f929ba88e20efcfce8f84abf50ed393a93f9c2971bb7b280e5793d43098c06dc034f136487c'
-  data.tar.gz: 42c005bf4853f4bb946a2bd143696c84fa84c6f933b71a6425505722aab150f290ab21265ac2b6e9fdaa313e0207becb46f5a14ff20a7cd2c18e4daa53d12084
+  metadata.gz: 17187f65ff16035e72fc7d7e0b9468bd970d337b1f8173fbc2dde15f420ad406aa33ecb440b4b65e0dffb921279660fdedb48b4bb320ce3e4e9a411eec3a21da
+  data.tar.gz: 8c8d0f0c86af8a97c18dc794e69b84634421607a7e6715120b90fd3d9f74bdd1848a5c422598dbc06fdb0ea7ce4ac474e76b761ec7e2243fdb87b2aa812af292

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.1
+
+- JSI v0.6.0
+
 # v0.2.0
 
 - Ur uses JSI schema modules instead of classes

data/lib/ur/content_type.rb

@@ -21,12 +21,15 @@ module Ur
   #   https://tools.ietf.org/html/rfc2045#section-5.1
   # - Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types
   #   https://tools.ietf.org/html/rfc2046
+  # - Additional Media Type Structured Syntax Suffixes
+  #   https://tools.ietf.org/html/rfc6839
   class ContentType < String
     # the character ranges in this SHOULD be significantly more restrictive,
-    # and the /<subtype> construct should not be optional. however, we'll aim
+    # and the `/<subtype>` construct should not be optional. however, we'll aim
     # to match whatever media type we are given.
     #
     # example:
+    #
     #     MEDIA_TYPE_REGEXP.match('application/vnd.github+json').named_captures
     #     =>
     #     {
@@ -38,6 +41,7 @@ module Ur
     #     }
     #
     # example of being more permissive than the spec allows:
+    #
     #     MEDIA_TYPE_REGEXP.match('where the %$*! am I').named_captures
     #     =>
     #     {
@@ -116,44 +120,53 @@ module Ur
       freeze
     end
 
-    # @return [String, nil] the media type of this content type.
-    #   e.g. "application/vnd.github+json" in content-type: application/vnd.github+json; charset="utf-8"
+    # the media type of this content type.
+    # e.g. `"application/vnd.github+json"` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [String, nil]
     attr_reader :media_type
 
-    # @return [String, nil] the 'type' portion of our media type.
-    #   e.g. "application" in content-type: application/vnd.github+json; charset="utf-8"
+    # the 'type' portion of our media type.
+    # e.g. `"application"` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [String, nil]
     attr_reader :type
 
-    # @return [String, nil] the 'subtype' portion of our media type.
-    #   e.g. "vnd.github+json" in content-type: application/vnd.github+json; charset="utf-8"
+    # the 'subtype' portion of our media type.
+    # e.g. `"vnd.github+json"` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [String, nil]
     attr_reader :subtype
 
-    # @return [String, nil] the 'facet' portion of our media type.
-    #   e.g. "vnd" in content-type: application/vnd.github+json; charset="utf-8"
+    # the 'facet' portion of our media type.
+    # e.g. `"vnd"` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [String, nil]
     attr_reader :facet
 
-    # @return [String, nil] the 'suffix' portion of our media type.
-    #   e.g. "json" in content-type: application/vnd.github+json; charset="utf-8"
+    # the 'suffix' portion of our media type.
+    # e.g. `"json"` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [String, nil]
     attr_reader :suffix
 
-    # @return [Hash<String, String>] parameters of this content type.
-    #   e.g. {"charset" => "utf-8"} in content-type: application/vnd.github+json; charset="utf-8"
+    # parameters of this content type.
+    # e.g. `{"charset" => "utf-8"}` in `content-type: application/vnd.github+json; charset="utf-8"`
+    # @return [Hash<String, String>]
     attr_reader :parameters
 
+    # is the 'type' portion of our media type equal (case-insensitive) to the given other_type
     # @param other_type
-    # @return [Boolean] is the 'type' portion of our media type equal (case-insensitive) to the given other_type
+    # @return [Boolean]
     def type?(other_type)
       type && type.casecmp?(other_type)
     end
 
+    # is the 'subtype' portion of our media type equal (case-insensitive) to the given other_subtype
     # @param other_subtype
-    # @return [Boolean] is the 'subtype' portion of our media type equal (case-insensitive) to the given other_subtype
+    # @return [Boolean]
     def subtype?(other_subtype)
       subtype && subtype.casecmp?(other_subtype)
     end
 
+    # is the 'suffix' portion of our media type equal (case-insensitive) to the given other_suffix
     # @param other_suffix
-    # @return [Boolean] is the 'suffix' portion of our media type equal (case-insensitive) to the given other_suffix
+    # @return [Boolean]
     def suffix?(other_suffix)
       suffix && suffix.casecmp?(other_suffix)
     end
@@ -173,11 +186,12 @@ module Ur
       ecmascript
     ).map(&:freeze).freeze
 
+    # does this content type appear to be binary?
+    # this library makes its best guess based on a very incomplete knowledge
+    # of which media types indicate binary or text.
     # @param unknown [Boolean] return this value when we have no idea whether
     #   our media type is binary or text.
-    # @return [Boolean] does this content type appear to be binary?
-    #   this library makes its best guess based on a very incomplete knowledge
-    #   of which media types indicate binary or text.
+    # @return [Boolean]
     def binary?(unknown: true)
       return false if type_text?
 
@@ -192,52 +206,62 @@ module Ur
       return unknown
     end
 
-    # @return [Boolean] is this a JSON content type?
+    # is this a JSON content type?
+    # @return [Boolean]
     def json?
       suffix ? suffix.casecmp?('json') : subtype ? subtype.casecmp?('json') : false
     end
 
-    # @return [Boolean] is this an XML content type?
+    # is this an XML content type?
+    # @return [Boolean]
     def xml?
       suffix ? suffix.casecmp?('xml'): subtype ? subtype.casecmp?('xml') : false
     end
 
-    # @return [Boolean] is this a x-www-form-urlencoded content type?
+    # is this a `x-www-form-urlencoded` content type?
+    # @return [Boolean]
     def form_urlencoded?
       suffix ? suffix.casecmp?('x-www-form-urlencoded'): subtype ? subtype.casecmp?('x-www-form-urlencoded') : false
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'text'
+    # is the 'type' portion of our media type 'text'
+    # @return [Boolean]
     def type_text?
       type && type.casecmp?('text')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'image'
+    # is the 'type' portion of our media type 'image'
+    # @return [Boolean]
     def type_image?
       type && type.casecmp?('image')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'audio'
+    # is the 'type' portion of our media type 'audio'
+    # @return [Boolean]
     def type_audio?
       type && type.casecmp?('audio')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'video'
+    # is the 'type' portion of our media type 'video'
+    # @return [Boolean]
     def type_video?
       type && type.casecmp?('video')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'application'
+    # is the 'type' portion of our media type 'application'
+    # @return [Boolean]
     def type_application?
       type && type.casecmp?('application')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'message'
+    # is the 'type' portion of our media type 'message'
+    # @return [Boolean]
     def type_message?
       type && type.casecmp?('message')
     end
 
-    # @return [Boolean] is the 'type' portion of our media type 'multipart'
+    # is the 'type' portion of our media type 'multipart'
+    # @return [Boolean]
     def type_multipart?
       type && type.casecmp?('multipart')
     end

data/lib/ur/request_and_response.rb

@@ -25,9 +25,10 @@ module Ur
     end
     include FaradayEntity
 
-    # @return [Ur::ContentType] the string value of the content type header. returns an
+    # the string value of the content type header. returns an
     # {Ur::ContentType}, a subclass of String which additionally parses the Content-Type
     # according to relevant RFCs.
+    # @return [Ur::ContentType]
     def content_type
       headers.each do |k, v|
         return ContentType.new(v) if k =~ /\Acontent[-_]type\z/i
@@ -40,17 +41,20 @@ module Ur
       content_type ? content_type.media_type : nil
     end
 
-    # @return [Boolean] is our content type JSON?
+    # is our content type JSON?
+    # @return [Boolean]
     def json?
       content_type && content_type.json?
     end
 
-    # @return [Boolean] is our content type XML?
+    # is our content type XML?
+    # @return [Boolean]
     def xml?
       content_type && content_type.xml?
     end
 
-    # @return [Boolean] is our content type x-www-form-urlencoded?
+    # is our content type `x-www-form-urlencoded`?
+    # @return [Boolean]
     def form_urlencoded?
       content_type && content_type.form_urlencoded?
     end

data/lib/ur/sub_ur.rb

@@ -5,7 +5,7 @@ require 'ur' unless Object.const_defined?(:Ur)
 module Ur
   module SubUr
     def ur
-      parent_jsis.detect { |p| p.is_a?(::Ur) }
+      jsi_parent_nodes.detect { |p| p.is_a?(::Ur) }
     end
   end
 end

data/lib/ur/version.rb

@@ -1 +1 @@
-UR_VERSION = "0.2.0".freeze
+UR_VERSION = "0.2.1".freeze

data/lib/ur.rb

@@ -6,9 +6,10 @@ require 'jsi'
 require 'time'
 require 'addressable/uri'
 require 'pathname'
+require 'yaml'
 
 UR_ROOT = Pathname.new(__FILE__).dirname.parent.expand_path
-Ur = JSI::Schema.new(YAML.load_file(UR_ROOT.join('resources/ur.schema.yml'))).jsi_schema_module
+Ur = JSI.new_schema_module(YAML.load_file(UR_ROOT.join('resources/ur.schema.yml')))
 module Ur
   VERSION = UR_VERSION
 
@@ -19,9 +20,9 @@ module Ur
   autoload :RackMiddleware, 'ur/middleware'
   autoload :Faraday, 'ur/faraday'
 
-  Request = self.schema.properties['request'].jsi_schema_module
-  Response = self.schema.properties['response'].jsi_schema_module
-  Metadata = self.schema.properties['metadata'].jsi_schema_module
+  Request = self.properties['request']
+  Response = self.properties['response']
+  Metadata = self.properties['metadata']
   require 'ur/request'
   require 'ur/response'
   require 'ur/metadata'
@@ -34,8 +35,7 @@ module Ur
         raise(TypeError, "expected hash for ur instance. got: #{instance.pretty_inspect.chomp}")
       end
 
-      ur_class = JSI.class_for_schemas(Set[schema] + schemas)
-      ur_class.new(instance, options).tap do |ur|
+      JSI::SchemaSet[schema, *schemas].new_jsi(instance, **options).tap do |ur|
         ur.request = {} if ur.request.nil?
         ur.response = {} if ur.response.nil?
         ur.metadata = {} if ur.metadata.nil?

data/resources/ur.schema.yml

@@ -1,3 +1,4 @@
+$schema: http://json-schema.org/draft-07/schema
 $id: https://schemas.ur.unth.net/ur
 type: object
 properties:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ur
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -38,148 +38,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  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'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  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'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  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'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  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'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  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'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  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'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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: ur provides a unified representation of a request and response. it can
   be interpreted from rack, faraday, or potentially other sources, and provides a
   consistent interface to access the attributes inherent to the request and additional
   useful parsers and computation from the request.
 email:
-- ethan@unth
+- ethan.ur@unth.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".simplecov"
-- ".yardopts"
 - CHANGELOG.md
 - LICENSE.md
 - README.md
-- Rakefile.rb
 - lib/ur.rb
 - lib/ur/content_type.rb
 - lib/ur/faraday.rb
@@ -191,15 +62,7 @@ files:
 - lib/ur/response.rb
 - lib/ur/sub_ur.rb
 - lib/ur/version.rb
-- resources/icons/LGPL-3.0.png
 - resources/ur.schema.yml
-- test/content_type_test.rb
-- test/test_helper.rb
-- test/ur_faraday_test.rb
-- test/ur_metadata_test.rb
-- test/ur_rack_test.rb
-- test/ur_test.rb
-- ur.gemspec
 homepage: https://github.com/notEthan/ur
 licenses:
 - LGPL-3.0
@@ -219,15 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 'ur: unified request representation'
-test_files:
-- test/content_type_test.rb
-- test/test_helper.rb
-- test/ur_faraday_test.rb
-- test/ur_metadata_test.rb
-- test/ur_rack_test.rb
-- test/ur_test.rb
-- ".simplecov"
+test_files: []

data/.simplecov

@@ -1 +0,0 @@
-SimpleCov.start

data/.yardopts

@@ -1 +0,0 @@
---main README.md --markup=markdown {lib}/**/*.rb

data/Rakefile.rb

@@ -1,9 +0,0 @@
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test

data/test/content_type_test.rb

@@ -1,342 +0,0 @@
-require_relative 'test_helper'
-
-describe 'Ur::ContentType' do
-  let(:content_type) { Ur::ContentType.new(content_type_str) }
-  describe 'application/vnd.github+json; charset="utf-8"' do
-    let(:content_type_str) { 'application/vnd.github+json; charset="utf-8"' }
-    it 'parses' do
-      assert_equal(content_type, content_type_str)
-
-      assert_equal('application/vnd.github+json', content_type.media_type)
-
-      assert_equal('application', content_type.type)
-      assert(content_type.type?('Application'))
-      assert(content_type.type_application?)
-
-      assert_equal('vnd.github+json', content_type.subtype)
-      assert_equal('vnd', content_type.facet)
-      assert_equal('json', content_type.suffix)
-
-      assert_equal({'charset' => 'utf-8'}, content_type.parameters)
-      assert_equal('utf-8', content_type.parameters['CharSet'])
-    end
-  end
-  describe 'no subtype' do
-    let(:content_type_str) { 'application; charset="utf-8"' }
-    it 'will allow it' do
-      assert_equal(content_type, content_type_str)
-
-      assert_equal('application', content_type.media_type)
-
-      assert_equal('application', content_type.type)
-      assert(content_type.type?('Application'))
-
-      assert_equal(nil, content_type.subtype)
-      assert_equal(nil, content_type.facet)
-      assert_equal(nil, content_type.suffix)
-
-      assert_equal({'charset' => 'utf-8'}, content_type.parameters)
-      assert_equal('utf-8', content_type.parameters['CharSet'])
-    end
-  end
-  describe 'no facet' do
-    let(:content_type_str) { 'application/github+json; charset="utf-8"' }
-    it 'parses' do
-      assert_equal(content_type, content_type_str)
-
-      assert_equal('application/github+json', content_type.media_type)
-
-      assert_equal('application', content_type.type)
-      assert(content_type.type?('Application'))
-
-      assert_equal('github+json', content_type.subtype)
-      assert_equal(nil, content_type.facet)
-      assert_equal('json', content_type.suffix)
-
-      assert_equal({'charset' => 'utf-8'}, content_type.parameters)
-      assert_equal('utf-8', content_type.parameters['CharSet'])
-    end
-  end
-  describe 'no suffix' do
-    let(:content_type_str) { 'application/vnd.github.json; charset="utf-8"' }
-    it 'parses' do
-      assert_equal(content_type, content_type_str)
-
-      assert_equal('application/vnd.github.json', content_type.media_type)
-
-      assert_equal('application', content_type.type)
-      assert(content_type.type?('Application'))
-
-      assert_equal('vnd.github.json', content_type.subtype)
-      assert_equal('vnd', content_type.facet)
-      assert_equal(nil, content_type.suffix)
-
-      assert_equal({'charset' => 'utf-8'}, content_type.parameters)
-      assert_equal('utf-8', content_type.parameters['CharSet'])
-    end
-    describe('[invalid] quote in type') do
-      let(:content_type_str) { 'applic"ation/foo; foo=bar' }
-      it('gives up') do
-        assert_equal('applic', content_type.type)
-        assert_equal(nil, content_type.subtype)
-      end
-    end
-    describe('[invalid] backslash in type') do
-      let(:content_type_str) { 'applicati\on/foo; foo=bar' }
-      it('parses') do
-        assert_equal('applicati\\on', content_type.type)
-        assert_equal('foo', content_type.subtype)
-      end
-    end
-    describe('[invalid] quote in subtype') do
-      let(:content_type_str) { 'application/f"oo; foo=bar' }
-      it('gives up') do
-        assert_equal('application', content_type.type)
-        assert_equal('f', content_type.subtype)
-      end
-    end
-    describe('[invalid] backslash in subtype') do
-      let(:content_type_str) { 'application/fo\\o; foo=bar' }
-      it('parses') do
-        assert_equal('application', content_type.type)
-        assert_equal('fo\\o', content_type.subtype)
-      end
-    end
-  end
-  describe 'parameters' do
-    describe 'basic usage' do
-      let(:content_type_str) { 'application/foo; charset="utf-8"; foo=bar' }
-      it('parses') do
-        assert_equal({'charset' => 'utf-8', 'foo' => 'bar'}, content_type.parameters)
-      end
-    end
-    describe 'params with capitalization' do
-      let(:content_type_str) { 'application/foo; Charset="utf-8"; FOO=bar' }
-      it('parses') do
-        assert_equal({'charset' => 'utf-8', 'foo' => 'bar'}, content_type.parameters)
-        assert_equal('utf-8', content_type.parameters['CharSet'])
-        assert_equal('utf-8', content_type.parameters['Charset'])
-        assert_equal('bar', content_type.parameters['foo'])
-        assert_equal('bar', content_type.parameters['FOO'])
-      end
-    end
-    describe 'repeated params' do
-      let(:content_type_str) { 'application/foo; foo="first"; foo=second' }
-      it('will just overwrite') do
-        assert_equal({'foo' => 'second'}, content_type.parameters)
-      end
-    end
-    describe 'repeated params, different capitalization' do
-      let(:content_type_str) { 'application/foo; FOO=first; Foo=second' }
-      it('will just overwrite') do
-        assert_equal({'foo' => 'second'}, content_type.parameters)
-      end
-    end
-    describe 'empty strings' do
-      let(:content_type_str) { 'application/foo; empty1=; empty2=""' }
-      it('parses') do
-        assert_equal({'empty1' => '', 'empty2' => ''}, content_type.parameters)
-      end
-    end
-    describe 'empty strings with whitespace' do
-      let(:content_type_str) { 'application/foo; empty1=  ; empty2=""   ' }
-      it('parses') do
-        assert_equal({'empty1' => '', 'empty2' => ''}, content_type.parameters)
-      end
-    end
-    describe('[invalid] opening quote only') do
-      let(:content_type_str) { 'application/foo; foo=1; bar="' }
-      it('parses') do
-        assert_equal({'foo' => '1', 'bar' => ''}, content_type.parameters)
-      end
-    end
-    describe('[invalid] backlash with no character') do
-      let(:content_type_str) { 'application/foo; foo=1; bar="\\' }
-      it('parses') do
-        assert_equal({'foo' => '1', 'bar' => ''}, content_type.parameters)
-      end
-    end
-    describe('[invalid] extra following quoted string') do
-      let(:content_type_str) { 'application/foo; foo="1" 2; bar=3' }
-      it('sorta parses') do
-        assert_equal({'foo' => '1 2', 'bar' => '3'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] quotes silliness') do
-      let(:content_type_str) { 'application/foo; foo="1" 2 "3 4" "5 "  ; bar=3' }
-      it('sorta parses') do
-        assert_equal({'foo' => '1 2 3 4 5 ', 'bar' => '3'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] backlash quote') do
-      let(:content_type_str) { 'application/foo; foo=1; bar="\\"' }
-      it('parses') do
-        assert_equal({'foo' => '1', 'bar' => '"'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] trailing ;') do
-      let(:content_type_str) { 'application/foo; foo=bar;' }
-      it('parses') do
-        assert_equal({'foo' => 'bar'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] extra ; inline') do
-      let(:content_type_str) { 'application/foo; ; ; foo=bar' }
-      it('parses') do
-        assert_equal({'foo' => 'bar'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] whitespace around the =') do
-      let(:content_type_str) { 'application/foo; foo = bar; baz = qux' }
-      it('parses') do
-        assert_equal({'foo ' => ' bar', 'baz ' => ' qux'}, content_type.parameters)
-      end
-    end
-    describe('whitespace before the ;') do
-      let(:content_type_str) { 'application/foo; foo=bar ; baz=qux' }
-      it('parses') do
-        assert_equal({'foo' => 'bar', 'baz' => 'qux'}, content_type.parameters)
-      end
-    end
-    describe('no media_type') do
-      let(:content_type_str) { '; foo=bar' }
-      it('parses') do
-        assert_equal({'foo' => 'bar'}, content_type.parameters)
-      end
-    end
-    describe('[invalid] quote in parameter name') do
-      let(:content_type_str) { 'application/foo; fo"o=bar' }
-      it('gives up') do
-        assert_equal({}, content_type.parameters)
-      end
-    end
-    describe('[invalid] backslash in parameter name') do
-      let(:content_type_str) { 'application/foo; fo\\o=bar' }
-      it('parses') do
-        assert_equal({'fo\\o' => 'bar'}, content_type.parameters)
-      end
-    end
-  end
-  describe 'binary?' do
-    binary_content_type_strs = [
-      'audio/ogg',
-      'Audio/OGG; foo=bar',
-      'VIDEO/foo+bar',
-    ]
-    binary_content_type_strs.each do |binary_content_type_str|
-      describe(binary_content_type_str) do
-        let(:content_type_str) { binary_content_type_str }
-        it 'is binary' do
-          assert(content_type.binary?(unknown: false))
-        end
-      end
-    end
-    not_binary_content_type_strs = [
-      'text/anything',
-      'TEXT/plain; charset=foo',
-      'application/JSON',
-      'media/foo+Json; foo="bar"',
-    ]
-    not_binary_content_type_strs.each do |not_binary_content_type_str|
-      describe(not_binary_content_type_str) do
-        let(:content_type_str) { not_binary_content_type_str }
-        it 'is not binary' do
-          assert(!content_type.binary?(unknown: true))
-        end
-      end
-    end
-    unknown_content_type_strs = [
-      'foo',
-      'foo/bar; note="not application/json"',
-      'application/jsonisnotthis',
-      'application/octet-stream',
-    ]
-    unknown_content_type_strs.each do |unknown_content_type_str|
-      describe(unknown_content_type_str) do
-        let(:content_type_str) { unknown_content_type_str }
-        it 'is unknown' do
-          assert(content_type.binary?(unknown: true))
-          assert(!content_type.binary?(unknown: false))
-        end
-      end
-    end
-  end
-  describe 'json?' do
-    json_content_type_strs = [
-      'application/json',
-      'Application/Json; charset=EBCDIC',
-      'Text/json',
-      'MEDIA/JSON',
-      'media/foo.bar+json',
-      'media/foo.bar+json; foo=',
-    ]
-    json_content_type_strs.each do |json_content_type_str|
-      describe(json_content_type_str) do
-        let(:content_type_str) { json_content_type_str }
-        it 'is json' do
-          assert(content_type.json?)
-        end
-      end
-    end
-    not_json_content_type_strs = [
-      'json',
-      'foo/bar; note="not application/json"',
-      'application/jsonisnotthis',
-      'text/json+xml', # I don't even know what I'm trying for here
-    ]
-    not_json_content_type_strs.each do |not_json_content_type_str|
-      describe(not_json_content_type_str) do
-        let(:content_type_str) { not_json_content_type_str }
-        it 'is not json' do
-          assert(!content_type.json?)
-        end
-      end
-    end
-  end
-  describe 'xml?' do
-    xml_content_type_strs = [
-      'application/xml',
-      'Application/Xml; charset=EBCDIC',
-      'Text/xml',
-      'MEDIA/XML',
-      'media/foo.bar+xml',
-      'media/foo.bar+xml; foo=',
-    ]
-    xml_content_type_strs.each do |xml_content_type_str|
-      describe(xml_content_type_str) do
-        let(:content_type_str) { xml_content_type_str }
-        it 'is xml' do
-          assert(content_type.xml?)
-        end
-      end
-    end
-    not_xml_content_type_strs = [
-      'xml',
-      'foo/bar; note="not application/xml"',
-      'application/xmlisnotthis',
-      'text/xml+json', # I don't even know what I'm trying for here
-    ]
-    not_xml_content_type_strs.each do |not_xml_content_type_str|
-      describe(not_xml_content_type_str) do
-        let(:content_type_str) { not_xml_content_type_str }
-        it 'is not xml' do
-          assert(!content_type.xml?)
-        end
-      end
-    end
-  end
-  describe 'form_urlencoded?' do
-    describe('application/x-www-form-urlencoded') do
-      let(:content_type_str) { 'application/x-www-form-urlencoded' }
-      it 'is form_urlencoded' do
-        assert(content_type.form_urlencoded?)
-      end
-    end
-    describe('application/foo') do
-      let(:content_type_str) { 'application/foo' }
-      it 'is not form_urlencoded' do
-        assert(!content_type.form_urlencoded?)
-      end
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,33 +0,0 @@
-proc { |p| $:.unshift(p) unless $:.any? { |lp| File.expand_path(lp) == p } }.call(File.expand_path('../lib', File.dirname(__FILE__)))
-
-require 'simplecov'
-require 'byebug'
-
-# NO EXPECTATIONS
-ENV["MT_NO_EXPECTATIONS"] = ''
-
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-
-class UrSpec < Minitest::Spec
-  if ENV['UR_TEST_ALPHA']
-    # :nocov:
-    define_singleton_method(:test_order) { :alpha }
-    # :nocov:
-  end
-
-  def assert_json_equal(exp, act, *a)
-    assert_equal(JSI::Typelike.as_json(exp), JSI::Typelike.as_json(act), *a)
-  end
-
-  def assert_equal exp, act, msg = nil
-    msg = message(msg, E) { diff exp, act }
-    assert exp == act, msg
-  end
-end
-
-# register this to be the base class for specs instead of Minitest::Spec
-Minitest::Spec.register_spec_type(//, UrSpec)
-
-require 'ur'

data/test/ur_faraday_test.rb

@@ -1,79 +0,0 @@
-require_relative 'test_helper'
-require 'faraday'
-require 'faraday_middleware'
-
-describe 'Ur faraday integration' do
-  it 'integrates, basic usage' do
-    ur = nil
-    faraday_conn = ::Faraday.new('https://ur.unth.net/') do |builder|
-      builder.use(Ur::FaradayMiddleware,
-        after_response: -> (ur_) { ur = ur_ },
-      )
-      builder.adapter(:rack, -> (env) { [200, {'Content-Type' => 'text/plain'}, ['ᚒ']] })
-    end
-    res = faraday_conn.get('/')
-    assert_equal('ᚒ', res.body)
-    assert_kind_of(Ur, ur)
-    assert_equal('get', ur.request['method'])
-    assert_equal('text/plain', ur.response.headers['Content-Type'])
-    assert_equal('ᚒ', ur.response.body)
-    assert(ur.validate)
-  end
-  it 'integrates, IO body' do
-    ur = nil
-    faraday_conn = ::Faraday.new('https://ur.unth.net/') do |builder|
-      builder.use(Ur::FaradayMiddleware,
-        after_response: -> (ur_) { ur = ur_ },
-      )
-      builder.adapter(:rack, -> (env) { [200, {'Content-Type' => 'text/plain'}, ['☺']] })
-    end
-    res = faraday_conn.post('/', StringIO.new('hello!'))
-    assert_equal('☺', res.body)
-    assert_kind_of(Ur, ur)
-    assert_equal('post', ur.request['method'])
-    assert_equal('hello!', ur.request.body)
-    assert_equal('text/plain', ur.response.headers['Content-Type'])
-    assert_equal('☺', ur.response.body)
-    assert(ur.validate)
-  end
-  it 'integrates, faraday middleware munges the json bodies but uses preserve_raw' do
-    ur = nil
-    faraday_conn = ::Faraday.new('https://ur.unth.net/') do |builder|
-      builder.request :json
-      builder.use(Ur::FaradayMiddleware,
-        after_response: -> (ur_) { ur = ur_ },
-      )
-      builder.response :json, preserve_raw: true
-      builder.adapter(:rack, -> (env) { [200, {'Content-Type' => 'application/json'}, ['{}']] })
-    end
-    res = faraday_conn.post('/', {'a' => 'b'})
-    assert_equal({}, res.body)
-    assert_kind_of(Ur, ur)
-    assert_equal('post', ur.request['method'])
-    assert_equal('{"a":"b"}', ur.request.body)
-    assert_equal('application/json', ur.response.headers['Content-Type'])
-    assert_equal('{}', ur.response.body)
-    assert(ur.validate)
-  end
-  it 'integrates, faraday middleware munges the json bodies and does not preserve_raw' do
-    ur = nil
-    faraday_conn = ::Faraday.new('https://ur.unth.net/') do |builder|
-      builder.use(Ur::FaradayMiddleware,
-        after_response: -> (ur_) { ur = ur_ },
-      )
-      builder.request :json
-      builder.response :json
-      builder.adapter(:rack, -> (env) { [200, {'Content-Type' => 'application/json'}, ['{}']] })
-    end
-    res = faraday_conn.post('/', {'a' => 'b'})
-    assert_equal({}, res.body)
-    assert_kind_of(Ur, ur)
-    assert_equal('post', ur.request['method'])
-    assert_nil(ur.request.body) # no good
-    assert_json_equal({"a" => "b"}, ur.request['body_parsed']) # best we get here
-    assert_equal('application/json', ur.response.headers['Content-Type'])
-    assert_nil(ur.response.body) # no good
-    assert_json_equal({}, ur.response['body_parsed']) # best we get here
-    assert(ur.validate)
-  end
-end

data/test/ur_metadata_test.rb

@@ -1,11 +0,0 @@
-require_relative 'test_helper'
-
-describe 'Ur metadata' do
-  it 'sets duration from began_at' do
-    ur = Ur.new
-    ur.metadata.began_at = Time.now
-    ur.metadata.finish!
-    assert_instance_of(Float, ur.metadata.duration)
-    assert_operator(ur.metadata.duration, :>, 0)
-  end
-end

data/test/ur_rack_test.rb

@@ -1,25 +0,0 @@
-require_relative 'test_helper'
-require 'rack'
-
-describe 'Ur rack integration' do
-  it 'builds from a rack env' do
-    env = Rack::MockRequest.env_for('https://ur.unth.net/', {'HTTP_FOO' => 'bar'})
-    ur = Ur.from_rack_request(env)
-    assert_equal('inbound', ur.bound)
-    assert_equal('GET', ur.request['method'])
-    assert_equal('bar', ur.request.headers['foo'])
-    assert_equal('https://ur.unth.net/', ur.request.uri)
-    assert(ur.response.empty?)
-    assert(ur.validate)
-  end
-  it 'builds from a rack request' do
-    env = Rack::Request.new(Rack::MockRequest.env_for('https://ur.unth.net/', {'HTTP_FOO' => 'bar'}))
-    ur = Ur.from_rack_request(env)
-    assert_equal('inbound', ur.bound)
-    assert_equal('GET', ur.request['method'])
-    assert_equal('bar', ur.request.headers['foo'])
-    assert_equal('https://ur.unth.net/', ur.request.uri)
-    assert(ur.response.empty?)
-    assert(ur.validate)
-  end
-end

data/test/ur_test.rb

@@ -1,105 +0,0 @@
-require_relative 'test_helper'
-require 'faraday'
-require 'active_support/tagged_logging'
-
-describe 'Ur' do
-  it 'has a valid schema' do
-    Ur.schema.validate_schema!
-  end
-
-  it 'initializes' do
-    Ur.new_jsi({})
-  end
-
-  it 'would prefer not to initialize' do
-    assert_raises(TypeError) { Ur.new("hello!") }
-  end
-
-  it 'integrates with rack and faraday middlewares' do
-    rack_app = proc do |env|
-      [200, {'Content-Type' => 'text/plain'}, ['ᚒ']]
-    end
-    client_logger = ActiveSupport::TaggedLogging.new(Logger.new(StringIO.new))
-    server_logger = ActiveSupport::TaggedLogging.new(Logger.new(StringIO.new))
-    called_rack_before_request = false
-    called_rack_after_response = false
-    called_faraday_before_request = false
-    called_faraday_after_response = false
-    rack_app = Ur::RackMiddleware.new(rack_app, logger: server_logger,
-      before_request: -> (ur) do
-        called_rack_before_request = true
-
-        server_logger.push_tags 'ur_test_rack'
-
-        assert_equal('inbound', ur.bound)
-        assert_equal('GET', ur.request['method'])
-        assert_equal('ur.unth.net', ur.request.headers['host'])
-        assert_equal('bar', ur.request.headers['foo'])
-        assert_equal('https://ur.unth.net/', ur.request.uri)
-        assert(ur.response.empty?)
-        assert_nil(ur.metadata.began_at)
-        assert_nil(ur.metadata.duration)
-        assert(ur.validate)
-      end,
-      after_response: -> (ur) do
-        called_rack_after_response = true
-
-        server_logger.pop_tags
-
-        assert_equal('inbound', ur.bound)
-        assert_equal('GET', ur.request['method'])
-        assert_equal(200, ur.response.status)
-        assert_equal('text/plain', ur.response.headers['Content-Type'])
-        assert_equal('ᚒ', ur.response.body)
-        assert_instance_of(Time, ur.metadata.began_at)
-        assert_instance_of(Float, ur.metadata.duration)
-        assert_operator(ur.metadata.duration, :>, 0)
-        assert_equal(['ur_test_rack'], ur.metadata.tags.to_a)
-        assert(ur.validate)
-      end,
-    )
-    faraday_conn = ::Faraday.new('https://ur.unth.net/') do |builder|
-      builder.use(Ur::FaradayMiddleware, logger: client_logger,
-        before_request: -> (ur) do
-          called_faraday_before_request = true
-
-          client_logger.push_tags 'ur_test_faraday'
-
-          assert_equal('outbound', ur.bound)
-          assert_equal('get', ur.request['method'])
-          assert_equal('bar', ur.request.headers['foo'])
-          assert_equal('https://ur.unth.net/', ur.request.uri)
-          assert_equal(Addressable::URI.parse('https://ur.unth.net/'), ur.request.addressable_uri)
-          assert(ur.response.empty?)
-          assert_nil(ur.metadata.began_at)
-          assert_nil(ur.metadata.duration)
-          assert(ur.validate)
-        end,
-        after_response: -> (ur) do
-          called_faraday_after_response = true
-
-          client_logger.pop_tags
-
-          assert_equal('outbound', ur.bound)
-          assert_equal('get', ur.request['method'])
-          assert_equal(200, ur.response.status)
-          assert_equal('text/plain', ur.response.headers['Content-Type'])
-          assert_equal('ᚒ', ur.response.body)
-          assert_instance_of(Time, ur.metadata.began_at)
-          assert_instance_of(Float, ur.metadata.duration)
-          assert_operator(ur.metadata.duration, :>, 0)
-          assert_equal(['ur_test_faraday'], ur.metadata.tags.to_a)
-          assert(ur.validate)
-        end,
-      )
-      builder.adapter(:rack, rack_app)
-    end
-    res = faraday_conn.get('/', nil, {'Foo' => 'bar'})
-    assert(called_rack_before_request)
-    assert(called_rack_after_response)
-    assert(called_faraday_before_request)
-    assert(called_faraday_after_response)
-    assert_equal(200, res.status)
-    assert_equal('ᚒ', res.body)
-  end
-end

data/ur.gemspec

@@ -1,33 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ur/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "ur"
-  spec.version       = UR_VERSION
-  spec.authors       = ["Ethan"]
-  spec.email         = ["ethan@unth"]
-
-  spec.summary       = 'ur: unified request representation'
-  spec.description   = 'ur provides a unified representation of a request and response. it can be interpreted from rack, faraday, or potentially other sources, and provides a consistent interface to access the attributes inherent to the request and additional useful parsers and computation from the request.'
-  spec.homepage      = "https://github.com/notEthan/ur"
-  spec.license       = "LGPL-3.0"
-
-  ignore_files   = %w(.gitignore .travis.yml Gemfile test)
-  ignore_files_re = %r{\A(#{ignore_files.map { |f| Regexp.escape(f) }.join('|')})(/|\z)}
-  spec.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(ignore_files_re) }
-  spec.test_files   = `git ls-files -z test`.split("\x0") + ['.simplecov']
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "jsi", "~> 0.4"
-  spec.add_dependency "addressable", "~> 2.0"
-  spec.add_development_dependency "rack"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "faraday"
-  spec.add_development_dependency "faraday_middleware"
-  spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "simplecov"
-end