search_solr_tools 3.10.0 → 4.2.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16b47cc43d16191bdd5f9f6390bc8b8fc5d373a8
-  data.tar.gz: d333dca497d2b19182f12a25c55c11dd99f011c9
+SHA256:
+  metadata.gz: 4fb4a3fed57095e97887c4a176eeae1f4c78067bf8b0f3e8879d3d6f150ad72a
+  data.tar.gz: 686cad9c0df062f9d443ee3b768ac538a2d346cba4be178bbc5203f6b61e304a
 SHA512:
-  metadata.gz: 8b27814b1d8a92e042c7bd1a41e5670df335da192e61a2b28ba6abf8b104573f89ed1a8e7b3094265f7b3c58aa7eebb68b374629d396e46bf6028933bc52f1b8
-  data.tar.gz: 0e12bc0d4857609db75239a068ccc902165f7db8b993bb8c979d2ee2c3dd5d5c8f58397dea0d70bef626d22d8418a9e25bfc5e0cfba92c0f57fa38d99e7977d1
+  metadata.gz: a2013304d878dffe4c7d48a2c6b49934d748d0fd415036f1d0ede445150ae9db9a5127d9ca7e10692c525e60f76369bd67d6411df67c12c48ef5d2c28e55eb65
+  data.tar.gz: c6bc24d203e49c9b8926a8c54ea5666344a95ba89253577ed68c94745968eb6aec84b3a5a9dd653a59e2a8e6dd2d9bb19c48eee2c0a21dcaace67b3a7b39d5ff

data/CHANGELOG.md

@@ -1,9 +1,53 @@
-## v3.9.0 (2017-04-10)
+## Unreleased
+
+  - Update Ruby to 2.6.5, update gem dependencies to more recent version.
+  - Updates to correspond with an update to Solr 8.5.2
+
+## v4.2.1 (2019-08-13)
+
+  - Patch release to include updated CHANGELOG.
+
+## v4.2.0 (2019-08-12)
+
+  - Update dataset-catalog-services URL to only fetch current (*not* retired)
+    metadata records.
+  - Add a few more gem release notes to README.
+
+Note: v4.1.0 was prematurely released and, in theory, yanked. However, on the
+second try at publishing 4.1.0, Rubygems complained about the attempt to
+republish a gem. The version was therefore bumped again to 4.2.0 as the path of
+least resistance to a successful publish. v4.1.0 should not be used.
+
+## v4.0.1 (2019-07-08)
+
+  - Update CHANGELOG and release instructions.
+  - Fix README typo.
+
+## v4.0.0 (2019-07-08)
+
+Changes:
+
+  - Update spatial field formatting to work with Solr 8.1.1.
+
+## v3.11.0 (2019-06-10)
+
+Changes:
+
+  - Update Ruby, Nokogiri, RestClient, Rubocop, and Webmock versions to address
+    security warnings.
+  - Update syntax as necessary for new versions of Rubocop and RestClient.
+
+## v3.10.0 (2017-04-10)
 
 Changes
 
   - Constrain ADC and ECHO feeds to only fetch records in the arctic.
 
+Note
+  - v3.9.1 and v3.10.0 were mistakenly released after version 3.9.0 was
+    tagged. All three versions are identical, although v3.9.0 was never
+    released to rubygems.org.
+
 ## v3.8.4 (2017-03-30)
 
 Bugfix

data/README.md

@@ -61,7 +61,7 @@ Once you have the gem built in the project directory, install the utility:
 
 ### Requirements
 
-* Ruby > 2.0.0
+* Ruby > 2.6.5
 * [Bundler](http://bundler.io/)
 * Requirements for nokogiri:
     * [libxml2/libxml2-dev](http://xmlsoft.org/)
@@ -105,7 +105,7 @@ Please be sure to run them in the `bundle exec` context if you're utilizing bund
 
 Requirements:
 
-* Ruby > 2.0.0
+* Ruby > 2.6.5
 * [Bundler](http://bundler.io/)
 * [Gem Release](https://github.com/svenfuchs/gem-release)
 * [Rake](https://github.com/ruby/rake)
@@ -113,6 +113,10 @@ Requirements:
   [ownership](http://guides.rubygems.org/publishing/) of the gem
 * RuboCop and the unit tests should all pass (`rake`)
 
+The [CHANGELOG.md](CHANGELOG.md) is not automatically updated by the
+`rake release:*` tasks. Update it manually to insert the correct version and
+date, and commit the file, before creating the release package.
+
 **gem release** is used by rake tasks in this project to handle version changes,
 tagging, and publishing to RubyGems.
 
@@ -130,16 +134,28 @@ tagging, and publishing to RubyGems.
 * the changes are pushed
 * the tagged version is built and published to RubyGems
 
-### SOLR:
+You will need to have a current Rubygems API key for the _NSIDC developer user_ account in
+order to publish a new version of the gem to Rubygems. To get the lastest API key:
+
+`curl -u <username> https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials`
+
+## Release steps (summary)
+
+- Confirm no errors are returned by `bundle exec rubocop`
+- Confirm all tests pass (`bundle exec rake spec:unit`)
+- Update the version number and date manually in `CHANGELOG.md` and commit the
+  changes.
+- Run the appropriate `bundle exec rake release:*` task
+
+### SOLR
 
-To harvest data utilizing the gem, you will need a local configured instance of
-Solr 4.3, which can be downloaded from
-[Apache's archive](https://archive.apache.org/dist/lucene/solr/4.3.0/).
+To harvest data utilizing the gem, you will need an installed instance of [Solr
+8.5.3](https://lucene.apache.org/solr/guide/)
 
 #### NSIDC
 
 At NSIDC the development VM can be provisioned with the
-[solr puppet module](https://bitbucket.org/nsidc/puppet-solr/) to install and
+[solr puppet module](https://bitbucket.org/nsidc/puppet-nsidc-solr/) to install and
 configure Solr.
 
 #### Non-NSIDC
@@ -172,17 +188,17 @@ the `--environment` flag when running `search_solr_tools harvest`.
 
 ### How to contact NSIDC
 
-User Services and general information:  
-Support: [http://support.nsidc.org](http://support.nsidc.org)  
+User Services and general information:
+Support: [http://support.nsidc.org](http://support.nsidc.org)
 Email: nsidc@nsidc.org
 
-Phone: +1 303.492.6199  
+Phone: +1 303.492.6199
 Fax: +1 303.492.2468
 
-Mailing address:  
-National Snow and Ice Data Center  
-CIRES, 449 UCB  
-University of Colorado  
+Mailing address:
+National Snow and Ice Data Center
+CIRES, 449 UCB
+University of Colorado
 Boulder, CO 80309-0449 USA
 
 ### License

data/bin/search_solr_tools

@@ -1,27 +1,29 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'search_solr_tools'
 require 'thor'
 
 class SolrHarvestCLI < Thor
-  map %w(--version -v) => :__print_version
+  map %w[--version -v] => :__print_version
 
   desc '--version, -v', 'print the version'
   def __print_version
     puts SearchSolrTools::VERSION
   end
 
-  desc 'harvest', 'Harvest from one of the ADE harvesters'
+  desc 'harvest', 'Harvest from the specified data centers'
   option :data_center, type: :array, required: true
   option :environment, required: true
   option :die_on_failure, type: :boolean
   def harvest(die_on_failure = options[:die_on_failure] || false)
     options[:data_center].each do |target|
-      puts target
+      puts "Target: #{target}"
       begin
         harvest_class = get_harvester_class(target)
         harvester = harvest_class.new(options[:environment], die_on_failure)
         harvester.harvest_and_delete
-      rescue => e
+      rescue StandardError => e
         puts "harvest failed for #{target}: #{e.message}"
         raise e
       end
@@ -64,30 +66,26 @@ class SolrHarvestCLI < Thor
   no_tasks do
     def harvester_map
       {
-        'bco_dmo'            => SearchSolrTools::Harvesters::BcoDmo,
-        'adc'                => SearchSolrTools::Harvesters::Adc,
-        'data_one'           => SearchSolrTools::Harvesters::DataOne,
-        'echo'               => SearchSolrTools::Harvesters::Echo,
-        'eol'                => SearchSolrTools::Harvesters::Eol,
-        'gtnp'               => SearchSolrTools::Harvesters::GtnP,
-        'ices'               => SearchSolrTools::Harvesters::Ices,
-        'ncdc_paleo'         => SearchSolrTools::Harvesters::NcdcPaleo,
-        'nmi'                => SearchSolrTools::Harvesters::Nmi,
-        'nodc'               => SearchSolrTools::Harvesters::Nodc,
-        'r2r'                => SearchSolrTools::Harvesters::R2R,
-        'rda'                => SearchSolrTools::Harvesters::Rda,
-        'usgs'               => SearchSolrTools::Harvesters::Usgs,
-        'tdar'               => SearchSolrTools::Harvesters::Tdar,
-        'pdc'                => SearchSolrTools::Harvesters::Pdc,
-        'nsidc'              => SearchSolrTools::Harvesters::NsidcJson,
+        'bco_dmo' => SearchSolrTools::Harvesters::BcoDmo,
+        'adc' => SearchSolrTools::Harvesters::Adc,
+        'echo' => SearchSolrTools::Harvesters::Echo,
+        'ices' => SearchSolrTools::Harvesters::Ices,
+        'nmi' => SearchSolrTools::Harvesters::Nmi,
+        'nodc' => SearchSolrTools::Harvesters::Nodc,
+        'r2r' => SearchSolrTools::Harvesters::R2R,
+        'rda' => SearchSolrTools::Harvesters::Rda,
+        'usgs' => SearchSolrTools::Harvesters::Usgs,
+        'tdar' => SearchSolrTools::Harvesters::Tdar,
+        'pdc' => SearchSolrTools::Harvesters::Pdc,
+        'nsidc' => SearchSolrTools::Harvesters::NsidcJson,
         'nsidc_auto_suggest' => SearchSolrTools::Harvesters::NsidcAutoSuggest,
-        'ade_auto_suggest'   => SearchSolrTools::Harvesters::AdeAutoSuggest
+        'ade_auto_suggest' => SearchSolrTools::Harvesters::AdeAutoSuggest
       }
     end
 
     def get_harvester_class(data_center_name)
       name = data_center_name.downcase.to_s
-      fail("Invalid data center #{name}") unless harvester_map.key?(name)
+      raise("Invalid data center #{name}") unless harvester_map.key?(name)
 
       harvester_map[name]
     end

data/lib/search_solr_tools.rb

@@ -1,8 +1,7 @@
-require 'require_all'
-require_relative './search_solr_tools/config/environments'
-require_relative './search_solr_tools/version'
+require_relative 'search_solr_tools/config/environments'
+require_relative 'search_solr_tools/version'
 
-require_rel './search_solr_tools/helpers'
-require_rel './search_solr_tools/selectors'
-require_rel './search_solr_tools/harvesters'
-require_rel './search_solr_tools/translators'
+require_relative 'search_solr_tools/helpers/selectors'
+%w( selectors harvesters translators ).each do |subdir|
+  Dir[File.join(__dir__, 'search_solr_tools', subdir, '*.rb')].each { |file| require file }
+end

data/lib/search_solr_tools/config/environments.yaml

@@ -36,39 +36,38 @@
     - http://data.eol.ucar.edu/jedi/catalog/ucar.ncar.eol.project.ITEX.thredds.xml
   :r2r_url: http://get.rvdata.us/services/cruise/
 
+  # Not using DCS API v2 here because not all retired datasets have their "retired"
+  # flag checked. For example, GLA01.033 is retired; GLA01.018 is not, but it
+  # should be. GLA01.018 will show up if we use DCS API v2.
+  :nsidc_oai_identifiers_url: oai?verb=ListIdentifiers&metadata_prefix=iso&retired=false
+
 :local:
   :host: localhost
   :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://integration.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :dev:
   ## For the below, you'll need to instantiate your own search-solr instance, and point host to that.
   :host: dev.search-solr.USERNAME.dev.int.nsidc.org
-  ## For these, either set up your own instance of dataset serach catalog or change it to point to integration
+  ## For the metadata content, either set up your own instance of dataset-catalog-services
+  ## or change the URL below to point to integration
   :nsidc_dataset_metadata_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:1580/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:1580/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :integration:
   :host: integration.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://integration.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :qa:
   :host: qa.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://qa.nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://qa.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :staging:
   :host: staging.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://staging.nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://staging.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :blue:
   :host: blue.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :production:
   :host: search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso

data/lib/search_solr_tools/harvesters/adc.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     class Adc < Base

data/lib/search_solr_tools/harvesters/ade_auto_suggest.rb

@@ -1,3 +1,5 @@
+require_relative 'auto_suggest'
+
 module SearchSolrTools
   module Harvesters
     class AdeAutoSuggest < AutoSuggest

data/lib/search_solr_tools/harvesters/auto_suggest.rb

@@ -1,3 +1,4 @@
+require_relative 'base'
 require 'json'
 require 'rest-client'
 

data/lib/search_solr_tools/harvesters/base.rb

@@ -43,7 +43,7 @@ module SearchSolrTools
         constraints = sanitize_data_centers_constraints(constraints)
         delete_query = "last_update:[* TO #{timestamp}] AND #{constraints}"
         solr = RSolr.connect url: solr_url + "/#{solr_core}"
-        unchanged_count = (solr.get 'select', params: { q: delete_query, rows: 0 })['response']['numFound'].to_i
+        unchanged_count = (solr.get 'select', params: { wt: :ruby, q: delete_query, rows: 0 })['response']['numFound'].to_i
         if unchanged_count == 0
           puts "All documents were updated after #{timestamp}, nothing to delete"
         else
@@ -61,7 +61,7 @@ module SearchSolrTools
       end
 
       def remove_documents(solr, delete_query, constraints, force, numfound)
-        all_response_count = (solr.get 'select', params: { q: constraints, rows: 0 })['response']['numFound']
+        all_response_count = (solr.get 'select', params: { wt: :ruby, q: constraints, rows: 0 })['response']['numFound']
         if force || (numfound / all_response_count.to_f < DELETE_DOCUMENTS_RATIO)
           puts "Deleting #{numfound} documents for #{constraints}"
           solr.delete_by_query delete_query

data/lib/search_solr_tools/harvesters/bcodmo.rb

@@ -1,3 +1,4 @@
+require_relative 'base'
 require 'json'
 require 'rest-client'
 

data/lib/search_solr_tools/harvesters/data_one.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     class DataOne < Base

data/lib/search_solr_tools/harvesters/echo.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     # Harvests data from ECHO and inserts it into Solr after it has been translated

data/lib/search_solr_tools/harvesters/gtnp.rb

@@ -1,3 +1,4 @@
+require_relative 'base'
 require 'json'
 require 'rest-client'
 

data/lib/search_solr_tools/harvesters/ices.rb

@@ -1,3 +1,4 @@
+require_relative 'base'
 module SearchSolrTools
   module Harvesters
     # Harvests data from ICES and inserts it into Solr after it has been translated

data/lib/search_solr_tools/harvesters/ncdc_paleo.rb

@@ -1,3 +1,4 @@
+require_relative 'base'
 module SearchSolrTools
   module Harvesters
     # Harvests data from NODC PALEO and inserts it into Solr after it has been translated

data/lib/search_solr_tools/harvesters/nmi.rb

@@ -1,3 +1,5 @@
+require_relative 'oai'
+
 module SearchSolrTools
   module Harvesters
     class Nmi < Oai

data/lib/search_solr_tools/harvesters/nodc.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     # Harvests data from NODC and inserts it into Solr after it has been translated

data/lib/search_solr_tools/harvesters/nsidc_auto_suggest.rb

@@ -1,3 +1,5 @@
+require_relative 'auto_suggest'
+
 module SearchSolrTools
   module Harvesters
     class NsidcAutoSuggest < AutoSuggest

data/lib/search_solr_tools/harvesters/nsidc_json.rb

@@ -31,9 +31,14 @@ module SearchSolrTools
       end
 
       def result_ids_from_nsidc
-        get_results SolrEnvironments[@environment][:nsidc_oai_identifiers_url], '//xmlns:identifier'
+        url = SolrEnvironments[@environment][:nsidc_dataset_metadata_url] +
+              SolrEnvironments[@environment][:nsidc_oai_identifiers_url]
+        get_results url, '//xmlns:identifier'
       end
 
+      # Fetch a JSON representation of a dataset's metadata
+      # @param id [String] NSIDC authoritative ID for the dataset
+      # @return [Hash] Parsed version of the JSON response
       def fetch_json_from_nsidc(id)
         json_response = RestClient.get(nsidc_json_url + id + '.json')
         JSON.parse(json_response)
@@ -44,6 +49,8 @@ module SearchSolrTools
         failure_ids = []
 
         result_ids_from_nsidc.each do |r|
+          # Each result looks like:
+          # oai:nsidc.org/AE_L2A
           id = r.text.split('/').last
           begin
             docs << { 'add' => { 'doc' => @translator.translate(fetch_json_from_nsidc(id)) } }

data/lib/search_solr_tools/harvesters/oai.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 require 'json'
 
 module SearchSolrTools

data/lib/search_solr_tools/harvesters/pdc.rb

@@ -1,3 +1,5 @@
+require_relative 'oai'
+
 module SearchSolrTools
   module Harvesters
     # Harvests data from Polar data catalogue and inserts it into

data/lib/search_solr_tools/harvesters/r2r.rb

@@ -1,8 +1,8 @@
+require_relative 'base'
+
 require 'nokogiri'
 require 'rest-client'
 
-require_relative 'base'
-
 module SearchSolrTools
   module Harvesters
     class R2R < Base

data/lib/search_solr_tools/harvesters/rda.rb

@@ -1,3 +1,5 @@
+require_relative 'oai'
+
 module SearchSolrTools
   module Harvesters
     # Harvests the RDA feed

data/lib/search_solr_tools/harvesters/tdar.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     # Harvests data from TDAR and inserts it into Solr after it has been translated

data/lib/search_solr_tools/harvesters/usgs.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module SearchSolrTools
   module Harvesters
     # Harvests data from USGS and inserts it into Solr after it has been translated

data/lib/search_solr_tools/helpers/data_one_format.rb

@@ -1,6 +1,6 @@
-require_relative './iso_namespaces'
-require_relative './iso_to_solr_format'
-require_relative './solr_format'
+require_relative 'iso_namespaces'
+require_relative 'iso_to_solr_format'
+require_relative 'solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/facet_configuration.rb

@@ -8,7 +8,7 @@ module SearchSolrTools
     class FacetConfiguration
       include Singleton
       def self.import_bin_configuration(env)
-        @bin_configuration = JSON.parse(RestClient.get(SolrEnvironments[env][:nsidc_dataset_metadata_url] + '/binConfiguration')) if @bin_configuration.nil?
+        @bin_configuration = JSON.parse(RestClient.get(SolrEnvironments[env][:nsidc_dataset_metadata_url] + 'binConfiguration')) if @bin_configuration.nil?
       end
 
       def self.get_facet_bin(facet_name)

data/lib/search_solr_tools/helpers/iso_to_solr.rb

@@ -1,10 +1,11 @@
+require_relative 'selectors'
 require 'nokogiri'
 
 module SearchSolrTools
   module Helpers
-    # Translates ISO nokogiri documents into solr nokogiri documents using a hash driver object
-    # This class should be constructed passing the selector file hash as a parameter (see selectors.rb)
-    # after creating an instance we call transtale with a nokogiri iso document as a parameter.
+    # Translates ISO nokogiri documents into solr nokogiri documents using a hash driver object.
+    # This class should be constructed passing the selector file hash as a parameter (see selectors.rb).
+    # After creating an instance we call translate with a nokogiri iso document as a parameter.
     class IsoToSolr
       def initialize(selector)
         @fields = SELECTORS[selector]

data/lib/search_solr_tools/helpers/iso_to_solr_format.rb

@@ -1,7 +1,7 @@
 require 'date'
 
-require_relative './iso_namespaces'
-require_relative './solr_format'
+require_relative 'iso_namespaces'
+require_relative 'solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/ncdc_paleo_format.rb

@@ -1,8 +1,8 @@
 require 'date'
 
-require_relative './iso_namespaces'
-require_relative './solr_format'
-require_relative './iso_to_solr_format'
+require_relative 'iso_namespaces'
+require_relative 'solr_format'
+require_relative 'iso_to_solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/r2r_format.rb

@@ -1,6 +1,6 @@
-require_relative './iso_namespaces'
-require_relative './iso_to_solr_format'
-require_relative './solr_format'
+require_relative 'iso_namespaces'
+require_relative 'iso_to_solr_format'
+require_relative 'solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/selectors.rb

@@ -1,5 +1,4 @@
-require 'require_all'
-require_rel '../selectors'
+Dir[File.join(__dir__, '..', 'selectors', '*.rb')].each { |file| require file }
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/solr_format.rb

@@ -2,6 +2,7 @@ require 'date'
 require 'iso8601'
 
 require_relative 'bounding_box_util'
+require_relative 'facet_configuration'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/tdar_format.rb

@@ -1,6 +1,6 @@
-require_relative './iso_namespaces'
-require_relative './iso_to_solr_format'
-require_relative './solr_format'
+require_relative 'iso_namespaces'
+require_relative 'iso_to_solr_format'
+require_relative 'solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/translate_spatial_coverage.rb

@@ -1,7 +1,7 @@
 require 'rgeo/geo_json'
 
-require 'search_solr_tools/helpers/bounding_box_util'
-require 'search_solr_tools/helpers/iso_to_solr_format'
+require_relative 'bounding_box_util'
+require_relative 'iso_to_solr_format'
 
 module SearchSolrTools
   module Helpers
@@ -36,7 +36,7 @@ module SearchSolrTools
             "#{geo_json.x} #{geo_json.y}"
           else
             bbox = RGeo::Cartesian::BoundingBox.create_from_geometry(geo_json)
-            "#{bbox.min_x} #{bbox.min_y} #{bbox.max_x} #{bbox.max_y}"
+            "ENVELOPE(#{bbox.min_x}, #{bbox.max_x}, #{bbox.max_y}, #{bbox.min_y})"
           end
         end
       end

data/lib/search_solr_tools/helpers/translate_temporal_coverage.rb

@@ -1,6 +1,6 @@
 require 'rgeo/geo_json'
 
-require 'search_solr_tools/helpers/solr_format'
+require_relative 'solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/helpers/usgs_format.rb

@@ -1,5 +1,5 @@
-require_relative './iso_namespaces'
-require_relative './iso_to_solr_format'
+require_relative 'iso_namespaces'
+require_relative 'iso_to_solr_format'
 
 module SearchSolrTools
   module Helpers

data/lib/search_solr_tools/selectors/adc.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/data_one_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/data_one.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/data_one_format'
+require_relative '../helpers/solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/echo_iso.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/ices_iso.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/ncdc_paleo.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/ncdc_paleo_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/nmi.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/nodc_iso.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/pdc_iso.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/r2r.rb

@@ -1,4 +1,6 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
+require_relative '../helpers/r2r_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/rda.rb

@@ -1,4 +1,5 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/tdar_opensearch.rb

@@ -1,4 +1,6 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
+require_relative '../helpers/tdar_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/selectors/usgs_iso.rb

@@ -1,4 +1,6 @@
-require 'search_solr_tools'
+require_relative '../helpers/solr_format'
+require_relative '../helpers/iso_to_solr_format'
+require_relative '../helpers/usgs_format'
 
 module SearchSolrTools
   module Selectors

data/lib/search_solr_tools/translators/eol_to_solr.rb

@@ -1,3 +1,5 @@
+require 'search_solr_tools'
+
 module SearchSolrTools
   module Translators
     # Translates an EOL THREDDS dataset link set into a SOLR json ingest record

data/lib/search_solr_tools/version.rb

@@ -1,3 +1,3 @@
 module SearchSolrTools
-  VERSION = '3.10.0'
+  VERSION = '5.0.0'
 end

data/search_solr_tools.gemspec

@@ -7,8 +7,8 @@ gem_files = %(CHANGELOG.md COPYING README.md bin/ lib/ search_solr_tools.gemspec
 Gem::Specification.new do |spec|
   spec.name          = 'search_solr_tools'
   spec.version       = SearchSolrTools::VERSION
-  spec.authors       = ['Chris Chalstrom', 'Michael Brandt', 'Jonathan Kovarik', 'Luis Lopez', 'Stuart Reed']
-  spec.email         = ['cchalstr@nsidc.org', 'mbrandt@colorado.edu', 'kovarik@nsidc.org', 'luis.lopezespinosa@colorado.edu', 'stuart.reed@colorado.edu']
+  spec.authors       = ['Chris Chalstrom', 'Michael Brandt', 'Jonathan Kovarik', 'Luis Lopez', 'Stuart Reed', 'Julia Collins', 'Scott Lewis']
+  spec.email         = ['cchalstr@nsidc.org', 'mbrandt@colorado.edu', 'kovarik@nsidc.org', 'luis.lopezespinosa@colorado.edu', 'stuart.reed@colorado.edu', 'jcollins@nsidc.org', 'scott.lewis@nsidc.org']
   spec.summary       = 'Tools to harvest and manage various scientific dataset feeds in a Solr instance.'
   spec.description   = <<-EOF
     Ruby translators to transform various metadata feeds into solr documents and
@@ -23,25 +23,24 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.6.5'
 
-  spec.add_runtime_dependency 'ffi-geos', '~> 1.2.0'
-  spec.add_runtime_dependency 'iso8601', '~> 0.8'
-  spec.add_runtime_dependency 'multi_json', '~> 1.11'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'require_all', '~> 1.3'
-  spec.add_runtime_dependency 'rest-client', '~> 1.6'
-  spec.add_runtime_dependency 'rgeo', '~> 0.3'
-  spec.add_runtime_dependency 'rgeo-geojson', '~> 0.3'
-  spec.add_runtime_dependency 'rsolr', '~> 1.0'
-  spec.add_runtime_dependency 'thor', '~> 0.18'
-  spec.add_development_dependency 'gem-release', '~> 0.7'
-  spec.add_development_dependency 'guard', '~> 2.12'
-  spec.add_development_dependency 'guard-rspec', '~> 4.6'
-  spec.add_development_dependency 'guard-rubocop', '~> 1.2'
-  spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.32.1'
-  spec.add_development_dependency 'webmock', '~> 1.13'
-  spec.add_development_dependency 'listen', '3.0.5'
+  spec.add_runtime_dependency 'ffi-geos', '~> 2.1.0'
+  spec.add_runtime_dependency 'iso8601', '~> 0.12.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.10.9'
+  spec.add_runtime_dependency 'rest-client', '~> 2.1.0'
+  spec.add_runtime_dependency 'rgeo', '~> 2.1.1'
+  spec.add_runtime_dependency 'rgeo-geojson', '~> 2.1.1'
+  spec.add_runtime_dependency 'rsolr', '~> 2.3.0'
+  spec.add_runtime_dependency 'thor', '~> 1.0.1'
+  spec.add_development_dependency 'gem-release', '~> 2.1.1'
+  spec.add_development_dependency 'guard', '~> 2.16.2'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
+  spec.add_development_dependency 'guard-rubocop', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 13.0.1'
+  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.add_development_dependency 'rubocop', '~> 0.86.0'
+  spec.add_development_dependency 'webmock', '~> 3.8.3'
+  spec.add_development_dependency 'listen', '3.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 4.2.2.pre1
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -9,10 +9,12 @@ authors:
 - Jonathan Kovarik
 - Luis Lopez
 - Stuart Reed
+- Julia Collins
+- Scott Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -20,266 +22,252 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.14.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.10.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.10.9
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 2.16.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 2.16.2
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.86.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 3.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 3.8.3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.2.1
 description: |2
       Ruby translators to transform various metadata feeds into solr documents and
       a command-line utility to access/utilize the gem's translators to harvest
@@ -290,6 +278,8 @@ email:
 - kovarik@nsidc.org
 - luis.lopezespinosa@colorado.edu
 - stuart.reed@colorado.edu
+- jcollins@nsidc.org
+- scott.lewis@nsidc.org
 executables:
 - search_solr_tools
 extensions: []
@@ -369,15 +359,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.6.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Tools to harvest and manage various scientific dataset feeds in a Solr instance.