From a2a53e1949660e71b0429d58c1224d85697b07df Mon Sep 17 00:00:00 2001 From: Peter Mangiafico Date: Tue, 21 Nov 2023 09:25:36 -0800 Subject: [PATCH] allow code to work in earlier ruby versions --- lib/iiif/v3/presentation/nav_place.rb | 6 +++--- spec/unit/iiif/v3/presentation/nav_place_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/iiif/v3/presentation/nav_place.rb b/lib/iiif/v3/presentation/nav_place.rb index 3a51256..d3b8fb4 100644 --- a/lib/iiif/v3/presentation/nav_place.rb +++ b/lib/iiif/v3/presentation/nav_place.rb @@ -6,6 +6,8 @@ module Presentation class NavPlace < IIIF::V3::AbstractResource Rect = Struct.new(:coord1, :coord2) + COORD_REGEX = /(?[NSEW]) (?\d+)[°⁰*] ?(?\d+)?[ʹ']? ?(?\d+)?[ʺ"]?/ + def initialize(coordinate_texts:, base_uri:) @coordinate_texts = coordinate_texts @base_uri = base_uri @@ -22,7 +24,7 @@ def build { id: "#{base_uri}/feature-collection/1", type: 'FeatureCollection', - features: + features: features } end @@ -42,8 +44,6 @@ def coordinates end.compact end - COORD_REGEX = /(?[NSEW]) (?\d+)[°⁰*] ?(?\d+)?[ʹ']? ?(?\d+)?[ʺ"]?/ - def coord_for(long_str, lat_str) long_matcher = long_str.match(COORD_REGEX) lat_matcher = lat_str.match(COORD_REGEX) diff --git a/spec/unit/iiif/v3/presentation/nav_place_spec.rb b/spec/unit/iiif/v3/presentation/nav_place_spec.rb index 5c45388..08790f2 100644 --- a/spec/unit/iiif/v3/presentation/nav_place_spec.rb +++ b/spec/unit/iiif/v3/presentation/nav_place_spec.rb @@ -1,5 +1,5 @@ describe IIIF::V3::Presentation::NavPlace do - let(:subject) { described_class.new(coordinate_texts:, base_uri:) } + let(:subject) { described_class.new(coordinate_texts: coordinate_texts, base_uri: base_uri) } let(:base_uri) { "https://purl.stanford.edu" } let(:invalid_coordinates) { ["bogus", "stuff", "is", "here"] } let(:valid_coordinates) do