geoblacklight_sidecar_images 0.8.1 → 0.9.0

data/spec/models/solr_document_sidecar_spec.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
 describe SolrDocumentSidecar do
   let(:document) { SolrDocument.new(document_attributes) }
 
-  describe '#sidecar' do
-    let(:document_attributes) { json_data('umn_iiif_jpg') }
+  describe "#sidecar" do
+    let(:document_attributes) { json_data("umn_iiif_jpg") }
 
-    it 'responds to image method' do
+    it "responds to image method" do
       expect(document.sidecar).to respond_to :image
     end
   end

data/spec/models/solr_document_spec.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
 describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }
 
-  describe '#sidecar' do
-    let(:document_attributes) { json_data('umn_iiif_jpg') }
+  describe "#sidecar" do
+    let(:document_attributes) { json_data("umn_iiif_jpg") }
 
-    it 'responds to sidecar method' do
+    it "responds to sidecar method" do
       expect(document).to respond_to :sidecar
     end
 
-    it 'responds with SolrDocumentSidecar' do
+    it "responds with SolrDocumentSidecar" do
       expect(document.sidecar).to be_kind_of SolrDocumentSidecar
     end
   end

data/spec/rails_helper.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-require 'spec_helper'
-require 'database_cleaner'
-require 'coveralls'
-Coveralls.wear!
-require 'engine_cart'
+require "spec_helper"
+require "database_cleaner"
+require "engine_cart"
 EngineCart.load_application!
 
-require 'rspec/rails'
+require "rspec/rails"
 # Add additional requires below this line. Rails is not loaded until this point!
 
-require 'geoblacklight_sidecar_images'
+require "geoblacklight_sidecar_images"
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
@@ -42,10 +40,10 @@ RSpec.configure do |config|
 
   config.before do
     DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
-                                 :transaction
-                               else
-                                 :truncation
-                               end
+      :transaction
+    else
+      :truncation
+    end
     DatabaseCleaner.start
   end
 

data/spec/services/image_service_spec.rb

@@ -1,52 +1,58 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
 describe GeoblacklightSidecarImages::ImageService do
-  let(:iiif_document) { SolrDocument.new(json_data('umich_iiif_jpg')) }
+  let(:iiif_document) { SolrDocument.new(json_data("umich_iiif_jpg")) }
   let(:iiif_imgsvc) { described_class.new(iiif_document) }
-  let(:wms_document) { SolrDocument.new(json_data('public_polygon_mit')) }
+  let(:wms_document) { SolrDocument.new(json_data("esri-wms-layer")) }
   let(:wms_imgsvc) { described_class.new(wms_document) }
-  let(:thumb_document) { SolrDocument.new(json_data('umn_solr_thumb')) }
+  let(:thumb_document) { SolrDocument.new(json_data("umn_solr_thumb")) }
   let(:thumb_imgsvc) { described_class.new(thumb_document) }
-  let(:map_document) { SolrDocument.new(json_data('b1g_thumbnail')) }
+  let(:map_document) { SolrDocument.new(json_data("b1g_thumbnail")) }
   let(:map_imgsvc) { described_class.new(map_document) }
 
   # @TODO: bdcbcd3e-f6db-4ee4-b7b7-d75fe35f1d92 - Michigan State - thumbnail_path_ss
 
-  describe '#store' do
-    it 'responds to store' do
+  describe "#store" do
+    it "responds to store" do
       expect(iiif_imgsvc).to respond_to(:store)
     end
 
-    it 'prioritizes settings thumbnail field' do
+    it "stores an image" do
+      iiif_imgsvc.store
+      expect(iiif_imgsvc.document.sidecar.image_state.current_state).to eq("succeeded")
+    end
+
+    it "prioritizes settings thumbnail field" do
       expect(thumb_imgsvc.send(:gblsi_thumbnail_field?)).to be_truthy
     end
 
-    it 'returns image_url' do
-      expect(thumb_imgsvc.send(:image_url)).to eq 'https://umedia.lib.umn.edu/sites/default/files/imagecache/square300/reference/562/image/jpeg/1089695.jpg'
+    it "returns image_url" do
+      expect(thumb_imgsvc.send(:image_url)).to eq "https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll206/id/133.jpg"
     end
 
-    it 'returns references if no settings thumbnail field value' do
+    it "returns references if no settings thumbnail field value" do
       expect(wms_imgsvc.send(:gblsi_thumbnail_field?)).to be_truthy
     end
 
-    it 'returns references without a settings thumbnail field value' do
-      expect(wms_imgsvc.send(:image_url)).to include 'wms'
+    it "returns references without a settings thumbnail field value" do
+      pending "MIT fixture is not working."
+      expect(wms_imgsvc.send(:image_url)).to include "wms"
     end
 
-    it 'returns no service_url when settings thumbnail field' do
+    it "returns no service_url when settings thumbnail field" do
       expect(map_imgsvc.send(:service_url)).to be_falsey
     end
   end
 
-  context 'when #iiif' do
-    describe '#private' do
-      it 'determines :image_url' do
+  context "when #iiif" do
+    describe "#private" do
+      it "determines :image_url" do
         expect(iiif_imgsvc.send(:image_url)).to be_kind_of String
       end
 
-      it 'returns a URI' do
+      it "returns a URI" do
         expect(URI(iiif_imgsvc.send(:image_url))).to be_kind_of URI
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,38 @@
 # frozen_string_literal: true
 
+ENV["RAILS_ENV"] = "test"
+
+require "simplecov"
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+
+SimpleCov.start "rails" do
+  # @TODO
+  # refuse_coverage_drop
+end
+
+require "database_cleaner"
+require "engine_cart"
+EngineCart.load_application!
+
+require "rspec/rails"
+require "capybara/rspec"
+require "selenium-webdriver"
+require "webdrivers"
+
 def json_data(filename)
   file_content = file_fixture("#{filename}.json").read
   JSON.parse(file_content, symbolize_names: true)
 end
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+
+  config.before do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'faraday', ENV["FARADAY_VERSION"].to_s != "" ? ENV["FARADAY_VERSION"] : '>= 1.0'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,35 +1,35 @@
 # frozen_string_literal: true
 
-require 'rails/generators'
+require "rails/generators"
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root './spec/test_app_templates'
+  source_root "./spec/test_app_templates"
 
   # if you need to generate any additional configuration
   # into the test app, this generator will be run immediately
   # after setting up the application
 
   def add_gems
-    gem 'blacklight', '~> 7.0'
-    gem 'geoblacklight', '>= 3.0'
+    gem "blacklight", "~> 7.0"
+    gem "geoblacklight", ">= 3.0"
 
-    Bundler.with_clean_env do
-      run 'bundle install'
+    Bundler.with_unbundled_env do
+      run "bundle install"
     end
   end
 
   def run_blacklight_generator
-    say_status('warning', 'GENERATING BL', :yellow)
-    generate 'blacklight:install', '--devise'
+    say_status("warning", "GENERATING BL", :yellow)
+    generate "blacklight:install", "--devise"
   end
 
   def run_geoblacklight_generator
-    say_status('warning', 'GENERATING GBL', :yellow)
-    generate 'geoblacklight:install', '--force'
+    say_status("warning", "GENERATING GBL", :yellow)
+    generate "geoblacklight:install", "--force"
   end
 
   def run_geoblacklight_sidecar_images_generator
-    say_status('warning', 'GENERATING GBLSI', :yellow)
-    generate 'geoblacklight_sidecar_images:install'
+    say_status("warning", "GENERATING GBLSI", :yellow)
+    generate "geoblacklight_sidecar_images:install"
   end
 end

data/template.rb

@@ -1,14 +1,14 @@
 # $ rails _5.2.2_ new app-name -m https://raw.githubusercontent.com/geoblacklight/geoblacklight_sidecar_images/master/template.rb
 
-gem 'blacklight', '>= 7.0'
-gem 'geoblacklight', '>= 2.0'
-gem 'statesman', '>= 3.4'
-gem 'geoblacklight_sidecar_images', :git => "git://github.com/ewlarson/geoblacklight_sidecar_images.git", :branch => "master"
+gem "blacklight", ">= 7.0"
+gem "geoblacklight", ">= 2.0"
+gem "statesman", ">= 3.4"
+gem "geoblacklight_sidecar_images", git: "git://github.com/ewlarson/geoblacklight_sidecar_images.git", branch: "master"
 
-run 'bundle install'
+run "bundle install"
 
-generate 'blacklight:install', '--devise'
-generate 'geoblacklight:install', '--force'
-generate 'geoblacklight_sidecar_images:install', '--force'
+generate "blacklight:install", "--devise"
+generate "geoblacklight:install", "--force"
+generate "geoblacklight_sidecar_images:install", "--force"
 
-rake 'db:migrate'
+rake "db:migrate"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Eric Larson
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: geoblacklight
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: geoblacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.4
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.4
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -54,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: statesman
+  name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.9.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +100,21 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: statesman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -186,102 +200,87 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: '0.22'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.24'
 description: 
 email:
-- ewlarson@umn.edu
+- ewlarson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".solr_wrapper.yml"
-- ".travis.yml"
+- ".standard.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -382,11 +381,13 @@ files:
 - spec/fixtures/files/umn_state_result2.json
 - spec/fixtures/files/uva_slug_colon.json
 - spec/jobs/store_image_job_spec.rb
+- spec/lib/tasks/geoblacklight_sidecar_images_spec.rb
 - spec/models/solr_document_sidecar_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/rails_helper.rb
 - spec/services/image_service_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - template.rb
 homepage: https://github.com/geoblacklight/geoblacklight_sidecar_images
@@ -412,52 +413,4 @@ rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Store local copies of remote imagery in GeoBlacklight
-test_files:
-- spec/fixtures/files/README.md
-- spec/fixtures/files/actual-papermap1.json
-- spec/fixtures/files/actual-point1.json
-- spec/fixtures/files/actual-polygon1.json
-- spec/fixtures/files/actual-raster1.json
-- spec/fixtures/files/b1g_thumbnail.json
-- spec/fixtures/files/baruch_ancestor1.json
-- spec/fixtures/files/baruch_ancestor2.json
-- spec/fixtures/files/baruch_documentation_download.json
-- spec/fixtures/files/bbox-spans-180.json
-- spec/fixtures/files/cornell_html_metadata.json
-- spec/fixtures/files/esri-dynamic-layer-all-layers.json
-- spec/fixtures/files/esri-dynamic-layer-single-layer.json
-- spec/fixtures/files/esri-feature-layer.json
-- spec/fixtures/files/esri-image-map-layer.json
-- spec/fixtures/files/esri-tiled_map_layer.json
-- spec/fixtures/files/esri-wms-layer.json
-- spec/fixtures/files/harvard_raster.json
-- spec/fixtures/files/iiif-eastern-hemisphere.json
-- spec/fixtures/files/index-map-polygon-no-downloadurl.json
-- spec/fixtures/files/index-map-polygon.json
-- spec/fixtures/files/index-map-stanford.json
-- spec/fixtures/files/index_map_point.json
-- spec/fixtures/files/no_spatial.json
-- spec/fixtures/files/princeton-child1.json
-- spec/fixtures/files/princeton-child2.json
-- spec/fixtures/files/princeton-child3.json
-- spec/fixtures/files/princeton-child4.json
-- spec/fixtures/files/princeton-parent.json
-- spec/fixtures/files/public_direct_download.json
-- spec/fixtures/files/public_iiif_princeton.json
-- spec/fixtures/files/public_polygon_mit.json
-- spec/fixtures/files/restricted-line.json
-- spec/fixtures/files/umich_iiif_jpg.json
-- spec/fixtures/files/umn_iiif_jpg.json
-- spec/fixtures/files/umn_metro_result1.json
-- spec/fixtures/files/umn_metro_result2.json
-- spec/fixtures/files/umn_solr_thumb.json
-- spec/fixtures/files/umn_state_result1.json
-- spec/fixtures/files/umn_state_result2.json
-- spec/fixtures/files/uva_slug_colon.json
-- spec/jobs/store_image_job_spec.rb
-- spec/models/solr_document_sidecar_spec.rb
-- spec/models/solr_document_spec.rb
-- spec/rails_helper.rb
-- spec/services/image_service_spec.rb
-- spec/spec_helper.rb
-- spec/test_app_templates/lib/generators/test_app_generator.rb
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci