geoblacklight_sidecar_images 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc49ef521745aa648dbf40a53e9d4659c2128137a92cf90ef9160a1c09a67d4
-  data.tar.gz: 232ad69ed6b51c52ce8f11114625d2f54b518787ca947e36f3a9aa140994a157
+  metadata.gz: fef925ce1a979f49bc5367e37df753875e9ef4342b818a902ec8e43e5e92e83d
+  data.tar.gz: 40d07638860d73938360e4c4328b17cbaca770e2bba3ae2b0fab1b2497663814
 SHA512:
-  metadata.gz: 6be9e8517730e03ec30c08e4596672521fed7b1422446985c82bb488dd30ed698be303c0afece54c40d66698bd31112d0aac68b95d56150e982662c4147b0192
-  data.tar.gz: 769854540a9a4daa9e4c00dba1cbbc4346cec36ed10daa76d13898e2d2f83fd0a7acf047f5075899a1708fc73d85e3ba6ebdf5548e8962e34f3c52ed2c269c5c
+  metadata.gz: 36a95037c48e9914211e3376f8c33ea5e81dcf5e067cc31b11d92433c382bd6076727a1ab6ecab339dd74c67fa768b96557d40e696d523242410171aa2960649
+  data.tar.gz: '09a55bddc96a1268b7725e4f1cbd4369e9297789a4aed5af037e83854c3094bec3c2958e7c7543f8540dc9428b915ce24324110241a3cab93e882aaca167ea12'

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require: rubocop-rspec
+require: rubocop-rails
 
 Rails:
   Enabled: true

data/Gemfile

@@ -16,7 +16,7 @@ group :development, :test do
   # Peg simplecov to < 0.8 until this is resolved:
   # https://github.com/colszowka/simplecov/issues/281
   gem 'coveralls', require: false
-  gem 'rubocop', '0.60.0', require: false
+  gem 'rubocop', '~> 1.9', require: false
 end
 
 # To use a debugger
@@ -37,11 +37,11 @@ if File.exist?(file)
   end
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-  gem 'geoblacklight', '~> 2.0'
+  gem 'geoblacklight', '>= 2.0'
   gem 'mini_magick', '~> 4.9.4'
   gem 'image_processing', '~> 1.6'
   gem 'mimemagic', '~> 0.3'
   gem 'statesman', '>= 3.4'
-  gem 'rails', '~> 5.2.0', '< 6'
+  gem 'rails', '>= 5.2', '< 6.2'
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -21,8 +21,8 @@ This GeoBlacklight plugin captures remote images from geographic web services an
 
 ## Requirements
 
-* [Ruby on Rails 5.2](https://weblog.rubyonrails.org/releases/)
-* [GeoBlacklight](https://github.com/geoblacklight/geoblacklight)
+* [Ruby on Rails >= 5.2](https://weblog.rubyonrails.org/releases/)
+* [GeoBlacklight >= 2.0](https://github.com/geoblacklight/geoblacklight)
 * [ImageMagick](https://github.com/ImageMagick/ImageMagick)
 
 ### Suggested
@@ -277,5 +277,6 @@ tail -f log/image_service_development.log
 * ~~0.2.0 - Forgo attaching placeholder imagery~~
 * ~~0.3.0 - Add Statesman (state machine library)~~
 * ~~0.4.0 - Rails 5.2 branch / Switch to ActionStorage~~
-* 0.5.0 to 0.9.0 - Feedback; Improve test coverage; Collect additional real-world issues
-* 1.0.0 - Final 5.2 release
+* ~~0.7.0 - Rails 5.2+ and 6+ / GeoBlacklight 2+ and 3+ support~~
+* 0.7.0 to 0.9.0 - Feedback; Improve test coverage; Collect additional real-world issues
+* 1.0.0 - Final release

data/app/models/solr_document_sidecar.rb

@@ -3,7 +3,10 @@
 ##
 # Metadata for indexed documents
 class SolrDocumentSidecar < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: SidecarImageTransition,
+    initial_state: :initialized
+  ]
 
   belongs_to :document, optional: false, polymorphic: true
   has_many :sidecar_image_transitions, autosave: false, dependent: :destroy

data/app/services/geoblacklight_sidecar_images/image_service.rb

@@ -41,8 +41,8 @@ module GeoblacklightSidecarImages
       end
 
       log_output
-    rescue Exception => invalid
-      @metadata['exception'] = invalid.inspect
+    rescue Exception => e
+      @metadata['exception'] = e.inspect
       @document.sidecar.image_state.transition_to!(:failed, @metadata)
 
       log_output

data/geoblacklight_sidecar_images.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'geoblacklight', '~> 2.0'
+  s.add_dependency 'geoblacklight', '>= 2.0'
   s.add_dependency 'mini_magick', '~> 4.9.4'
   s.add_dependency 'image_processing', '~> 1.6'
   s.add_dependency 'statesman', '>= 3.4'
   s.add_dependency 'mimemagic', '~> 0.3'
-  s.add_dependency 'rails', '>= 5.2', '< 6'
+  s.add_dependency 'rails', '>= 5.2', '< 6.2'
 
   s.add_development_dependency 'byebug'
   s.add_development_dependency 'capybara'
@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
   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 'rubocop', '~> 0.60.0'
+  s.add_development_dependency 'rubocop', '~> 1.9'
   s.add_development_dependency 'rubocop-rspec', '~> 1.30.0'
+  s.add_development_dependency 'rubocop-rails', '~> 2.9'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'solr_wrapper', '~> 2.2'
   s.add_development_dependency 'sprockets', '< 4'

data/lib/geoblacklight_sidecar_images/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightSidecarImages
-  VERSION = '0.6.5'
+  VERSION = '0.7.0'
 end

data/spec/models/solr_document_sidecar_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe GeoblacklightSidecarImages::SolrDocumentSidecar do
+describe SolrDocumentSidecar do
   let(:document) { SolrDocument.new(document_attributes) }
 
   describe '#sidecar' do

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

@@ -11,7 +11,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def add_gems
     gem 'blacklight', '~> 7.0'
-    gem 'geoblacklight', '~> 2.0'
+    gem 'geoblacklight', '>= 3.0'
 
     Bundler.with_clean_env do
       run 'bundle install'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Eric Larson
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoblacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -90,7 +90,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -191,14 +191,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.30.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -393,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Store local copies of remote imagery in GeoBlacklight