hydra-derivatives 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5c7df4967dcb508c79af83f929109d51177b4c9
-  data.tar.gz: 8e6337d340b299ebde7aabc85f7b0157ff37382e
+  metadata.gz: d9915bdcf795eeb369e8d6d74c73ea28b6e123d7
+  data.tar.gz: 8324701965b3eeaafab56b3d7c4c1865c7a63523
 SHA512:
-  metadata.gz: 571c14601cbe8d592c123e6522fc29ddc43071d61e6208d7c061ccebc717a0fa13a6cfcaec423ca6e7a4be7be9de942a6885df4eb724c388df12a5c2f7f963bb
-  data.tar.gz: 0e2612a962f3f9c5d0da7114d89b1fcf78c7e5a11233b9dd347bc500a0ad8264f9c9d6cbf7d23e3ac974d9f3670b9015725c4f92338787c27afc001a90b00324
+  metadata.gz: 85e2b44fb759711a73de6a282732f919f5fc2cb6caf8bcb7f312d6e78238588b9321d174e45aca66cfd58cc01f43b4ba65207400f532be822333a5aa43031e9d
+  data.tar.gz: 7367297fea0431159120dca7805b16e54fd2c6e252368f6ef8b57e8bf7ce89f19931d8485fe50ce774a3500a73e3bb31b95fb591e8ed4dccfb05e0df3e6c83fc

data/History.md

@@ -1,3 +1,6 @@
+## 0.1.1 (2014-07-21)
+ - Define a logger
+
 ## 0.1.0 (2014-05-09)
  - Add support for thumbnailing documents
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/hydra/derivatives.rb

@@ -16,6 +16,7 @@ module Hydra
     autoload :ExtractMetadata
     autoload :ShellBasedProcessor
     autoload :Jpeg2kImage
+    autoload :Logger
 
     def self.config
       @config ||= reset_config!

data/lib/hydra/derivatives/extract_metadata.rb

@@ -30,7 +30,7 @@ module Hydra
 
       def filename_for_characterization
         mime_type = MIME::Types[mimeType].first
-        logger.warn "Unable to find a registered mime type for #{mimeType.inspect} on #{pid}" unless mime_type
+        Logger.warn "Unable to find a registered mime type for #{mimeType.inspect} on #{pid}" unless mime_type
         extension = mime_type ? ".#{mime_type.extensions.first}" : ''
         ["#{pid}-#{dsVersionID}", "#{extension}"]
       end

data/lib/hydra/derivatives/jpeg2k_image.rb

@@ -8,19 +8,16 @@ module Hydra
       include ShellBasedProcessor
 
       def process
-        quality, colorspace = extract_quality_and_colorspace
+        image = MiniMagick::Image.read(source_datastream.content)
+        quality = image['%[channels]'] == 'gray' ? 'gray' : 'color'
         directives.each do |name, args|
-          file_path = nil
-          long_dim = nil
+          long_dim = self.class.long_dim(image)
+          file_path = self.class.tmp_file('.tif')
           to_srgb = args.fetch(:to_srgb, true)
           if args[:resize] || to_srgb
-            image = preprocess(resize: args[:resize], to_srgb: to_srgb, src_quality: quality)
-            long_dim = self.class.long_dim(image)
-            file_path = self.class.tmp_file('.tif')
-            image.write file_path
-          else
-            long_dim = self.class.long_dim(MiniMagick::Image.read(source_datastream.content))
+            preprocess(image, resize: args[:resize], to_srgb: to_srgb, src_quality: quality)
           end
+          image.write file_path
           recipe = self.class.kdu_compress_recipe(args, quality, long_dim)
           output_datastream_name = args[:datastream] || output_datastream_id(name)
           encode_datastream(output_datastream_name, recipe, file_path: file_path)
@@ -43,9 +40,8 @@ module Hydra
       end
       
       protected
-      def preprocess(opts={})
-        # resize: <geometry>, to_srgb: <bool>,src_quality: 'color'|'grey'
-        image = MiniMagick::Image.read(source_datastream.content)
+      def preprocess(image, opts={})
+        # resize: <geometry>, to_srgb: <bool>, src_quality: 'color'|'gray'
         image.combine_options do |c|
           c.resize(opts[:resize]) if opts[:resize]
           c.profile self.class.srgb_profile_path if opts[:src_quality] == 'color' && opts[:to_srgb]
@@ -53,15 +49,6 @@ module Hydra
         image
       end
 
-      def extract_quality_and_colorspace
-        xml = source_datastream.extract_metadata
-        doc = Nokogiri::XML(xml).remove_namespaces!
-        bps = doc.xpath('//bitsPerSample').first.content
-        quality = bps == '8 8 8' ? 'color' : 'grey'
-        colorspace = doc.xpath('.//colorSpace').first.content
-        [quality, colorspace]
-      end
-
       def self.encode(path, recipe, output_file)
         kdu_compress = Hydra::Derivatives.kdu_compress_path
         execute "#{kdu_compress} -i #{path} -o #{output_file} #{recipe}"
@@ -89,7 +76,7 @@ module Hydra
           if Hydra::Derivatives.kdu_compress_recipes.has_key? recipe
             return Hydra::Derivatives.kdu_compress_recipes[recipe]
           else
-            logger.warn "No JP2 recipe for :#{args[:recipe].to_s} ('#{recipe}') found in configuration. Using best guess."
+            Logger.warn "No JP2 recipe for :#{args[:recipe].to_s} ('#{recipe}') found in configuration. Using best guess."
             return Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args,quality,long_dim)
           end
         elsif args[:recipe].is_a? String
@@ -104,7 +91,7 @@ module Hydra
         rates_arg = Hydra::Derivatives::Jpeg2kImage.layer_rates(args.fetch(:layers, 8), args.fetch(:compression, 10))
         tile_size = args.fetch(:tile_size, 1024)
         tiles_arg = "\{#{tile_size},#{tile_size}\}"
-        jp2_space_arg = quality == 'grey' ? 'sLUM' : 'sRGB'
+        jp2_space_arg = quality == 'gray' ? 'sLUM' : 'sRGB'
 
         %Q{-rate #{rates_arg} 
             -jp2_space #{jp2_space_arg}

data/lib/hydra/derivatives/logger.rb

@@ -0,0 +1,24 @@
+module Hydra::Derivatives
+  class Logger
+
+    class << self
+
+      def method_missing method_name, *arguments, &block
+        logger.send(method_name, *arguments, &block)
+      rescue  
+        super
+      end
+
+      def respond_to?(method_name, include_private = false)
+        logger.respond_to? method_name
+      end
+
+      private
+
+      def logger
+        ActiveFedora::Base.logger || ::Logger.new(STDOUT)
+      end
+
+    end
+  end
+end

data/spec/lib/hydra/derivatives/extract_metadata_spec.rb

@@ -21,12 +21,16 @@ module Hydra::Derivatives
     context '#extract_metadata' do
       context 'without content' do
         let(:initialization_options) { {content: '', mime_type: 'text/plain'} }
-        its(:extract_metadata) { should be_nil}
+        it 'should be nil' do
+          expect(subject.extract_metadata).to be_nil
+        end
       end
 
       context 'with content', unless: ENV['TRAVIS'] == 'true' do
         let(:mime_type) { 'image/jpeg' }
-        its(:extract_metadata) { should match("<identity format=\"Plain text\" mimetype=\"text/plain\"")}
+        it 'should get some XML' do
+          expect(subject.extract_metadata).to match "<identity format=\"Plain text\" mimetype=\"text/plain\""
+        end
       end
     end
 
@@ -36,4 +40,4 @@ module Hydra::Derivatives
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-require 'rspec/autorun'
 ENV['environment'] ||= 'test'
 # - RSpec adds ./lib to the $LOAD_PATH
 require 'hydra/derivatives'
 #Resque.inline = Rails.env.test?
+require 'byebug' unless ENV['TRAVIS']
 
 RSpec.configure do |config|
 end

data/spec/units/config_spec.rb

@@ -4,31 +4,31 @@ describe "the configuration" do
   subject {Hydra::Derivatives }
 
   it "should have some configuration defaults" do
-    subject.ffmpeg_path.should == 'ffmpeg'
-    subject.enable_ffmpeg.should be_true
-    subject.libreoffice_path.should == 'soffice'
-    subject.temp_file_base.should == '/tmp'
-    subject.fits_path.should == 'fits.sh'
-    subject.kdu_compress_path.should == 'kdu_compress'
+    expect(subject.ffmpeg_path).to eq('ffmpeg')
+    expect(subject.enable_ffmpeg).to be true
+    expect(subject.libreoffice_path).to eq('soffice')
+    expect(subject.temp_file_base).to eq('/tmp')
+    expect(subject.fits_path).to eq('fits.sh')
+    expect(subject.kdu_compress_path).to eq('kdu_compress')
   end
 
   it "should let you change the configuration" do
     subject.ffmpeg_path = '/usr/local/ffmpeg-1.0/bin/ffmpeg'
-    subject.ffmpeg_path.should == '/usr/local/ffmpeg-1.0/bin/ffmpeg'
+    expect(subject.ffmpeg_path).to eq('/usr/local/ffmpeg-1.0/bin/ffmpeg')
 
     subject.kdu_compress_path = '/opt/local/bin/kdu_compress'
-    subject.kdu_compress_path.should == '/opt/local/bin/kdu_compress'
+    expect(subject.kdu_compress_path).to eq('/opt/local/bin/kdu_compress')
 
   end
 
   it "should let you reset the configuration" do
     subject.ffmpeg_path = '/usr/local/ffmpeg-1.0/bin/ffmpeg'
     subject.reset_config!
-    subject.ffmpeg_path.should == 'ffmpeg'
+    expect(subject.ffmpeg_path).to eq('ffmpeg')
 
     subject.kdu_compress_path = '/usr/local/bin/kdu_compress'
     subject.reset_config!
-    subject.kdu_compress_path.should == 'kdu_compress'
+    expect(subject.kdu_compress_path).to eq('kdu_compress')
   end
 
 end

data/spec/units/extract_spec.rb

@@ -16,7 +16,7 @@ describe Hydra::Derivatives::ExtractMetadata, :unless => $in_travis do
       xml = subject.extract_metadata
       doc = Nokogiri::HTML(xml)
       identity = doc.xpath('//identity').first
-      identity.attr('mimetype').should == 'image/png'
+      expect(identity.attr('mimetype')).to eq('image/png')
     end
   end
 end

data/spec/units/image_spec.rb

@@ -7,8 +7,8 @@ describe Hydra::Derivatives::Image do
     subject { Hydra::Derivatives::Image.new(object, 'content', directives)}
 
     it "should use the string as the size and the name is autogenerated" do
-      subject.should_receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "100x100>", 'png') do |ds|
-        ds.dsid.should == 'content_thumb'
+      expect(subject).to receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "100x100>", 'png') do |ds|
+        expect(ds.dsid).to eq('content_thumb')
       end
       subject.process
     end
@@ -17,8 +17,8 @@ describe Hydra::Derivatives::Image do
     let(:directives) {{ :thumb => {size: "200x300>", datastream: 'thumbnail'} }}
     subject { Hydra::Derivatives::Image.new(object, 'content', directives)}
     it "should use the specified size and name" do
-      subject.should_receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "200x300>", 'png') do |ds|
-        ds.dsid.should == 'thumbnail'
+      expect(subject).to receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "200x300>", 'png') do |ds|
+        expect(ds.dsid).to eq('thumbnail')
       end
       subject.process
 

data/spec/units/jpeg2k_spec.rb

@@ -7,14 +7,14 @@ describe Hydra::Derivatives::Jpeg2kImage do
   describe "#calculate_recipe" do
     it "calculates the number of levels from a size" do
       dim = 7200
-      Hydra::Derivatives::Jpeg2kImage.level_count_for_size(dim).should == 6
+      expect(Hydra::Derivatives::Jpeg2kImage.level_count_for_size(dim)).to eq(6)
     end
 
     it "calculates the compression rates for each quality layer" do
       compression_num = 10
       layers = 8
       calc = Hydra::Derivatives::Jpeg2kImage.layer_rates(layers, compression_num) 
-      calc.should == "2.4,1.48331273,0.91675694,0.56659885,0.3501847,0.21643059,0.13376427,0.0826726"
+      expect(calc).to eq("2.4,1.48331273,0.91675694,0.56659885,0.3501847,0.21643059,0.13376427,0.0826726")
     end
 
   end
@@ -28,25 +28,25 @@ describe Hydra::Derivatives::Jpeg2kImage do
     it "can get the recipe from a config file" do
       args = { recipe: :myrecipe }
       r = Hydra::Derivatives::Jpeg2kImage.kdu_compress_recipe(args, 'grey', 7200)
-      r.should == @sample_cfg['jp2_recipes']['myrecipe_grey']
+      expect(r).to eq(@sample_cfg['jp2_recipes']['myrecipe_grey'])
     end
 
     it "can take a recipe as a string" do
       args = { recipe: '-my -excellent -recipe' }
       r = Hydra::Derivatives::Jpeg2kImage.kdu_compress_recipe(args, 'grey', 7200)
-      r.should == args[:recipe]
+      expect(r).to eq(args[:recipe])
     end
 
     it "will fall back to a #calculate_recipe if a symbol is passed but no recipe is found" do
       args = { recipe: :x }
       r = Hydra::Derivatives::Jpeg2kImage.kdu_compress_recipe(args, 'grey', 7200)
-      r.should == Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args, 'grey', 7200)
+      expect(r).to eq(Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args, 'grey', 7200))
     end
 
     it "will fall back to a #calculate_recipe if there is no attempt to provide one" do
       args = {}
       r = Hydra::Derivatives::Jpeg2kImage.kdu_compress_recipe(args, 'grey', 7200)
-      r.should == Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args, 'grey', 7200)
+      expect(r).to eq(Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args, 'grey', 7200))
     end
 
   end

data/spec/units/logger_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Hydra::Derivatives::Logger do
+
+  context "with log levels" do
+
+    let(:levels) { ["unknown", "fatal", "error", "warn", "info", "debug"] }
+
+    it "should respond successfully" do
+      levels.each do |level|
+        expect(Hydra::Derivatives::Logger.respond_to?(level)).to be_truthy
+      end
+    end
+    it "should accept messages" do
+      expect(Hydra::Derivatives::Logger.warn("message")).to be_truthy
+    end
+  end
+
+  context "with garbage" do
+    it "should raise an error" do
+      expect{Hydra::Derivatives::Logger.garbage}.to raise_error(NoMethodError)
+    end
+  end
+
+end

data/spec/units/transcoding_spec.rb

@@ -70,15 +70,15 @@ describe "Transcoder" do
     end
 
     it "should transcode" do
-      file.datastreams.key?('content_medium').should be_false
+      expect(file.datastreams.key?('content_medium')).to be_falsey
       file.create_derivatives
-      file.datastreams['content_medium'].should have_content
-      file.datastreams['content_medium'].mimeType.should == 'image/png'
-      file.datastreams['content_thumb'].should have_content
-      file.datastreams['content_thumb'].mimeType.should == 'image/png'
-      file.datastreams['access'].should have_content
-      file.datastreams['access'].mimeType.should == 'image/jpeg'
-      file.datastreams.key?('content_text').should be_false
+      expect(file.datastreams['content_medium']).to have_content
+      expect(file.datastreams['content_medium'].mimeType).to eq('image/png')
+      expect(file.datastreams['content_thumb']).to have_content
+      expect(file.datastreams['content_thumb'].mimeType).to eq('image/png')
+      expect(file.datastreams['access']).to have_content
+      expect(file.datastreams['access'].mimeType).to eq('image/jpeg')
+      expect(file.datastreams.key?('content_text')).to be_falsey
     end
   end
 
@@ -87,10 +87,10 @@ describe "Transcoder" do
     let(:file) { GenericFile.new(mime_type: 'application/pdf').tap { |t| t.content.content = attachment; t.save } }
 
     it "should transcode" do
-      file.datastreams.key?('content_thumb').should be_false
+      expect(file.datastreams.key?('content_thumb')).to be_falsey
       file.create_derivatives
-      file.datastreams['content_thumb'].should have_content
-      file.datastreams['content_thumb'].mimeType.should == 'image/png'
+      expect(file.datastreams['content_thumb']).to have_content
+      expect(file.datastreams['content_thumb'].mimeType).to eq('image/png')
     end
   end
 
@@ -100,10 +100,10 @@ describe "Transcoder" do
 
     it "should transcode" do
       file.create_derivatives
-      file.datastreams['content_mp3'].should have_content
-      file.datastreams['content_mp3'].mimeType.should == 'audio/mpeg'
-      file.datastreams['content_ogg'].should have_content
-      file.datastreams['content_ogg'].mimeType.should == 'audio/ogg'
+      expect(file.datastreams['content_mp3']).to have_content
+      expect(file.datastreams['content_mp3'].mimeType).to eq('audio/mpeg')
+      expect(file.datastreams['content_ogg']).to have_content
+      expect(file.datastreams['content_ogg'].mimeType).to eq('audio/ogg')
     end
   end
 
@@ -112,10 +112,9 @@ describe "Transcoder" do
     let(:file) { GenericFile.new(mime_type: 'audio/wav').tap { |t| t.content.content = attachment; t.content.mimeType = 'audio/vnd.wav'; t.save } }
 
     it "should transcode" do
-      expect(logger).to receive(:warn).with("Unable to find a registered mime type for \"audio/vnd.wav\" on #{file.pid}").twice
       file.create_derivatives
-      file.datastreams['content_mp3'].should have_content
-      file.datastreams['content_mp3'].mimeType.should == 'audio/mpeg'
+      expect(file.datastreams['content_mp3']).to have_content
+      expect(file.datastreams['content_mp3'].mimeType).to eq('audio/mpeg')
     end
   end
 
@@ -125,12 +124,12 @@ describe "Transcoder" do
 
     it "should transcode" do
       file.create_derivatives
-      file.datastreams['content_mp4'].should have_content
-      file.datastreams['content_mp4'].mimeType.should == 'video/mp4'
-      file.datastreams['content_webm'].should have_content
-      file.datastreams['content_webm'].mimeType.should == 'video/webm'
-      file.datastreams['thumbnail'].should have_content
-      file.datastreams['thumbnail'].mimeType.should == 'image/jpeg'
+      expect(file.datastreams['content_mp4']).to have_content
+      expect(file.datastreams['content_mp4'].mimeType).to eq('video/mp4')
+      expect(file.datastreams['content_webm']).to have_content
+      expect(file.datastreams['content_webm'].mimeType).to eq('video/webm')
+      expect(file.datastreams['thumbnail']).to have_content
+      expect(file.datastreams['thumbnail'].mimeType).to eq('image/jpeg')
     end
   end
 
@@ -139,11 +138,11 @@ describe "Transcoder" do
     let(:file) { GenericFile.new(mime_type: 'image/png', label: "special").tap { |t| t.content.content = attachment; t.save } }
 
     it "should transcode" do
-      file.datastreams.key?('special_ds').should be_false
+      expect(file.datastreams.key?('special_ds')).to be_falsey
       file.create_derivatives
-      file.datastreams['special_ds'].should have_content
-      file.datastreams['special_ds'].mimeType.should == 'image/png'
-      file.datastreams['special_ds'].should have_content
+      expect(file.datastreams['special_ds']).to have_content
+      expect(file.datastreams['special_ds'].mimeType).to eq('image/png')
+      expect(file.datastreams['special_ds']).to have_content
     end
   end
 
@@ -212,14 +211,14 @@ describe "Transcoder" do
     let(:file) { GenericFile.new(mime_type: 'image/tiff').tap { |t| t.content.content = attachment; t.save } }
     it "should transcode" do
       file.create_derivatives
-      file.datastreams['content_diy'].should have_content
-      file.datastreams['content_diy'].mimeType.should == 'image/jp2'
-      file.datastreams['config_lookup'].should have_content
-      file.datastreams['config_lookup'].mimeType.should == 'image/jp2'
-      file.datastreams['resized'].should have_content
-      file.datastreams['resized'].mimeType.should == 'image/jp2'
-      file.datastreams['string_recipe'].should have_content
-      file.datastreams['string_recipe'].mimeType.should == 'image/jp2'
+      expect(file.datastreams['content_diy']).to have_content
+      expect(file.datastreams['content_diy'].mimeType).to eq('image/jp2')
+      expect(file.datastreams['config_lookup']).to have_content
+      expect(file.datastreams['config_lookup'].mimeType).to eq('image/jp2')
+      expect(file.datastreams['resized']).to have_content
+      expect(file.datastreams['resized'].mimeType).to eq('image/jp2')
+      expect(file.datastreams['string_recipe']).to have_content
+      expect(file.datastreams['string_recipe'].mimeType).to eq('image/jp2')
     end
   end
 end

data/spec/units/video_spec.rb

@@ -6,7 +6,7 @@ describe Hydra::Derivatives::Video do
       let(:directives) {{ :thumb => {format: "webm", datastream: 'thumbnail'} }}
       subject { Hydra::Derivatives::Video.new(double(:obj), 'content', directives)}
       it "should create a datastream with the specified name" do
-        subject.should_receive(:encode_datastream).with("thumbnail", "webm", 'video/webm', {Hydra::Derivatives::Ffmpeg::OUTPUT_OPTIONS =>"-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100", Hydra::Derivatives::Ffmpeg::INPUT_OPTIONS=>""})
+        expect(subject).to receive(:encode_datastream).with("thumbnail", "webm", 'video/webm', {Hydra::Derivatives::Ffmpeg::OUTPUT_OPTIONS =>"-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100", Hydra::Derivatives::Ffmpeg::INPUT_OPTIONS=>""})
         subject.process
 
       end
@@ -16,7 +16,7 @@ describe Hydra::Derivatives::Video do
       let(:directives) {{ :thumb => {format: "webm"} }}
       subject { Hydra::Derivatives::Video.new(double(:obj), 'content', directives)}
       it "should create a datastream and infer the name" do
-        subject.should_receive(:encode_datastream).with("content_thumb", "webm", 'video/webm', {Hydra::Derivatives::Ffmpeg::OUTPUT_OPTIONS =>"-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100", Hydra::Derivatives::Ffmpeg::INPUT_OPTIONS=>""})
+        expect(subject).to receive(:encode_datastream).with("content_thumb", "webm", 'video/webm', {Hydra::Derivatives::Ffmpeg::OUTPUT_OPTIONS =>"-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100", Hydra::Derivatives::Ffmpeg::INPUT_OPTIONS=>""})
         subject.process
 
       end
@@ -26,7 +26,7 @@ describe Hydra::Derivatives::Video do
       let(:directives) {{ :thumb => {:format => 'jpg' , datastream: 'thumbnail'} }}
       subject { Hydra::Derivatives::Video.new(double(:obj), 'content', directives)}
       it "should create a datastream and infer the name" do
-        subject.should_receive(:encode_datastream).with("thumbnail", "jpg", "image/jpeg", {:output_options=>"-s 320x240 -vcodec mjpeg -vframes 1 -an -f rawvideo", :input_options=>" -itsoffset -2"})
+        expect(subject).to receive(:encode_datastream).with("thumbnail", "jpg", "image/jpeg", {:output_options=>"-s 320x240 -vcodec mjpeg -vframes 1 -an -f rawvideo", :input_options=>" -itsoffset -2"})
         subject.process
 
       end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: jettywrapper
   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: rspec
   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: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hydra-file_characterization
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: Derivative generation plugin for hydra
@@ -135,9 +135,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - History.md
@@ -157,8 +157,8 @@ files:
 - lib/hydra/derivatives/extract_metadata.rb
 - lib/hydra/derivatives/ffmpeg.rb
 - lib/hydra/derivatives/image.rb
-- lib/hydra/derivatives/jpeg2k_config.yml
 - lib/hydra/derivatives/jpeg2k_image.rb
+- lib/hydra/derivatives/logger.rb
 - lib/hydra/derivatives/processor.rb
 - lib/hydra/derivatives/railtie.rb
 - lib/hydra/derivatives/shell_based_processor.rb
@@ -183,6 +183,7 @@ files:
 - spec/units/extract_spec.rb
 - spec/units/image_spec.rb
 - spec/units/jpeg2k_spec.rb
+- spec/units/logger_spec.rb
 - spec/units/transcoding_spec.rb
 - spec/units/video_spec.rb
 homepage: https://github.com/projecthydra/hydra-derivatives
@@ -195,12 +196,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -230,5 +231,6 @@ test_files:
 - spec/units/extract_spec.rb
 - spec/units/image_spec.rb
 - spec/units/jpeg2k_spec.rb
+- spec/units/logger_spec.rb
 - spec/units/transcoding_spec.rb
 - spec/units/video_spec.rb

data/lib/hydra/derivatives/jpeg2k_config.yml

@@ -1,20 +0,0 @@
-defaults: &defaults
-  jp2_recipes:
-    # note that these aren't real recipes, just enough to test configuration options
-    myrecipe_color: >
-      -rate 2.4
-      -jp2_space sRGB 
-      Stiles=\{1024,1024\}
-    myrecipe_grey: >
-      -rate 2.4
-      -jp2_space sLUM 
-      Stiles=\{1024,1024\}
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults