geo_combine 0.8.0 → 0.9.1

data/spec/lib/geo_combine/migrators/v1_aardvark_migrator_spec.rb

@@ -6,17 +6,41 @@ RSpec.describe GeoCombine::Migrators::V1AardvarkMigrator do
   include JsonDocs
 
   describe '#run' do
-    it 'migrates keys' do
+    it 'migrates fields to new names and types' do
       input_hash = JSON.parse(full_geoblacklight)
-      # TODO: Note that this fixture has not yet been fully converted to
-      # aardvark. See https://github.com/OpenGeoMetadata/GeoCombine/issues/121
-      # for remaining work.
       expected_output = JSON.parse(full_geoblacklight_aardvark)
       expect(described_class.new(v1_hash: input_hash).run).to eq(expected_output)
     end
 
+    it 'removes deprecated fields' do
+      input_hash = JSON.parse(full_geoblacklight)
+      output = described_class.new(v1_hash: input_hash).run
+      expect(output.keys).not_to include(described_class::SCHEMA_FIELD_MAP.keys)
+      expect(output.keys).not_to include('dc_type_s')
+      expect(output.keys).not_to include('layer_geom_type_s')
+    end
+
+    it 'leaves custom fields unchanged' do
+      input_hash = JSON.parse(full_geoblacklight)
+      input_hash['custom_field'] = 'custom_value'
+      output = described_class.new(v1_hash: input_hash).run
+      expect(output['custom_field']).to eq('custom_value')
+    end
+
     context 'when the given record is already in aardvark schema' do
-      xit 'returns the record unchanged'
+      it 'returns the record unchanged' do
+        input_hash = JSON.parse(full_geoblacklight_aardvark)
+        expect(described_class.new(v1_hash: input_hash).run).to eq(input_hash)
+      end
+    end
+
+    context 'when the user supplies a mapping for collection names to ids' do
+      it 'converts the collection names to ids' do
+        input_hash = JSON.parse(full_geoblacklight)
+        collection_id_map = { 'Uganda GIS Maps and Data, 2000-2010' => 'stanford-rb371kw9607' }
+        output = described_class.new(v1_hash: input_hash, collection_id_map:).run
+        expect(output['dct_isPartOf_sm']).to eq(['stanford-rb371kw9607'])
+      end
     end
   end
 end

data/spec/lib/geo_combine_spec.rb

@@ -2,25 +2,28 @@
 
 require 'spec_helper'
 
-RSpec.describe GeoCombine::Metadata do
+RSpec.describe GeoCombine do
   include XmlDocs
-  describe '#initialize' do
-    it 'reads metadata from file if File is readable' do
-      expect(File).to receive(:readable?).and_return(true)
-      expect(File).to receive(:read).and_return(simple_xml)
-      metadata_object = described_class.new('./tmp/fake/file/location')
-      expect(metadata_object).to be_an described_class
-      expect(metadata_object.metadata).to be_an Nokogiri::XML::Document
-      expect(metadata_object.metadata.css('Author').count).to eq 2
-    end
 
-    it 'reads metadata from parameter if File is not readable' do
-      metadata_object = described_class.new(simple_xml)
-      expect(metadata_object).to be_an described_class
-      expect(metadata_object.metadata).to be_an Nokogiri::XML::Document
-      expect(metadata_object.metadata.css('Author').count).to eq 2
+  describe GeoCombine::Metadata do
+    describe '#initialize' do
+      it 'reads metadata from file if File is readable' do
+        expect(File).to receive(:readable?).and_return(true)
+        expect(File).to receive(:read).and_return(simple_xml)
+        metadata_object = described_class.new('./tmp/fake/file/location')
+        expect(metadata_object).to be_an described_class
+        expect(metadata_object.metadata).to be_an Nokogiri::XML::Document
+        expect(metadata_object.metadata.css('Author').count).to eq 2
+      end
+
+      it 'reads metadata from parameter if File is not readable' do
+        metadata_object = described_class.new(simple_xml)
+        expect(metadata_object).to be_an described_class
+        expect(metadata_object.metadata).to be_an Nokogiri::XML::Document
+        expect(metadata_object.metadata.css('Author').count).to eq 2
+      end
     end
+    # GeoCombine subclasses should individually test `to_geoblacklight` and
+    # `to_html` methods
   end
-  # GeoCombine subclasses should individually test `to_geoblacklight` and
-  # `to_html` methods
 end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ require 'webmock/rspec'
 WebMock.allow_net_connect!
 
 # include the spec support files
-Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
+Dir['./spec/support/**/*.rb'].each { |f| require f }
 
 RSpec.configure do |config|
   config.include Helpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_combine
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - lib/geo_combine/harvester.rb
 - lib/geo_combine/indexer.rb
 - lib/geo_combine/iso19139.rb
+- lib/geo_combine/logger.rb
 - lib/geo_combine/migrators/v1_aardvark_migrator.rb
 - lib/geo_combine/ogp.rb
 - lib/geo_combine/railtie.rb
@@ -361,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A Ruby toolkit for managing geospatial metadata