linkheaders-processor 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df2bc9ea84550e0de7be8110f49121ea84962ac797b01860858a445213787d5
-  data.tar.gz: ea148084a6ee71bb8e5509ae94c1dde4714dc66e609527b8c186362cc71c7c76
+  metadata.gz: c8eb95bf3880ef8dba373d47230b512d5209bcde19581c1064c2cb703bab3abf
+  data.tar.gz: 3ac9096ab4487e30f5e8a78a18cd982f47e232f4dc7e8b9d9573b73ee96b63ad
 SHA512:
-  metadata.gz: 9b66ae4ca8d0b48f71d4d33f2bccc1575abc5efe65ebe7bc756cab9fb47836d06fe9dc011ae0e55b0a3be6db331e3018e62d006bb8140b181538b65dc66cbab1
-  data.tar.gz: 8c2ae044bd1a111f915ea419932b431227b344386ad1824d4e1fc6f86269c2c513d72918d693addf0fa6e0ae0a3fcc2cabb9fa9c27542b3f5bed4d1d5edbf3d9
+  metadata.gz: 6de8bcfd72fb78d76483fe9473ece432ccfc6de1cd68eb1ceda5509ec7324e9c010f60a8c996c335c4164cc920a23b046c8ea1a0f9b6edd08f55acfe17e7caca
+  data.tar.gz: 557b9ff9c6f9da8a7f28d3f01e9079f14caf205fe14b017bcc0aa2902b80a89cd32207e98e4ec2642e9d08aae112c22c6835e0821fb7acc1282a3e620771f0cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    linkheaders-processor (0.1.14)
+    linkheaders-processor (0.1.18)
       json (~> 2.0)
       json-ld (~> 3.2)
       json-ld-preloaded (~> 3.2)
@@ -19,7 +19,7 @@ GEM
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (1.10.0)
+    faraday (1.10.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -39,7 +39,7 @@ GEM
     faraday-encoding (0.0.5)
       faraday
     faraday-excon (1.1.0)
-    faraday-http-cache (2.4.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
@@ -58,13 +58,13 @@ GEM
       domain_name (~> 0.5)
     json (2.6.2)
     json-canonicalization (0.3.0)
-    json-ld (3.2.1)
+    json-ld (3.2.3)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (~> 2.2)
-      rdf (~> 3.2)
+      rdf (~> 3.2, >= 3.2.9)
     json-ld-preloaded (3.2.0)
       json-ld (~> 3.2)
       rdf (~> 3.2)
@@ -96,7 +96,7 @@ GEM
     rack (2.2.4)
     rainbow (3.1.1)
     rake (13.0.6)
-    rdf (3.2.8)
+    rdf (3.2.9)
       link_header (~> 0.0, >= 0.0.8)
     regexp_parser (2.5.0)
     rest-client (2.1.0)
@@ -118,7 +118,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.32.0)
+    rubocop (1.33.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)

data/lib/linkheaders/processor/version.rb

@@ -3,6 +3,6 @@
 
 module LinkHeaders
   class Processor
-    VERSION = "0.1.14"
+    VERSION = "0.1.18"
   end
 end

data/lib/linkheaders/processor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'processor/version'
-require_relative 'constants'
 require_relative 'link'
 require_relative 'web_utils'
 require 'link_header'
@@ -63,10 +62,10 @@ module LinkHeaders
       newlinks = parse_http_link_headers(head) # pass guid to check against anchors in linksets
       warn "HTTPlinks #{newlinks.inspect}"
 
-      HTML_FORMATS['html'].each do |format|
+      ['text/html','text/xhtml+xml', 'application/xhtml+xml'].each do |format|
         if head[:content_type] and head[:content_type].match(format)
           warn "found #{format} content - parsing"
-          htmllinks = parse_html_link_headers(body) # pass html body to find HTML link headers
+          htmllinks = parse_html_link_headers(body: body, anchor: default_anchor) # pass html body to find HTML link headers
           warn "htmllinks #{htmllinks.inspect}"
         end
       end
@@ -124,7 +123,7 @@ module LinkHeaders
         relation = sections['rel']
         sections.delete('rel')
         relations = relation.split(/\s+/)  # handle the multiple relation case
-        $stderr.puts "RELATIONS #{relations}"
+        warn "RELATIONS #{relations}"
 
         relations.each do |rel|
           next unless rel.match?(/\w/)
@@ -139,8 +138,8 @@ module LinkHeaders
     #
     # @param [String] body The HTML of the page containing HTML Link headers
     #
-    def parse_html_link_headers(body)
-      m = MetaInspector.new('http://example.org', document: body)
+    def parse_html_link_headers(body:, anchor: '')
+      m = MetaInspector.new(anchor, document: body)
       # an array of elements that look like this: [{:rel=>"alternate", :type=>"application/ld+json", :href=>"http://scidata.vitk.lv/dataset/303.jsonld"}]
       newlinks = Array.new
       m.head_links.each do |l|
@@ -155,7 +154,7 @@ module LinkHeaders
         l.delete(:href)        
         
         relations = relation.split(/\s+/)  # handle the multiple relation case
-        $stderr.puts "RELATIONS #{relations}"
+        warn "RELATIONS #{relations}"
 
         relations.each do |rel|
           next unless rel.match?(/\w/)
@@ -246,13 +245,13 @@ module LinkHeaders
       # warn "linkset body #{linkset.inspect}"
       return {} unless linkset
 
-      links = linkset.scan(/(<.*?>[^<]+)/) # split on the open angle bracket, which indicates a new link
+#      links = linkset.scan(/(<.*?>[^<]+)/) # split on the open angle bracket, which indicates a new link
+      links = linkset.split(/,\n*/) # split on the comma+newline
       # warn "Links found #{links}"
 
       links.each do |ls|
-        # warn "workking on link #{ls}"
-        ls = ls.first # ls is a single element array
-        elements = ls.split(';') # semicolon delimited fields
+        # warn "working on link #{ls}"
+        elements = ls.split(';').map {|element| element.strip!} # semicolon delimited fields
         # ["<https://w3id.org/a2a-fair-metrics/08-http-describedby-citeas-linkset-txt/>", "anchor=\"https://s11.no/2022/a2a-fair-metrics/08-http-describedby-citeas-linkset-txt/\"", "rel=\"cite-as\""]
         href = elements.shift # first element is always the link url
         # warn "working on link href #{href}"
@@ -260,8 +259,6 @@ module LinkHeaders
         attrhash = {}
         elements.each do |e|
           key, val = e.split('=')
-          key.strip!
-          val.strip!
           val.delete_prefix!('"').delete_suffix!('"') # get rid of newlines and start/end quotes
           attrhash[key.to_sym] = val # split on key=val and make key a symbol
         end 

data/lib/linkheaders/web_utils.rb

@@ -1,4 +1,4 @@
-def lhfetch(url, headers = ACCEPT_STAR_HEADER)
+def lhfetch(url, headers = {accept: "*/*"})
   # warn "In fetch routine now.  "
 
   # warn "executing call over the Web to #{url.to_s}"

data/spec/linkheader/parser_spec.rb

@@ -1,7 +1,37 @@
 # frozen_string_literal: true
+require_relative '../../lib/linkheaders/processor'
+require 'rest-client'
+
+
+url1 = "https://w3id.org/a2a-fair-metrics/22-http-html-citeas-describedby-mixed/"
+p = LinkHeaders::Processor.new(default_anchor: url1)
+r = RestClient.get(url1)
+p.extract_and_parse(response: r)
+factory = p.factory  # LinkHeaders::LinkFactory
+
 
 RSpec.describe LinkHeaders::Processor do
+
   it 'has a version number' do
     expect(LinkHeaders::Processor::VERSION).not_to be nil
   end
+
+  it "should find PURL citeas which has described-by and cite-as in mixed HTTP and HTML headers" do
+    expect(factory.all_links.length).to eq 5
+  end
+  it "should find find href on all links" do
+    expect(factory.all_links.select{|l| l.href}.length).to eq 5
+  end
+  it "should find find href on all links" do
+    expect(factory.all_links.select{|l| l.anchor}.length).to eq 5
+  end
+  it "should find 5 links in mixed HTTP and HTML headers" do
+    expect(factory.all_links.select{|l| l.relation}.length).to eq 5
+  end
+  it "should find one citeas in mixed HTTP and HTML headers" do
+    expect(factory.all_links.select{|l| l.relation == 'cite-as'}.length).to eq 1
+  end
+  it "should find described-by in mixed HTTP and HTML headers" do
+    expect(factory.all_links.select{|l| l.relation == 'describedby'}.length).to eq 1
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkheaders-processor
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.18
 platform: ruby
 authors:
 - Mark Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -137,7 +137,6 @@ files:
 - README.md
 - Rakefile
 - launch.json
-- lib/linkheaders/constants.rb
 - lib/linkheaders/link.rb
 - lib/linkheaders/processor.rb
 - lib/linkheaders/processor/version.rb

data/lib/linkheaders/constants.rb

@@ -1,29 +0,0 @@
-ACCEPT_ALL_HEADER = {'Accept' => 'text/turtle, application/ld+json, application/rdf+xml, text/xhtml+xml, application/n3, application/rdf+n3, application/turtle, application/x-turtle, text/n3, text/turtle, text/rdf+n3, text/rdf+turtle, application/n-triples' }
-ACCEPT_STAR_HEADER = {'Accept' => '*/*'}
-
-TEXT_FORMATS = {
-    'text' => ['text/plain',],
-}
-
-RDF_FORMATS = {
-  'jsonld'  => ['application/ld+json', 'application/vnd.schemaorg.ld+json'],  # NEW FOR DATACITE
-  'turtle'  => ['text/turtle','application/n3','application/rdf+n3',
-               'application/turtle', 'application/x-turtle','text/n3','text/turtle',
-               'text/rdf+n3', 'text/rdf+turtle'],
-  #'rdfa'    => ['text/xhtml+xml', 'application/xhtml+xml'],
-  'rdfxml'  => ['application/rdf+xml'],
-  'triples' => ['application/n-triples','application/n-quads', 'application/trig']
-}
-
-XML_FORMATS = {
-  'xml' => ['text/xhtml','text/xml',]
-}
-
-HTML_FORMATS = {
-  'html' => ['text/html','text/xhtml+xml', 'application/xhtml+xml']
-}
-
-JSON_FORMATS = {
-            'json' => ['application/json',]
-}
-