hydra-derivatives 3.4.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c50d782fb24f22b346b37488997f08b6412ebb7
-  data.tar.gz: 04b2eb295f5081b08143302733d115b15b52a76b
+SHA256:
+  metadata.gz: 506f0f1154a7b2ec1e3af2d55ad7b1a20687c9061303339928e87b42c71d7dd8
+  data.tar.gz: 5af2d8d9e93cc8d8f12d5e5726775721332e0bcb568017b0c486f94c8160bee7
 SHA512:
-  metadata.gz: 7c334e3f9356efbe09922e815a84da44daf1e229018021819c1be8983cee3bfb815350477ba49b603c03fcfd1f177048afeb709c05a8e77fd35947bcb43074ba
-  data.tar.gz: d4c454ce7bc48be6b6becd36b38c8a2edf5ba73c39c5af7ed266c8296d8f14cfbcec2820574c562a7a77c74a8e064c07c7919ab640ef2866132eb42d5d74835e
+  metadata.gz: 5614a1fb4662d0bac907f0302f811d1850f98a98ade8e70b3bc3377fd2adce97112f6e24bf35d0a017689742b9eccca5276b82300529ddc4d1023fd787ab7fb9
+  data.tar.gz: 43d0a1555fe82600b663cc8b07b3dbc8d8d6e7743b964d31e3a50b1858006870e4076e57d9399855f1eaf95ca729bf41007eac74ca1fe3487809eae841220f33

data/.circleci/config.yml

@@ -0,0 +1,59 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@1.0
+jobs:
+  bundle_lint_test:
+    parameters:
+      ruby_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 2.1.4
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+      solr_version: 7-slim
+    steps:
+      - samvera/cached_checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install ghostscript libpng-dev imagemagick ffmpeg libreoffice dcraw
+      - setup_remote_docker
+      - run:
+          name: Install Kakadu
+          command: |
+            docker create --name kakadu josejuansanchez/kakadu:1.0
+            docker cp kakadu:/kakadu kakadu
+            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
+      - run:
+          name: Modify ImageMagick delegate for raw files
+          command: sudo sed -i 's/decode="dng:decode" command=".*"\/>$/decode="dng:decode" command="\&quot\;dcraw\&quot\; -c -q 3 -H 5 -w \&quot\;\%i\&quot\; \| \&quot\;convert\&quot\; - \&quot\;\%u\.png\&quot\;"\/>/' /etc/ImageMagick-6/delegates.xml
+
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+
+      - samvera/install_solr_core
+
+      - samvera/rubocop
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_lint_test:
+          name: ruby2-5
+          ruby_version: 2.5.9
+      - bundle_lint_test:
+          name: ruby2-6
+          ruby_version: 2.6.9
+      - bundle_lint_test:
+          name: ruby2-7
+          ruby_version: 2.7.5

data/.solr_wrapper

@@ -0,0 +1,2 @@
+---
+version: '7.7.2'

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,36 @@
+The Samvera community is dedicated to providing a welcoming and
+positive experience for all its members, whether they are at a formal
+gathering, in a social setting, or taking part in activities online.
+The Samvera community welcomes participation from people all over the
+world and these members bring with them a wide variety of
+professional, personal and social backgrounds; whatever these may be,
+we treat colleagues with dignity and respect.
+
+Community members communicate primarily in English, though for many of
+them this is not their native language. We therefore strive to express
+ourselves simply and clearly remembering that unnecessary use of
+jargon and slang will be a barrier to understanding for many of our
+colleagues.  We are sensitive to the fact that the international
+nature of the community means that we span many different social norms
+around language and behaviour and we strive to conduct ourselves,
+online and in person, in ways that are unlikely to cause offence.
+
+Samvera conversations are often information-rich and intended to
+generate discussion and debate.  We discuss ideas from a standpoint of
+mutual respect and reasoned argument.
+
+Community members work together to promote a respectful and safe
+community. In the event that someone’s conduct is causing offence or
+distress, Samvera has a detailed
+[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+which can be applied to address the problem. The first step in dealing
+with any serious misconduct is to contact a local meeting organizer,
+the
+[Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
+([email](mailto:helpers@samvera.org)), a community member you
+trust, or the
+[Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
+immediately; at Samvera events, these people can be identified by
+distinctive name badges. The
+[Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+should be consulted for fuller details.

data/CONTRIBUTING.md

@@ -1,21 +1,24 @@
 # How to Contribute
 
-We want your help to make Project Hydra great.
-There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+We want your help to make the Samvera community great. There are a few guidelines
+that we need contributors to follow so that we can have a chance of
+keeping on top of things.
 
 ## Code of Conduct
 
-The Hydra community is dedicated to providing a welcoming and positive experience for all its
-members, whether they are at a formal gathering, in a social setting, or taking part in activities
-online.  Please see our [Code of Conduct](https://wiki.duraspace.org/display/hydra/Code+of+Conduct)
-for more information.
+The Samvera Community is dedicated to providing a welcoming and positive
+experience for all its members, whether they are at a formal gathering, in
+a social setting, or taking part in activities online. Please see our
+[Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
-## Hydra Project Intellectual Property Licensing and Ownership
+## Samvera Community Intellectual Property Licensing and Ownership
 
-All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
-If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+All code contributors must have an Individual Contributor License Agreement
+(iCLA) on file with the Samvera Steering Group. If the contributor works for
+an institution, the institution must have a Corporate Contributor License
+Agreement (cCLA) on file.
 
-https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
@@ -31,7 +34,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](./issues) by:
+* Submit a [Github issue](https://github.com/samvera/hydra-derivatives/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -48,7 +51,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Please avoid working directly on the `master` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
-  * Test functionality with RSpec; est features / UI with Capybara.
+  * Test functionality with RSpec; Test features / UI with Capybara.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
 ### Documenting Code
@@ -60,15 +63,11 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
   * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
   * We will all be understanding of one another's time constraints in this area.
-* YARD examples:
-  * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
-  * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
 * [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
 
 ### Committing changes
 
 * Make commits of logical units.
-  * Your commit should include a high level description of your work in HISTORY.textile
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
@@ -103,6 +102,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
       long to fit in 72 characters
 ```
 
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
@@ -125,9 +128,7 @@ We adopted [Github's Pull Request Review](https://help.github.com/articles/about
 Common checks that may occur in our repositories:
 
 1. Travis CI - where our automated tests are running
-2. Hound CI - where we check for style violations
-3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
-4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
+2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 
@@ -144,16 +145,17 @@ First, the person contributing the code is putting themselves out there. Be mind
 This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
 
   * Does the commit message explain what is going on?
-  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
   * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
   * Does the description of the new/changed specs match your understanding of what the spec is doing?
+  * Did the Travis tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
 * [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Gemfile

@@ -3,9 +3,11 @@ 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'

data/README.md

@@ -1,11 +1,35 @@
 # hydra-derivatives
 
+Code:
 [![Version](https://badge.fury.io/rb/hydra-derivatives.png)](http://badge.fury.io/rb/hydra-derivatives)
-[![Build Status](https://travis-ci.org/projecthydra/hydra-derivatives.png?branch=master)](https://travis-ci.org/projecthydra/hydra-derivatives)
-[![Dependency Status](https://gemnasium.com/projecthydra/hydra-derivatives.png)](https://gemnasium.com/projecthydra/hydra-derivatives)
-[![Coverage Status](https://coveralls.io/repos/github/projecthydra/hydra-derivatives/badge.svg?branch=master)](https://coveralls.io/github/projecthydra/hydra-derivatives?branch=master)
+[![Build Status](https://circleci.com/gh/samvera/hydra-derivatives.svg?style=svg)](https://circleci.com/gh/samvera/hydra-derivatives)
+[![Coverage Status](https://coveralls.io/repos/github/samvera/hydra-derivatives/badge.svg?branch=master)](https://coveralls.io/github/samvera/hydra-derivatives?branch=master)
 
-Derivative generation for hydra
+Docs:
+[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
+
+Jump In: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+
+# What is hydra-derivatives?
+
+Derivative generation for Samvera applications.
+
+## Product Owner & Maintenance
+
+**hydra-derivatives** is a Core Component of the Samvera community. The documentation for
+what this means can be found
+[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
+
+### Product Owner
+
+[jenlindner](https://github.com/jenlindner)
+
+# Help
+
+The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
+
+# Getting Started
 
 If you have an ActiveFedora class like this:
 ```ruby
@@ -141,7 +165,7 @@ Just add `gem 'hydra-derivatives'` to your Gemfile.
 * [GhostScript](https://www.ghostscript.com/)
 * [ImageMagick](http://www.imagemagick.org/)
 * Kakadu's [kdu_compress](http://www.kakadusoftware.com/) (optional)
-* [ufraw](http://ufraw.sourceforge.net/)
+* [ufraw](http://ufraw.sourceforge.net/) or [dcraw](https://dechifro.org/dcraw/)
 
 To enable LibreOffice, FFMpeg, ImageMagick, FITS support, and kdu_compress support, make sure they are on your path. Most people will put that in their .bash_profile or somewhere similar.
 
@@ -171,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.
@@ -181,10 +210,54 @@ 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)
   * `:layers` (Integer) : The number of quality layers. Default: 8
   * `:compression` (Integer) : The left number of the compression ratio `n:1`, e.g. 12 will apply 12:1 compression. Default: 10.
   * `:tile_size` (Integer) : Pixel dimension of the tiles. Default: 1024
+
+# Development Environment
+
+## Dependencies
+
+* [ImageMagick](https://www.imagemagick.org)
+    * On a mac, do `brew install imagemagick`
+* [LibreOffice](https://www.libreoffice.org/)
+*   * On a mac, do `brew cask install libreoffice`
+* [Kakadu](http://kakadusoftware.com/)
+    * On a mac, extract the file and run the pkg installer therein (don't get distracted by the files called kdu_show)
+* [Ghostscript](https://www.ghostscript.com/)
+    * On a mac, `brew install ghostscript`
+* ufraw
+    * On a mac, `brew install ufraw`
+* dcraw (ufraw alternative)
+    * On a mac, `brew install dcraw`
+    * You will need to modify ImageMagick's delegate for dng files in order to use dcraw.
+	* First find where the deletegates.xml file is located: `identify -list delegate | grep Path`
+	* Edit the delegates.xml file by replacing the dng:decode delegate line with the following:
+          ```<delegate decode="dng:decode" command="&quot;dcraw&quot; -c -q 3 -H 5 -w &quot;%i&quot; | &quot;convert&quot; - &quot;%u.png&quot;"/>```
+* libvpx
+    * On a mac, `brew install libvpx`
+* ffmpeg
+    * On a mac, `brew install ffmpeg`
+    * Ensure `libvpx` is installed first
+
+## Running Tests
+
+1. Run tests with `RAILS_ENV=test bundle exec rake ci`
+
+## Running specific tests
+
+If you don't want to run the whole suite all at once like CI, do the following:
+
+1. Run the test servers with `rake derivatives:test_server`
+2. Run the tests.
+
+# Acknowledgments
+
+This software has been developed by and is brought to you by the Samvera community.  Learn more at the
+[Samvera website](http://samvera.org/).
+
+![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)

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'
@@ -29,6 +29,18 @@ namespace :derivatives do
       Rake::Task['derivatives:rspec'].invoke
     end
   end
+
+  desc 'Start up test server'
+  task :test_server do
+    ENV["RAILS_ENV"] = "test"
+    with_test_server do
+      puts "Solr: http://localhost:#{ENV["SOLR_TEST_PORT"]}/solr"
+      puts "Fedora: http://localhost:#{ENV["FCREPO_TEST_PORT"]}/rest"
+      while(1) do
+        sleep(1)
+      end
+    end
+  end
 end
 
 desc 'Run continuous integration build'

data/SUPPORT.md

@@ -0,0 +1,5 @@
+If you would like to report an issue, first search [the list of issues](https://github.com/samvera/hydra-derivatives/issues/) to see if someone else has already reported it, and then feel free to [create a new issue](https://github.com/samvera/hydra-derivatives/issues/new).
+
+If you have questions or need help, please email [the Samvera community tech list](https://groups.google.com/forum/#!forum/samvera-tech) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
+
+You can learn more about the various Samvera communication channels on the [Get in touch!](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391) wiki page.

data/VERSION

@@ -1 +1 @@
-3.4.1
+3.6.1

data/config/fcrepo_wrapper_test.yml

@@ -1,6 +1,6 @@
-port: null
+port: 8986
 verbose: true
 managed: true
 enable_jms: false
 fcrepo_home_dir: tmp/fcrepo4-test-data
-version: 4.7.4
+version: 4.7.4

data/config/solr_wrapper_test.yml

@@ -0,0 +1,2 @@
+---
+port: 8985

data/hydra-derivatives.gemspec

@@ -4,27 +4,31 @@ Gem::Specification.new do |spec|
   spec.name          = "hydra-derivatives"
   spec.version       = version
   spec.authors       = ["Justin Coyne"]
-  spec.email         = ["justin@curationexperts.com"]
+  spec.email         = ["jenlindner@gmail.com", "jcoyne85@stanford.edu"]
   spec.description   = "Derivative generation plugin for hydra"
   spec.summary       = "Derivative generation plugin for hydra"
   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', '~> 1.3'
+  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", "~> 0.4"
+  spec.add_development_dependency "solr_wrapper", "~> 2.0"
 
-  spec.add_dependency 'active-fedora', '>= 11.3.1', '< 13'
+  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 'activemodel', '< 6.1'
+  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/logger.rb

@@ -11,8 +11,8 @@ module Hydra::Derivatives
         logger.respond_to? method_name
       end
 
-      def respond_to_missing?(method_name, _include_private = false)
-        logger.respond_to_missing? method_name
+      def respond_to_missing?(method_name, include_private = false)
+        logger.send(:respond_to_missing?, method_name, include_private)
       end
 
       private

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
@@ -22,20 +24,27 @@ module Hydra::Derivatives::Processors
       # TODO: this pulls the whole file into memory. We should stream it from Fedora instead
       # @return [String] the result of calling the extract service
       def fetch
-        req = Net::HTTP.new(uri.host, uri.port)
-        req.use_ssl = true if check_for_ssl
-        resp = req.post(uri.to_s, file_content, request_headers)
+        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
+      end
 
-        if resp.type_params['charset']
-          resp.body.force_encoding(resp.type_params['charset'])
+      # 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, use_ssl: check_for_ssl) do |http|
+          req = Net::HTTP::Post.new(uri.request_uri, request_headers)
+          req.basic_auth uri.user, uri.password unless uri.password.nil?
+          req.body = file_content
+          http.request req
         end
-        resp.body
       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/lib/hydra/derivatives/processors/image.rb

@@ -21,8 +21,10 @@ module Hydra::Derivatives::Processors
       def create_resized_image
         create_image do |xfrm|
           if size
-            xfrm.flatten
-            xfrm.resize(size)
+            xfrm.combine_options do |i|
+              i.flatten
+              i.resize(size)
+            end
           end
         end
       end

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

@@ -99,15 +99,9 @@ module Hydra::Derivatives::Processors
       File.unlink(file_path) unless file_path.nil?
     end
 
-    def encode_file(recipe, opts = {})
+    def encode_file(recipe, file_path:)
       output_file = self.class.tmp_file('.jp2')
-      if opts[:file_path]
-        self.class.encode(opts[:file_path], recipe, output_file)
-      else
-        Hydra::Derivatives::TempfileService.create(source_file) do |f|
-          self.class.encode(f.path, recipe, output_file)
-        end
-      end
+      self.class.encode(file_path, recipe, output_file)
       output_file_service.call(File.open(output_file, 'rb'), directives)
       File.unlink(output_file)
     end

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

@@ -19,13 +19,6 @@ module Hydra::Derivatives::Processors
       raise "Processor is an abstract class. Implement `process' on #{self.class.name}"
     end
 
-    # This governs the output key sent to the persist file service
-    # while this is adequate for storing in Fedora, it's not a great name for saving
-    # to the file system.
-    def output_file_id(name)
-      [out_prefix, name].join('_')
-    end
-
     def output_filename_for(_name)
       File.basename(source_path)
     end

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

@@ -62,9 +62,8 @@ module Hydra::Derivatives::Processors
         err_str = ''
         stdin, stdout, stderr, wait_thr = popen3(command)
         context[:pid] = wait_thr[:pid]
+        files = [stderr, stdout]
         stdin.close
-        stdout.close
-        files = [stderr]
 
         until all_eof?(files)
           ready = IO.select(files, nil, nil, 60)
@@ -82,11 +81,14 @@ module Hydra::Derivatives::Processors
                 err_str << data
               end
             rescue EOFError
-              Rails.logger "Caught an eof error in ShellBasedProcessor"
+              Hydra::Derivatives::Logger.debug "Caught an eof error in ShellBasedProcessor"
               # No big deal.
             end
           end
         end
+
+        stdout.close
+        stderr.close
         exit_status = wait_thr.value
 
         raise "Unable to execute command \"#{command}\". Exit code: #{exit_status}\nError message: #{err_str}" unless exit_status.success?

data/lib/hydra/derivatives/services/persist_output_file_service.rb

@@ -23,7 +23,7 @@ module Hydra::Derivatives
       if file.respond_to? :mime_type
         file.mime_type
       else
-        "appliction/octet-stream"
+        "application/octet-stream"
       end
     end
   end

data/solr/config/schema.xml

@@ -168,7 +168,6 @@
     <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -338,7 +337,6 @@
  <!--  <defaultSearchField>text</defaultSearchField> -->
 
  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
 
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,

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>