geo_combine 0.7.0 → 0.9.0

data/lib/geo_combine/harvester.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'find'
+require 'git'
+require 'net/http'
+require 'geo_combine/logger'
+
+module GeoCombine
+  # Harvests Geoblacklight documents from OpenGeoMetadata for indexing
+  class Harvester
+    attr_reader :ogm_path, :schema_version
+
+    # Non-metadata repositories that shouldn't be harvested
+    def self.denylist
+      [
+        'GeoCombine',
+        'aardvark',
+        'metadata-issues',
+        'ogm_utils-python',
+        'opengeometadata.github.io',
+        'opengeometadata-rails',
+        'gbl-1_to_aardvark'
+      ]
+    end
+
+    # GitHub API endpoint for OpenGeoMetadata repositories
+    def self.ogm_api_uri
+      URI('https://api.github.com/orgs/opengeometadata/repos?per_page=1000')
+    end
+
+    def initialize(
+      ogm_path: ENV.fetch('OGM_PATH', 'tmp/opengeometadata'),
+      schema_version: ENV.fetch('SCHEMA_VERSION', '1.0'),
+      logger: GeoCombine::Logger.logger
+    )
+      @ogm_path = ogm_path
+      @schema_version = schema_version
+      @logger = logger
+    end
+
+    # Enumerable of docs to index, for passing to an indexer
+    def docs_to_index
+      return to_enum(:docs_to_index) unless block_given?
+
+      @logger.info "loading documents from #{ogm_path}"
+      Find.find(@ogm_path) do |path|
+        # skip non-json and layers.json files
+        if File.basename(path) == 'layers.json' || !File.basename(path).end_with?('.json')
+          @logger.debug "skipping #{path}; not a geoblacklight JSON document"
+          next
+        end
+
+        doc = JSON.parse(File.read(path))
+        [doc].flatten.each do |record|
+          # skip indexing if this record has a different schema version than what we want
+          record_schema = record['gbl_mdVersion_s'] || record['geoblacklight_version']
+          record_id = record['layer_slug_s'] || record['dc_identifier_s']
+          if record_schema != @schema_version
+            @logger.debug "skipping #{record_id}; schema version #{record_schema} doesn't match #{@schema_version}"
+            next
+          end
+
+          @logger.debug "found record #{record_id} at #{path}"
+          yield record, path
+        end
+      end
+    end
+
+    # Update a repository via git
+    # If the repository doesn't exist, clone it.
+    def pull(repo)
+      repo_path = File.join(@ogm_path, repo)
+      clone(repo) unless File.directory? repo_path
+
+      Git.open(repo_path).pull
+      @logger.info "updated #{repo}"
+      repo
+    end
+
+    # Update all repositories
+    # Return the names of repositories updated
+    def pull_all
+      updated = repositories.map(&method(:pull)).compact
+      @logger.info "updated #{updated.size} repositories"
+      updated
+    end
+
+    # Clone a repository via git
+    # If the repository already exists, skip it.
+    def clone(repo)
+      repo_path = File.join(@ogm_path, repo)
+      repo_info = repository_info(repo)
+      repo_url = "https://github.com/OpenGeoMetadata/#{repo}.git"
+
+      # Skip if exists; warn if archived or empty
+      if File.directory? repo_path
+        @logger.warn "skipping clone to #{repo_path}; directory exists"
+        return nil
+      end
+      @logger.warn "repository is archived: #{repo_url}" if repo_info['archived']
+      @logger.warn "repository is empty: #{repo_url}" if repo_info['size'].zero?
+
+      Git.clone(repo_url, nil, path: ogm_path, depth: 1)
+      @logger.info "cloned #{repo_url} to #{repo_path}"
+      repo
+    end
+
+    # Clone all repositories via git
+    # Return the names of repositories cloned.
+    def clone_all
+      cloned = repositories.map(&method(:clone)).compact
+      @logger.info "cloned #{cloned.size} repositories"
+      cloned
+    end
+
+    private
+
+    # List of repository names to harvest
+    def repositories
+      @repositories ||= JSON.parse(Net::HTTP.get(self.class.ogm_api_uri))
+                            .filter { |repo| repo['size'].positive? }
+                            .reject { |repo| repo['archived'] }
+                            .map { |repo| repo['name'] }
+                            .reject { |name| self.class.denylist.include? name }
+    end
+
+    def repository_info(repo_name)
+      JSON.parse(Net::HTTP.get(URI("https://api.github.com/repos/opengeometadata/#{repo_name}")))
+    end
+  end
+end

data/lib/geo_combine/indexer.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require 'rsolr'
+require 'faraday/retry'
+require 'faraday/net_http_persistent'
+require 'geo_combine/logger'
+
+module GeoCombine
+  # Indexes Geoblacklight documents into Solr
+  class Indexer
+    attr_reader :solr
+
+    def initialize(solr: nil, logger: GeoCombine::Logger.logger)
+      @logger = logger
+      @batch_size = ENV.fetch('SOLR_BATCH_SIZE', 100).to_i
+
+      # If SOLR_URL is set, use it; if in a Geoblacklight app, use its solr core
+      solr_url = ENV.fetch('SOLR_URL', nil)
+      solr_url ||= Blacklight.default_index.connection.base_uri.to_s if defined? Blacklight
+
+      # If neither, warn and try to use local Blacklight default solr core
+      if solr_url.nil?
+        @logger.warn 'SOLR_URL not set; using Blacklight default'
+        solr_url = 'http://localhost:8983/solr/blacklight-core'
+      end
+
+      @solr = solr || RSolr.connect(client, url: solr_url)
+    end
+
+    # Index everything and return the number of docs successfully indexed
+    def index(docs)
+      # Track total indexed and time spent
+      @logger.info "indexing into #{solr_url}"
+      total_indexed = 0
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      # Index in batches; set batch size via BATCH_SIZE
+      batch = []
+      docs.each do |doc, path|
+        if batch.size < @batch_size
+          batch << [doc, path]
+        else
+          total_indexed += index_batch(batch)
+          batch = []
+        end
+      end
+      total_indexed += index_batch(batch) unless batch.empty?
+
+      # Issue a commit to make sure all documents are indexed
+      @solr.commit
+      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      sec = end_time - start_time
+      @logger.info format('indexed %<total_indexed>d documents in %<sec>.2f seconds', total_indexed:, sec:)
+      total_indexed
+    end
+
+    # URL to the solr instance being used
+    def solr_url
+      @solr.options[:url]
+    end
+
+    private
+
+    # Index a batch of documents; if we fail, index them all individually
+    def index_batch(batch)
+      docs = batch.map(&:first)
+      @solr.update(data: batch_json(docs), params:, headers:)
+      @logger.debug "indexed batch (#{batch.size} docs)"
+      batch.size
+    rescue RSolr::Error::Http => e
+      @logger.error "error indexing batch (#{batch.size} docs): #{format_error(e)}"
+      @logger.warn 'retrying documents individually'
+      batch.map { |doc, path| index_single(doc, path) }.compact.size
+    end
+
+    # Index a single document; if it fails, log the error and continue
+    def index_single(doc, path)
+      @solr.add(doc, params:, headers:)
+      @logger.debug "indexed #{path}"
+      doc
+    rescue RSolr::Error::Http => e
+      @logger.error "error indexing #{path}: #{format_error(e)}"
+      nil
+    end
+
+    # Generate a JSON string to send to solr update API for a batch of documents
+    def batch_json(batch)
+      batch.map { |doc| "add: { doc: #{doc.to_json} }" }.join(",\n").prepend('{ ').concat(' }')
+    end
+
+    # Generate a friendly error message for logging including status code and message
+    def format_error(error)
+      code = error.response[:status]
+      status_info = "#{code} #{RSolr::Error::Http::STATUS_CODES[code.to_i]}"
+      error_info = parse_solr_error(error)
+      [status_info, error_info].compact.join(' - ')
+    end
+
+    # Extract the specific error message from a solr JSON error response, if any
+    def parse_solr_error(error)
+      JSON.parse(error.response[:body]).dig('error', 'msg')
+    rescue StandardError
+      nil
+    end
+
+    def headers
+      { 'Content-Type' => 'application/json' }
+    end
+
+    def params
+      { overwrite: true }
+    end
+
+    def client
+      @client ||= Faraday.new do |conn|
+        conn.request :retry, max: 3, interval: 1, backoff_factor: 2, exceptions: [
+          Faraday::TimeoutError,
+          Faraday::ConnectionFailed,
+          Faraday::TooManyRequestsError
+        ]
+        conn.response :raise_error
+        conn.adapter :net_http_persistent
+      end
+    end
+  end
+end

data/lib/geo_combine/logger.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module GeoCombine
+  # Logger for gem
+  class Logger
+    def self.logger
+      @logger ||= ::Logger.new(
+        $stderr,
+        progname: 'GeoCombine',
+        level: ENV.fetch('LOG_LEVEL', 'info').to_sym
+      )
+    end
+  end
+end

data/lib/geo_combine/migrators/v1_aardvark_migrator.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'active_support'
+
+module GeoCombine
+  module Migrators
+    # migrates the v1 schema to the aardvark schema
+    class V1AardvarkMigrator
+      attr_reader :v1_hash
+
+      # @param v1_hash [Hash] parsed json in the v1 schema
+      # @param collection_id_map [Hash] a hash mapping collection names to ids for converting dct_isPartOf_sm
+      def initialize(v1_hash:, collection_id_map: {})
+        @v1_hash = v1_hash
+        @v2_hash = v1_hash
+        @collection_id_map = collection_id_map
+      end
+
+      def run
+        # Return unchanged if already in the aardvark schema
+        return @v2_hash if @v2_hash['gbl_mdVersion_s'] == 'Aardvark'
+
+        # Convert the record
+        convert_keys
+        convert_single_to_multi_valued_fields
+        convert_non_crosswalked_fields
+        remove_deprecated_fields
+
+        # Mark the record as converted and return it
+        @v2_hash['gbl_mdVersion_s'] = 'Aardvark'
+        @v2_hash
+      end
+
+      # Namespace and URI changes to fields
+      def convert_keys
+        @v2_hash.transform_keys! do |k|
+          SCHEMA_FIELD_MAP[k] || k
+        end
+      end
+
+      # Fields that need to be converted from single to multi-valued
+      def convert_single_to_multi_valued_fields
+        @v2_hash = @v2_hash.each_with_object({}) do |(k, v), h|
+          h[k] = if !v.is_a?(Array) && k.match?(/.*_[s|i]m/)
+                   [v]
+                 else
+                   v
+                 end
+        end
+      end
+
+      # Convert non-crosswalked fields via lookup tables
+      def convert_non_crosswalked_fields
+        # Keys may or may not include whitespace, so we normalize them.
+        # Resource class is required so we default to "Other"; resource type is not required.
+        @v2_hash['gbl_resourceClass_sm'] = RESOURCE_CLASS_MAP[@v1_hash['dc_type_s']&.gsub(/\s+/, '')] || ['Other']
+        resource_type = RESOURCE_TYPE_MAP[@v1_hash['layer_geom_type_s']&.gsub(/\s+/, '')]
+        @v2_hash['gbl_resourceType_sm'] = resource_type unless resource_type.nil?
+
+        # If the user specified a collection id map, use it to convert the collection names to ids
+        is_part_of = @v1_hash['dct_isPartOf_sm']&.map { |name| @collection_id_map[name] }&.compact
+        if is_part_of.present?
+          @v2_hash['dct_isPartOf_sm'] = is_part_of
+        else
+          @v2_hash.delete('dct_isPartOf_sm')
+        end
+      end
+
+      # Remove fields that are no longer used
+      def remove_deprecated_fields
+        @v2_hash = @v2_hash.except(*SCHEMA_FIELD_MAP.keys, 'dc_type_s', 'layer_geom_type_s')
+      end
+
+      SCHEMA_FIELD_MAP = {
+        'dc_title_s' => 'dct_title_s', # new namespace
+        'dc_description_s' => 'dct_description_sm', # new namespace; single to multi-valued
+        'dc_language_s' => 'dct_language_sm', # new namespace; single to multi-valued
+        'dc_language_sm' => 'dct_language_sm', # new namespace
+        'dc_creator_sm' => 'dct_creator_sm', # new namespace
+        'dc_publisher_s' => 'dct_publisher_sm', # new namespace; single to multi-valued
+        'dct_provenance_s' => 'schema_provider_s', # new URI name
+        'dc_subject_sm' => 'dct_subject_sm', # new namespace
+        'solr_geom' => 'dcat_bbox', # new URI name
+        'solr_year_i' => 'gbl_indexYear_im', # new URI name; single to multi-valued
+        'dc_source_sm' => 'dct_source_sm', # new namespace
+        'dc_rights_s' => 'dct_accessRights_s', # new URI name
+        'dc_format_s' => 'dct_format_s', # new namespace
+        'layer_id_s' => 'gbl_wxsIdentifier_s', # new URI name
+        'layer_slug_s' => 'id', # new URI name
+        'dc_identifier_s' => 'dct_identifier_sm', # new namespace; single to multi-valued
+        'layer_modified_dt' => 'gbl_mdModified_dt', # new URI name
+        'geoblacklight_version' => 'gbl_mdVersion_s', # new URI name
+        'suppressed_b' => 'gbl_suppressed_b' # new namespace
+      }.freeze
+
+      # Map Dublin Core types to Aardvark resource class sets
+      # See: https://github.com/OpenGeoMetadata/opengeometadata.github.io/blob/main/docs/ogm-aardvark/resource-class.md
+      RESOURCE_CLASS_MAP = {
+        'Collection' => ['Collections'],
+        'Dataset' => ['Datasets'],
+        'Image' => ['Imagery'],
+        'InteractiveResource' => ['Websites'],
+        'Service' => ['Web services'],
+        'StillImage' => ['Imagery']
+      }.freeze
+
+      # Map geometry types to Aardvark resource type sets
+      # See: https://github.com/OpenGeoMetadata/opengeometadata.github.io/blob/main/docs/ogm-aardvark/resource-type.md
+      RESOURCE_TYPE_MAP = {
+        'Point' => ['Point data'],
+        'Line' => ['Line data'],
+        'Polygon' => ['Polygon data'],
+        'Raster' => ['Raster data'],
+        'Table' => ['Table data']
+      }.freeze
+    end
+  end
+end

data/lib/geo_combine/ogp.rb

@@ -75,7 +75,7 @@ module GeoCombine
         dc_publisher_s: metadata['Publisher'],
         dc_subject_sm: subjects,
         dc_type_s: 'Dataset'
-      }.delete_if { |_k, v| v.nil? }
+      }.compact
     end
 
     def date

data/lib/geo_combine/railtie.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module GeoCombine
+  # Railtie for rake tasks
   class Railtie < Rails::Railtie
     rake_tasks do
       load 'tasks/geo_combine.rake'

data/lib/geo_combine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoCombine
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

data/lib/geo_combine.rb

@@ -72,6 +72,9 @@ require 'geo_combine/ogp'
 # Require harvesting/indexing files
 require 'geo_combine/geo_blacklight_harvester'
 
+# Migrators
+require 'geo_combine/migrators/v1_aardvark_migrator'
+
 # Require gem files
 require 'geo_combine/version'
 require 'geo_combine/railtie' if defined?(Rails)

data/lib/tasks/geo_combine.rake

@@ -3,58 +3,29 @@
 require 'json'
 require 'rsolr'
 require 'find'
-require 'geo_combine/geo_blacklight_harvester'
 require 'faraday/net_http_persistent'
+require 'geo_combine/harvester'
+require 'geo_combine/indexer'
+require 'geo_combine/geo_blacklight_harvester'
 
 namespace :geocombine do
   desc 'Clone OpenGeoMetadata repositories'
   task :clone, [:repo] do |_t, args|
-    if args.repo
-      ogm_repos = ["https://github.com/OpenGeoMetadata/#{args.repo}.git"]
-    else
-      ogm_api_uri = URI('https://api.github.com/orgs/opengeometadata/repos')
-      ogm_repos = JSON.parse(Net::HTTP.get(ogm_api_uri)).map do |repo|
-        repo['clone_url'] if (repo['size']).positive?
-      end.compact
-      ogm_repos.reject! { |repo| GeoCombineRake.denylist.include?(repo) }
-    end
-    ogm_repos.each do |repo|
-      Kernel.system "echo #{repo} && mkdir -p #{GeoCombineRake.ogm_path} && cd #{GeoCombineRake.ogm_path} && git clone --depth 1 #{repo}"
-    end
+    harvester = GeoCombine::Harvester.new
+    args[:repo] ? harvester.clone(args.repo) : harvester.clone_all
   end
 
   desc '"git pull" OpenGeoMetadata repositories'
   task :pull, [:repo] do |_t, args|
-    paths = if args.repo
-              [File.join(GeoCombineRake.ogm_path, args.repo)]
-            else
-              Dir.glob("#{GeoCombineRake.ogm_path}/*")
-            end
-    paths.each do |path|
-      next unless File.directory?(path)
-
-      Kernel.system "echo #{path} && cd #{path} && git pull origin"
-    end
+    harvester = GeoCombine::Harvester.new
+    args[:repo] ? harvester.pull(args.repo) : harvester.pull_all
   end
 
   desc 'Index all JSON documents except Layers.json'
   task :index do
-    puts "Indexing #{GeoCombineRake.ogm_path} into #{GeoCombineRake.solr_url}"
-    solr = RSolr.connect url: GeoCombineRake.solr_url, adapter: :net_http_persistent
-    Find.find(GeoCombineRake.ogm_path) do |path|
-      next unless File.basename(path).include?('.json') && File.basename(path) != 'layers.json'
-
-      doc = JSON.parse(File.read(path))
-      [doc].flatten.each do |record|
-        puts "Indexing #{record['layer_slug_s']}: #{path}" if $DEBUG
-        solr.update params: { commitWithin: GeoCombineRake.commit_within, overwrite: true },
-                    data: [record].to_json,
-                    headers: { 'Content-Type' => 'application/json' }
-      rescue RSolr::Error::Http => e
-        puts e
-      end
-    end
-    solr.commit
+    harvester = GeoCombine::Harvester.new
+    indexer = GeoCombine::Indexer.new
+    indexer.index(harvester.docs_to_index)
   end
 
   namespace :geoblacklight_harvester do
@@ -66,29 +37,3 @@ namespace :geocombine do
     end
   end
 end
-
-# Class to hold helper methods for use in GeoCombine rake tasks
-class GeoCombineRake
-  def self.commit_within
-    (ENV['SOLR_COMMIT_WITHIN'] || 5000).to_i
-  end
-
-  def self.denylist
-    [
-      'https://github.com/OpenGeoMetadata/GeoCombine.git',
-      'https://github.com/OpenGeoMetadata/aardvark.git',
-      'https://github.com/OpenGeoMetadata/metadata-issues.git',
-      'https://github.com/OpenGeoMetadata/ogm_utils-python.git',
-      'https://github.com/OpenGeoMetadata/opengeometadata.github.io.git',
-      'https://github.com/OpenGeoMetadata/opengeometadata-rails.git'
-    ]
-  end
-
-  def self.ogm_path
-    ENV['OGM_PATH'] || 'tmp/opengeometadata'
-  end
-
-  def self.solr_url
-    ENV['SOLR_URL'] || 'http://127.0.0.1:8983/solr/blacklight-core'
-  end
-end

data/spec/fixtures/docs/full_geoblacklight.json

@@ -28,6 +28,13 @@
   "dct_spatial_sm":[
     "Uganda"
   ],
+  "dct_isPartOf_sm":[
+    "Uganda GIS Maps and Data, 2000-2010"
+  ],
+  "dc_source_sm": [
+    "stanford-rb371kw9607"
+  ],
   "solr_geom":"ENVELOPE(29.572742, 35.000308, 4.234077, -1.478794)",
-  "solr_year_i":2005
+  "solr_year_i":2005,
+  "suppressed_b":false
 }

data/spec/fixtures/docs/full_geoblacklight_aardvark.json

@@ -0,0 +1,51 @@
+{
+  "gbl_mdVersion_s":"Aardvark",
+  "dct_identifier_sm":[
+    "http://purl.stanford.edu/cz128vq0535"
+  ],
+  "dct_title_s":"2005 Rural Poverty GIS Database: Uganda",
+  "dct_description_sm":[
+    "This polygon shapefile contains 2005 poverty data for 855 rural subcounties in Uganda. These data are intended for researchers, students, policy makers and the general public for reference and mapping purposes, and may be used for basic applications such as viewing, querying, and map output production."
+  ],
+  "dct_accessRights_s":"Public",
+  "schema_provider_s":"Stanford",
+  "dct_references_s":"{\"http://schema.org/url\":\"http://purl.stanford.edu/cz128vq0535\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:cz128vq0535/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/cz128vq0535.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:cz128vq0535/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:cz128vq0535/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://geowebservices.stanford.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://geowebservices.stanford.edu/geoserver/wms\"}",
+  "gbl_wxsIdentifier_s":"druid:cz128vq0535",
+  "id":"stanford-cz128vq0535",
+  "gbl_resourceType_sm": [
+    "Polygon data"
+  ],
+  "gbl_mdModified_dt":"2015-01-13T18:46:38Z",
+  "dct_format_s":"Shapefile",
+  "dct_language_sm":[
+    "English"
+  ],
+  "gbl_resourceClass_sm":[
+    "Datasets"
+  ],
+  "dct_publisher_sm":[
+    "Uganda Bureau of Statistics"
+  ],
+  "dct_creator_sm":[
+    "Uganda Bureau of Statistics"
+  ],
+  "dct_subject_sm":[
+    "Poverty",
+    "Statistics"
+  ],
+  "dct_issued_s":"2005",
+  "dct_temporal_sm":[
+    "2005"
+  ],
+  "dct_spatial_sm":[
+    "Uganda"
+  ],
+  "dct_source_sm": [
+    "stanford-rb371kw9607"
+  ],
+  "dcat_bbox":"ENVELOPE(29.572742, 35.000308, 4.234077, -1.478794)",
+  "gbl_indexYear_im":[
+    2005
+  ],
+  "gbl_suppressed_b":false
+}

data/spec/fixtures/indexing/aardvark.json

@@ -0,0 +1,57 @@
+{
+  "dct_title_s": "A description of the coast & city of Goa.",
+  "dct_alternative_sm": [
+    "A description of the coast & city of Goa."
+  ],
+  "dct_description_sm": [
+    "Photocopy.   Some relief shown pictorially.   North oriented to the left.   \"The city of Goa & all its dependencies doth justly belong to the crown of England by the mariage [sic] of King Charles the Second with Queen Catherine\"--upper right.   \"21\"--upper right.   Outside of original margin is image of British Museum rule and \"7-Tab-125.\" Dimensions: 51 x 61 centimeters"
+  ],
+  "dct_language_sm": [
+    "eng"
+  ],
+  "dct_publisher_sm": [
+    "British Museum? (London?)"
+  ],
+  "schema_provider_s": "University of Minnesota",
+  "gbl_resourceClass_sm": [
+    "Maps"
+  ],
+  "dcat_keyword_sm": [
+    "Velha Goa (India) Maps",
+    "Maps"
+  ],
+  "dct_temporal_sm": [
+    "1900-1999"
+  ],
+  "dct_issued_s": "1900 - 1999?",
+  "gbl_indexYear_im": [
+    "1900"
+  ],
+  "gbl_dateRange_drsim": [
+    "[1900 TO 1999]"
+  ],
+  "dct_spatial_sm": [
+    "India"
+  ],
+  "locn_geometry": "ENVELOPE(-2.36,-2.06,11.73,11.5101)",
+  "dcat_bbox": "ENVELOPE(-2.36,-2.06,11.73,11.5101)",
+  "dcat_centroid": "11.620049999999999,-2.21",
+  "pcdm_memberOf_sm": [
+    "64bd8c4c-8e60-4956-b43d-bdc3f93db488"
+  ],
+  "dct_isPartOf_sm": [
+    "05d-01"
+  ],
+  "dct_rights_sm": [
+    "Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization."
+  ],
+  "dct_accessRights_s": "Public",
+  "dct_format_s": "JPEG",
+  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"http://cdm16022.contentdm.oclc.org/utils/getfile/collection/p16022coll205/id/236/filename/print/page/download/fparams/forcedownload\",\"http://schema.org/url\":\"https://umedia.lib.umn.edu/item/p16022coll205:236\",\"http://iiif.io/api/presentation#manifest\":\"https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll205/236/manifest.json\"}",
+  "id": "p16022coll205:236",
+  "dct_identifier_sm": [
+    "UMN_ALMA:9949551790001701"
+  ],
+  "gbl_mdModified_dt": "2022-04-01T15:27:13Z",
+  "gbl_mdVersion_s": "Aardvark"
+}

data/spec/fixtures/json_docs.rb

@@ -15,6 +15,12 @@ module JsonDocs
     File.read(File.join(File.dirname(__FILE__), './docs/full_geoblacklight.json'))
   end
 
+  ##
+  #  full_geoblacklight fixture converted to the aardvark schema
+  def full_geoblacklight_aardvark
+    File.read(File.join(File.dirname(__FILE__), './docs/full_geoblacklight_aardvark.json'))
+  end
+
   ##
   # A sample Esri OpenData metadata record
   def esri_opendata_metadata

data/spec/lib/geo_combine/bounding_box_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe GeoCombine::BoundingBox do
 
   describe '#valid?' do
     context 'when valid' do
-      it { valid.valid? }
+      it { expect(valid.valid?).to be true }
     end
 
     context 'when south > north' do