geo_combine 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a403eec66c0f81cd06bed4033f411ed137276277e6f9a6eb0a672c64428dcca0
-  data.tar.gz: 7c6e8a61d3d8783a633edac40c57c435a4b6b3d9bd17ff1ae272e794fb6c2b56
+  metadata.gz: '0439618d4248a21c1f4efe91e863d01ad9b97f0798b7f855b60c15eab7457bbf'
+  data.tar.gz: a01ec4dc01b9c6d3dd39e34c178f2271b83d8c51ecf16226e8595a36ddbf37ea
 SHA512:
-  metadata.gz: b995db35d3452c377d93a9384018e54c01730b76462e5109d3a4ab3e7e24ddcbf3a8fa1b7703b2e571832a054d8a43459a34b18df9b5af418e87107c8509a873
-  data.tar.gz: fc129701c6e2fb138e9f43aab3b2b6e84dc68696813cbb1fb5c7ede89f364c88b8d5717a3e477fc030dfd2ee588a335df0274bf4005f1434c14a841d0f92e0de
+  metadata.gz: 4c7c77f1cf1b60e7438f144d97a1af16126cdc1c9567ae2006cdcaa26c47fc0d5af8672e6368b5b139789b8f44f55cbadc1bd1f220b84b4a36c4bfc78dba3a65
+  data.tar.gz: d33c6c00ed6b39a6c2a8238ad9e14304bb59e450a031b8b8836635bb71d4a2deed3b8b0de68ca10c6e0ae9e9013f67acab42e765534475e2040af76f65a7a1ad

data/README.md

@@ -105,12 +105,16 @@ $ SOLR_COMMIT_WITHIN=100 bundle exec rake geocombine:index
 
 GeoCombine provides a Harvester class and rake task to harvest and index content from GeoBlacklight sites (or any site that follows the Blacklight API format). Given that the configurations can change from consumer to consumer and site to site, the class provides a relatively simple configuration API. This can be configured in an initializer, a wrapping rake task, or any other ruby context where the rake task our class would be invoked.
 
+```sh
+bundle exec rake geocombine:geoblacklight_harvester:index[YOUR_CONFIGURED_SITE_KEY]
+```
+
 #### Harvester configuration
 
 Only the sites themselves are required to be configured but there are various configuration options that can (optionally) be supplied to modify the harvester's behavior.
 
 ```ruby
-GeoCombine::GeoBlacklightIndexer.configure do
+GeoCombine::GeoBlacklightHarvester.configure do
   {
     commit_within: '10000',
     crawl_delay: 1, # All sites

data/lib/geo_combine/geo_blacklight_harvester.rb

@@ -146,6 +146,7 @@ module GeoCombine
 
           url = response.dig('links', 'next')
           break unless url
+          url = "#{url}&format=json"
           self.page += 1
           puts "Fetching page #{page} @ #{url}" if GeoCombine::GeoBlacklightHarvester.config[:debug]
           begin

data/lib/geo_combine/version.rb

@@ -1,3 +1,3 @@
 module GeoCombine
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/tasks/geo_combine.rake

@@ -64,10 +64,10 @@ namespace :geocombine do
 
   namespace :geoblacklight_harvester do
     desc 'Harvest documents from a configured GeoBlacklight instance'
-    task :index, [:site] do |_t, args|
+    task :index, [:site] => [:environment] do |_t, args|
       raise ArgumentError, 'A site argument is required' unless args.site
 
-      GeoCombine::GeoBlacklightHarvester.new(args.site).index
+      GeoCombine::GeoBlacklightHarvester.new(args.site.to_sym).index
     end
   end
 end

data/spec/lib/geo_combine/geo_blacklight_harvester_spec.rb

@@ -148,7 +148,7 @@ RSpec.describe GeoCombine::GeoBlacklightHarvester do
     before do
       allow(RSolr).to receive(:connect).and_return(stub_solr_connection)
       expect(Net::HTTP).to receive(:get).with(
-        URI('https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2')
+        URI('https://example.com/catalog.json?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&per_page=100&page=2&format=json')
       ).and_return(second_results_response.to_json)
     end
 
@@ -157,7 +157,7 @@ RSpec.describe GeoCombine::GeoBlacklightHarvester do
           { 'links' => { 'self' => 'https://example.com/catalog/abc-123' } },
           { 'links' => { 'self' => 'https://example.com/catalog/abc-321' } }
         ],
-        'links' => { 'next' => 'https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2' }
+        'links' => { 'next' => 'https://example.com/catalog.json?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&per_page=100&page=2' }
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_combine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,7 +245,7 @@ homepage: ''
 licenses:
 - Apache
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,8 +260,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A Ruby toolkit for managing geospatial metadata
 test_files: