search_solr_tools 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0e97fdb6cd3986683da13d8fd8ff26a150b00a3fc3b64de54fee93d3ceaf1d
-  data.tar.gz: 9e0c10993ab2fce13b400f9fb419788f0706b4367d9629145e425ed8c5931d05
+  metadata.gz: 212ffd0ff43e757dbb703cadc65629ee7fd702b5101b5004e5c5d92ef912c9b1
+  data.tar.gz: 555b2b7a437c60b509f8e53ff23edcbccaa0041e143c1cc1aee42d9447807913
 SHA512:
-  metadata.gz: 9fa45abe863da34e10f81183d242db3ccf8e1b37b01b2efb0836f469f50ae1f36dc3cd03ca6ab27a0ea2d0a83db232b93bb98271b8948b3283f717f2fd03ee66
-  data.tar.gz: 190b02a7ecd6ed44c762317d4e142e88877f053ad09457187e05c5a9e6de7e41f307118ad64661cc8efe563d0bb23054d795c3aa0a307b3b71df4d764c30fd53
+  metadata.gz: 8537a5e35631b4a398def6bce69053aded8b866b83cabb66e5fbbb8e7a94fb0eaca791e683222b03103931894e785798f287103647c37956ff408de960d8b9e8
+  data.tar.gz: 49483d94104e262d9ad52955b341c7d4f654f56ba7d996f6f2dba3a2c7768a0a3a9f11489621cddd20b0cdb844e11d518e8713dd2b665a2c95067d762ad86445

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v8.0.0 (2026-06-12)
+
+  - Update to use ruby 3.4.9 and latest gem dependencies
+  - Modify code to meet latest rubocop specifcations
+
+## v7.2.1 (2023-10-20)
+
+  - Revert deployment tagging changes, since they didn't solve the duplicate
+    workflow trigger problem.
+
 ## v7.2.0 (2023-10-19)
 
   - Force parameter facets based on GCMD keywords to be upper-case.

data/README.md

@@ -54,7 +54,7 @@ See _Harvesting Data_ (below) for usage examples.
 
 ### Requirements
 
-* Ruby > 3.2.2
+* Ruby > 3.4.9
 * [Bundler](http://bundler.io/)
 * Requirements for nokogiri:
     * [libxml2/libxml2-dev](http://xmlsoft.org/)
@@ -102,7 +102,7 @@ as described in [Logging](#logging) below.
 
 Requirements:
 
-* Ruby > 3.2.2
+* Ruby > 3.4.9
 * [Bundler](http://bundler.io/)
 * [Rake](https://github.com/ruby/rake)
 * RuboCop and the unit tests should all pass (`rake`)

data/lib/search_solr_tools/errors/harvest_error.rb

@@ -71,7 +71,7 @@ module SearchSolrTools
         @status_data = status
         @other_message = message
 
-        super message
+        super(message)
       end
 
       # rubocop:disable Metrics/AbcSize

data/lib/search_solr_tools/harvesters/auto_suggest.rb

@@ -28,7 +28,7 @@ module SearchSolrTools
       end
 
       def fetch_auto_suggest_facet_data(url, fields)
-        fields.each do |name, _config|
+        fields.each_key do |name|
           url += "&facet.field=#{name}"
         end
 
@@ -55,10 +55,7 @@ module SearchSolrTools
           Helpers::HarvestStatus.new(Helpers::HarvestStatus::INGEST_OK => add_docs)
         else
           logger.error "Failed adding #{add_docs.size} documents in single commit, retrying one by one"
-          new_add_docs = []
-          add_docs.each do |doc|
-            new_add_docs << { 'add' => { 'doc' => doc } }
-          end
+          new_add_docs = add_docs.map { |doc| { 'add' => { 'doc' => doc } } }
           insert_solr_docs new_add_docs, Base::JSON_CONTENT_TYPE, @env_settings[:auto_suggest_collection_name]
         end
       end

data/lib/search_solr_tools/harvesters/base.rb

@@ -92,7 +92,7 @@ module SearchSolrTools
 
       def sanitize_data_centers_constraints(query_string)
         # Remove lucene special characters, preserve the query parameter and compress whitespace
-        query_string = query_string.gsub(/[:&|!~\-\(\)\{\}\[\]\^\*\?\+]+/, ' ')
+        query_string = query_string.gsub(/[:&|!~\-(){}\[\]^*?+]+/, ' ')
         query_string = query_string.gsub('data_centers ', 'data_centers:')
         query_string = query_string.gsub('source ', 'source:')
         query_string.squeeze(' ').strip
@@ -123,8 +123,8 @@ module SearchSolrTools
           status.record_status doc_status
           doc_status == Helpers::HarvestStatus::INGEST_OK ? success += 1 : failure += 1
         end
-        logger.info "#{success} document#{success == 1 ? '' : 's'} successfully added to Solr."
-        logger.info "#{failure} document#{failure == 1 ? '' : 's'} not added to Solr."
+        logger.info "#{success} document#{'s' if success == 1} successfully added to Solr."
+        logger.info "#{failure} document#{'s' if failure == 1} not added to Solr."
 
         status
       end

data/lib/search_solr_tools/harvesters/nsidc_auto_suggest.rb

@@ -12,7 +12,7 @@ module SearchSolrTools
 
       def harvest
         url = "#{solr_url}/#{@env_settings[:collection_name]}/select?q=*%3A*&fq=source%3ANSIDC&rows=0&wt=json&indent=true&facet=true&facet.mincount=1&facet.sort=count&facet.limit=-1"
-        super url, fields
+        super(url, fields)
       end
 
       def fields

data/lib/search_solr_tools/harvesters/nsidc_json.rb

@@ -38,7 +38,7 @@ module SearchSolrTools
 
         status = insert_solr_docs result[:add_docs], Base::JSON_CONTENT_TYPE
 
-        status.record_status(Helpers::HarvestStatus::HARVEST_NO_DOCS) if (result[:num_docs]).zero?
+        status.record_status(Helpers::HarvestStatus::HARVEST_NO_DOCS) if result[:num_docs].zero?
 
         # Record the number of harvest failures; note that if this is 0, that's OK, the status will stay at 0
         status.record_status(Helpers::HarvestStatus::HARVEST_FAILURE, result[:failure_ids].length)

data/lib/search_solr_tools/helpers/facet_configuration.rb

@@ -9,6 +9,7 @@ module SearchSolrTools
     ## Singleton configuration class to get and parse the binning configuration from the catalog services endpoint
     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?
       end

data/lib/search_solr_tools/helpers/harvest_status.rb

@@ -38,7 +38,7 @@ module SearchSolrTools
       end
 
       def ok?
-        ERROR_STATUS.each { |s| return false unless (@status[s]).zero? }
+        ERROR_STATUS.each { |s| return false unless @status[s].zero? }
         @ping_solr && @ping_source
       end
     end

data/lib/search_solr_tools/helpers/solr_format.rb

@@ -45,7 +45,7 @@ module SearchSolrTools
       end
 
       def self.temporal_display_str(date_range)
-        temporal_str = (date_range[:start]).to_s
+        temporal_str = date_range[:start].to_s
         temporal_str += ",#{date_range[:end]}" unless date_range[:end].nil?
         temporal_str
       end
@@ -82,7 +82,7 @@ module SearchSolrTools
       end
 
       def self.reduce_temporal_duration(values)
-        values.map { |v| Integer(v) rescue nil }.compact.max
+        values.map { |v| Integer(v, exception: false) }.compact.max
       end
 
       def self.facet_binning(type, format_string)
@@ -129,7 +129,8 @@ module SearchSolrTools
         return true if resolution.to_s.empty?
         return true unless %w[single range].include? resolution['type']
         return true if resolution['type'] == 'single' && resolution['resolution'].to_s.empty?
-        return true if resolution['type'] == 'range' && resolution['min_resolution'].to_s.empty?
+
+        true if resolution['type'] == 'range' && resolution['min_resolution'].to_s.empty?
       end
 
       def self.get_spatial_scope_facet_with_bounding_box(bbox)

data/lib/search_solr_tools/translators/nsidc_json.rb

@@ -20,7 +20,7 @@ module SearchSolrTools
         temporal_coverage_values = Helpers::TranslateTemporalCoverage.translate_coverages json_doc['temporalCoverages']
         spatial_coverages = convert_spatial_coverages(json_doc['spatialCoverages'])
 
-        solr_add_hash = json_doc.select { |k, _v| copy_keys.include?(k) }
+        solr_add_hash = json_doc.slice(*copy_keys)
         solr_add_hash.merge!(
           'authoritative_id'          => json_doc['authoritativeId'],
           'dataset_version'           => json_doc['majorVersion']['version'],
@@ -63,11 +63,7 @@ module SearchSolrTools
       # rubocop:enable Metrics/AbcSize
 
       def convert_spatial_coverages(nsidc_geom)
-        geometries = []
-        nsidc_geom.each do |entry|
-          geometries << RGeo::GeoJSON.decode(entry['geom4326'])
-        end
-        geometries
+        nsidc_geom.map { |entry| RGeo::GeoJSON.decode(entry['geom4326']) }
       end
 
       def translate_sensor_to_facet_sensor(json)
@@ -178,22 +174,13 @@ module SearchSolrTools
         parameters_strings = translate_json_string(parameters_json, PARAMETER_PARTS)
         return [] if parameters_strings.nil?
 
-        facet_params = []
-        parameters_strings.each do |str|
-          facet_params << Helpers::SolrFormat.parameter_binning(str)
-        end
-        facet_params
+        parameters_strings.map { |str| Helpers::SolrFormat.parameter_binning(str) }
       end
 
       def translate_format_to_facet_format(format_json)
         return [] if format_json.nil?
 
-        facet_format = []
-
-        format_json.each do |format|
-          facet_format << Helpers::SolrFormat.facet_binning('format', format)
-        end
-        facet_format
+        format_json.map { |format| Helpers::SolrFormat.facet_binning('format', format) }
       end
 
       def translate_json_string(json, limit_values = nil)
@@ -222,9 +209,9 @@ module SearchSolrTools
 
       def generate_part_array(json, limit_values = nil)
         parts = []
-        json = json.select { |k, _v| limit_values.include?(k) } unless limit_values.nil? || limit_values.empty?
+        json = json.slice(*limit_values) unless limit_values.nil? || limit_values.empty?
 
-        json.each do |_k, v|
+        json.each_value do |v|
           parts << v unless v.to_s.empty?
         end
 

data/lib/search_solr_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SearchSolrTools
-  VERSION = '7.2.0'
+  VERSION = '8.0.0'
 end

data/search_solr_tools.gemspec

@@ -23,29 +23,29 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 3.2.2'
+  spec.required_ruby_version = '~> 3.4.9'
 
-  spec.add_runtime_dependency 'ffi-geos', '~> 2.4.0'
+  spec.add_runtime_dependency 'ffi-geos', '~> 2.5.0'
   spec.add_runtime_dependency 'iso8601', '~> 0.13.0'
-  spec.add_runtime_dependency 'logging', '~> 2.3.1'
-  spec.add_runtime_dependency 'multi_json', '~> 1.15.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.15.4'
+  spec.add_runtime_dependency 'logging', '~> 2.4.0'
+  spec.add_runtime_dependency 'multi_json', '~> 1.21.0'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.19.3'
   spec.add_runtime_dependency 'rest-client', '~> 2.1.0'
-  spec.add_runtime_dependency 'rgeo', '~> 3.0.0'
-  spec.add_runtime_dependency 'rgeo-geojson', '~> 2.1.1'
-  spec.add_runtime_dependency 'rsolr', '~> 2.5.0'
-  spec.add_runtime_dependency 'thor', '~> 1.2.2'
+  spec.add_runtime_dependency 'rgeo', '~> 3.1.0'
+  spec.add_runtime_dependency 'rgeo-geojson', '~> 2.2.0'
+  spec.add_runtime_dependency 'rsolr', '~> 2.6.0'
+  spec.add_runtime_dependency 'thor', '~> 1.5.0'
 
   spec.add_development_dependency 'bump', '~> 0.10.0'
-  spec.add_development_dependency 'gem-release', '~> 2.2.2'
-  spec.add_development_dependency 'guard', '~> 2.18.0'
+  spec.add_development_dependency 'gem-release', '~> 2.2.4'
+  spec.add_development_dependency 'guard', '~> 2.20.1'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
   spec.add_development_dependency 'guard-rubocop', '~> 1.5.0'
-  spec.add_development_dependency 'listen', '3.8.0'
-  spec.add_development_dependency 'rake', '~> 13.0.6'
-  spec.add_development_dependency 'rspec', '~> 3.12.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.2'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.22.0'
-  spec.add_development_dependency 'webmock', '~> 3.18.1'
+  spec.add_development_dependency 'listen', '3.10.0'
+  spec.add_development_dependency 'rake', '~> 13.4.2'
+  spec.add_development_dependency 'rspec', '~> 3.13.2'
+  spec.add_development_dependency 'rubocop', '~> 1.87.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.7.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 3.10.2'
+  spec.add_development_dependency 'webmock', '~> 3.26.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -11,10 +11,9 @@ authors:
 - Stuart Reed
 - Julia Collins
 - Scott Lewis
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -22,14 +21,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
@@ -50,42 +49,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.19.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +105,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -176,28 +175,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.20.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.20.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -232,98 +231,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.87.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.87.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.18.1
+        version: 3.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.18.1
+        version: 3.26.2
 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
@@ -365,7 +364,6 @@ homepage: https://github.com/nsidc/search-solr-tools
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -373,15 +371,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.2
+      version: 3.4.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Tools to harvest and manage various scientific dataset feeds in a Solr instance.
 test_files: []