search_solr_tools 3.2.0 → 3.2.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d43d4ba7d890aca12ff850bf34519570fef1ac
-  data.tar.gz: 100eb3ee2af79f329a06e631a43a17f7cc59dfbc
+  metadata.gz: 93167b9c7cbc13f9415c75b7f11498863e71bca1
+  data.tar.gz: 0ec2c511ba85b1a3ea16967efb032296c4141a98
 SHA512:
-  metadata.gz: 05d762332d649542b24557909059cb1b398d90319ce3025ac74720d72780179a809c08afba0976f0e09532ca99158cb6791857f1f7991c233a019e8baf966163
-  data.tar.gz: ee8bd339599759bd0310e14513ca269f12c364c59e7a7d250fc4b8db24baec3c99c886d7187474fee376f6cf0dce37e441f2e57445a1369cbb0f10d35d159202
+  metadata.gz: b155435198dd89d63e441e6a66332a7db2e3d59f196dbcc574ac1aa3292f821b8648750391df3391eeaeed2811c1be2b40f3529b58700135988a13bb18db0efd
+  data.tar.gz: f738aa6f83a8717b68752a12a7b9439d6222e099a7754d23bb3276c7db1f3a39c213cfef653895f43e494ecd483483147cbe04aa89633c87e3422dcf38f25e8c

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## v3.2.0
+## v3.2.1
+
+Bugfixes
+
+  - Catch a timeout error earlier in the stack to prevent an infinite loop of
+    retries; this bug caused the PDC harvester to attempt to access the feed 150
+    times, instead of simply failing after 3 failed
+    attempts. [Pivotal 103057378](https://www.pivotaltracker.com/story/show/103057378)
+
+## v3.2.0 (2015-07-01)
 
 New Features
 
@@ -7,20 +16,20 @@ New Features
   - Add subcommands `-v` and `--version` to display the installed version of the
     gem
 
-## v3.1.2
+## v3.1.2 (2015-06-30)
 
 Changes
 
   - Gem is available via [RubyGems](https://rubygems.org)
 
-## v3.1.1
+## v3.1.1 (2015-06-29)
 
 Bugfixes
 
   - Updated deletion constraints such that lucene special characters in
     dataset names do not cause deletion of that data provider's data to fail.
 
-## v3.1.0
+## v3.1.0 (2015-06-25)
 
 Features
 
@@ -35,13 +44,13 @@ Bugfixes
   - Fix broken configuration, where production was attempting to use the Blue,
     rather than the the production, Solr host for harvesting. (see PCT-410)
 
-## v3.0.1
+## v3.0.1 (2015-06-18)
 
 Bugfixes
 
   - Fix broken `delete_all` commands.
 
-## v3.0.0
+## v3.0.0 (2015-06-15)
 
   - Packaged as a gem with a new executable file, providing a new interface to
     harvest feeds into solr.
@@ -50,7 +59,7 @@ Bugfixes
     the query to Solr was failing because the "/" character could not be
     correctly escaped.
 
-## v2.0.0
+## v2.0.0 (2015-06-08)
 
   - Upgrade from Ruby version 1.9.3 to 2.2.2
   - Compliant with

data/bin/search_solr_tools

@@ -52,7 +52,7 @@ class SolrHarvestCLI < Thor
   desc 'delete_by_data_center', 'Force deletion of documents for a specific data center with timestamps before the passed timestamp in format iso8601 (2014-07-14T21:49:21Z)'
   option :timestamp, required: true
   option :environment, required: true
-  option :data_center,  required: true
+  option :data_center, required: true
   def delete_by_data_center
     harvester = get_harvester_class(options[:data_center]).new options[:environment]
     harvester.delete_old_documents(options[:timestamp],

data/lib/search_solr_tools/harvesters/base.rb

@@ -96,7 +96,7 @@ module SearchSolrTools
 
         # Some docs will cause solr to time out during the POST
         begin
-          RestClient.post(url, doc_serialized,  content_type: content_type) do |response, _request, _result|
+          RestClient.post(url, doc_serialized, content_type: content_type) do |response, _request, _result|
             success = response.code == 200
             puts "Error for #{doc_serialized}\n\n response: #{response.body}" unless success
           end
@@ -127,9 +127,9 @@ module SearchSolrTools
         begin
           puts "Request: #{request_url}"
           response = open(request_url, read_timeout: timeout, 'Content-Type' => content_type)
-        rescue OpenURI::HTTPError, Timeout::Error => e
+        rescue OpenURI::HTTPError, Timeout::Error, Errno::ETIMEDOUT => e
           retries_left -= 1
-          puts "## REQUEST FAILED ## Retrying #{retries_left} more times..."
+          puts "## REQUEST FAILED ## #{e.class} ## Retrying #{retries_left} more times..."
 
           retry if retries_left > 0
 

data/lib/search_solr_tools/harvesters/bcodmo.rb

@@ -8,7 +8,7 @@ module SearchSolrTools
       def initialize(env = 'development', die_on_failure = false)
         super env, die_on_failure
         @translator = Translators::BcodmoJsonToSolr.new
-        @wkt_parser = RGeo::WKRep::WKTParser.new(nil, {})   # (factory_generator_=nil,
+        @wkt_parser = RGeo::WKRep::WKTParser.new(nil, {}) # (factory_generator_=nil,
       end
 
       def harvest_and_delete

data/lib/search_solr_tools/harvesters/eol.rb

@@ -44,9 +44,7 @@ module SearchSolrTools
       end
 
       def open_xml_document(url)
-        Nokogiri::XML(open(url)) do |config|
-          config.strict
-        end
+        Nokogiri::XML(open(url), &:strict)
       end
     end
   end

data/lib/search_solr_tools/harvesters/oai.rb

@@ -27,7 +27,7 @@ module SearchSolrTools
           begin
             insert_solr_docs(translated_docs(results))
           rescue => e
-            puts "ERROR: #{e}"
+            puts "ERROR: #{e.class} #{e}"
             raise e if @die_on_failure
           end
         end

data/lib/search_solr_tools/helpers/iso_to_solr.rb

@@ -87,7 +87,7 @@ module SearchSolrTools
           text.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
         end
 
-        text.gsub!("\u00BF", '') if text.respond_to?(:gsub!)
+        text.delete!("\u00BF") if text.respond_to?(:delete!)
 
         text
       end

data/lib/search_solr_tools/helpers/translate_temporal_coverage.rb

@@ -25,7 +25,7 @@ module SearchSolrTools
         max_temporal_duration = SolrFormat.reduce_temporal_duration(temporal_durations)
         facet = SolrFormat.get_temporal_duration_facet(max_temporal_duration)
 
-        { 'temporal_coverages' => temporal_display, 'temporal_duration' => max_temporal_duration, 'temporal' => temporal_index_str, 'facet_temporal_duration' => facet  }
+        { 'temporal_coverages' => temporal_display, 'temporal_duration' => max_temporal_duration, 'temporal' => temporal_index_str, 'facet_temporal_duration' => facet }
       end
 
       def self.format_string(value)

data/lib/search_solr_tools/selectors/echo_iso.rb

@@ -72,7 +72,7 @@ module SearchSolrTools
       temporal_coverages: {
         xpaths: ['.//Collection/Temporal/RangeDateTime'],
         multivalue: true,
-        format:  Helpers::IsoToSolrFormat::TEMPORAL_DISPLAY_STRING_FORMATTED
+        format: Helpers::IsoToSolrFormat::TEMPORAL_DISPLAY_STRING_FORMATTED
       },
       temporal_duration: {
         xpaths: ['.//Collection/Temporal/RangeDateTime'],

data/lib/search_solr_tools/selectors/ices_iso.rb

@@ -75,7 +75,7 @@ module SearchSolrTools
       temporal: {
         xpaths: ['.//gmd:EX_TemporalExtent'],
         multivalue: true,
-        format:  Helpers::IsoToSolrFormat::TEMPORAL_INDEX_STRING
+        format: Helpers::IsoToSolrFormat::TEMPORAL_INDEX_STRING
       },
       sensors: {
         xpaths: ['.//gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:instrument/gmi:MI_Instrument/gmi:citation/gmd:CI_Citation/gmd:title/gco:CharacterString'],

data/lib/search_solr_tools/selectors/nodc_iso.rb

@@ -75,7 +75,7 @@ module SearchSolrTools
       temporal: {
         xpaths: ['.//gmd:EX_TemporalExtent'],
         multivalue: true,
-        format:  Helpers::IsoToSolrFormat::TEMPORAL_INDEX_STRING
+        format: Helpers::IsoToSolrFormat::TEMPORAL_INDEX_STRING
       },
       sensors: {
         xpaths: ['.//gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:instrument/gmi:MI_Instrument/gmi:citation/gmd:CI_Citation/gmd:title/gco:CharacterString'],

data/lib/search_solr_tools/selectors/r2r.rb

@@ -81,7 +81,7 @@ module SearchSolrTools
       temporal: {
         xpaths: ['.//gmd:EX_Extent[@id="temporalExtent"]'],
         multivalue: false,
-        format:  Helpers::R2RFormat::TEMPORAL_INDEX_STRING
+        format: Helpers::R2RFormat::TEMPORAL_INDEX_STRING
       },
       sensors: {
         xpaths: ['.//gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:instrument/gmi:MI_Instrument/gmi:type/gmx:Anchor'],

data/lib/search_solr_tools/translators/nsidc_json.rb

@@ -175,7 +175,7 @@ module SearchSolrTools
       end
 
       def generate_part_array(json, limit_values = nil)
-        parts =  []
+        parts = []
         json = json.select { |k, _v| limit_values.include?(k) } unless limit_values.nil? || limit_values.empty?
 
         json.each do |_k, v|

data/lib/search_solr_tools/version.rb

@@ -1,3 +1,3 @@
 module SearchSolrTools
-  VERSION = '3.2.0'
+  VERSION = '3.2.1.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1.pre2
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso8601
@@ -336,9 +336,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8