geoblacklight_sidecar_images 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f06c7af296c459455b5fe957e3beb1cb645d6858d4616fd36be7588be9a6e4
-  data.tar.gz: c072e128bfdf21f0a2403a2ea828f2f7e810b989cf36aba7387d8e32d5c00a27
+  metadata.gz: 07e87a85df004575b8fe2b6c5527b6207fc680063d365cc90f344cf458c36d66
+  data.tar.gz: 943c20ab4215221cfcdef614d2e1d8874b1f74a538e04eb812ab252f50453dd1
 SHA512:
-  metadata.gz: 7e22a7a9de645a3746d4136b874ce312a62a0f0f7bbe5207d5952352d5abee212a041b588d0f8898b745998b1858c95fe58e7968f7f040fa639dce80e0e1cbb1
-  data.tar.gz: '097fe4199abadd75813720959580afd61e7753361f0e37c76ea9ec308c7a296ceb915e610f057b094252319950afd33bfe001d2017be430b150ededa74c55cae'
+  metadata.gz: 3946c6b696da98e7293414f8cc273051c4933f6584cd0cece3b5eb6dc1af1ebe042cd287e8ba57b6c0ac1f251634f1cb563f3695a452448d3a4a478465be3a35
+  data.tar.gz: d8e8b2886ad18358a55c992edf1d5cbfe43bf53e613115ad72f5908096f34f476d058387c97d9afc97f8c955b58c570f0dd534aecd7b6285c8b1f1d6793edac8

data/.github/workflows/ruby.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        bundler_version: [2.1.1]
+        bundler_version: [2.2.8]
         faraday_version: ['~> 2.0']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3.1
     - name: Install bundler
       run: gem install bundler -v ${{ matrix.bundler_version }}
     - name: Install dependencies
@@ -33,9 +33,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ["3.2"]
-        rails_version: [7.0.4.2, 6.1.7.2]
-        bundler_version: [2.1.1]
+        ruby_version: [3.3.1]
+        rails_version: [7.1.3.2, 7.0.8.1]
+        bundler_version: [2.2.8]
         faraday_version: ['~> 2.0']
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}

data/README.md

@@ -19,7 +19,7 @@ This GeoBlacklight plugin captures remote images from geographic web services an
 
 ## Requirements
 
-* [Ruby on Rails >= 6.1.7](https://weblog.rubyonrails.org/releases/)
+* [Ruby on Rails >= 5.2, < 8.0](https://weblog.rubyonrails.org/releases/)
 * [GeoBlacklight v4 or v3](https://github.com/geoblacklight/geoblacklight)
 * [ImageMagick](https://github.com/ImageMagick/ImageMagick)
 
@@ -220,7 +220,7 @@ document.sidecar.image.attached?
 document.sidecar.image.variable?
 
 # Example image_tag with resize
-<%= image_tag document.sidecar.image.variant(resize: "100x100"), {class: 'media-object'} %>
+<%= image_tag document.sidecar.image.variant(resize_to_fit: [100, 100]), {class: 'media-object'} %>
 
 ```
 
@@ -241,7 +241,7 @@ Example for adding a thumbnail to the show page sidebar.
     <div class="card">
       <div class="card-header">Thumbnail</div>
       <div class="card-body">
-        <%= image_tag @document.sidecar.image.variant(resize: "200"), {class: 'mr-3'} %>
+        <%= image_tag @document.sidecar.image.variant(resize_to_fit: [200, 200]), {class: 'mr-3'} %>
       </div>
     </div>
   <% end %>
@@ -266,7 +266,7 @@ bundle exec rake gblsci:sample_data:seed
 # Run harvest
 bundle exec rake gblsci:images:harvest_all
 
-# Tail log
+# Tail image service log file
 tail -f log/image_service_development.log
 
 ```

data/geoblacklight_sidecar_images.gemspec

@@ -22,18 +22,18 @@ Gem::Specification.new do |s|
   s.add_dependency "image_processing", "~> 1.6"
   s.add_dependency "mimemagic", "~> 0.3"
   s.add_dependency "mini_magick", "~> 4.9.4"
-  s.add_dependency "rails", ">= 5.2", "< 7.1"
+  s.add_dependency "rails", ">= 5.2", "< 8.0"
   s.add_dependency "statesman", ">= 3.4"
 
   s.add_development_dependency "byebug"
   s.add_development_dependency "capybara"
   s.add_development_dependency "webdrivers"
-  s.add_development_dependency "database_cleaner", "~> 1.3"
-  s.add_development_dependency "engine_cart", "~> 2.2"
-  s.add_development_dependency "rspec-rails", "~> 3.0"
+  s.add_development_dependency "database_cleaner", "~> 2.0"
+  s.add_development_dependency "engine_cart", "~> 2.0"
+  s.add_development_dependency "rspec-rails", "~> 6.0"
   s.add_development_dependency "selenium-webdriver"
   s.add_development_dependency "simplecov", "~> 0.22"
   s.add_development_dependency "solr_wrapper", "~> 4.0"
   s.add_development_dependency "sprockets", "< 4"
-  s.add_development_dependency "standard", "~> 1.24"
+  s.add_development_dependency "standard", "~> 1.0"
 end

data/lib/generators/geoblacklight_sidecar_images/config_generator.rb

@@ -12,7 +12,7 @@ module GeoblacklightSidecarImages
     DESCRIPTION
 
     def set_active_storage_processor
-      app_config = <<-"APP"
+      app_config = <<-APP
       
         config.active_storage.variant_processor = :mini_magick
       APP

data/lib/generators/geoblacklight_sidecar_images/jobs_generator.rb

@@ -12,7 +12,7 @@ module GeoblacklightSidecarImages
     DESCRIPTION
 
     def config_development_jobs_queue_adapter
-      job_config = <<-"JOBS"
+      job_config = <<-JOBS
         config.active_job.queue_adapter = :inline
       JOBS
 

data/lib/generators/geoblacklight_sidecar_images/models_generator.rb

@@ -22,7 +22,7 @@ module GeoblacklightSidecarImages
     end
 
     def include_sidecar_solrdocument
-      sidecar = <<-"SIDECAR"
+      sidecar = <<-SIDECAR
         def sidecar
           # Find or create, and set version
           sidecar = SolrDocumentSidecar.where(

data/lib/generators/geoblacklight_sidecar_images/templates/helpers/blacklight/layout_helper_behavior.rb

@@ -55,8 +55,8 @@ module Blacklight
     #
     # @param [Hash] options
     # @return [String]
-    def render_nav_actions(options = {}, &block)
-      render_filtered_partials(blacklight_config.navbar.partials, options, &block)
+    def render_nav_actions(options = {}, &)
+      render_filtered_partials(blacklight_config.navbar.partials, options, &)
     end
 
     ##

data/lib/generators/geoblacklight_sidecar_images/templates/views/catalog/_index_split_default.html.erb

@@ -5,7 +5,7 @@
       <div class='col-2 thumbnail'>
         <% if document.sidecar.image.attached? %>
           <% if document.sidecar.image.variable? %>
-            <%= image_tag document.sidecar.image.variant(resize: "200") %>
+            <%= image_tag document.sidecar.image.variant(resize_to_fit: [200, 200]) %>
           <% else %>
             <%= image_tag document.sidecar.image %>
           <% end %>

data/lib/geoblacklight_sidecar_images/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightSidecarImages
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/jobs/store_image_job_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require "spec_helper"
 
 describe GeoblacklightSidecarImages::StoreImageJob, type: :job do
   let(:document) { SolrDocument.new(document_attributes) }

data/spec/lib/tasks/geoblacklight_sidecar_images_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "rails_helper"
 require "spec_helper"
 require "rake"
 

data/spec/models/solr_document_sidecar_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require "spec_helper"
 
 describe SolrDocumentSidecar do
   let(:document) { SolrDocument.new(document_attributes) }

data/spec/models/solr_document_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require "spec_helper"
 
 describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }

data/spec/services/image_service_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require "spec_helper"
 
 describe GeoblacklightSidecarImages::ImageService do
   # Dynamic Map Layer

data/spec/spec_helper.rb

@@ -1,23 +1,29 @@
 # frozen_string_literal: true
 
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 
-require "simplecov"
-SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+# require "simplecov"
+# SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
 
-SimpleCov.start "rails" do
-  # @TODO
-  # refuse_coverage_drop
-end
+# SimpleCov.start "rails" do
+# @TODO
+# refuse_coverage_drop
+# end
 
 require "database_cleaner"
+require "capybara/rspec"
+require "selenium-webdriver"
+require "webdrivers"
+
+require "rails/all"
+require "blacklight"
+require "geoblacklight"
+require "geoblacklight_sidecar_images"
+
 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
@@ -25,6 +31,9 @@ def json_data(filename)
 end
 
 RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
   config.use_transactional_fixtures = false
 
   config.before do
@@ -36,3 +45,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
+
+def main_app
+  Rails.application.class.routes.url_helpers
+end

data/spec/test_app_templates/Gemfile.extra

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Larson
 - Eliot Jordan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,7 +90,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
@@ -163,42 +163,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -261,15 +261,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
-description: 
+        version: '1.0'
+description:
 email:
 - ewlarson@gmail.com
 executables: []
@@ -353,7 +353,6 @@ files:
 - 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
@@ -363,7 +362,7 @@ homepage: https://github.com/geoblacklight/geoblacklight_sidecar_images
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -378,8 +377,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Store local copies of remote imagery in GeoBlacklight
 test_files: []

data/spec/rails_helper.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-ENV["RAILS_ENV"] ||= "test"
-
-require "spec_helper"
-require "database_cleaner"
-require "engine_cart"
-EngineCart.load_application!
-
-require "rspec/rails"
-# Add additional requires below this line. Rails is not loaded until this point!
-
-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
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-#
-# The following line is provided for convenience purposes. It has the downside
-# of increasing the boot-up time by auto-requiring all files in the support
-# directory. Alternatively, in the individual `*_spec.rb` files, manually
-# require only the support files necessary.
-#
-# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-# require 'capybara/poltergeist'
-# Capybara.javascript_driver = :poltergeist
-
-RSpec.configure do |config|
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  config.before(:suite) do
-    DatabaseCleaner.clean_with :truncation
-  end
-
-  config.before do
-    DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
-      :transaction
-    else
-      :truncation
-    end
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
-
-  config.infer_spec_type_from_file_location!
-end
-
-def main_app
-  Rails.application.class.routes.url_helpers
-end