ftr_ruby 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f01bdc7760b54fbe420367a78c59e4b8539073b99e321f46f277aa1b6695600
-  data.tar.gz: 2dda7ed64ce4ca85a77f34a863da866cef94cba75bce18f4701169b671d564a1
+  metadata.gz: 36fedccafa5cfc2d5c52b7ed6e67441a84f65f1cb78255f713d6b5a911228e20
+  data.tar.gz: 63398e934c32807fbfcfe4d5cd47bdde473b213bfadbc734936c7bcfb70c3132
 SHA512:
-  metadata.gz: b1d0aa5cee43240b3a2536841b9709b4b61e8d9adbe84ee3720b8366f5a12f589f4b90efe1714ff99475d51635e90b17f4c067f28d42236a339646fc3f875ab3
-  data.tar.gz: 87b71b41d91fe24b8e96674cb9fbbefbd10c2e888cc959ccd24edb4613f0320b14bf2f4bdc5d44898a4c55ece0a19da98c6468007062c38ea398e442ebe0ec83
+  metadata.gz: 66f1338361bf3d9c55df4bceddaa1672109002712d0977e7913a7f5f7702ec23910faabd4e7f3d0924b9ef4ea80bee014c6590f085c62b7ff5e5a246e33823be
+  data.tar.gz: 57bd37118cc69a3a9083f9322f4d2447d89f95f1f8bd0becf23475feb4ad8da1cb191f1232a071fe6979281729a538e589603358ee380a696810cd796e91bfbd

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.1.14] - 2026-06-11
+
+### Added
+- RSpec tests for all URL normalization cases in `Output#initialize`: scheme suffix in `protocol`, uppercase `protocol`, scheme prefix in `host`, port preservation in `host`, leading/trailing slashes in `basePath`, internal slashes in `basePath`, leading slash in `testid`, empty `basePath`, and a combined "all messy inputs" scenario
+
 ## [0.1.13] - 2026-06-11
 
 ### Fixed

data/lib/dcat_metadata.rb

@@ -57,6 +57,9 @@ module FtrRuby
     # @option meta [String] :protocol         Protocol (http/https)
     # @option meta [String] :host             Hostname of the test service
     # @option meta [String] :basePath         Base path of the test service
+    # @option meta [String] :endpoint_url     URL of the test service (will be auto-generated if not supplied).  Note that endpoint path is defined by the FTR spec to be assess/test, but this is not enforced
+    # @option meta [String] :endpoint_desc    URL to the OpenAPI docs (will be auto-generated if not supplied)
+    # @option meta [String] :identifier       Identifier of test (will be auto-generated from host, protocol, basepath, testid if not supplied)
     #
     # @note Several fields have sensible defaults (e.g. +dctype+, +supportedby+, +applicationarea+).
     #       The +end_url+ and +identifier+ are automatically constructed from +protocol+, +host+,
@@ -72,8 +75,6 @@ module FtrRuby
       @keywords = meta[:keywords] || []
       @keywords = [@keywords] unless @keywords.is_a? Array
       @creator = meta[:creator]
-      @end_desc = meta[:end_desc]
-      @end_url = meta[:end_url]
       @dctype = meta[:dctype] || "http://edamontology.org/operation_2428"
       @supportedby = meta[:supportedby] || ["https://tools.ostrails.eu/champion"]
       @applicationarea = meta[:applicationarea] || ["http://www.fairsharing.org/ontology/subject/SRAO_0000401"]
@@ -87,15 +88,27 @@ module FtrRuby
       @protocol = meta[:protocol]
       @host = meta[:host]
       @basePath = meta[:basePath]
-      cleanhost = @host.gsub("/", "")
-      cleanpath = @basePath.gsub("/", "") # TODO: this needs to check only leading and trailing!  NOt internal...
-      endpointpath = "assess/test"
-      @end_url = "#{protocol}://#{cleanhost}/#{cleanpath}/#{endpointpath}/#{testid}"
-      @end_desc = "#{protocol}://#{cleanhost}/#{cleanpath}/#{testid}/api"
-      @identifier = "#{protocol}://#{cleanhost}/#{cleanpath}/#{testid}"
       @definedby =  meta[:definedby] || @identifier
       @landingpage = meta[:landingPage] || @identifier
 
+      cleanhost = @host.gsub(%r{/$}, "")
+      cleanpath = @basePath.gsub(%r{/$}, "")
+      endpointpath = "assess/test"
+
+      # The two overrides below are needed for FAIRsharing tests to ensure that the proper endpoint is shown in
+      # test output. Without this, endpoint URLs and descriptions pointing to non-existent URLs are generated.
+      @end_desc = meta[:end_desc]
+      @end_url = meta[:end_url]
+
+      # Override the endpoint URL if provided in the meta data.
+      @end_url = meta[:endpoint_url] || "#{protocol}://#{cleanhost}/#{cleanpath}/#{endpointpath}/#{testid}"
+
+      # Override the endpoint description if provided in the meta data.
+      @end_desc = meta[:endpoint_description] || "#{protocol}://#{cleanhost}/#{cleanpath}/#{testid}/api"
+
+      # Override the endpoint description if provided in the meta data.
+      @identifier =  meta[:identifier] || "#{protocol}://#{cleanhost}/#{cleanpath}/#{testid}"
+
       unless @testid && @testname && @description && @creator && @end_desc && @end_url && @protocol && @host && @basePath
         warn "this record is invalid - it is missing one of  testid testname description creator  end_desc end_url protocol  host  basePath"
       end

data/lib/ftr_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FtrRuby
-  VERSION = "0.1.13"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftr_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - markwilkinson
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -379,6 +380,7 @@ metadata:
   source_code_uri: https://github.com/markwilkinson/FTR-Ruby
   documentation_uri: https://rubydoc.info/gems/ftr_ruby
   bug_tracker_uri: https://github.com/markwilkinson/FTR-Ruby/issues
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -393,7 +395,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.9
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Libraries supporting the FTR Vocabulary.
 test_files: []