search_solr_tools 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd15c0c642948b78d62d5d037165231313d46db3
-  data.tar.gz: 27533d22f692b1a5eb82ac95a7bd42107833ec50
+  metadata.gz: 187e12f711b38e3274387d3575728d8d5250bf48
+  data.tar.gz: db79a42d420a46430dcf32e4bf442bf790d0d18b
 SHA512:
-  metadata.gz: f5b173eea4feaadf84ec0c466b201d4a91253c64b83b2abe47f36555a92eac7fafb116e9692c7cc80bdebd55e434b8645ffdf56f4f650cc11f0b357e1ce0d824
-  data.tar.gz: 60c2871f475e7e2c9f2d85a2ce510cae73890ba329759b0c7bb200c29e8b05f0c3b14f6281209738a900606a814b9198069434978a2ce522aa3abdd15e93aa63
+  metadata.gz: a69bcf39d6c09009d399cd2d029f8691ed6d00b3760a217f7ed7c5324c4171d0332b6ed2982c12caa9f663bc489a4edd5ce5ce0a8717a8dde2df78cdf2215c5c
+  data.tar.gz: 613a293d8808099b554551932c37b8c3a709cdbb94488c61cd4f65bd5d0737ba7cd30537e217beccb032d3792195759496e785f4f1ffeb6560e1f1a0560ca7e0

data/README.md

@@ -93,11 +93,6 @@ one terminal window.
 
 RuboCop can be configured by modifying `.rubocop.yml`.
 
-Pushing with failing tests or RuboCop violations will cause the Jenkins build to
-break. Jenkins jobs to build and deploy this project are named
-"NSIDC_Search_SOLR_()…" and can be viewed under the
-[NSIDC Search tab](https://scm.nsidc.org/jenkins/view/NSIDC%20Search/).
-
 ### Testing
 
 Unit tests can be run with `rspec`, `bundle exec rake spec:unit`, or `bundle
@@ -114,7 +109,7 @@ Requirements:
 * [Bundler](http://bundler.io/)
 * [Gem Release](https://github.com/svenfuchs/gem-release)
 * [Rake](https://github.com/ruby/rake)
-* a [RubyGems](https://rubygems.org) account that has
+* A [RubyGems](https://rubygems.org) account that has
   [ownership](http://guides.rubygems.org/publishing/) of the gem
 * RuboCop and the unit tests should all pass (`rake`)
 
@@ -125,7 +120,7 @@ tagging, and publishing to RubyGems.
 |---------------------------|-------------|
 | `rake release:pre[false]` | Increase the current prerelease version number, push changes |
 | `rake release:pre[true]`  | Increase the current prerelease version number, publish release\* |
-| `rake release:none`       | Drop the prerelease version, publish release, then `pre[false]` |
+| `rake release:none`       | Drop the prerelease version, publish release, then `pre[false]` (does a patch release) |
 | `rake release:minor`      | Increase the minor version number, publish release, then `pre[false]` |
 | `rake release:major`      | Increase the major version number, publish release, then `pre[false]` |
 

data/bin/search_solr_tools

@@ -58,8 +58,7 @@ class SolrHarvestCLI < Thor
     harvester.delete_old_documents(options[:timestamp],
                                    "data_centers:\"#{SearchSolrTools::Helpers::SolrFormat::DATA_CENTER_NAMES[options[:data_center].upcase.to_sym][:long_name]}\"",
                                    SearchSolrTools::SolrEnvironments[harvester.environment][:collection_name],
-                                   true
-                                  )
+                                   true)
   end
 
   no_tasks do
@@ -90,7 +89,7 @@ class SolrHarvestCLI < Thor
 
     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/harvesters/ade_auto_suggest.rb

@@ -3,7 +3,7 @@ module SearchSolrTools
     class AdeAutoSuggest < AutoSuggest
       def harvest_and_delete
         puts 'Building auto-suggest indexes for ADE'
-        super(method(:harvest), "source:\"ADE\"", @env_settings[:auto_suggest_collection_name])
+        super(method(:harvest), 'source:"ADE"', @env_settings[:auto_suggest_collection_name])
       end
 
       def harvest
@@ -12,7 +12,8 @@ module SearchSolrTools
       end
 
       def fields
-        { 'full_keywords_and_parameters' => { weight: 2, source: 'ADE', creator: method(:keyword_creator) },
+        {
+          'full_keywords_and_parameters' => { weight: 2, source: 'ADE', creator: method(:keyword_creator) },
           'full_authors' => { weight: 1, source: 'ADE', creator: method(:author_creator) }
         }
       end

data/lib/search_solr_tools/harvesters/base.rb

@@ -81,7 +81,7 @@ module SearchSolrTools
         end
         puts "#{success} document#{success == 1 ? '' : 's'} successfully added to Solr."
         puts "#{failure} document#{failure == 1 ? '' : 's'} not added to Solr."
-        fail 'Some documents failed to be inserted into Solr' if failure > 0
+        raise 'Some documents failed to be inserted into Solr' if failure > 0
       end
 
       def insert_solr_doc(doc, content_type = XML_CONTENT_TYPE, core = SolrEnvironments[@environment][:collection_name])

data/lib/search_solr_tools/harvesters/bcodmo.rb

@@ -18,7 +18,7 @@ module SearchSolrTools
       def harvest_bcodmo_into_solr
         result = translate_bcodmo
         insert_solr_docs result[:add_docs], Base::JSON_CONTENT_TYPE
-        fail 'Failed to harvest some records from the provider' if result[:failure_ids].length > 0
+        raise 'Failed to harvest some records from the provider' if result[:failure_ids].length > 0
       end
 
       def translate_bcodmo

data/lib/search_solr_tools/harvesters/eol.rb

@@ -22,7 +22,7 @@ module SearchSolrTools
             doc = open_xml_document(dataset)
             if doc.xpath('//xmlns:metadata').size > 1
               # THREDDS allows for a dataset of datasests, EOL should not utilize this
-              fail "Complex dataset encountered at #{doc.xpath('//xmlns:catalog').to_html}"
+              raise "Complex dataset encountered at #{doc.xpath('//xmlns:catalog').to_html}"
             end
             metadata_doc = open_xml_document(doc.xpath('//xmlns:metadata')[0]['xlink:href'])
             { 'add' => { 'doc' => @translator.translate(doc, metadata_doc) } }

data/lib/search_solr_tools/harvesters/gtnp.rb

@@ -28,7 +28,7 @@ module SearchSolrTools
       def harvest_gtnp_into_solr
         result = translate_gtnp
         insert_solr_docs result[:add_docs], Base::JSON_CONTENT_TYPE
-        fail 'Failed to harvest some records from the provider' if result[:failure_ids].length > 0
+        raise 'Failed to harvest some records from the provider' if result[:failure_ids].length > 0
       end
 
       def translate_gtnp

data/lib/search_solr_tools/harvesters/ices.rb

@@ -48,8 +48,7 @@ module SearchSolrTools
                                                      'maxRecords' => maxRecords,
                                                      'startPosition' => startPosition,
                                                      'constraintLanguage' => 'CQL_TEXT',
-                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd'
-                                                    )
+                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd')
       end
     end
   end

data/lib/search_solr_tools/harvesters/ncdc_paleo.rb

@@ -52,8 +52,7 @@ module SearchSolrTools
         Helpers::CswIsoQueryBuilder.get_query_string(ncdc_paleo_url,
                                                      'resultType' => resultType,
                                                      'maxRecords' => maxRecords,
-                                                     'startPosition' => startPosition
-                                                    )
+                                                     'startPosition' => startPosition)
       end
     end
   end

data/lib/search_solr_tools/harvesters/nodc.rb

@@ -48,8 +48,7 @@ module SearchSolrTools
                                                      'maxRecords' => maxRecords,
                                                      'startPosition' => startPosition,
                                                      'constraint' => bbox_constraint,
-                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd'
-                                                    )
+                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd')
       end
 
       def bbox_constraint

data/lib/search_solr_tools/harvesters/nsidc_auto_suggest.rb

@@ -3,7 +3,7 @@ module SearchSolrTools
     class NsidcAutoSuggest < AutoSuggest
       def harvest_and_delete
         puts 'Building auto-suggest indexes for NSIDC'
-        super(method(:harvest), "source:\"NSIDC\"", @env_settings[:auto_suggest_collection_name])
+        super(method(:harvest), 'source:"NSIDC"', @env_settings[:auto_suggest_collection_name])
       end
 
       def harvest
@@ -12,7 +12,8 @@ module SearchSolrTools
       end
 
       def fields
-        { 'authoritative_id' => { weight: 1, source: 'NSIDC', creator: method(:standard_add_creator) },
+        {
+          'authoritative_id' => { weight: 1, source: 'NSIDC', creator: method(:standard_add_creator) },
           'full_title' => { weight: 2, source: 'NSIDC', creator: method(:standard_add_creator) },
           'copy_parameters' => { weight: 5, source: 'NSIDC', creator: method(:standard_add_creator) },
           'full_platforms' => { weight: 2, source: 'NSIDC', creator: method(:short_full_split_add_creator) },

data/lib/search_solr_tools/harvesters/nsidc_json.rb

@@ -23,7 +23,7 @@ module SearchSolrTools
       def harvest_nsidc_json_into_solr
         result = docs_with_translated_entries_from_nsidc
         insert_solr_docs result[:add_docs], Base::JSON_CONTENT_TYPE
-        fail 'Failed to harvest and insert some authoritative IDs' if result[:failure_ids].length > 0
+        raise 'Failed to harvest and insert some authoritative IDs' if result[:failure_ids].length > 0
       end
 
       def nsidc_json_url

data/lib/search_solr_tools/harvesters/oai.rb

@@ -34,11 +34,11 @@ module SearchSolrTools
       end
 
       def results
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def metadata_url
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def translated_docs(entries)
@@ -48,7 +48,7 @@ module SearchSolrTools
       private
 
       def request_params
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def request_string

data/lib/search_solr_tools/harvesters/usgs.rb

@@ -49,8 +49,7 @@ module SearchSolrTools
                                                      'startPosition' => startPosition,
                                                      'TypeNames' => '',
                                                      'constraint' => bbox_constraint,
-                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd'
-                                                    )
+                                                     'outputSchema' => 'http://www.isotc211.org/2005/gmd')
       end
 
       def bbox_constraint

data/lib/search_solr_tools/helpers/iso_to_solr.rb

@@ -83,7 +83,7 @@ module SearchSolrTools
       end
 
       def strip_invalid_utf8_bytes(text)
-        if text.respond_to?(:encode) && (!text.valid_encoding?)
+        if text.respond_to?(:encode) && !text.valid_encoding?
           text.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
         end
 

data/lib/search_solr_tools/helpers/iso_to_solr_format.rb

@@ -188,7 +188,7 @@ module SearchSolrTools
 
         return '' if vals.empty? || out_of_bounds
 
-        val = (-val.to_f) if %w(West South).include?(vals.last)
+        val = -val.to_f if %w(West South).include?(vals.last)
 
         val.to_f.to_s
       end

data/lib/search_solr_tools/helpers/solr_format.rb

@@ -134,7 +134,7 @@ module SearchSolrTools
           j = send(find_index_method, resolution['max_resolution'])
           return resolution_values[i..j]
         end
-        fail "Invalid resolution #{resolution['type']}"
+        raise "Invalid resolution #{resolution['type']}"
       end
 
       def self.resolution_not_specified?(resolution)

data/lib/search_solr_tools/translators/eol_to_solr.rb

@@ -62,9 +62,9 @@ module SearchSolrTools
       def parse_geospatial_coverages(doc)
         node = doc.xpath('//xmlns:geospatialCoverage')
         south = node.xpath('./xmlns:northsouth/xmlns:start').text.to_f
-        north = south + (node.xpath('./xmlns:northsouth/xmlns:size').text.to_f)
+        north = south + node.xpath('./xmlns:northsouth/xmlns:size').text.to_f
         west = node.xpath('./xmlns:eastwest/xmlns:start').text.to_f
-        east = west + (node.xpath('./xmlns:eastwest/xmlns:size').text.to_f)
+        east = west + node.xpath('./xmlns:eastwest/xmlns:size').text.to_f
         # EOL uses out-of-range east-west values to represent bounding boxes
         # that cross the date line.   For any box with a value out of range,
         # adjust the east/west value to lie within the -180 to 180 range.

data/lib/search_solr_tools/translators/nsidc_json.rb

@@ -43,7 +43,7 @@ module SearchSolrTools
           'last_revision_date' => (Helpers::SolrFormat.date_str json_doc['lastRevisionDate']),
           'dataset_url' => json_doc['datasetUrl'],
           'distribution_formats' => json_doc['distributionFormats'],
-          'facet_format' => (json_doc['distributionFormats'].empty?) ? [Helpers::SolrFormat::NOT_SPECIFIED] : translate_format_to_facet_format(json_doc['distributionFormats']),
+          'facet_format' => json_doc['distributionFormats'].empty? ? [Helpers::SolrFormat::NOT_SPECIFIED] : translate_format_to_facet_format(json_doc['distributionFormats']),
           'source' => %w(NSIDC ADE),
           'popularity' => json_doc['popularity'],
           'data_access_urls' => translate_data_access_urls(json_doc['dataAccessLinks']),

data/lib/search_solr_tools/version.rb

@@ -1,3 +1,3 @@
 module SearchSolrTools
-  VERSION = '3.7.0'
+  VERSION = '3.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Chris Chalstrom