geo_combine 0.2.0 → 0.5.1

data/spec/lib/geo_combine/geoblacklight_spec.rb

@@ -4,14 +4,15 @@ RSpec.describe GeoCombine::Geoblacklight do
   include XmlDocs
   include JsonDocs
   include GeoCombine::Exceptions
-  let(:full_geobl) { GeoCombine::Geoblacklight.new(full_geoblacklight) }
-  let(:basic_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight) }
+  let(:full_geobl) { described_class.new(full_geoblacklight) }
+  let(:basic_geobl) { described_class.new(basic_geoblacklight) }
+  let(:pre_v1_geobl) { described_class.new(geoblacklight_pre_v1) }
   describe '#initialize' do
     it 'parses metadata argument JSON to Hash' do
       expect(basic_geobl.instance_variable_get(:@metadata)).to be_an Hash
     end
     describe 'merges fields argument into metadata' do
-      let(:basic_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'dc_identifier_s' => 'new one', "extra_field" => true)}
+      let(:basic_geobl) { described_class.new(basic_geoblacklight, 'dc_identifier_s' => 'new one', "extra_field" => true)}
       it 'overwrites existing metadata fields' do
         expect(basic_geobl.metadata['dc_identifier_s']).to eq 'new one'
       end
@@ -32,12 +33,9 @@ RSpec.describe GeoCombine::Geoblacklight do
       expect(valid_json?(basic_geobl.to_json)).to be_truthy
     end
   end
-  let(:enhanced_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
+  let(:enhanced_geobl) { described_class.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
   before { enhanced_geobl.enhance_metadata }
   describe '#enhance_metadata' do
-    it 'calls enhancement methods to validate document' do
-      expect(enhanced_geobl.valid?).to be true
-    end
     it 'enhances the dc_subject_sm field' do
       expect(enhanced_geobl.metadata['dc_subject_sm']).to include 'Boundaries', 'Inland Waters'
     end
@@ -113,6 +111,11 @@ RSpec.describe GeoCombine::Geoblacklight do
       expect(enhanced_geobl).to receive(:dct_references_validate!)
       enhanced_geobl.valid?
     end
+    it 'validates spatial bounding box' do
+      expect(JSON::Validator).to receive(:validate!).and_return true
+      expect { basic_geobl.valid? }
+        .to raise_error GeoCombine::Exceptions::InvalidGeometry
+    end
   end
   describe '#dct_references_validate!' do
     context 'with valid document' do
@@ -151,4 +154,32 @@ RSpec.describe GeoCombine::Geoblacklight do
       end
     end
   end
+  describe 'spatial_validate!' do
+    context 'when valid' do
+      it { full_geobl.spatial_validate! }
+    end
+    context 'when invalid' do
+      it { expect { basic_geobl.spatial_validate! }.to raise_error GeoCombine::Exceptions::InvalidGeometry }
+    end
+  end
+  describe 'upgrade_to_v1' do
+    before do
+      expect(pre_v1_geobl).to receive(:upgrade_to_v1).and_call_original
+      pre_v1_geobl.enhance_metadata
+    end
+
+    it 'tags with version' do
+      expect(pre_v1_geobl.metadata).to include('geoblacklight_version' => '1.0')
+    end
+
+    it 'properly deprecates fields' do
+      described_class::DEPRECATED_KEYS_V1.each do |k|
+        expect(pre_v1_geobl.metadata.keys).not_to include(k.to_s)
+      end
+    end
+
+    it 'normalizes slugs' do
+      expect(pre_v1_geobl.metadata).to include('layer_slug_s' => 'sde-columbia-esri-arcatlas-snow-ln')
+    end
+  end
 end

data/spec/lib/geo_combine/ogp_spec.rb

@@ -0,0 +1,163 @@
+require 'spec_helper'
+
+RSpec.describe GeoCombine::OGP do
+  include JsonDocs
+
+  subject(:ogp) { GeoCombine::OGP.new(ogp_harvard_raster) }
+  let(:ogp_tufts) { GeoCombine::OGP.new(ogp_tufts_vector) }
+  let(:ogp_line) { GeoCombine::OGP.new(ogp_harvard_line) }
+  let(:metadata) { ogp.instance_variable_get(:@metadata) }
+
+  describe '#initialize' do
+    it 'parses JSON into metadata Hash' do
+      expect(metadata).to be_an Hash
+    end
+  end
+
+  describe '#to_geoblacklight' do
+    it 'calls geoblacklight_terms to create a GeoBlacklight object' do
+      expect(ogp).to receive(:geoblacklight_terms).and_return({})
+      expect(ogp.to_geoblacklight).to be_an GeoCombine::Geoblacklight
+    end
+  end
+
+  describe '#geoblacklight_terms' do
+    describe 'builds a hash which maps metadata' do
+      it 'with dc_identifier_s' do
+        expect(ogp.geoblacklight_terms).to include(dc_identifier_s: 'HARVARD.SDE2.G1059_W57_1654_PF_SH1')
+      end
+      it 'with dc_title_s' do
+        expect(ogp.geoblacklight_terms).to include(dc_title_s: 'World Map, 1654 (Raster Image)')
+      end
+      it 'with dc_description_s sanitized' do
+        expect(ogp.geoblacklight_terms).to include(dc_description_s: metadata['Abstract'])
+      end
+      it 'with dc_rights_s' do
+        expect(ogp.geoblacklight_terms).to include(dc_rights_s: 'Public')
+        expect(ogp_line.geoblacklight_terms).to include(dc_rights_s: 'Restricted')
+      end
+      it 'with dct_provenance_s' do
+        expect(ogp.geoblacklight_terms).to include(dct_provenance_s: 'Harvard')
+      end
+      it 'with dct_references_s' do
+        expect(ogp.geoblacklight_terms).to include(:dct_references_s)
+      end
+      it 'with layer_id_s that is blank' do
+        expect(ogp.geoblacklight_terms)
+          .to include(layer_id_s: "#{metadata['WorkspaceName']}:#{metadata['Name']}")
+      end
+      it 'with layer_geom_type_s' do
+        expect(ogp.geoblacklight_terms).to include(:layer_geom_type_s)
+      end
+      it 'with layer_slug_s' do
+        expect(ogp.geoblacklight_terms)
+          .to include(layer_slug_s: 'harvard-g1059-w57-1654-pf-sh1')
+      end
+      it 'with solr_geom' do
+        expect(ogp.geoblacklight_terms).to include(:solr_geom)
+      end
+      it 'with dc_subject_sm' do
+        expect(ogp.geoblacklight_terms).to include(
+          dc_subject_sm: [
+            'Maps', 'Human settlements', 'Cities and towns', 'Villages',
+            'Bodies of water', 'Landforms', 'Transportation',
+            'imageryBaseMapsEarthCover'
+          ]
+        )
+      end
+      it 'with dct_spatial_sm' do
+        expect(ogp.geoblacklight_terms).to include(
+          dct_spatial_sm: [
+            'Earth', 'Northern Hemisphere', 'Southern Hemisphere',
+            'Eastern Hemisphere', 'Western Hemisphere', 'Africa', 'Asia',
+            'Australia', 'Europe', 'North America', 'South America',
+            'Arctic regions'
+          ]
+        )
+      end
+    end
+  end
+
+  describe '#ogp_geom' do
+    it 'when Paper Map use Raster' do
+      expect(ogp.ogp_geom).to eq 'Raster'
+    end
+    it 'anything else, return it' do
+      expect(ogp_tufts.ogp_geom).to eq 'Polygon'
+    end
+  end
+
+  describe '#ogp_formats' do
+    context 'when Paper Map or Raster' do
+      it 'returns GeoTIFF' do
+        %w[Raster Paper\ Map].each do |datatype|
+          expect(ogp).to receive(:metadata).and_return('DataType' => datatype)
+          expect(ogp.ogp_formats).to eq 'GeoTIFF'
+        end
+
+      end
+    end
+    context 'when Polygon, Line, or Point' do
+      it 'returns Shapefile' do
+        %w[Polygon Line Point].each do |datatype|
+          expect(ogp).to receive(:metadata).and_return('DataType' => datatype)
+          expect(ogp.ogp_formats).to eq 'Shapefile'
+        end
+      end
+    end
+    context 'unknown data types' do
+      it 'throws exception' do
+        expect(ogp).to receive(:metadata).twice.and_return('DataType' => 'Unknown')
+        expect { ogp.ogp_formats }.to raise_error(ArgumentError, 'Unknown')
+      end
+    end
+  end
+
+  describe '#envelope' do
+    it 'properly formatted envelope' do
+      expect(ogp.envelope).to eq 'ENVELOPE(-180.0, 180.0, 90.0, -90.0)'
+    end
+    it 'fails on out-of-bounds envelopes' do
+      expect(ogp).to receive(:west).and_return(-181)
+      expect { ogp.envelope }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe '#references' do
+    context 'harvard raster' do
+      it 'has wms and download services' do
+        expect(JSON.parse(ogp.references)).to include(
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://pelham.lib.harvard.edu:8080/geoserver/wms',
+          'http://schema.org/DownloadAction' => 'http://pelham.lib.harvard.edu:8080/HGL/HGLOpenDelivery'
+        )
+      end
+    end
+    context 'tufts vector' do
+      it 'has wms wfs services' do
+        expect(JSON.parse(ogp_tufts.references)).to include(
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://geoserver01.uit.tufts.edu/wms',
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://geoserver01.uit.tufts.edu/wfs'
+        )
+      end
+    end
+    context 'harvard line' do
+      it 'has restricted services' do
+        expect(JSON.parse(ogp_line.references)).to include(
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs',
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms'
+        )
+        expect(JSON.parse(ogp_line.references)).not_to include('http://schema.org/DownloadAction')
+      end
+    end
+  end
+
+  describe 'valid geoblacklight schema' do
+    context 'harvard' do
+      it { expect { ogp.to_geoblacklight.valid? }.to_not raise_error }
+      it { expect { ogp_line.to_geoblacklight.valid? }.to_not raise_error }
+    end
+    context 'tufts' do
+      it { expect { ogp_tufts.to_geoblacklight.valid? }.to_not raise_error }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ require 'fixtures/xml_docs'
 require 'fixtures/json_docs'
 require 'helpers'
 require 'rspec-html-matchers'
+require 'byebug'
 
 RSpec.configure do |config|
   config.include Helpers

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: geo_combine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +112,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,15 +183,20 @@ files:
 - bin/geocombine
 - geo_combine.gemspec
 - lib/geo_combine.rb
+- lib/geo_combine/bounding_box.rb
+- lib/geo_combine/ckan_metadata.rb
 - lib/geo_combine/cli.rb
 - lib/geo_combine/esri_open_data.rb
 - lib/geo_combine/exceptions.rb
 - lib/geo_combine/fgdc.rb
 - lib/geo_combine/formats.rb
 - lib/geo_combine/formatting.rb
+- lib/geo_combine/geo_blacklight_harvester.rb
 - lib/geo_combine/geoblacklight.rb
 - lib/geo_combine/geometry_types.rb
 - lib/geo_combine/iso19139.rb
+- lib/geo_combine/ogp.rb
+- lib/geo_combine/railtie.rb
 - lib/geo_combine/subjects.rb
 - lib/geo_combine/version.rb
 - lib/tasks/geo_combine.rake
@@ -187,23 +220,32 @@ files:
 - spec/features/fgdc2html_spec.rb
 - spec/features/iso2html_spec.rb
 - spec/fixtures/docs/basic_geoblacklight.json
+- spec/fixtures/docs/ckan.json
 - spec/fixtures/docs/esri_open_data.json
 - spec/fixtures/docs/full_geoblacklight.json
+- spec/fixtures/docs/geoblacklight_pre_v1.json
+- spec/fixtures/docs/ogp_harvard_line.json
+- spec/fixtures/docs/ogp_harvard_raster.json
+- spec/fixtures/docs/ogp_tufts_vector.json
 - spec/fixtures/json_docs.rb
 - spec/fixtures/xml_docs.rb
 - spec/helpers.rb
+- spec/lib/geo_combine/bounding_box_spec.rb
+- spec/lib/geo_combine/ckan_metadata_spec.rb
 - spec/lib/geo_combine/esri_open_data_spec.rb
 - spec/lib/geo_combine/fgdc_spec.rb
 - spec/lib/geo_combine/formatting_spec.rb
+- spec/lib/geo_combine/geo_blacklight_harvester_spec.rb
 - spec/lib/geo_combine/geoblacklight_spec.rb
 - spec/lib/geo_combine/iso19139_spec.rb
+- spec/lib/geo_combine/ogp_spec.rb
 - spec/lib/geo_combine_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
 - Apache
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,24 +260,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A Ruby toolkit for managing geospatial metadata
 test_files:
 - spec/features/fgdc2html_spec.rb
 - spec/features/iso2html_spec.rb
 - spec/fixtures/docs/basic_geoblacklight.json
+- spec/fixtures/docs/ckan.json
 - spec/fixtures/docs/esri_open_data.json
 - spec/fixtures/docs/full_geoblacklight.json
+- spec/fixtures/docs/geoblacklight_pre_v1.json
+- spec/fixtures/docs/ogp_harvard_line.json
+- spec/fixtures/docs/ogp_harvard_raster.json
+- spec/fixtures/docs/ogp_tufts_vector.json
 - spec/fixtures/json_docs.rb
 - spec/fixtures/xml_docs.rb
 - spec/helpers.rb
+- spec/lib/geo_combine/bounding_box_spec.rb
+- spec/lib/geo_combine/ckan_metadata_spec.rb
 - spec/lib/geo_combine/esri_open_data_spec.rb
 - spec/lib/geo_combine/fgdc_spec.rb
 - spec/lib/geo_combine/formatting_spec.rb
+- spec/lib/geo_combine/geo_blacklight_harvester_spec.rb
 - spec/lib/geo_combine/geoblacklight_spec.rb
 - spec/lib/geo_combine/iso19139_spec.rb
+- spec/lib/geo_combine/ogp_spec.rb
 - spec/lib/geo_combine_spec.rb
 - spec/spec_helper.rb