ur 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834735162f5c696d940e546b1908bca87a2b0c8e93d3f20247b1468404071b56
-  data.tar.gz: 6083f1cfaf96c4857c43e580398c512e00589f8e0ef9b799f365d2719d8c1848
+  metadata.gz: 8a9b51f120da021be44f14991d4dc1d726fb58b5b70a4bd595ad29ca8af12fff
+  data.tar.gz: 373234337bf222a869de55a7bf5bd9ccda0ccf54b469e109832f6962856937ea
 SHA512:
-  metadata.gz: 39f8e38f80a35a4d019bed707745d7835fcdc92e8e162dd90a492ce46c711016cb73789ff57d384ac763f8514a5f5749ccc4f1db75a9d4cad4e96a7512ce8be4
-  data.tar.gz: 4c92cbd6cf2dcb597bd6a265cd7c5a892af3ea504a220e82a7cbcc5e06ef421703ead862e0ba5b6ab88b7633050fe93966befc78c50a76c4f5e23155d65c8a7c
+  metadata.gz: 916a05043d591e85b189b364550eca8944302a88b35402d8f46b1a588489cd756039e3dc226c2f3940aa77116d6f3669481f74c9bf620c11766a3dbc09f4ca7e
+  data.tar.gz: a6e10766c94d53c3c8a2f87e7d2b911f808cb1ee32a04732e8058c98822a8674b5e1bcd7471f83102a642bc3d5a5767f4e4263b68fe0257d10d7fd04b32bb009

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.2.5
+
+- Request and Response #links
+- JSI ~> v0.8.1
+
+# v0.2.4
+
+- JSI = v0.8.0
+
 # v0.2.3
 
 - JSI v0.7.0

data/lib/ur/request_and_response.rb

@@ -41,6 +41,14 @@ module Ur
       content_type ? content_type.media_type : nil
     end
 
+    # @return [Enumerable<Weblink>]
+    def links
+      headers.each do |k, v|
+        return(Weblink.parse_link_value(v, ur.request.uri)) if k =~ /\Alink\z/i
+      end
+      [].freeze
+    end
+
     # is our content type JSON?
     # @return [Boolean]
     def json?

data/lib/ur/version.rb

@@ -1 +1 @@
-UR_VERSION = "0.2.3".freeze
+UR_VERSION = "0.2.5".freeze

data/lib/ur/weblink.rb

@@ -20,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
     #
@@ -29,10 +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 = /"([^"]*)"/
-
       ss = StringScanner.new(link_value)
       parse_fail = proc do
         raise ParseError, "Unable to parse link value: #{link_value} " +
@@ -42,26 +46,25 @@ module Ur
       while !ss.eos?
         # get the target_uri, within some angle brackets
         ss.scan(/\s*<([^>]+)>/) || parse_fail.call
-        target_uri = ss[1]
+        target_uri = JSI::Util.uri(ss[1].freeze)
         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*/)
-          attributes[ss[1]] = ss[2] || ss[3]
+        while ss.scan(ATTRIBUTE_PAIR)
+          attributes[ss[1].freeze] = (ss[2] || ss[3]).freeze
         end
-        links << new(target_uri, attributes, context_uri)
+        links << new(target_uri, attributes.freeze, context_uri)
         unless ss.eos?
           # either the string ends or has a comma followed by another link
           ss.scan(/\s*,\s*/) || parse_fail.call
         end
       end
-      links
+      links.freeze
     end
 
     def initialize(target_uri, attributes, context_uri=nil)
-      @target_uri = to_addressable_uri(target_uri)
+      @target_uri = JSI::Util.uri(target_uri)
       @attributes = attributes
-      @context_uri = to_addressable_uri(context_uri)
+      @context_uri = JSI::Util.uri(context_uri)
+      freeze
     end
 
     # the context uri of the link, as an Addressable URI. this URI must be absolute, and the target_uri
@@ -115,11 +118,16 @@ module Ur
       "<#{target_uri}>" + attributes.map { |k,v| %Q(; #{k}="#{v}") }.join('')
     end
 
-    private
+    include(JSI::Util::Private::FingerprintHash::Immutable)
 
-    # if uri is nil, returns nil; otherwise, tries to return a Addressable::URI
-    def to_addressable_uri(uri)
-      uri.nil? || uri.is_a?(Addressable::URI) ? uri : Addressable::URI.parse(uri)
+    # @private
+    def jsi_fingerprint
+      {
+        class: Weblink,
+        target_uri: @target_uri,
+        attributes: @attributes,
+        context_uri: @context_uri,
+      }.freeze
     end
   end
 end

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
 
@@ -94,7 +96,7 @@ module Ur
 
   # Ur#logger_tags applies tags from a tagged logger to this ur's metadata.
   # note: ur does not log anything and this logger is not stored.
-  # @param [logger] a tagged logger
+  # @param logger a tagged logger
   # @return [void]
   def logger_tags(logger)
     if logger && logger.formatter.respond_to?(:current_tags)

data/ur.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jsi", "~> 0.7"
+  spec.add_dependency "jsi", "~> 0.8.1"
   spec.add_dependency "addressable", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ur
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Ethan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement