geoblacklight_sidecar_images 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef925ce1a979f49bc5367e37df753875e9ef4342b818a902ec8e43e5e92e83d
-  data.tar.gz: 40d07638860d73938360e4c4328b17cbaca770e2bba3ae2b0fab1b2497663814
+  metadata.gz: 65f48652a713c5542469d6de4abe02385e821303f0393feaa15b3198c041a8bc
+  data.tar.gz: ebc3d1bf2b4b7aa8feb6e2ceb9932ef4330ee14c09ab54c57d904a405b02e36b
 SHA512:
-  metadata.gz: 36a95037c48e9914211e3376f8c33ea5e81dcf5e067cc31b11d92433c382bd6076727a1ab6ecab339dd74c67fa768b96557d40e696d523242410171aa2960649
-  data.tar.gz: '09a55bddc96a1268b7725e4f1cbd4369e9297789a4aed5af037e83854c3094bec3c2958e7c7543f8540dc9428b915ce24324110241a3cab93e882aaca167ea12'
+  metadata.gz: 0b82873f4f53d32f225b6f1dd51e7c0f48616ede7f9023db89918414bcc14994e8b25314f13eef5c5da66d768a2f4ec1fce10e359d3e5d5ae7ce69cba4603310
+  data.tar.gz: 715b8fc09e049231f4606f246aa22ae299e79b478a37185b56038264d58081f42b1c3d4ebe130a0627ed41cc77bc91cd8b646f1565ca55991e2035906c4a9e74

data/.solr_wrapper.yml

@@ -0,0 +1,5 @@
+validate: false
+download_dir: tmp/solr
+collection:
+  dir: solr/conf/
+  name: blacklight-core

data/Gemfile

@@ -40,8 +40,8 @@ else
   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', '< 6.2'
+  gem 'marcel', '>= 1.0'
+  gem 'rails', '>= 5.2.5', '< 6.2'
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/geoblacklight/geoblacklight_sidecar_images.svg?branch=master)](https://travis-ci.org/geoblacklight/geoblacklight_sidecar_images)
 [![Maintainability](https://api.codeclimate.com/v1/badges/88c14165af5459963011/maintainability)](https://codeclimate.com/github/geoblacklight/geoblacklight_sidecar_images/maintainability)
 [![Coverage Status](https://coveralls.io/repos/github/geoblacklight/geoblacklight_sidecar_images/badge.svg?branch=master)](https://coveralls.io/github/geoblacklight/geoblacklight_sidecar_images?branch=master)
-[![Gem Version](https://badge.fury.io/rb/geoblacklight_sidecar_images.svg)](https://badge.fury.io/rb/geoblacklight_sidecar_images)
+[![rubygem](https://badgen.net/rubygems/v/geoblacklight_sidecar_images)](https://badgen.net/rubygems/v/geoblacklight_sidecar_images)
 
 Store local copies of remote imagery in GeoBlacklight.
 
@@ -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 >= 2.0](https://github.com/geoblacklight/geoblacklight)
+* [Ruby on Rails >= 5.2.5](https://weblog.rubyonrails.org/releases/)
+* [GeoBlacklight >= 3.3](https://github.com/geoblacklight/geoblacklight)
 * [ImageMagick](https://github.com/ImageMagick/ImageMagick)
 
 ### Suggested

data/Rakefile

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'rails'
 begin
   require 'bundler/setup'
+  require 'bundler/gem_tasks'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end

data/app/services/geoblacklight_sidecar_images/image_service.rb

@@ -150,17 +150,15 @@ module GeoblacklightSidecarImages
     # have not been set beyond the default, then a thumbnail url from
     # dct references is used instead.
     def image_url
-      @image_url ||= begin
-        if gblsi_thumbnail_uri
-          gblsi_thumbnail_uri
-        elsif restricted_scanned_map?
-          image_reference
-        elsif restricted_wms_layer? && !geoserver_credentials_valid?
-          image_reference
-        else
-          service_url || image_reference
-        end
-      end
+      @image_url ||= if gblsi_thumbnail_uri
+                       gblsi_thumbnail_uri
+                     elsif restricted_scanned_map?
+                       image_reference
+                     elsif restricted_wms_layer? && !geoserver_credentials_valid?
+                       image_reference
+                     else
+                       service_url || image_reference
+                     end
     end
 
     # Checks if the document is Local restriced access and is a scanned map.

data/geoblacklight_sidecar_images.gemspec

@@ -18,7 +18,7 @@ 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', '>= 3.3'
   s.add_dependency 'mini_magick', '~> 4.9.4'
   s.add_dependency 'image_processing', '~> 1.6'
   s.add_dependency 'statesman', '>= 3.4'
@@ -35,6 +35,6 @@ Gem::Specification.new do |s|
   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 'solr_wrapper', '~> 3.1'
   s.add_development_dependency 'sprockets', '< 4'
 end

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

@@ -1,5 +1,5 @@
 <% # header bar for doc items in index view -%>
-<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document.id, bbox: document.bounding_box_as_wsen } do %>
+<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document.id, geom: document.geometry.geojson } do %>
   <div class='status-icons'>
     <%= render partial: 'header_icons', locals: { document: document } %>
   </div>

data/lib/geoblacklight_sidecar_images/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Larson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoblacklight
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -247,14 +247,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +280,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE