ur 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39ab1a17905dc8a0fb40eb22896580951abec8cfe78a11c4a1fd558ca6c6917
-  data.tar.gz: 5915b4da516b30c6ee291eb7f5a5bb5a8f974d30da327d5660a9b1a0549068a8
+  metadata.gz: b856342339ad2804ef44731304ee8ecc7801bf090ce019d00751bb8b491df4ff
+  data.tar.gz: 75095d90b5e6e4ebff5020fff905a2b52348be06aa2495b8dfe79c730f6e8cc0
 SHA512:
-  metadata.gz: e59ca34e85e21e8c659a10e57cffad39d3fa718389bed6ccb6e4327cb33b237569517bb8d5c2eb93272a0c20634966697823a7142f1d861ba58c933dad5342c6
-  data.tar.gz: 3ab8ad92c6e70fc3dd87928a200a500e8bd5d27440fd9c2b3e35d46d3778aed80122cefda50875cb0bb6f84dcba75fbc24bdc194d88d4f345439b97f98f7b9b6
+  metadata.gz: 5934007c613d667498a52cc36238b9d7ff378381945a4d1fceaeb87f4be73cf93af4336701a4a076aea8c1e47de377ada03071a6e0cb52ebf30764bcfd1d1dd5
+  data.tar.gz: b6a86b4deac6c7d452aaa46bd828d4695ef954bf085a94d0d86bcbf290e4dcc9759a31eb7b726471f09c8999981a3e455349e07be062411762e3899de6c344a2

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+# v0.2.4
+
+- JSI = v0.8.0
+
+# v0.2.3
+
+- JSI v0.7.0
+
 # v0.2.2
 
 - Ur::Weblink
-- JSI v0.7.0
 - Ruby 3
 
 # v0.2.1

data/lib/ur/content_type.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ur' unless Object.const_defined?(:Ur)
+require 'strscan'
 
 module Ur
   # Ur::ContentType represents a Content-Type header field.

data/lib/ur/version.rb

@@ -1 +1 @@
-UR_VERSION = "0.2.2".freeze
+UR_VERSION = "0.2.4".freeze

data/lib/ur/weblink.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ur' unless Object.const_defined?(:Ur)
+require 'strscan'
 
 module Ur
   # a RFC5988 Web Link
@@ -19,6 +20,14 @@ module Ur
     class NoContextError < Error
     end
 
+    ATTR_CHAR = /[a-zA-Z0-9!#\$&+\-.^_`|~]/.freeze # defined in https://tools.ietf.org/html/rfc5987#section-3.2.1
+    PTOKEN = %r([a-zA-Z0-9!#\$%&'()*+\-./:<=>?@\[\]^_`{|}~]).freeze
+    QUOTED_STRING = /"([^"]*)"/.freeze
+
+    # attributes: semicolon, some attr_chars, an optional asterisk, equals, and a quoted
+    # string or series of unquoted ptokens
+    ATTRIBUTE_PAIR = /\s*;\s*(#{ATTR_CHAR.source}+\*?)\s*=\s*(?:#{QUOTED_STRING.source}|(#{PTOKEN.source}+))\s*/.freeze
+
     # parses an array of Web Links from the value an HTTP Link header, as described in
     # https://tools.ietf.org/html/rfc5988#section-5
     #
@@ -28,11 +37,6 @@ module Ur
 
       return links unless link_value
 
-      attr_char = /[a-zA-Z0-9!#\$&+\-.^_`|~]/ # defined in https://tools.ietf.org/html/rfc5987#section-3.2.1
-      ptoken = %r([a-zA-Z0-9!#\$%&'()*+\-./:<=>?@\[\]^_`{|}~])
-      quoted_string = /"([^"]*)"/
-
-      require 'strscan'
       ss = StringScanner.new(link_value)
       parse_fail = proc do
         raise ParseError, "Unable to parse link value: #{link_value} " +
@@ -44,9 +48,7 @@ module Ur
         ss.scan(/\s*<([^>]+)>/) || parse_fail.call
         target_uri = ss[1]
         attributes = {}
-        # get the attributes: semicolon, some attr_chars, an optional asterisk, equals, and a quoted
-        # string or series of unquoted ptokens
-        while ss.scan(/\s*;\s*(#{attr_char.source}+\*?)\s*=\s*(?:#{quoted_string.source}|(#{ptoken.source}+))\s*/)
+        while ss.scan(ATTRIBUTE_PAIR)
           attributes[ss[1]] = ss[2] || ss[3]
         end
         links << new(target_uri, attributes, context_uri)

data/lib/ur.rb

@@ -31,16 +31,16 @@ module Ur
   autoload :ContentType, 'ur/content_type'
 
   class << self
-    def new(instance = {}, schemas: Set[], **options)
+    def new(instance = {}, schemas: Set[], mutable: true, **options)
       unless instance.respond_to?(:to_hash)
-        raise(TypeError, "expected hash for ur instance. got: #{instance.pretty_inspect.chomp}")
+        raise(TypeError, "Epected Ur instance content to be a Hash. Got: #{instance.pretty_inspect.chomp}")
       end
 
-      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?
-      end
+      instance = instance.merge({'request' => {}}) if !instance['request']
+      instance = instance.merge({'response' => {}}) if !instance['response']
+      instance = instance.merge({'metadata' => {}}) if !instance['metadata']
+
+      JSI::SchemaSet[schema, *schemas].new_jsi(instance, mutable: mutable, **options)
     end
 
     def from_rack_request(request_env, **options)
@@ -76,9 +76,11 @@ module Ur
           end
         end.compact.inject({}, &:update)
 
-        env["rack.input"].rewind
-        ur.request.body = env["rack.input"].read
-        env["rack.input"].rewind
+        if env["rack.input"]
+          env["rack.input"].rewind
+          ur.request.body = env["rack.input"].read
+          env["rack.input"].rewind
+        end
       end
     end
 

data/ur.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ur/version"
+require_relative "lib/ur/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "ur"
@@ -25,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jsi", "~> 0.6"
+  spec.add_dependency "jsi", "= 0.8.0"
   spec.add_dependency "addressable", "~> 2.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ur
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ethan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: 'ur: unified request representation'