fsp_harvester 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24e34b5239426a8555e5d893cb3692a1f03442f6b4af3c03c5751c975a7871b
-  data.tar.gz: d372b73eb7693e5a4c9a2f78e20d02b62f3c195ed4185db7532018a45a694570
+  metadata.gz: 7da32f3321193e93f64154c35db0c840f5e7f086451660f99b62d3f4c834e295
+  data.tar.gz: 5a0a1ff4ef6b2100accd8bab4f20d6842d25ebf88d5e600e646804da9ed24bd9
 SHA512:
-  metadata.gz: e85c8ba90bee37156e8a4d8e98ec0d8c2148ffc86e24ac3faf0adde1146efaafa2333e7e25acf2b5b4d05aa1f2a9a411deb18890175e93bd1b8d0980773e42c2
-  data.tar.gz: f20559315f1b9aff81978600f50743fdee2d3b200eae0dc375ccf267fda90909cb16a6e43686a5efea0f6c583c90c4511c7390702ad7f9e9704f80f829da128b
+  metadata.gz: dad90f81b73489a151220c132d74508832573a352b209a537bbbaf6543a90b9e132cca80ecca33d15d02eca91841642d73e795113076f4564730194b5bf1fa53
+  data.tar.gz: 5d11c2f002f4e73a4971aec0d047cd14d35f6763155d0effa9c79f419ff6fd26f853158b290d2264edd148633570f5ecd50d4e1f6c7e9d136c7d2880517bdefc

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fsp_harvester (0.1.6)
+    fsp_harvester (0.1.7)
       json (~> 2.0)
       linkeddata (~> 3.2)
-      linkheaders-processor (~> 0.1.12)
+      linkheaders-processor (~> 0.1.13)
       metainspector (~> 5.11.2)
       parseconfig (~> 1.1)
       rake (~> 13.0)
@@ -126,7 +126,7 @@ GEM
       shex (~> 0.7)
       sparql (~> 3.2)
       sparql-client (~> 3.2)
-    linkheaders-processor (0.1.12)
+    linkheaders-processor (0.1.13)
       json (~> 2.0)
       json-ld (~> 3.2)
       json-ld-preloaded (~> 3.2)

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 

data/lib/fsp_harvester/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FspHarvester
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"  # up to date
 end

data/lib/fsp_harvester.rb

@@ -19,6 +19,7 @@ require 'rdf/xsd'
 require_relative './metadata_object'
 require_relative './constants'
 require_relative './web_utils'
+require_relative './signposting_tests'
 
 module FspHarvester
   class Error < StandardError
@@ -27,14 +28,15 @@ module FspHarvester
   class Utils
     # @@distillerknown = {} # global, hash of sha256 keys of message bodies - have they been seen before t/f
     # @warnings = JSON.parse(File.read("warnings.json"))
-    @meta = FspHarvester::MetadataObject.new
+    
 
     def self.resolve_guid(guid:)
+      @meta = FspHarvester::MetadataObject.new
       @meta.finalURI = [guid]
       type, url = convertToURL(guid: guid)
-      links = []
+      links = Array.new
       if type
-        links, @meta = resolve_url(url: url)
+        links = resolve_url(url: url)
       else
         @meta.warnings << ['006', guid, '']
         @meta.comments << "FATAL: GUID type not recognized.\n"
@@ -75,14 +77,14 @@ module FspHarvester
       unless response
         @meta.warnings << ['001', url, header]
         @meta.comments << "WARN: Unable to resolve #{url} using HTTP Accept header #{header}.\n"
-        return [[], @meta]
+        return []
       end
 
       @meta.comments << "INFO: following redirection using this header led to the following URL: #{@meta.finalURI.last}.  Using the output from this URL for the next few tests..."
       @meta.full_response << response.body
 
       links = process_link_headers(response: response) unless nolinkheaders
-      [links, @meta]
+      links
     end
 
     def self.process_link_headers(response:)
@@ -92,111 +94,42 @@ module FspHarvester
       parser.extract_and_parse(response: response)
       factory = parser.factory # LinkHeaders::LinkFactory
 
-      warn "\n\n length #{factory.all_links.length}\n\n"
+      warn "\n\n length bfore #{factory.all_links.length}\n\n"
       signpostingcheck(factory: factory)
+      warn "\n\n length aftr #{factory.all_links.length}\n\n"
+      warn "\n\n links #{factory.all_links}\n\n"
+      factory.all_links
     end
 
     def self.signpostingcheck(factory:)
-      citeas = 0
-      describedby = 0
+      citeas = Array.new
+      describedby = Array.new
+      item = Array.new
       factory.all_links.each do |l|
         case l.relation
         when 'cite-as'
-          citeas += 1
+          citeas << l
         when 'item'
-          if !(l.respond_to? 'type')
-            @meta.warnings << ['011', l.href, '']
-            @meta.comments << "WARN: The resource does not follow the FAIR Signposting standard, which encourages any item links to also have a 'type' attribute.\n"
-          end
-          type = l.type if l.respond_to? 'type'
-          type = '*/*' unless type  # this becomes a frozen string
-          header = { accept: type }
-          response = FspHarvester::WebUtils.fspfetch(url: l.href, headers: header, method: :head)
-          
-          if response
-            if response.headers[:content_type] and !(type == '*/*')
-              rtype = type.gsub(%r{/}, "\/")   # because type is a frozen string
-              rtype = rtype.gsub(/\+/, '.')
-              typeregex = Regexp.new(type)
-              if response.headers[:content_type].match(typeregex)
-                warn response.headers[:content_type]
-                warn typeregex.inspect
-                @meta.comments << "INFO: item link responds according to Signposting specifications\n"
-              else
-                @meta.warnings << ['012', l.href, header]
-                @meta.comments << "WARN: Content type of returned item link does not match the 'type' attribute\n"
-              end
-            else
-              @meta.warnings << ['013', l.href, header]
-              @meta.comments << "WARN: Content type of returned item link is not specified in response headers or cannot be matched against accept headers\n"
-            end
-          else
-            @meta.warnings << ['014', l.href, header]
-            @meta.comments << "WARN: item link doesn't resolve\n"
-          end
-
+          item << l
         when 'describedby'
-          describedby += 1
-          if !(l.respond_to? 'type')
-            @meta.warnings << ['005', l.href, '']
-            @meta.comments << "WARN: The resource does not follow the FAIR Signposting standard, which requires any describedby links to also have a 'type' attribute.\n"
-          end
-          type = l.type if l.respond_to? 'type'
-          type = '*/*' unless type
-          header = { accept: type }
-          response = FspHarvester::WebUtils.fspfetch(url: l.href, headers: header, method: :head)
-          if response
-            if response.headers[:content_type] and !(type == '*/*')
-              rtype = type.gsub(%r{/}, "\/")
-              rtype = rtype.gsub(/\+/, '.')
-              typeregex = Regexp.new(rtype)
-              if response.headers[:content_type].match(typeregex)
-                warn response.headers[:content_type]
-                warn typeregex.inspect
-                @meta.comments << "INFO: describedby link responds according to Signposting specifications\n"
-              else
-                @meta.warnings << ['009', l.href, header]
-                @meta.comments << "WARN: Content type of returned describedby link does not match the 'type' attribute\n"
-              end
-            else
-              @meta.warnings << ['010', l.href, header]
-              @meta.comments << "WARN: Content type of returned describedby link is not specified in response headers or cannot be matched against accept headers\n"
-            end
-          else
-            @meta.warnings << ['008', l.href, header]
-            @meta.comments << "WARN: describedby link doesn't resolve\n"
-          end
+          describedby << l
         end
       end
-      if citeas > 1
+
+      check_describedby_rules(describedby: describedby)
+      check_item_rules(item: item)
+
+      uniqueciteas = Array.new
+      if citeas.length > 1
+        warn "INFO: multiple cite-as links found. Checking for conflicts\n"
         @meta.comments << "INFO: multiple cite-as links found. Checking for conflicts\n"
-        citeas = check_for_citeas_conflicts(factory: factory) # this adds to the metadata objects if there are conflicts, returns the list of unique citeas (SHOULD ONLY BE ONE!)
+        uniqueciteas = check_for_citeas_conflicts(citeas: citeas) # this adds to the metadata objects if there are conflicts, returns the list of unique citeas (SHOULD ONLY BE ONE!)
       end
 
-      unless citeas == 1 && describedby > 0
+      unless uniqueciteas == 1 && describedby.length > 0
         @meta.warnings << ['004', '', '']
         @meta.comments << "WARN: The resource does not follow the FAIR Signposting standard, which requires exactly one cite-as header, and at least one describedby header\n"
       end
-      factory.all_links
-    end
-
-    def self.check_for_citeas_conflicts(factory:)
-      @meta.comments << 'INFO: checking for conflicting cite-as links'
-      citeas = []
-      factory.all_links.each do |link|
-        next unless link.relation == 'cite-as'
-
-        @meta.comments << "INFO: Adding citeas #{link.href} to the testing queue."
-        citeas << link.href
-      end
-
-      if citeas.uniq.length == 1
-        @meta.comments << 'INFO: No conflicting cite-as links found.'
-      else  # only one allowed!
-        @meta.warnings << ['007', '', '']
-        @meta.comments << "WARN: The resource does not follow the FAIR Signposting standard: Found conflicting cite-as link headers\n"
-      end
-      citeas.uniq
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fsp_harvester
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mark Wilkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: metainspector
   requirement: !ruby/object:Gem::Requirement