geo_combine 0.5.1 → 0.6.0

data/spec/lib/geo_combine/geoblacklight_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe GeoCombine::Geoblacklight do
@@ -5,68 +7,84 @@ RSpec.describe GeoCombine::Geoblacklight do
   include JsonDocs
   include GeoCombine::Exceptions
   let(:full_geobl) { described_class.new(full_geoblacklight) }
+  let(:enhanced_geobl) { described_class.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
   let(:basic_geobl) { described_class.new(basic_geoblacklight) }
   let(:pre_v1_geobl) { described_class.new(geoblacklight_pre_v1) }
+  let(:enhanced_geobl) { described_class.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
+
+  before { enhanced_geobl.enhance_metadata }
+
   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) { described_class.new(basic_geoblacklight, 'dc_identifier_s' => 'new one', "extra_field" => true)}
+      let(:basic_geobl) do
+        described_class.new(basic_geoblacklight, 'dc_identifier_s' => 'new one', 'extra_field' => true)
+      end
+
       it 'overwrites existing metadata fields' do
         expect(basic_geobl.metadata['dc_identifier_s']).to eq 'new one'
       end
+
       it 'adds in new fields' do
         expect(basic_geobl.metadata['extra_field']).to be true
       end
     end
   end
+
   describe '#metadata' do
     it 'reads the metadata instance variable' do
       expect(basic_geobl.metadata).to be_an Hash
       expect(basic_geobl.metadata).to have_key 'dc_identifier_s'
     end
   end
+
   describe '#to_json' do
     it 'returns valid json' do
       expect(valid_json?(full_geobl.to_json)).to be_truthy
       expect(valid_json?(basic_geobl.to_json)).to be_truthy
     end
   end
-  let(:enhanced_geobl) { described_class.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
-  before { enhanced_geobl.enhance_metadata }
+
   describe '#enhance_metadata' do
     it 'enhances the dc_subject_sm field' do
       expect(enhanced_geobl.metadata['dc_subject_sm']).to include 'Boundaries', 'Inland Waters'
     end
+
     it 'formats the date properly as ISO8601' do
       expect(enhanced_geobl.metadata['layer_modified_dt']).to match(/Z$/)
     end
+
     it 'formats the geometry type field' do
       expect(enhanced_geobl.metadata['layer_geom_type_s']).to eq 'Polygon'
     end
   end
+
   describe '#valid?' do
     it 'a valid geoblacklight-schema document should be valid' do
       expect(full_geobl.valid?).to be true
     end
+
     context 'must have required fields' do
-      %w(
+      %w[
         dc_title_s
         dc_identifier_s
         dc_rights_s
         dct_provenance_s
         layer_slug_s
         solr_geom
-      ).each do |field|
+      ].each do |field|
         it field do
           full_geobl.metadata.delete field
           expect { full_geobl.valid? }.to raise_error(JSON::Schema::ValidationError, /#{field}/)
         end
       end
     end
+
     context 'need not have optional fields' do
-      %w(
+      %w[
         dc_description_s
         dc_format_s
         dc_language_s
@@ -83,46 +101,52 @@ RSpec.describe GeoCombine::Geoblacklight do
         layer_id_s
         layer_modified_dt
         solr_year_i
-      ).each do |field|
+      ].each do |field|
         it field do
           full_geobl.metadata.delete field
           expect { full_geobl.valid? }.not_to raise_error
         end
       end
     end
+
     context 'need not have deprecated fields' do
-      %w(
+      %w[
         dc_relation_sm
         dc_type_s
         georss_box_s
         georss_point_s
         uuid
-      ).each do |field|
+      ].each do |field|
         it field do
           full_geobl.metadata.delete field
           expect { full_geobl.valid? }.not_to raise_error
         end
       end
     end
+
     it 'an invalid document' do
       expect { basic_geobl.valid? }.to raise_error JSON::Schema::ValidationError
     end
+
     it 'calls the dct_references_s validator' 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
       it 'is valid' do
         expect(full_geobl.dct_references_validate!).to be true
       end
     end
+
     context 'with invalid document' do
       let(:unparseable_json) do
         <<-JSON
@@ -133,35 +157,41 @@ RSpec.describe GeoCombine::Geoblacklight do
         JSON
       end
       let(:bad_ref) do
-        GeoCombine::Geoblacklight.new(
+        described_class.new(
           basic_geoblacklight, 'dct_references_s' => unparseable_json, 'layer_geom_type_s' => 'esriGeometryPolygon'
         )
       end
       let(:not_hash) do
-        GeoCombine::Geoblacklight.new(
+        described_class.new(
           basic_geoblacklight, 'dct_references_s' => '[{}]', 'layer_geom_type_s' => 'esriGeometryPolygon'
         )
       end
+
       before do
         bad_ref.enhance_metadata
         not_hash.enhance_metadata
       end
+
       it 'unparseable json' do
         expect { bad_ref.dct_references_validate! }.to raise_error JSON::ParserError
       end
+
       it 'not a hash' do
         expect { not_hash.dct_references_validate! }.to raise_error GeoCombine::Exceptions::InvalidDCTReferences
       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

data/spec/lib/geo_combine/iso19139_spec.rb

@@ -1,46 +1,58 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe GeoCombine::Iso19139 do
   include XmlDocs
-  let(:iso_object){ GeoCombine::Iso19139.new(stanford_iso) }
+  let(:iso_object) { described_class.new(stanford_iso) }
+
   describe '#initialize' do
     it 'returns an instantiated Iso19139 object' do
-      expect(iso_object).to be_an GeoCombine::Iso19139
+      expect(iso_object).to be_an described_class
     end
   end
+
   describe '#xsl_geoblacklight' do
-    it 'should be defined' do
+    it 'is defined' do
       expect(iso_object.xsl_geoblacklight).to be_an Nokogiri::XSLT::Stylesheet
     end
   end
+
   describe '#xsl_html' do
-    it 'should be defined' do
+    it 'is defined' do
       expect(iso_object.xsl_geoblacklight).to be_an Nokogiri::XSLT::Stylesheet
     end
   end
+
   describe '#to_geoblacklight' do
     let(:valid_geoblacklight) { iso_object.to_geoblacklight('layer_geom_type_s' => 'Polygon') }
-    it 'should create a GeoCombine::Geoblacklight object' do
+
+    it 'creates a GeoCombine::Geoblacklight object' do
       expect(valid_geoblacklight).to be_an GeoCombine::Geoblacklight
     end
+
     it 'is valid GeoBlacklight-Schema' do
       valid_geoblacklight.enhance_metadata
-      expect(valid_geoblacklight.valid?).to be_truthy
+      expect(valid_geoblacklight).to be_valid
     end
-    it 'should have geoblacklight_version' do
+
+    it 'has geoblacklight_version' do
       expect(valid_geoblacklight.metadata['geoblacklight_version']).to eq '1.0'
     end
-    it 'should have dc_creator_sm' do
-      expect(valid_geoblacklight.metadata["dc_creator_sm"]).to be_an Array
-      expect(valid_geoblacklight.metadata["dc_creator_sm"]).to eq ["Circuit Rider Productions"]
+
+    it 'has dc_creator_sm' do
+      expect(valid_geoblacklight.metadata['dc_creator_sm']).to be_an Array
+      expect(valid_geoblacklight.metadata['dc_creator_sm']).to eq ['Circuit Rider Productions']
     end
-    it 'should have dc_publisher_sm' do
-      expect(valid_geoblacklight.metadata["dc_publisher_sm"]).to be_an Array
-      expect(valid_geoblacklight.metadata["dc_publisher_sm"]).to eq ["Circuit Rider Productions"]
+
+    it 'has dc_publisher_sm' do
+      expect(valid_geoblacklight.metadata['dc_publisher_sm']).to be_an Array
+      expect(valid_geoblacklight.metadata['dc_publisher_sm']).to eq ['Circuit Rider Productions']
     end
   end
+
   describe '#to_html' do
-    it 'should create a transformation of the metadata as a String' do
+    it 'creates a transformation of the metadata as a String' do
       expect(iso_object.to_html).to be_an String
     end
   end

data/spec/lib/geo_combine/ogp_spec.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 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) }
+  subject(:ogp) { described_class.new(ogp_harvard_raster) }
+
+  let(:ogp_tufts) { described_class.new(ogp_tufts_vector) }
+  let(:ogp_line) { described_class.new(ogp_harvard_line) }
   let(:metadata) { ogp.instance_variable_get(:@metadata) }
 
   describe '#initialize' do
@@ -26,36 +29,46 @@ RSpec.describe GeoCombine::OGP 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: [
@@ -65,6 +78,7 @@ RSpec.describe GeoCombine::OGP do
           ]
         )
       end
+
       it 'with dct_spatial_sm' do
         expect(ogp.geoblacklight_terms).to include(
           dct_spatial_sm: [
@@ -82,6 +96,7 @@ RSpec.describe GeoCombine::OGP 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
@@ -90,13 +105,13 @@ RSpec.describe GeoCombine::OGP do
   describe '#ogp_formats' do
     context 'when Paper Map or Raster' do
       it 'returns GeoTIFF' do
-        %w[Raster Paper\ Map].each do |datatype|
+        ['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|
@@ -105,6 +120,7 @@ RSpec.describe GeoCombine::OGP do
         end
       end
     end
+
     context 'unknown data types' do
       it 'throws exception' do
         expect(ogp).to receive(:metadata).twice.and_return('DataType' => 'Unknown')
@@ -117,6 +133,7 @@ RSpec.describe GeoCombine::OGP 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)
@@ -132,6 +149,7 @@ RSpec.describe GeoCombine::OGP do
         )
       end
     end
+
     context 'tufts vector' do
       it 'has wms wfs services' do
         expect(JSON.parse(ogp_tufts.references)).to include(
@@ -140,6 +158,7 @@ RSpec.describe GeoCombine::OGP do
         )
       end
     end
+
     context 'harvard line' do
       it 'has restricted services' do
         expect(JSON.parse(ogp_line.references)).to include(
@@ -153,11 +172,12 @@ RSpec.describe GeoCombine::OGP do
 
   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 }
+      it { expect { ogp.to_geoblacklight.valid? }.not_to raise_error }
+      it { expect { ogp_line.to_geoblacklight.valid? }.not_to raise_error }
     end
+
     context 'tufts' do
-      it { expect { ogp_tufts.to_geoblacklight.valid? }.to_not raise_error }
+      it { expect { ogp_tufts.to_geoblacklight.valid? }.not_to raise_error }
     end
   end
 end

data/spec/lib/geo_combine_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe GeoCombine::Metadata do
@@ -6,14 +8,15 @@ RSpec.describe GeoCombine::Metadata 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 = GeoCombine::Metadata.new('./tmp/fake/file/location')
-      expect(metadata_object).to be_an GeoCombine::Metadata
+      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 = GeoCombine::Metadata.new(simple_xml)
-      expect(metadata_object).to be_an GeoCombine::Metadata
+      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

data/spec/lib/tasks/geo_combine_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rake'
+
+describe 'geo_combine.rake' do
+  before(:all) do
+    load File.expand_path('../../../lib/tasks/geo_combine.rake', __dir__)
+    Rake::Task.define_task(:environment)
+  end
+
+  before do
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:[]).with('OGM_PATH').and_return(File.join(fixture_dir, 'indexing'))
+  end
+
+  describe 'geocombine:clone' do
+    before do
+      WebMock.disable_net_connect!
+    end
+
+    after do
+      WebMock.allow_net_connect!
+    end
+
+    it 'does not clone repos on deny list' do
+      stub_request(:get, 'https://api.github.com/orgs/opengeometadata/repos').to_return(status: 200, body: read_fixture('docs/repos.json'))
+      allow(Kernel).to receive(:system)
+      Rake::Task['geocombine:clone'].invoke
+      expect(Kernel).to have_received(:system).exactly(21).times
+    end
+  end
+
+  describe 'geocombine:index' do
+    it 'only indexes .json files but not layers.json' do
+      rsolr_mock = instance_double('RSolr::Client')
+      allow(rsolr_mock).to receive(:update)
+      allow(rsolr_mock).to receive(:commit)
+      allow(RSolr).to receive(:connect).and_return(rsolr_mock)
+      Rake::Task['geocombine:index'].invoke
+      # We expect 2 files to index
+      expect(rsolr_mock).to have_received(:update).exactly(2).times
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,15 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'coveralls'
-Coveralls.wear!
+# frozen_string_literal: true
+
+require 'simplecov'
+
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+SimpleCov.start 'rails' do
+  add_filter 'lib/tasks/geo_combine.rake'
+  add_filter 'lib/geo_combine/version.rb'
+  add_filter 'lib/geo_combine/railtie.rb'
+  add_filter 'lib/geo_combine/cli.rb'
+  minimum_coverage 95 # When updating this value, update the README badge value
+end
 
 require 'geo_combine'
 require 'fixtures/xml_docs'
@@ -26,78 +18,21 @@ require 'helpers'
 require 'rspec-html-matchers'
 require 'byebug'
 
+# Setup webmock for specific tests
+require 'webmock/rspec'
+WebMock.allow_net_connect!
+
+# include the spec support files
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
+
 RSpec.configure do |config|
   config.include Helpers
   config.include RSpecHtmlMatchers
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
 end

data/spec/support/fixtures.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+def read_fixture(fname)
+  File.read(File.join(fixture_dir, fname))
+end
+
+def fixture_dir
+  @fixture_dir ||= File.join(File.dirname(__FILE__), '../fixtures')
+end