hydra-derivatives 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d19f9f569bcbc802b64a375b73be6e019d62f9b2c6a9a0e6b35dbd2fcfe58a
-  data.tar.gz: 88f0cabb0114f725c9f8473cd793b6eb2fc274e575e6ae59bceeb50498551025
+  metadata.gz: 124f992a28f2883d1c8d762ae0232957645923e145c48ec75bfe33280f0683ab
+  data.tar.gz: 02336f270677e9e55e768c8c03bf71afc62fb759c5f48ee7eaddc1033345e07f
 SHA512:
-  metadata.gz: 44611dab7f3cd84daf842d95953ed4ad8e2a3899e615c155848458620f1a066bf667f034c13e91c600614f6aadffc352d9dcd595bdfff7b96eefa76af7ccb33e
-  data.tar.gz: f47fef855a22d55db4c4088dbdddf1fb999b8427d0aa255f7510cf2581509ad0ce3239d08059b77bd00a91620054dcba6a50cc10c3e45114fe5fc37cc014856f
+  metadata.gz: 675ccaa54a34cdf812c295d9e937a29041053526f69a8eb7d68c6b162939cbc0a1e973c4b8176274af9fbbc1e45fd804121d7fffa860a0958ede78d47d454057
+  data.tar.gz: 49815c8d5efe8fb0d5eb8aa83fbec991e4bc86454087b773c2a4556a7028680a4d6a0bafd568a4af1a81bb9dded89bc703d99161eafe97940706e94321c3ca47

data/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.0.1
+        default: 2.1.4
     executor:
       name: 'samvera/ruby_fcrepo_solr'
       ruby_version: << parameters.ruby_version >>
@@ -32,6 +32,9 @@ jobs:
             fi
             sudo cp kakadu/*.so /usr/lib
             sudo cp kakadu/* /usr/bin
+      - run:
+          name: Modify ImageMagick security policy
+          command: sudo sed -i 's/policy domain="coder" rights="none" pattern="PDF"/policy domain="coder" rights="read|write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml
 
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
@@ -49,14 +52,18 @@ workflows:
   ci:
     jobs:
       - bundle_lint_test:
-          name: ruby2-4-6
-          ruby_version: 2.4.6
+          name: ruby2-4
+          ruby_version: 2.4.10
+          project: hydra-derivatives
+      - bundle_lint_test:
+          name: ruby2-5
+          ruby_version: 2.5.8
           project: hydra-derivatives
       - bundle_lint_test:
-          name: ruby2-5-5
-          ruby_version: 2.5.5
+          name: ruby2-6
+          ruby_version: 2.6.6
           project: hydra-derivatives
       - bundle_lint_test:
-          name: ruby2-6-3
-          ruby_version: 2.6.3
+          name: ruby2-7
+          ruby_version: 2.7.1
           project: hydra-derivatives

data/Gemfile

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 # Please see hydra-derivatives.gemspec for dependency information.
 gemspec
 
+gem 'sprockets', '~> 3.7'
+
 group :development, :test do
-  gem 'byebug' unless ENV['TRAVIS']
   gem 'coveralls'
+  gem 'rspec_junit_formatter'
   gem 'rubocop', '~> 0.52.0', require: false
   gem 'rubocop-rspec', require: false
   gem 'simplecov'
-  gem 'rspec_junit_formatter'
 end

data/README.md

@@ -195,6 +195,11 @@ MAGICK_TEMPDIR
 ```
 YMMV as to where setting them will take effect in your app; the application's web server's vhost directives are a location known to work with an Apache web server set up.
 
+ImageMagick by default disables reading and writing of PDFs due to a [vulnerability in ghostscript](https://www.kb.cert.org/vuls/id/332928/). Make sure to install a fixed version of ghostscript and modify ImageMagick's security policy to allow reading and writing PDFs:
+```
+sudo sed -i 's/policy domain="coder" rights="none" pattern="PDF"/policy domain="coder" rights="read|write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml
+```
+
 ## JPEG2k Directives
 
 Unlike the other processors, the `Jpeg2kImage` processor does not generally accept arguments that directly (or nearly so) translate to the arguments you would give to the corresponding command line utility.
@@ -205,7 +210,7 @@ Instead, each directive may contain these arguments:
   * `:to_srgb` (Boolean) : If `true` and the image is a color image it will map the source image color profile to sRGB. Default: `true`
   * `:resize` (String) : Geometry; the same syntax as the `Hydra::Derivatives::Image` processor
   * `:recipe` :
-    - If a Symbol the recipe will be read from the `Hydra::Derivatives.kdu_compress_recipes` hash. You can override this, or a couple of samples are supplied. The symbol in the config file should be the name in the model + `_{quality}`, e.g. `recipe: :default` will look `:default_color` or `:default_grey` in the hash.
+    - If a Symbol the recipe will be read from the `Hydra::Derivatives.kdu_compress_recipes` hash. You can override this, or a couple of samples are supplied. The symbol in the config file should be the name in the model + `_{quality}`, e.g. `recipe: :default` will look `:default_color` or `:default_gray` in the hash.
     - If a String the recipe in the string will be used. You may include anything the command line utility will accept except `-i` or `-o`. See `$ kdu_compress -usage` in your shell.
     - If no `:recipe` is provided the processor will examine the image and make a best guess, but you can set a few basic options (the remainder of this list). Note that these are ignored if you provided a recipe via either of the first two methods described.
   * `:levels` (Integer) : The number of decomposition levels. The default is the number of times the long dimension can be divided by two, down to 96, e.g. a 7200 pixel image would have 6 levels (3600, 1800, 900, 450, 225, 112)

data/Rakefile

@@ -20,7 +20,7 @@ namespace :derivatives do
   end
 
   RSpec::Core::RakeTask.new(:rspec) do |task|
-    task.rspec_opts = "--tag ~requires_kdu_compress" if ENV['TRAVIS']
+    task.rspec_opts = "--tag ~requires_kdu_compress" if ENV['CI']
   end
 
   desc 'Start up Solr & Fedora and run tests'

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/hydra-derivatives.gemspec

@@ -10,21 +10,24 @@ Gem::Specification.new do |spec|
   spec.license       = "APACHE2"
   spec.homepage      = "https://github.com/projecthydra/hydra-derivatives"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).select { |f| File.dirname(f) !~ %r{\A"?spec|test|features\/?} }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rails', '> 5.1', '< 7.0'
   spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency "solr_wrapper", "~> 2.0"
 
-  spec.add_dependency 'active-fedora', '>= 11.3.1', '< 14'
+  spec.add_dependency 'active-fedora', '>= 11.5.6',
+                      '!= 12.0.0', '!= 12.0.1', '!= 12.0.2', '!= 12.0.3', '!= 12.1.0', '!= 12.1.1', '!= 12.2.0', '!= 12.2.1',
+                      '!= 13.0.0', '!= 13.1.0', '!= 13.1.1', '!= 13.1.2', '!= 13.1.3', '!= 13.2.0', '!= 13.2.1'
   spec.add_dependency 'active_encode', '~>0.1'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6'
-  spec.add_dependency 'addressable', '~>2.5'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 7'
+  spec.add_dependency 'addressable', '~> 2.5'
   spec.add_dependency 'deprecation'
   spec.add_dependency 'mime-types', '> 2.0', '< 4.0'
   spec.add_dependency 'mini_magick', '>= 3.2', '< 5'

data/lib/hydra/derivatives/config.rb

@@ -57,7 +57,7 @@ module Hydra
             ORGgen_plt=yes
             ORGtparts=R
             "Stiles={1024,1024}" ).gsub(/\s+/, " ").strip,
-          default_grey: %(-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171
+          default_gray: %(-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171
             -jp2_space sLUM
             -double_buffering 10
             -num_threads 4

data/lib/hydra/derivatives/processors/document.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# An abstract class for asyncronous jobs that convert office documents using soffice
 module Hydra::Derivatives::Processors
   class Document < Processor
     include ShellBasedProcessor
@@ -23,7 +26,7 @@ module Hydra::Derivatives::Processors
         if directives.fetch(:format) == "jpg"
           Hydra::Derivatives::Processors::Image.new(converted_file, directives).process
         else
-          output_file_service.call(File.read(converted_file), directives)
+          output_file_service.call(File.open(converted_file, 'rb'), directives)
         end
       end
 

data/lib/hydra/derivatives/processors/full_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hydra::Derivatives::Processors
   # Extract the full text from the content using Solr's extract handler
   class FullText < Processor
@@ -24,6 +26,7 @@ module Hydra::Derivatives::Processors
       def fetch
         resp = http_request
         raise "Solr Extract service was unsuccessful. '#{uri}' returned code #{resp.code} for #{source_path}\n#{resp.body}" unless resp.code == '200'
+
         file_content.rewind if file_content.respond_to?(:rewind)
         resp.body.force_encoding(resp.type_params['charset']) if resp.type_params['charset']
         resp.body
@@ -32,9 +35,8 @@ module Hydra::Derivatives::Processors
       # Send the request to the extract service
       # @return [Net::HttpResponse] the result of calling the extract service
       def http_request
-        Net::HTTP.start(uri.host, uri.port) do |http|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: check_for_ssl) do |http|
           req = Net::HTTP::Post.new(uri.request_uri, request_headers)
-          req.use_ssl = true if check_for_ssl
           req.basic_auth uri.user, uri.password unless uri.password.nil?
           req.body = file_content
           http.request req
@@ -42,7 +44,7 @@ module Hydra::Derivatives::Processors
       end
 
       def file_content
-        @content ||= File.open(source_path).read
+        @file_content ||= File.open(source_path).read
       end
 
       # @return [Hash] the request headers to send to the Solr extract service

data/solr/config/xslt/example.xsl

@@ -124,7 +124,7 @@
       td { vertical-align: top; }
       ul { margin: 0px; margin-left: 1em; padding: 0px; }
       .note { font-size:80%; }
-      .doc { margin-top: 1em; border-top: solid grey 1px; }
+      .doc { margin-top: 1em; border-top: solid gray 1px; }
       .exp { display: none; font-family: monospace; white-space: pre; }
     </style>
   </xsl:template>

data/solr/config/xslt/luke.xsl

@@ -326,7 +326,7 @@
         <style type="text/css">
             <![CDATA[
             td.name {font-style: italic; font-size:80%; }
-            .doc { margin: 0.5em; border: solid grey 1px; }
+            .doc { margin: 0.5em; border: solid gray 1px; }
             .exp { display: none; font-family: monospace; white-space: pre; }
             div.histogram { background: none repeat scroll 0%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;}
             table.histogram { width: auto; vertical-align: bottom; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +120,104 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.1
-    - - "<"
+        version: 11.5.6
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.2.0
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: 13.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.1
-    - - "<"
+        version: 11.5.6
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.0.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.1.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 13.2.0
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: active_encode
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +241,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +251,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -285,45 +403,6 @@ files:
 - solr/config/xslt/example_atom.xsl
 - solr/config/xslt/example_rss.xsl
 - solr/config/xslt/luke.xsl
-- spec/fixtures/FlashPix.ppt
-- spec/fixtures/adobe1998.tif
-- spec/fixtures/countdown.avi
-- spec/fixtures/jpeg2k_config.yml
-- spec/fixtures/piano_note.wav
-- spec/fixtures/sample.rtf
-- spec/fixtures/test.dng
-- spec/fixtures/test.doc
-- spec/fixtures/test.docx
-- spec/fixtures/test.pdf
-- spec/fixtures/test.pptx
-- spec/fixtures/test.tif
-- spec/fixtures/test.xls
-- spec/fixtures/test.xlsx
-- spec/fixtures/world.png
-- spec/processors/active_encode_spec.rb
-- spec/processors/document_spec.rb
-- spec/processors/full_text_spec.rb
-- spec/processors/image_spec.rb
-- spec/processors/jpeg2k_spec.rb
-- spec/processors/processor_spec.rb
-- spec/processors/shell_based_processor_spec.rb
-- spec/processors/video_spec.rb
-- spec/runners/active_encode_derivatives_spec.rb
-- spec/runners/runner_spec.rb
-- spec/services/audio_derivatives_spec.rb
-- spec/services/persist_basic_contained_output_file_service_spec.rb
-- spec/services/persist_external_file_output_file_service_spec.rb
-- spec/services/persist_output_file_service_spec.rb
-- spec/services/remote_source_file_spec.rb
-- spec/services/retrieve_source_file_service_spec.rb
-- spec/services/tempfile_service_spec.rb
-- spec/spec_helper.rb
-- spec/units/audio_encoder_spec.rb
-- spec/units/config_spec.rb
-- spec/units/derivatives_spec.rb
-- spec/units/io_decorator_spec.rb
-- spec/units/logger_spec.rb
-- spec/units/transcoding_spec.rb
 homepage: https://github.com/projecthydra/hydra-derivatives
 licenses:
 - APACHE2
@@ -343,47 +422,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra
-test_files:
-- spec/fixtures/FlashPix.ppt
-- spec/fixtures/adobe1998.tif
-- spec/fixtures/countdown.avi
-- spec/fixtures/jpeg2k_config.yml
-- spec/fixtures/piano_note.wav
-- spec/fixtures/sample.rtf
-- spec/fixtures/test.dng
-- spec/fixtures/test.doc
-- spec/fixtures/test.docx
-- spec/fixtures/test.pdf
-- spec/fixtures/test.pptx
-- spec/fixtures/test.tif
-- spec/fixtures/test.xls
-- spec/fixtures/test.xlsx
-- spec/fixtures/world.png
-- spec/processors/active_encode_spec.rb
-- spec/processors/document_spec.rb
-- spec/processors/full_text_spec.rb
-- spec/processors/image_spec.rb
-- spec/processors/jpeg2k_spec.rb
-- spec/processors/processor_spec.rb
-- spec/processors/shell_based_processor_spec.rb
-- spec/processors/video_spec.rb
-- spec/runners/active_encode_derivatives_spec.rb
-- spec/runners/runner_spec.rb
-- spec/services/audio_derivatives_spec.rb
-- spec/services/persist_basic_contained_output_file_service_spec.rb
-- spec/services/persist_external_file_output_file_service_spec.rb
-- spec/services/persist_output_file_service_spec.rb
-- spec/services/remote_source_file_spec.rb
-- spec/services/retrieve_source_file_service_spec.rb
-- spec/services/tempfile_service_spec.rb
-- spec/spec_helper.rb
-- spec/units/audio_encoder_spec.rb
-- spec/units/config_spec.rb
-- spec/units/derivatives_spec.rb
-- spec/units/io_decorator_spec.rb
-- spec/units/logger_spec.rb
-- spec/units/transcoding_spec.rb
+test_files: []