geoblacklight_sidecar_images 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1fb2b7358b4783e0275b47a341170fa2e252bf19eae91c735bc97e562fb5e9
-  data.tar.gz: 73f43cd9d9aaef743bff32e888ca7be68e7a5b216b69fb69e5defd1ac1a73070
+  metadata.gz: b80ac6e8ded571d024d3b299500c905b4f357309e16158aaaeac49ae8301b38b
+  data.tar.gz: '09fff8a81169c51b7d2af25b935da6d6f5f2db58636b75cdce7d3d386e41eff2'
 SHA512:
-  metadata.gz: 489500acdc7152c6efffce9d82fe3c5368f155a9f653984cab5226c3977b24c6d4814cbc23c8ddde48293a243901cd3a50681ecd626525b8f601ac351fc5a3d7
-  data.tar.gz: 37bea86e335908b5a9bb7301028c9a11f6c9f9e637de0b8d93699a30604ddad0f2ad74e4ddfe4d8d86d4bac8d17de91c7781e7d2b7e4d27e2518f15bada3e34f
+  metadata.gz: 52cb834ba4bddb62e298239b218afb71e931d90989c26af79e41388e6989f9d2c02e080b1ca9cfa5f8d6aa21fd5e8a13c5b2b1359560bf2eeae61f7e073ddc5a
+  data.tar.gz: '0043110884ccd6e21f6f3cdcaf72977db1a7013967be8b433153bc0bce27bdf6e21d480cc42d38f41ff35c2e38c5438363146f6090c8af268bdad2b6bddca9a8'

data/.github/workflows/ruby.yml

@@ -0,0 +1,69 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - feature/github-actions
+  pull_request:
+
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run linter
+      run: bundle exec standardrb
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: ["3.0","2.7"]
+        rails_version: [7.0.4.2, 6.1.7.2]
+        bundler_version: [2.1.1]
+        faraday_version: ['>= 2', '~> 1.0']
+
+    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+    - name: Create Solr container
+      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
+    - name: Install bundler
+      run: gem install bundler -v ${{ matrix.bundler_version }}
+    - name: Install dependencies
+      run: bundle _${{ matrix.bundler_version }}_ install
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
+    - name: Setup Yarn
+      run: exec "yarnpkg"
+    - name: Load config into solr
+      run: |
+          cd solr/conf
+          zip -1 -r solr_config.zip ./*
+          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
+          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
+    - name: Upload coverage artifacts
+      uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: coverage
+        path: coverage/

data/.gitignore

@@ -17,3 +17,4 @@ spec/test_app/storage/
 spec/test_app/tmp/
 .internal_test_app
 .ruby-version
+.byebug_history

data/.solr_wrapper.yml

@@ -1,4 +1,6 @@
+url: https://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
 validate: false
+instance_dir: tmp/solr
 download_dir: tmp/solr
 collection:
   dir: solr/conf/

data/.standard.yml

@@ -0,0 +1 @@
+format: progress

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Declare your gem's dependencies in geoblacklight_sidecar_images.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -13,10 +13,6 @@ gemspec
 # your gem to rubygems.org.
 
 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', '~> 1.9', require: false
 end
 
 # To use a debugger
@@ -26,22 +22,35 @@ end
 # engine_cart: 1.2.0
 # engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+file = File.expand_path("Gemfile", ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
 
 if File.exist?(file)
   begin
     eval_gemfile file
   rescue Bundler::GemfileError => e
-    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn "[EngineCart] Skipping Rails application dependencies:"
     Bundler.ui.warn e.message
   end
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-  gem 'geoblacklight', '>= 2.0'
-  gem 'mini_magick', '~> 4.9.4'
-  gem 'image_processing', '~> 1.6'
-  gem 'statesman', '>= 3.4'
-  gem 'marcel', '>= 1.0'
-  gem 'rails', '>= 5.2.5', '< 6.2'
+  gem "geoblacklight", ">= 2.0"
+  gem "mini_magick", "~> 4.9.4"
+  gem "image_processing", "~> 1.6"
+  gem "statesman", ">= 3.4"
+  gem "marcel", ">= 1.0"
+  if ENV["RAILS_VERSION"]
+    if ENV["RAILS_VERSION"] == "edge"
+      gem "rails", github: "rails/rails"
+      ENV["ENGINE_CART_RAILS_OPTIONS"] = "--edge --skip-turbolinks"
+    else
+      gem "rails", ENV["RAILS_VERSION"]
+    end
+  end
+end
+
+if File.exist?("spec/test_app_templates/Gemfile.extra")
+  # rubocop:disable Security/Eval
+  eval File.read("spec/test_app_templates/Gemfile.extra"), nil, "spec/test_app_templates/Gemfile.extra"
+  # rubocop:enable Security/Eval
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,9 +1,7 @@
 # GeoBlacklight Sidecar Images
 
-[![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)
-[![rubygem](https://badgen.net/rubygems/v/geoblacklight_sidecar_images)](https://badgen.net/rubygems/v/geoblacklight_sidecar_images)
+![CI](https://github.com/geoblacklight/geoblacklight_sidecar_images/actions/workflows/ruby.yml/badge.svg)
+[![Gem Version](https://img.shields.io/gem/v/geoblacklight_sidecar_images.svg)](https://github.com/geoblacklight/geoblacklight_sidecar_images/releases)
 
 Store local copies of remote imagery in GeoBlacklight.
 
@@ -105,10 +103,10 @@ bundle exec rake gblsci:images:harvest_all
 
 #### Harvest an individual image
 
-Allows you to add images one document id at a time.
+Allows you to add images one document id at a time. Pass a DOC_ID env var.
 
 ```bash
-bundle exec rake gblsci:images:harvest_doc_id['stanford-cz128vq0535']
+DOC_ID='stanford-cz128vq0535' bundle exec rake gblsci:images:harvest_doc_id
 ```
 
 #### Harvest all incomplete states
@@ -163,7 +161,7 @@ bundle exec rake gblsci:images:harvest_purge_orphans
 Remove sidecar objects and attached images via a CSV file of document ids
 
 ```bash
-bundle exec rake gblsci:images:harvest_purge_orphans
+bundle exec rake gblsci:images:harvest_destroy_batch
 ```
 
 ### Troubleshooting

data/Rakefile

@@ -1,33 +1,69 @@
 # frozen_string_literal: true
 
-require 'rails'
+require "rails"
 begin
-  require 'bundler/setup'
-  require 'bundler/gem_tasks'
+  require "bundler/setup"
+  require "bundler/gem_tasks"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
 Bundler::GemHelper.install_tasks
 
-require 'solr_wrapper'
+require "solr_wrapper"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 RuboCop::RakeTask.new(:rubocop)
 
-require 'solr_wrapper/rake_task'
-require 'engine_cart/rake_task'
-require 'geoblacklight_sidecar_images/version'
+require "solr_wrapper/rake_task"
+require "engine_cart/rake_task"
+require "geoblacklight_sidecar_images/version"
 
-task ci: ['engine_cart:generate'] do
-  ENV['environment'] = 'test'
-  SolrWrapper.wrap do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr', 'conf')) do
-      # run the tests
-      Rake::Task['spec'].invoke
+desc "Run test suite"
+task ci: ["engine_cart:generate"] do
+  ENV["environment"] = "test"
+  # run the tests
+  Rake::Task["spec"].invoke
+end
+
+namespace :geoblacklight do
+  namespace :internal do
+    task seed: ["engine_cart:generate"] do
+      within_test_app do
+        system "bundle exec rake gblsci:sample_data:seed"
+        system "bundle exec rake geoblacklight:downloads:mkdir"
+      end
+    end
+  end
+
+  desc "Run Solr and seed with sample data"
+  task :solr do
+    if File.exist? EngineCart.destination
+      within_test_app do
+        system "bundle update"
+      end
+    else
+      Rake::Task["engine_cart:generate"].invoke
+    end
+
+    SolrWrapper.wrap(port: "8983") do |solr|
+      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path(".", File.dirname(__FILE__)), "solr", "conf")) do
+        Rake::Task["geoblacklight:internal:seed"].invoke
+
+        within_test_app do
+          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+          puts "\n^C to stop"
+          puts " "
+          begin
+            sleep
+          rescue Interrupt
+            puts "Shutting down..."
+          end
+        end
+      end
     end
   end
 end

data/app/jobs/geoblacklight_sidecar_images/store_image_job.rb

@@ -8,8 +8,8 @@ module GeoblacklightSidecarImages
       document = Geoblacklight::SolrDocument.find(solr_document_id)
 
       metadata = {}
-      metadata['solr_doc_id'] = document.id
-      metadata['solr_version'] = document.sidecar.version
+      metadata["solr_doc_id"] = document.id
+      metadata["solr_version"] = document.sidecar.version
 
       document.sidecar.image_state.transition_to!(:queued, metadata)
       GeoblacklightSidecarImages::ImageService.new(document).store

data/app/mailers/geoblacklight_sidecar_images/application_mailer.rb

@@ -2,7 +2,7 @@
 
 module GeoblacklightSidecarImages
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 end

data/app/models/concerns/wms_rewrite_concern.rb

@@ -17,6 +17,6 @@ module WmsRewriteConcern
   end
 
   def local?
-    fetch(Settings.FIELDS.PROVENANCE, '').casecmp(Settings.INSTITUTION_LOCAL_NAME).zero?
+    fetch(Settings.FIELDS.PROVENANCE, "").casecmp(Settings.INSTITUTION_LOCAL_NAME).zero?
   end
 end

data/app/models/sidecar_image_state_machine.rb

@@ -12,10 +12,10 @@ class SidecarImageStateMachine
 
   # Queued => Background Job Init
   # Processing => Failed, Placeheld, Succeeded
-  transition from: :initialized,  to: %i[queued processing]
-  transition from: :queued,       to: %i[queued processing]
-  transition from: :processing,   to: %i[queued processing placeheld succeeded failed]
-  transition from: :placeheld,    to: %i[queued processing failed]
-  transition from: :failed,       to: %i[queued processing]
-  transition from: :succeeded,    to: %i[queued processing]
+  transition from: :initialized, to: %i[queued processing]
+  transition from: :queued, to: %i[queued processing]
+  transition from: :processing, to: %i[queued processing placeheld succeeded failed]
+  transition from: :placeheld, to: %i[queued processing failed]
+  transition from: :failed, to: %i[queued processing]
+  transition from: :succeeded, to: %i[queued processing]
 end

data/app/models/sidecar_image_transition.rb

@@ -3,7 +3,7 @@
 class SidecarImageTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
-  validates :to_state, inclusion: { in: SidecarImageStateMachine.states }
+  validates :to_state, inclusion: {in: SidecarImageStateMachine.states}
 
   belongs_to :solr_document_sidecar, inverse_of: :sidecar_image_transitions
 end

data/app/services/geoblacklight_sidecar_images/image_service/iiif.rb

@@ -10,7 +10,7 @@ module GeoblacklightSidecarImages
       # @param [Integer] thumbnail size
       # @return [String] iiif thumbnail url
       def self.image_url(document, size)
-        "#{document.viewer_endpoint.gsub('info.json', '')}full/#{size},/0/default.jpg"
+        "#{document.viewer_endpoint.gsub("info.json", "")}full/#{size},/0/default.jpg"
       end
     end
   end

data/app/services/geoblacklight_sidecar_images/image_service/wms.rb

@@ -15,11 +15,11 @@ module GeoblacklightSidecarImages
         # Swap proxy url with princeton geoserver url.
         # Thumbnail requests send geoserver auth.
         endpoint = document.viewer_endpoint.gsub(Settings.PROXY_GEOSERVER_URL,
-                                                 Settings.INSTITUTION_GEOSERVER_URL)
+          Settings.INSTITUTION_GEOSERVER_URL)
         "#{endpoint}/reflect?" \
-          '&FORMAT=image%2Fpng' \
-          '&TRANSPARENT=TRUE' \
-          "&LAYERS=#{document['layer_id_s']}" \
+          "&FORMAT=image%2Fpng" \
+          "&TRANSPARENT=TRUE" \
+          "&LAYERS=#{document["layer_id_s"]}" \
           "&WIDTH=#{size}" \
           "&HEIGHT=#{size}"
       end

data/app/services/geoblacklight_sidecar_images/image_service.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'addressable/uri'
-require 'mimemagic'
+require "addressable/uri"
+require "mimemagic"
 
 module GeoblacklightSidecarImages
   class ImageService
@@ -12,15 +12,15 @@ module GeoblacklightSidecarImages
       @document = document
 
       @metadata = {}
-      @metadata['solr_doc_id'] = document.id
-      @metadata['solr_version'] = @document.sidecar.version
-      @metadata['placeheld'] = false
+      @metadata["solr_doc_id"] = document.id
+      @metadata["solr_version"] = @document.sidecar.version
+      @metadata["placeheld"] = false
 
       @document.sidecar.image_state.transition_to!(:processing, @metadata)
 
       @logger ||= ActiveSupport::TaggedLogging.new(
         Logger.new(
-          Rails.root.join('log', "image_service_#{Rails.env}.log")
+          Rails.root.join("log", "image_service_#{Rails.env}.log")
         )
       )
     end
@@ -34,15 +34,15 @@ module GeoblacklightSidecarImages
 
       io_file = image_tempfile(@document.id)
 
-      if io_file.nil? || @metadata['placeheld'] == true
+      if io_file.nil? || @metadata["placeheld"] == true
         @document.sidecar.image_state.transition_to!(:placeheld, @metadata)
       else
         attach_io(io_file)
       end
 
       log_output
-    rescue Exception => e
-      @metadata['exception'] = e.inspect
+    rescue => e
+      @metadata["exception"] = e.inspect
       @document.sidecar.image_state.transition_to!(:failed, @metadata)
 
       log_output
@@ -51,18 +51,18 @@ module GeoblacklightSidecarImages
     private
 
     def image_tempfile(document_id)
-      @metadata['viewer_protocol']      = @document.viewer_protocol
-      @metadata['image_url']            = image_url
-      @metadata['gblsi_thumbnail_uri']  = gblsi_thumbnail_uri
+      @metadata["viewer_protocol"] = @document.viewer_protocol
+      @metadata["image_url"] = image_url
+      @metadata["gblsi_thumbnail_uri"] = gblsi_thumbnail_uri
 
-      return nil unless image_data && @metadata['placeheld'] == false
+      return nil unless image_data && @metadata["placeheld"] == false
 
-      temp_file = Tempfile.new([document_id, '.tmp'])
+      temp_file = Tempfile.new("#{document_id}.tmp")
       temp_file.binmode
       temp_file.write(image_data)
       temp_file.rewind
 
-      @metadata['image_tempfile'] = temp_file.inspect
+      @metadata["image_tempfile"] = temp_file.inspect
       temp_file
     end
 
@@ -71,11 +71,11 @@ module GeoblacklightSidecarImages
       # Pull the mimetype and file extension via MimeMagic
       mm = MimeMagic.by_magic(File.open(io))
 
-      @metadata['MimeMagic_type'] = mm.type
-      @metadata['MimeMagic_mediatype'] = mm.mediatype
-      @metadata['MimeMagic_subtype'] = mm.subtype
+      @metadata["MimeMagic_type"] = mm.type
+      @metadata["MimeMagic_mediatype"] = mm.mediatype
+      @metadata["MimeMagic_subtype"] = mm.subtype
 
-      if mm.mediatype == 'image'
+      if mm.mediatype == "image"
         @document.sidecar.image.attach(
           io: io,
           filename: "#{@document.id}.#{mm.subtype}",
@@ -91,12 +91,12 @@ module GeoblacklightSidecarImages
     def geoserver_credentials
       return unless restricted_wms_layer?
 
-      Settings.PROXY_GEOSERVER_AUTH.gsub('Basic ', '')
+      Settings.PROXY_GEOSERVER_AUTH.gsub("Basic ", "")
     end
 
     # Tests if geoserver credentials are set beyond the default.
     def geoserver_credentials_valid?
-      Settings.PROXY_GEOSERVER_AUTH != 'Basic base64encodedusername:password'
+      Settings.PROXY_GEOSERVER_AUTH != "Basic base64encodedusername:password"
     end
 
     # Tests if local thumbnail method is configured
@@ -125,23 +125,23 @@ module GeoblacklightSidecarImages
 
       uri = Addressable::URI.parse(image_url)
 
-      return nil unless uri.scheme.include?('http')
+      return nil unless uri.scheme.include?("http")
 
       conn = Faraday.new(url: uri.normalize.to_s) do |b|
-        b.use FaradayMiddleware::FollowRedirects
+        b.use Geoblacklight::FaradayMiddleware::FollowRedirects
         b.adapter :net_http
       end
 
       conn.options.timeout = timeout
       conn.authorization :Basic, auth if auth
       conn.get.body
-    rescue Faraday::Error::ConnectionFailed
-      @metadata['error'] = 'Faraday::Error::ConnectionFailed'
-      @metadata['placeheld'] = true
+    rescue Faraday::ConnectionFailed
+      @metadata["error"] = "Faraday::ConnectionFailed"
+      @metadata["placeheld"] = true
       nil
-    rescue Faraday::Error::TimeoutError
-      @metadata['error'] = 'Faraday::Error::TimeoutError'
-      @metadata['placeheld'] = true
+    rescue Faraday::TimeoutError
+      @metadata["error"] = "Faraday::TimeoutError"
+      @metadata["placeheld"] = true
       nil
     end
 
@@ -151,24 +151,24 @@ module GeoblacklightSidecarImages
     # dct references is used instead.
     def image_url
       @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
+        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.
     def restricted_scanned_map?
-      @document.local_restricted? && @document['layer_geom_type_s'] == 'Image'
+      @document.local_restricted? && @document["layer_geom_type_s"] == "Image"
     end
 
     # Checks if the document is Local restriced access and is a wms layer.
     def restricted_wms_layer?
-      @document.local_restricted? && @document.viewer_protocol == 'wms'
+      @document.local_restricted? && @document.viewer_protocol == "wms"
     end
 
     # Gets the url for a specific service endpoint if the item is
@@ -186,15 +186,15 @@ module GeoblacklightSidecarImages
 
           protocol = @document.viewer_protocol
 
-          if protocol == 'map' || protocol.nil?
-            @metadata['error'] = 'Unsupported viewer protocol'
-            @metadata['placeheld'] = true
+          if protocol == "map" || protocol.nil?
+            @metadata["error"] = "Unsupported viewer protocol"
+            @metadata["placeheld"] = true
             return nil
           end
           "GeoblacklightSidecarImages::ImageService::#{protocol.camelcase}".constantize.image_url(@document, image_size)
         rescue NameError
-          @metadata['error'] = 'service_url NameError'
-          @metadata['placeheld'] = true
+          @metadata["error"] = "service_url NameError"
+          @metadata["placeheld"] = true
           return nil
         end
     end
@@ -203,7 +203,7 @@ module GeoblacklightSidecarImages
     def image_reference
       return nil if @document[@document.references.reference_field].nil?
 
-      JSON.parse(@document[@document.references.reference_field])['http://schema.org/thumbnailUrl']
+      JSON.parse(@document[@document.references.reference_field])["http://schema.org/thumbnailUrl"]
     end
 
     # Default image size.
@@ -218,7 +218,7 @@ module GeoblacklightSidecarImages
 
     # Capture metadata within image harvest log
     def log_output
-      @metadata['state'] = @document.sidecar.image_state.current_state
+      @metadata["state"] = @document.sidecar.image_state.current_state
       @metadata.each do |key, value|
         @logger.tagged(@document.id, key.to_s) { @logger.info value }
       end

data/db/migrate/20180118203155_create_solr_document_sidecars.rb

@@ -4,7 +4,7 @@ class CreateSolrDocumentSidecars < ActiveRecord::Migration[5.2]
       t.string "document_id"
       t.string "document_type"
       t.string "image"
-      t.integer "version", :limit => 8
+      t.integer "version", limit: 8
 
       t.index ["document_type", "document_id"], name: "sidecars_solr_document"
 

data/db/migrate/20180118203519_create_sidecar_image_transitions.rb

@@ -17,13 +17,13 @@ class CreateSidecarImageTransitions < ActiveRecord::Migration[5.2]
     add_foreign_key :sidecar_image_transitions, :solr_document_sidecars
 
     add_index(:sidecar_image_transitions,
-              [:solr_document_sidecar_id, :sort_key],
-              unique: true,
-              name: "index_sidecar_image_transitions_parent_sort")
+      [:solr_document_sidecar_id, :sort_key],
+      unique: true,
+      name: "index_sidecar_image_transitions_parent_sort")
     add_index(:sidecar_image_transitions,
-              [:solr_document_sidecar_id, :most_recent],
-              unique: true,
+      [:solr_document_sidecar_id, :most_recent],
+      unique: true,
 
-              name: "index_sidecar_image_transitions_parent_most_recent")
+      name: "index_sidecar_image_transitions_parent_most_recent")
   end
 end