linkheaders-processor 0.1.19 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65747de845763341178717385337c65ed5d78a7df57bccecee17f392d8330b12
-  data.tar.gz: 1e2c5ae203200e40e8fc238b211f63491bc2ba4756d3bd807ccb916a7c9b270f
+  metadata.gz: 88db7265719e8b2f1d6fa9f804d6970dc411f6ff609cdff6fbf21f9e904d76d8
+  data.tar.gz: b504685f471206e45bae949bc3f423c2ed9e9aedca7c0d27784c5ca6d6a78e02
 SHA512:
-  metadata.gz: a92597e6f649e5abdc524862c051a0a2d442c753976ea5cea70ce0ce4b1c30261d0f0f3e9e3e577ad55c396cad7a780c806f068012ef26a3ae91a7cc8fbb109e
-  data.tar.gz: bdd96b086e950c0b427ec8d15ed151723639d72b81d9f3a15adfca22bf7326c51ee9711cf0aa451a3e1d472cb14d8c46d6ced944627058d5e87fa695dbcde6f6
+  metadata.gz: a1973c63103587b077879d1d53fa50cc5f9b1102a3dd8db2e56d792ceaa0d60addcb8a3edeb50069fa3263c2f4820e09cdd9714579c4d0b119ab2cbbe5e44122
+  data.tar.gz: ce8c65a0e657430caca6abff60c435aa79bc659f6623017ddb9d7e90d2988c7f51650ca7f89df58b2c5db2a1b904c8137da7c66c1557d08f80208304cef6ba8d

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    linkheaders-processor (0.1.19)
+    linkheaders-processor (0.1.21)
       json (~> 2.0)
       json-ld (~> 3.2)
       json-ld-preloaded (~> 3.2)
       link_header (~> 0.0.8)
       metainspector (~> 5.11.2)
       rest-client (~> 2.1)
-      securerandom (~> 0.1.0)
+      securerandom
 
 GEM
   remote: https://rubygems.org/
@@ -16,10 +16,11 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    bcp47_spec (0.2.1)
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (1.10.1)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -58,16 +59,16 @@ GEM
       domain_name (~> 0.5)
     json (2.6.2)
     json-canonicalization (0.3.2)
-    json-ld (3.2.5)
+    json-ld (3.3.0)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.3, >= 0.3.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
-      rdf (~> 3.2, >= 3.2.10)
-    json-ld-preloaded (3.2.2)
-      json-ld (~> 3.2)
-      rdf (~> 3.2)
+      rdf (~> 3.3)
+    json-ld-preloaded (3.3.0)
+      json-ld (~> 3.3)
+      rdf (~> 3.3)
     link_header (0.0.8)
     metainspector (5.11.2)
       addressable (~> 2.7)
@@ -83,7 +84,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0808)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     nesty (1.0.2)
     netrc (0.11.0)
     nokogiri (1.15.4-x86_64-linux)
@@ -96,7 +97,8 @@ GEM
     rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    rdf (3.2.11)
+    rdf (3.3.1)
+      bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
     regexp_parser (2.5.0)
     rest-client (2.1.0)
@@ -132,7 +134,7 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    securerandom (0.1.1)
+    securerandom (0.2.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)

data/README.md

@@ -1,4 +1,4 @@
-# LinkHeader::Parser
+# LinkHeaders::Processor
 
 A gem to extract Link Headers from Web responses.
 

data/lib/linkheaders/processor/version.rb

@@ -3,6 +3,6 @@
 
 module LinkHeaders
   class Processor
-    VERSION = "0.1.19"
+    VERSION = "0.1.21"
   end
 end

data/lib/linkheaders/processor.rb

@@ -96,28 +96,33 @@ module LinkHeaders
     def split_http_link_headers_and_process(parts)
       newlinks = Array.new
       parts.each do |part, _index|
-        # warn "link is:  #{part}"
-
-        section = part.split(';') # ["<https://example.one.com>", "rel='preconnect'"]
-        warn section
-        next unless section[0]
-
-        href = section[0][/<(.*)>/, 1]
-        next unless href  # this is mandatory!
-
-        next unless section[1]
+        warn "link is:  #{part}"  # <https://s11.no/2022/a2a-fair-metrics/70-rda-r1-01m-t2-type-charset/test-apple-data.csv>;rel="item";type="text/csv;charset=UTF-8"
+
+        # this is crazy hard, because we can't rely on quotes!
+        part = part + ";"
+        href = part[/<([^\]]+)>;/, 1]
+        next unless href
+        part = part.gsub(/<([^\]]+)>\s?;\s?/, "") # now only ;rel="item";type="text/csv;charset=UTF-8"; pro=gram
+        pieces = part.scan(/(\S+?\s?=\s?"[^"]+?"\s?);?/).flatten  # ["rel=\"item\"", "type=\"text/csv;charset=UTF-8\""]   and the non-quoted stuff is ignored
+        pieces.each do |p|
+          part = part.gsub(p, "")  # now just ";;prog=gram;"
+        end
+        rest = part.split(";")  # ["", "", "prog=gram"]
 
         sections = {}
-        section[1..].each do |s| # can be more than one link property "rel='preconnect'"
+        pieces.concat(rest).each do |s| # can be more than one link property "rel='preconnect'"
           s.strip!
-          unless m = s.match(%r{(\w+?)="?([\w:\d.,\#\-+/\s]+)"?})
+          unless m = s.match(%r{(\w+?)\s?=\s?"?([\w\;\:\d\.\,\=\#\-\+\/\s]+)"?})
+          warn " NO PATTERN MATCH ON #{s}"
             next
           end # can be rel="cite-as describedby"  --> two relations in one!  or "linkset+json"
 
           relation = m[1] # rel"
           value = m[2] # "preconnect"
+          warn "section relation #{relation} value #{value}"
           sections[relation] = value # value could hold multiple relation types   sections[:rel] = "preconnect"
         end
+
         next unless sections['rel']  # the relation is required!
 
         anchor = sections['anchor'] || default_anchor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkheaders-processor
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: ruby
 authors:
 - Mark Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,16 +84,16 @@ dependencies:
   name: securerandom
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metainspector
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ metadata:
   homepage_uri: https://github.com/markwilkinson/linkheader-processor
   source_code_uri: https://github.com/markwilkinson/linkheader-processor
   changelog_uri: https://github.com/markwilkinson/linkheader-processor/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/linkheaders-processor/
 post_install_message: 
 rdoc_options: []
 require_paths: