Merge pull request #163 from tulibraries/DEVO-654-ruby-upgrade

Update ingest command

Author: dkinzer

exe/cob_web_index

@@ -33,11 +33,12 @@ class App
       end
 
       if options["use-fixtures"]
-        CobWebIndex::CLI.ingest_fixtures(opts)
+        CobWebIndex::CLI.ingest_fixtures(**opts)
       elsif args.empty?
-        CobWebIndex::CLI.pull(opts)
+        CobWebIndex::CLI.pull(**opts)
       else
-        CobWebIndex::CLI.ingest(opts.merge(ingest_path: args[0], delete_collection: true))
+        opts.merge!(ingest_path: args[0], delete_collection: true)
+        CobWebIndex::CLI.ingest(**opts)
       end
     end
   end

lib/cob_web_index.rb

@@ -17,6 +17,7 @@ def self.ingest(ingest_path: nil, ingest_string: "", **opts)
       if ingest_path
         logger.info "Ingesting #{ingest_path}"
         ingest_string = CobWebIndex::CLI.open_read(ingest_path)
+
         data = JSON.parse(ingest_string).fetch("data")
 
         # Protect against trying to ingest nil data
@@ -60,7 +61,8 @@ def self.open_read(url)
         options = { http_basic_authentication: [ENV["WEB_CONTENT_BASIC_AUTH_USER"], ENV["WEB_CONTENT_BASIC_AUTH_PASSWORD"]] }
       end
       options[:read_timeout] = ENV["WEB_CONTENT_READ_TIMEOUT"].to_i if ENV["WEB_CONTENT_READ_TIMEOUT"]
-      URI.open(url, options).read
+      file = options.empty? ? URI.open(url) : URI.open(url, options)
+      file.read
     end
 
     def self.ingest_fixtures(opts = {})

spec/cob_web_index_spec.rb

@@ -96,7 +96,7 @@
     }
 
     it "receives no options" do
-      expect(URI).to receive(:open).with(uri, {})
+      expect(URI).to receive(:open).with(uri)
       CobWebIndex::CLI.open_read(uri)
     end