hydra-derivatives 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124f992a28f2883d1c8d762ae0232957645923e145c48ec75bfe33280f0683ab
-  data.tar.gz: 02336f270677e9e55e768c8c03bf71afc62fb759c5f48ee7eaddc1033345e07f
+  metadata.gz: 506f0f1154a7b2ec1e3af2d55ad7b1a20687c9061303339928e87b42c71d7dd8
+  data.tar.gz: 5af2d8d9e93cc8d8f12d5e5726775721332e0bcb568017b0c486f94c8160bee7
 SHA512:
-  metadata.gz: 675ccaa54a34cdf812c295d9e937a29041053526f69a8eb7d68c6b162939cbc0a1e973c4b8176274af9fbbc1e45fd804121d7fffa860a0958ede78d47d454057
-  data.tar.gz: 49815c8d5efe8fb0d5eb8aa83fbec991e4bc86454087b773c2a4556a7028680a4d6a0bafd568a4af1a81bb9dded89bc703d99161eafe97940706e94321c3ca47
+  metadata.gz: 5614a1fb4662d0bac907f0302f811d1850f98a98ade8e70b3bc3377fd2adce97112f6e24bf35d0a017689742b9eccca5276b82300529ddc4d1023fd787ab7fb9
+  data.tar.gz: 43d0a1555fe82600b663cc8b07b3dbc8d8d6e7743b964d31e3a50b1858006870e4076e57d9399855f1eaf95ca729bf41007eac74ca1fe3487809eae841220f33

data/.circleci/config.yml

@@ -1,46 +1,43 @@
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1.0
 jobs:
   bundle_lint_test:
     parameters:
       ruby_version:
         type: string
-      project:
-        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 ufraw-batch libpng-dev imagemagick ffmpeg libreoffice
+            sudo apt-get install ghostscript libpng-dev imagemagick ffmpeg libreoffice dcraw
+      - setup_remote_docker
       - run:
           name: Install Kakadu
           command: |
-            if [ ! -d "kakadu" ]; then
-              mkdir ~/downloads
-              wget http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip -O ~/downloads/kakadu.zip
-              unzip ~/downloads/kakadu.zip
-              mv KDU77_Demo_Apps_for_Linux-x86-64_150710 kakadu
-            fi
+            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_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: << parameters.project >>
-          cache_version: '2'
 
       - samvera/install_solr_core
 
@@ -51,19 +48,12 @@ jobs:
 workflows:
   ci:
     jobs:
-      - bundle_lint_test:
-          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
+          ruby_version: 2.5.9
       - bundle_lint_test:
           name: ruby2-6
-          ruby_version: 2.6.6
-          project: hydra-derivatives
+          ruby_version: 2.6.9
       - bundle_lint_test:
           name: ruby2-7
-          ruby_version: 2.7.1
-          project: hydra-derivatives
+          ruby_version: 2.7.5

data/README.md

@@ -165,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.
 
@@ -232,6 +232,12 @@ Instead, each directive may contain these arguments:
     * 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

data/VERSION

@@ -1 +1 @@
-3.6.0
+3.6.1

data/hydra-derivatives.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
                       '!= 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 'activemodel', '< 6.1'
   spec.add_dependency 'activesupport', '>= 4.0', '< 7'
   spec.add_dependency 'addressable', '~> 2.5'
   spec.add_dependency 'deprecation'

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -422,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra