hydra-derivatives 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4f7de97aeaa9148272e2cc1e4d16bba7d33f4f
-  data.tar.gz: 867caa37665a6e477ab511435b501124b63f852a
+  metadata.gz: 505c538dd6ded3a65f826eb0d93040bc4edf2a1e
+  data.tar.gz: 0323253a69f02a91b84e07f546e42debd822ea7f
 SHA512:
-  metadata.gz: fcc289306fd1d503078e74e149f3dc252f0b55c60e735fe9f650cd636e88d9be78d929f71ea3df138e30ae54bc1a166e22b447282bb2e644c44db64b9e70f07d
-  data.tar.gz: 2a0396315ec846b9a1457561810cf6c0decf3bed5b45a4f409854e8ab6df78de6a4600acab934494e78f2f3395bbd95f66f1f85f8ded36178025e8bddff9807b
+  metadata.gz: c27070a785686b16bb37c60d0a30cf175da384e2818942efb3d7994ff0eacf2a61b84aa0f1189216d4242ed235bda6bda1a43001b3dcb7ad09efcb5a9a085254
+  data.tar.gz: 453cec1e1d0b1f5940ad251f6271771e0f062f37e53342f80e31f783005b1a87615868d615e569389dcef1635e2332ef59e7a7f92048c93018e0a6e4f0876349

data/.gitignore

@@ -7,3 +7,4 @@ pkg/
 .ruby-gemset
 fcrepo4-data/
 fcrepo4-test-data/
+coverage/

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 cache: bundler
 sudo: false
+before_install:
+  - gem update --system
+  - gem install bundler
 rvm:
   - 2.2.5
+  - 2.3.1
+  - 2.4.0
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/CONTRIBUTING.md

@@ -3,6 +3,13 @@
 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.
 
+## 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.
+
 ## Hydra Project Intellectual Property Licensing and Ownership
 
 All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
@@ -16,8 +23,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Reporting Issues
 * Making Changes
+* Documenting Code
+* Committing Changes
 * Submitting Changes
-* Merging Changes
+* Reviewing and Merging Changes
 
 ### Reporting Issues
 
@@ -38,8 +47,28 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Then checkout the new branch with `git checkout fix/master/my_contribution`.
   * 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.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+### Documenting Code
+
+* All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  * Documentation should seek to answer the question "why does this code exist?"
+* Document private / protected methods as desired.
+* If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  * 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 
+  * 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)
@@ -60,7 +89,9 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
         class PostsController
           def index
-            respond_with Post.limit(10)
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
           end
         end
 
@@ -72,38 +103,53 @@ 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
 
-[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
-  * It is likely a good idea to run your tests again.
-* Squash the commits for your branch into one commit
-  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
-  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * It is a good idea to run your tests again.
+* If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
+  * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 
-### Merging Changes
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+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)
+
+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.
+
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+* Ask clarifying questions
+* State your understanding and expectations
+* Provide example code or alternate solutions, and explain why
+
+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:
 
-* It is considered "poor from" to merge your own request.
-* Please take the time to review the changes and get a sense of what is being 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 refactorings_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * 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?
-  * Did the Travis tests complete successfully?
-* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
-* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+  * Does the description of the new/changed specs match your understanding of what the spec is doing?
+
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'simplecov'
+  gem 'coveralls'
   gem 'byebug' unless ENV['TRAVIS']
   gem 'rubocop', '~> 0.37.2', require: false
   gem 'rubocop-rspec', require: false

data/History.md

@@ -1,3 +1,7 @@
+## 3.2.2 (2017-04-07)
+* 2017-04-05: Raise an exception when encoding fails [Valerie Maher] * 2017-04-03: Add in service check to determine which libraries ffmpeg has [Jame Little]
+* 2017-04-01: Fix broken rspec tests [Chris Colvard]
+
 ## 3.2.1 (2016-11-21)
 2016-11-17: Default to first page for pdf images [Adam Wead]
 

data/README.md

@@ -1,4 +1,9 @@
-# hydra-derivatives [![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)
+# hydra-derivatives
+
+[![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)
 
 Derivative generation for hydra
 
@@ -65,10 +70,10 @@ If no timeout is set the system will process until complete (possibly indefinite
 ```
 require 'hydra/derivatives'
 
-Hydra::Derivatives::Video::Processor.timeout  = 10.minutes
-Hydra::Derivatives::Document.timeout = 5.minutes
-Hydra::Derivatives::Audio.timeout = 10.minutes
-Hydra::Derivatives::Image.timeout = 5.minutes
+Hydra::Derivatives::Processors::Video::Processor.timeout  = 10.minutes
+Hydra::Derivatives::Processors::Document.timeout = 5.minutes
+Hydra::Derivatives::Processors::Audio.timeout = 10.minutes
+Hydra::Derivatives::Processors::Image.timeout = 5.minutes
 
 ```
 
@@ -77,10 +82,10 @@ Hydra::Derivatives::Image.timeout = 5.minutes
 Flags can be set for using different video codes.  Default codecs are shown below
 
 ```
-Hydra::Derivatives::Video::Processor.config.mpeg4.codec = '-vcodec libx264 -acodec libfdk_aac'
-Hydra::Derivatives::Video::Processor.config.webm.codec = '-vcodec libvpx -acodec libvorbis'
-Hydra::Derivatives::Video::Processor.config.mkv.codec = '-vcodec ffv1'
-Hydra::Derivatives::Video::Processor.config.jpeg.codec = '-vcodec mjpeg'
+Hydra::Derivatives::Processors::Video::Processor.config.mpeg4.codec = '-vcodec libx264 -acodec libfdk_aac'
+Hydra::Derivatives::Processors::Video::Processor.config.webm.codec = '-vcodec libvpx -acodec libvorbis'
+Hydra::Derivatives::Processors::Video::Processor.config.mkv.codec = '-vcodec ffv1'
+Hydra::Derivatives::Processors::Video::Processor.config.jpeg.codec = '-vcodec mjpeg'
 ```
 
 ### Additional Directives
@@ -103,11 +108,13 @@ Just add `gem 'hydra-derivatives'` to your Gemfile.
 
 ## Dependencies
 
-* [FITS](http://fitstool.org/) - 0.8.x (0.8.5 is known to be good)
+* [FITS](http://fitstool.org/) - 1.0.x (1.0.5 is known to be good)
 * [FFMpeg](http://www.ffmpeg.org/)
 * [LibreOffice](https://www.libreoffice.org/) (openoffice.org-headless on Ubuntu/Debian to avoid "_X11 error: Can't open display:_")
+* [GhostScript](https://www.ghostscript.com/)
 * [ImageMagick](http://www.imagemagick.org/)
 * Kakadu's [kdu_compress](http://www.kakadusoftware.com/) (optional)
+* [ufraw](http://ufraw.sourceforge.net/)
 
 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.
 
@@ -115,7 +122,7 @@ For example:
 
 ```bash
 # in .bash_profile
-export PATH=${PATH}:/Users/justin/workspace/fits-0.8.5:/Applications/LibreOffice.app/Contents/MacOS
+export PATH=${PATH}:/Users/justin/workspace/fits-1.0.5:/Applications/LibreOffice.app/Contents/MacOS
 ```
 
 Alternatively, you can configure their paths:
@@ -125,6 +132,17 @@ Hydra::Derivatives.fits_path = '/opt/local/fits/bin/fits.sh'
 Hydra::Derivatives.libreoffice_path = '/opt/local/libreoffice_path/bin/soffice'
 Hydra::Derivatives.kdu_compress_path = '/usr/local/bin/kdu_compress'
 ```
+## Configuration
+
+ImageMagick by default stores temp files in system /tmp. If you'd like to override this, adjust these environment variables:
+
+```
+MAGICK_TEMPORARY_PATH
+MAGICK_TMPDIR
+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.
 
 ## JPEG2k Directives
 

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/lib/hydra/derivatives.rb

@@ -26,6 +26,7 @@ module Hydra
     autoload :Logger
     autoload :TempfileService
     autoload :IoDecorator
+    autoload :AudioEncoder
 
     autoload_under 'services' do
       autoload :RetrieveSourceFileService
@@ -46,8 +47,9 @@ module Hydra
       @config = Config.new
     end
 
-    [:ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, :kdu_compress_path,
-     :kdu_compress_recipes, :enable_ffmpeg, :source_file_service, :output_file_service].each do |method|
+    CONFIG_METHODS = [:ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, :kdu_compress_path,
+                      :kdu_compress_recipes, :enable_ffmpeg, :source_file_service, :output_file_service].freeze
+    CONFIG_METHODS.each do |method|
       module_eval <<-RUBY
         def self.#{method}
           config.#{method}

data/lib/hydra/derivatives/audio_encoder.rb

@@ -0,0 +1,27 @@
+require 'open3'
+
+module Hydra::Derivatives
+  class AudioEncoder
+    def initialize
+      @ffmpeg_output = Open3.capture3('ffmpeg -codecs').to_s
+    rescue
+      Logger.warn('Unable to find ffmpeg')
+      @ffmpeg_output = ""
+    end
+
+    def audio_encoder
+      audio_encoder = if fdk_aac?
+                        'libfdk_aac'
+                      else
+                        'aac'
+                      end
+      audio_encoder
+    end
+
+    private
+
+      def fdk_aac?
+        @ffmpeg_output.include?('--enable-libfdk-aac') || @ffmpeg_output.include?('--with-fdk-aac')
+      end
+  end
+end

data/lib/hydra/derivatives/config.rb

@@ -32,7 +32,8 @@ module Hydra
       end
 
       def enable_ffmpeg
-        @enable_ffmpeg ||= true
+        return @enable_ffmpeg unless @enable_ffmpeg.nil?
+        @enable_ffmpeg = true
       end
 
       def kdu_compress_path

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

@@ -73,20 +73,18 @@ module Hydra::Derivatives::Processors
         rates.map(&:to_s).join(',')
       end
 
-      protected
-
-        def encode(path, recipe, output_file)
-          kdu_compress = Hydra::Derivatives.kdu_compress_path
-          execute "#{kdu_compress} -quiet -i #{path} -o #{output_file} #{recipe}"
-        end
+      def encode(path, recipe, output_file)
+        kdu_compress = Hydra::Derivatives.kdu_compress_path
+        execute "#{kdu_compress} -quiet -i #{path} -o #{output_file} #{recipe}"
+      end
 
-        def tmp_file(ext)
-          Dir::Tmpname.create(['sufia', ext], Hydra::Derivatives.temp_file_base) {}
-        end
+      def tmp_file(ext)
+        Dir::Tmpname.create(['sufia', ext], Hydra::Derivatives.temp_file_base) {}
+      end
 
-        def long_dim(image)
-          [image[:width], image[:height]].max
-        end
+      def long_dim(image)
+        [image[:width], image[:height]].max
+      end
     end
 
     def process

data/lib/hydra/derivatives/processors/video/config.rb

@@ -19,7 +19,8 @@ module Hydra::Derivatives::Processors::Video
     end
 
     def mpeg4
-      @mpeg4 ||= CodecConfig.new('-vcodec libx264 -acodec libfdk_aac')
+      audio_encoder = Hydra::Derivatives::AudioEncoder.new
+      @mpeg4 ||= CodecConfig.new("-vcodec libx264 -acodec #{audio_encoder.audio_encoder}")
     end
 
     def webm

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

@@ -0,0 +1,17 @@
+require 'open3'
+
+module Hydra::Derivatives
+  class CapabilityService
+    attr_accessor :ffmpeg_output
+    def capture_output
+      @ffmpeg_output = Open3.capture3('ffmpeg -codecs').to_s
+    rescue
+      Logger.warn('Unable to find ffmpeg')
+      @ffmpeg_output = ""
+    end
+
+    def fdk_aac?
+      @ffmpeg_output.include?('--enable-libfdk-aac') || @ffmpeg_output.include?('--with-fdk-aac')
+    end
+  end
+end

data/spec/processors/image_spec.rb

@@ -111,7 +111,7 @@ describe Hydra::Derivatives::Processors::Image do
       end
     end
 
-    context "when running the complete command", unless: in_travis? do
+    context "when running the complete command", requires_imagemagick: true do
       let(:file_name) { File.join(fixture_path, "test.tif") }
       it "converts the image" do
         expect(Hydra::Derivatives::PersistBasicContainedOutputFileService).to receive(:call).with(kind_of(StringIO), directives)

data/spec/processors/jpeg2k_spec.rb

@@ -3,6 +3,8 @@ require 'yaml'
 
 describe Hydra::Derivatives::Processors::Jpeg2kImage do
   let(:object) { ActiveFedora::Base.new }
+  let(:filename) { File.expand_path('../../fixtures/test.tif', __FILE__) }
+  let(:image) { MiniMagick::Image.open(filename) }
 
   describe "#calculate_recipe" do
     it "calculates the number of levels from a size" do
@@ -29,6 +31,9 @@ describe Hydra::Derivatives::Processors::Jpeg2kImage do
       @sample_cfg = YAML.load_file(File.expand_path('../../fixtures/jpeg2k_config.yml', __FILE__))['test']
       Hydra::Derivatives.kdu_compress_recipes = @sample_cfg['jp2_recipes']
     end
+    after(:all) do
+      Hydra::Derivatives.reset_config!
+    end
 
     it "can get the recipe from a config file" do
       args = { recipe: :myrecipe }
@@ -54,4 +59,24 @@ describe Hydra::Derivatives::Processors::Jpeg2kImage do
       expect(r).to eq(described_class.calculate_recipe(args, 'grey', 7200))
     end
   end
+
+  describe "#encode" do
+    it "executes the external utility" do
+      expect(described_class).to receive(:execute) { 0 }
+      described_class.encode('infile', 'recipe', 'outfile')
+    end
+  end
+
+  describe "#tmp_file" do
+    it "returns a temp file with the correct extension" do
+      f = described_class.tmp_file('.test')
+      expect(f).to end_with('.test')
+    end
+  end
+
+  describe "long_dim" do
+    it "returns the image's largest dimension" do
+      expect(described_class.long_dim(image)).to eq(386)
+    end
+  end
 end

data/spec/services/audio_derivatives_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Hydra::Derivatives::AudioDerivatives do
   describe ".create" do
     let(:filename) { 'spec/fixtures/piano_note.wav' }
-    context "with a filename", unless: in_travis? do
+    let(:af_path) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path }
+
+    context "with a filename", requires_ffmpeg: true do
       before do
         class LocalFileService
           def self.call(file_name, _options, &_block)
@@ -21,8 +23,8 @@ describe Hydra::Derivatives::AudioDerivatives do
 
       it "creates derivatives" do
         described_class.create(filename,
-                               outputs: [{ label: 'mp3', format: 'mp3', url: 'http://localhost:8983/fedora/rest/dev/1234/mp3' },
-                                         { label: 'ogg', format: 'ogg', url: 'http://localhost:8983/fedora/rest/dev/1234/ogg' }])
+                               outputs: [{ label: 'mp3', format: 'mp3', url: "#{af_path}/1234/mp3" },
+                                         { label: 'ogg', format: 'ogg', url: "#{af_path}/1234/ogg" }])
       end
     end
 

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
 ENV['environment'] ||= 'test'
+
+require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter '/spec'
+end
+Coveralls.wear!
+
 # - RSpec adds ./lib to the $LOAD_PATH
 require 'hydra/derivatives'
 # Resque.inline = Rails.env.test?
@@ -22,7 +31,3 @@ MIME::Types.add(dng_format)
 def fixture_path
   File.expand_path("../fixtures", __FILE__)
 end
-
-def in_travis?
-  !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true'
-end

data/spec/units/audio_encoder_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Hydra::Derivatives::AudioEncoder do
+  before do
+    @audio_encoder = described_class.new
+  end
+
+  describe 'fdk_aac?' do
+    it 'outpus libfdk_aac if your ffmpeg was compiled with the library' do
+      enable_libfdk_flags = '--enable-gpl --enable-version3 --enable-nonfree --enable-hardcoded-tables --enable-avresample --with-fdk-aac'
+      @audio_encoder.instance_variable_set(:@ffmpeg_output, enable_libfdk_flags)
+      audio_encoder = @audio_encoder.audio_encoder
+      expect(audio_encoder).to eq('libfdk_aac')
+    end
+
+    it 'outputs aac if your ffmpeg was compiled with the library' do
+      enable_libfdk_flags = '--enable-gpl --enable-version3 --enable-nonfree --enable-hardcoded-tables --enable-avresample'
+      @audio_encoder.instance_variable_set(:@ffmpeg_output, enable_libfdk_flags)
+      audio_encoder = @audio_encoder.audio_encoder
+      expect(audio_encoder).to eq('aac')
+    end
+  end
+end

data/spec/units/config_spec.rb

@@ -1,7 +1,12 @@
 require 'spec_helper'
 
 describe "the configuration" do
-  subject { Hydra::Derivatives }
+  subject { Hydra::Derivatives::Config.new }
+
+  before do
+    # It's not always /tmp; it depends on OS and ENV vars
+    allow(Dir).to receive(:tmpdir).and_return('/tmp')
+  end
 
   it "has some configuration defaults" do
     expect(subject.ffmpeg_path).to eq('ffmpeg')
@@ -20,6 +25,9 @@ describe "the configuration" do
 
     subject.kdu_compress_path = '/opt/local/bin/kdu_compress'
     expect(subject.kdu_compress_path).to eq('/opt/local/bin/kdu_compress')
+
+    subject.enable_ffmpeg = false
+    expect(subject.enable_ffmpeg).to be false
   end
 
   it "lets you set a custom output file service" do
@@ -33,14 +41,4 @@ describe "the configuration" do
     subject.source_file_service = source_file_service
     expect(subject.source_file_service).to eq(source_file_service)
   end
-
-  it "lets you reset the configuration" do
-    subject.ffmpeg_path = '/usr/local/ffmpeg-1.0/bin/ffmpeg'
-    subject.reset_config!
-    expect(subject.ffmpeg_path).to eq('ffmpeg')
-
-    subject.kdu_compress_path = '/usr/local/bin/kdu_compress'
-    subject.reset_config!
-    expect(subject.kdu_compress_path).to eq('kdu_compress')
-  end
 end

data/spec/units/derivatives_spec.rb

@@ -30,4 +30,29 @@ describe Hydra::Derivatives do
       end
     end
   end
+
+  Hydra::Derivatives::CONFIG_METHODS.each do |method|
+    describe method.to_s do
+      it 'returns the config value' do
+        expect(subject.send(method)).to eq subject.config.send(method)
+      end
+    end
+    describe "#{method}=" do
+      it 'stores config changes' do
+        expect { subject.send("#{method}=", "new_value") }.to change { subject.config.send(method) }.from(subject.config.send(method)).to("new_value")
+      end
+    end
+  end
+
+  describe 'reset_config!' do
+    it "resets the configuration" do
+      subject.ffmpeg_path = '/usr/local/ffmpeg-1.0/bin/ffmpeg'
+      subject.reset_config!
+      expect(subject.ffmpeg_path).to eq('ffmpeg')
+
+      subject.kdu_compress_path = '/usr/local/bin/kdu_compress'
+      subject.reset_config!
+      expect(subject.kdu_compress_path).to eq('kdu_compress')
+    end
+  end
 end

data/spec/units/transcoding_spec.rb

@@ -13,12 +13,12 @@ describe "Transcoding" do
           PdfDerivatives.create(self, source: :original_file,
                                       outputs: [{ label: :thumb, size: "100x100>", url: "#{uri}/original_file_thumb" }])
           FullTextExtract.create(self, source: :original_file, outputs: [{ url: "#{uri}/fulltext" }])
-        when 'audio/wav'
+        when 'audio/x-wav'
           AudioDerivatives.create(self, source: :original_file,
                                         outputs: [
-                                          { label: :mp3, format: 'mp3', url: "#{uri}/mp3" },
-                                          { label: :ogg, format: 'ogg', url: "#{uri}/ogg" }])
-        when 'video/avi'
+                                          { label: :mp3, format: 'mp3', url: "#{uri}/original_file_mp3" },
+                                          { label: :ogg, format: 'ogg', url: "#{uri}/original_file_ogg" }])
+        when 'video/x-msvideo'
           VideoDerivatives.create(self, source: :original_file,
                                         outputs: [
                                           { label: :mp4,       format: 'mp4',  url: "#{uri}/original_file_mp4" },
@@ -40,7 +40,7 @@ describe "Transcoding" do
         when 'text/rtf'
           DocumentDerivatives.create(self, source: :original_file,
                                            outputs: [
-                                             { label: :preservation, format: 'odf', url: "#{uri}/original_file_preservation" },
+                                             { label: :preservation, format: 'odt', url: "#{uri}/original_file_preservation" },
                                              { label: :access,       format: 'pdf', url: "#{uri}/original_file_access" },
                                              { label: :thumnail,     format: 'jpg', url: "#{uri}/original_file_thumbnail" }])
         when 'application/msword'
@@ -52,21 +52,21 @@ describe "Transcoding" do
         when 'application/vnd.ms-excel'
           DocumentDerivatives.create(self, source: :original_file,
                                            outputs: [
-                                             { label: :preservation, format: 'xslx', url: "#{uri}/original_file_preservation" },
+                                             { label: :preservation, format: 'xlsx', url: "#{uri}/original_file_preservation" },
                                              { label: :access,       format: 'pdf',  url: "#{uri}/original_file_access" },
                                              { label: :thumnail,     format: 'jpg',  url: "#{uri}/original_file_thumbnail" }])
         when 'image/tiff'
           Jpeg2kImageDerivatives.create(self, source: :original_file,
                                               outputs: [
-                                                { label: :resized,       recipe: :default, processor: 'jpeg2k_image', resize: "600x600>", url: "#{uri}/resized" },
-                                                { label: :config_lookup, recipe: :default, processor: 'jpeg2k_image',                     url: "#{uri}/config_lookup" },
-                                                { label: :string_recipe, recipe: '-quiet', processor: 'jpeg2k_image',                     url: "#{uri}/string_recipe" },
-                                                { label: :diy,                             processor: 'jpeg2k_image',                     url: "#{uri}/original_file_diy" }])
+                                                { label: :resized,       format: 'jp2', recipe: :default, processor: 'jpeg2k_image', resize: "600x600>", url: "#{uri}/resized" },
+                                                { label: :config_lookup, format: 'jp2', recipe: :default, processor: 'jpeg2k_image', url: "#{uri}/config_lookup" },
+                                                { label: :string_recipe, format: 'jp2', recipe: '-jp2_space sRGB', processor: 'jpeg2k_image', url: "#{uri}/string_recipe" },
+                                                { label: :diy,           format: 'jp2', processor: 'jpeg2k_image', url: "#{uri}/original_file_diy" }])
         when 'image/x-adobe-dng'
           ImageDerivatives.create(self, source: :original_file,
                                         outputs: [
-                                          { label: :access, size: "300x300>", format: 'jpg', processor: :raw_image },
-                                          { label: :thumb,  size: "100x100>", format: 'jpg', processor: :raw_image }])
+                                          { label: :access, size: "300x300>", format: 'jpg', processor: :raw_image, url: "#{uri}/original_file_access" },
+                                          { label: :thumb,  size: "100x100>", format: 'jpg', processor: :raw_image, url: "#{uri}/original_file_thumb" }])
         end
       end
     end
@@ -82,6 +82,7 @@ describe "Transcoding" do
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'image/png') do |f|
         f.original_file.content = attachment
+        f.original_file.mime_type = f.mime_type_from_fits
         f.save!
       end
     end
@@ -100,36 +101,37 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached RAW image", unless: in_travis? do
+  describe "with an attached RAW image", requires_imagemagick: true do
     let(:filename) { File.expand_path('../../fixtures/test.dng', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'image/x-adobe-dng') do |f|
         f.original_file.content = attachment
-        f.original_file.mime_type = 'image/x-adobe-dng'
+        f.original_file.mime_type = f.mime_type_from_fits
         f.save!
       end
     end
 
     it "transcodes" do
-      expect(file.attached_files.key?('access')).to be_falsey
-      expect(file.attached_files.key?('thumb')).to be_falsey
+      expect(file.attached_files.key?('original_file_access')).to be_falsey
+      expect(file.attached_files.key?('original_file_thumb')).to be_falsey
 
       file.create_derivatives(filename)
-      expect(file.attached_files['access']).to have_content
-      expect(file.attached_files['access'].mime_type).to eq('image/jpeg')
-      expect(file.attached_files['thumb']).to have_content
-      expect(file.attached_files['thumb'].mime_type).to eq('image/jpeg')
+      file.reload
+      expect(file.attached_files['original_file_access']).to have_content
+      expect(file.attached_files['original_file_access'].mime_type).to eq('image/jpeg')
+      expect(file.attached_files['original_file_thumb']).to have_content
+      expect(file.attached_files['original_file_thumb'].mime_type).to eq('image/jpeg')
     end
   end
 
-  describe "with an attached pdf", unless: in_travis? do
+  describe "with an attached pdf", requires_imagemagick: true do
     let(:filename) { File.expand_path('../../fixtures/test.pdf', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'application/pdf') do |t|
         t.original_file.content = attachment
-        t.original_file.mime_type = 'application/pdf'
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end
@@ -145,12 +147,13 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached audio", unless: in_travis? do
+  describe "with an attached audio", requires_ffmpeg: true do
     let(:filename) { File.expand_path('../../fixtures/piano_note.wav', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
-      GenericFile.new(mime_type_from_fits: 'audio/wav').tap do |t|
+      GenericFile.new(mime_type_from_fits: 'audio/x-wav').tap do |t|
         t.original_file.content = attachment
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end
@@ -165,11 +168,11 @@ describe "Transcoding" do
     end
   end
 
-  describe "when the source datastrem has an unknown mime_type", unless: in_travis? do
+  describe "when the source datastrem has an unknown mime_type", requires_ffmpeg: true do
     let(:filename) { File.expand_path('../../fixtures/piano_note.wav', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
-      GenericFile.new(mime_type_from_fits: 'audio/wav').tap do |t|
+      GenericFile.new(mime_type_from_fits: 'audio/x-wav').tap do |t|
         t.original_file.content = attachment
         t.original_file.mime_type = 'audio/vnd.wav'
         t.save
@@ -185,13 +188,14 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached video", unless: in_travis? do
+  describe "with an attached video", requires_ffmpeg: true do
     let(:filename) { File.expand_path('../../fixtures/countdown.avi', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
-      GenericFile.create(mime_type_from_fits: 'video/avi') do |t|
+      GenericFile.create(mime_type_from_fits: 'video/x-msvideo') do |t|
         t.original_file.content = attachment
-        t.original_file.mime_type = 'video/msvideo'
+        t.original_file.mime_type = t.mime_type_from_fits
+        t.save
       end
     end
 
@@ -220,12 +224,14 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached Powerpoint", unless: in_travis? do
+  describe "with an attached Powerpoint", requires_libreoffice: true do
     let(:filename) { File.expand_path('../../fixtures/FlashPix.ppt', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
       GenericFile.create(mime_type_from_fits: 'application/vnd.ms-powerpoint') do |t|
         t.original_file.content = attachment
+        t.original_file.mime_type = t.mime_type_from_fits
+        t.save
       end
     end
 
@@ -241,12 +247,13 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached rich text format", unless: in_travis? do
+  describe "with an attached rich text format", requires_libreoffice: true do
     let(:filename) { File.expand_path('../../fixtures/sample.rtf', __FILE__) }
     let(:attachment) { File.open(filename) }
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'text/rtf').tap do |t|
         t.original_file.content = attachment
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end
@@ -263,14 +270,14 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached word doc format", unless: in_travis? do
+  describe "with an attached word doc format", requires_libreoffice: true do
     let(:filename)   { File.expand_path('../../fixtures/test.doc', __FILE__) }
     let(:attachment) { File.open(filename) }
 
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'application/msword').tap do |t|
         t.original_file.content = attachment
-        t.original_file.mime_type = 'application/msword'
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end
@@ -287,14 +294,14 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached excel format", unless: in_travis? do
+  describe "with an attached excel format", requires_libreoffice: true do
     let(:filename)   { File.expand_path('../../fixtures/test.xls', __FILE__) }
     let(:attachment) { File.open(filename) }
 
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'application/vnd.ms-excel').tap do |t|
         t.original_file.content = attachment
-        t.original_file.mime_type = 'application/vnd.ms-excel'
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end
@@ -311,13 +318,14 @@ describe "Transcoding" do
     end
   end
 
-  describe "with an attached tiff", unless: in_travis? do
+  describe "with an attached tiff", requires_kdu_compress: true do
     let(:filename) { File.expand_path('../../fixtures/test.tif', __FILE__) }
     let(:attachment) { File.open(filename) }
 
     let(:file) do
       GenericFile.new(mime_type_from_fits: 'image/tiff').tap do |t|
         t.original_file.content = attachment
+        t.original_file.mime_type = t.mime_type_from_fits
         t.save
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,6 +199,7 @@ files:
 - lib/color_profiles/license.txt
 - lib/color_profiles/sRGB_IEC61966-2-1_no_black_scaling.icc
 - lib/hydra/derivatives.rb
+- lib/hydra/derivatives/audio_encoder.rb
 - lib/hydra/derivatives/config.rb
 - lib/hydra/derivatives/io_decorator.rb
 - lib/hydra/derivatives/logger.rb
@@ -223,6 +224,7 @@ files:
 - lib/hydra/derivatives/runners/pdf_derivatives.rb
 - lib/hydra/derivatives/runners/runner.rb
 - lib/hydra/derivatives/runners/video_derivatives.rb
+- lib/hydra/derivatives/services/capability_service.rb
 - lib/hydra/derivatives/services/mime_type_service.rb
 - lib/hydra/derivatives/services/persist_basic_contained_output_file_service.rb
 - lib/hydra/derivatives/services/persist_output_file_service.rb
@@ -271,6 +273,7 @@ files:
 - 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
@@ -296,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra
@@ -328,6 +331,7 @@ test_files:
 - 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