hydra-derivatives 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0212a791210218d33a99934df59e57d60ad44258
-  data.tar.gz: 5cbe5a947d8709a75a958380ac7495c6fd84eb5f
+  metadata.gz: 1bc8abf9416fda90a423323e7717b6ff5b889f70
+  data.tar.gz: db345a163681b8b2d981f5f4aad33e868951d03c
 SHA512:
-  metadata.gz: 9b340d1a70f8be41222ea8be383cf9f25085c30b7df20b6898176f229f2096bee2cfd55803e4d80a2eeb6b4e43b0b05cc49a3691bb6b163a314276345f703c83
-  data.tar.gz: de99c7a8c27dcc00bde2b165536e87d2b960d1936dfafb35e13460dfd50a46cdcf2374d1a18c9b31aab10159b2c7ba1951df619f453063de594aaf2d781be043
+  metadata.gz: 57b97d9fbd4b63233ae73d58da47546f2c466a78de5bea3ef687f818cf3d493d17ed4c128f8a0c312f3a872d17bf0771a754479fbac1ddcdb359f5f02ef6f81f
+  data.tar.gz: 30f51ea9f6b6fc4be16631b89d46c090a7ee26e96b46a2d0f70c3e76f71eedcf890d0940db488413082e6446d5b059bd71a54e6fefc3cf8b37274f13cc49fbd0

data/.gitignore

@@ -2,3 +2,4 @@ Gemfile.lock
 tmp/
 jetty/
 pkg/
+.bundle/

data/History.md

@@ -1,3 +1,26 @@
+ ## 0.0.8 (2013-04-09)
+ - Add support for JPEG2000 Derivatives
+ - Correcting Railtie initializer
+ - Added ImageMagick dependency 
+ - Updated FITS URL
+ - Adding input and output options to ffmpeg and video processor
+ - Revert "Switch to streamio_ffmpeg for easier handling of ffmpeg arguments"
+ - Switch to streamio_ffmpeg for easier handling of ffmpeg arguments
+ - Adding Railtie for initialization
+
+## 0.0.7 (2013-10-11)
+ - Restore `Hydra::Derivatives::ExtractMetadata#to_tempfile`
+
+## 0.0.6 (2013-10-10)
+ - Added version badge 
+ - Adding Hydra::FileCharacterization
+ - Updating CONTRIBUTING.md as per Hydra v6.0.0
+ - Adding microsoft openxmlformats as output formats
+ - Adding rewind to allow image data to be extracted properly
+ - Replacing rmagick with mini_magick
+ - Refactoring extraction to implicitly close
+ - Changes audio encoding to libfdk_aac for video derivatives
+
 ## 0.0.5 (2013-07-25)
 - Allow images to change format without being resize [Justin Coyne]
 

data/README.md

@@ -1,6 +1,4 @@
-hydra-derivatives
-=================
-[![Gem Version](https://badge.fury.io/rb/hydra-derivatives.png)](http://badge.fury.io/rb/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)
 
 Derivative generation for hydra
 
@@ -23,6 +21,8 @@ If you have an ActiveFedora class like this:
             obj.transform_datastream :content, { :mp4 => {format: 'mp4'}, :webm => {format: 'webm'} }, processor: :video
           when 'image/png', 'image/jpg'
             obj.transform_datastream :content, { :medium => "300x300>", :thumb => "100x100>" }
+          when 'image/tiff'
+            obj.transform_datastream :content, { :service => { resize: "3600x3600>" } }, processor: 'jpeg2k_image'
           end
         end
     end
@@ -48,8 +48,10 @@ Or a class like this:
             transform_datastream :content, { :mp3 => {format: 'mp3'}, :ogg => {format: 'ogg'} }, processor: :audio
           when 'video/avi'
             transform_datastream :content, { :mp4 => {format: 'mp4'}, :webm => {format: 'webm'} }, processor: :video
-          when 'image/png', 'image/jpg', 'image/tiff'
+          when 'image/png', 'image/jpg'
             transform_datastream :content, { :medium => "300x300>", :thumb => {size: "100x100>", datastream: 'thumbnail'} }
+          when 'image/tiff'
+            transform_datastream :content, { :service => { recipe: :default } }, processor: 'jpeg2k_image'
           end
         end
     end
@@ -60,7 +62,7 @@ And you add some content to it:
 ```ruby
    obj = GenericFile.new
    obj.content.content = File.open(...)
-   obj.mime_type = 'image/tiff'
+   obj.mime_type = 'image/jpg'
    obj.save
 ```
 
@@ -74,11 +76,15 @@ Just add `gem 'hydra-derivatives'` to your Gemfile.
 
 ## Dependencies
 
-* [Fits](https://code.google.com/p/fits/)
+* [FITS](http://fitstool.org/)
 * [FFMpeg](http://www.ffmpeg.org/)
 * [LibreOffice](https://www.libreoffice.org/)
+* [ImageMagick](http://www.imagemagick.org/)
+* Kakadu's [kdu_compress](http://www.kakadusoftware.com/)
+
+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.
 
-To enable LibreOffice, FFMpeg and Fits.sh support, you make sure they are on your path.  Most people will put that in their .bash_profile or somewhere similar.  For example:
+For example:
 
 ```bash
 # in .bash_profile
@@ -90,5 +96,23 @@ Alternatively, you can configure their paths:
 Hydra::Derivatives.ffmpeg_path = '/opt/local/ffmpeg/bin/ffmpeg'
 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'
 ```
+
+## 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. 
+
+Instead, each directive may contain these arguments:
+
+  * `:datastream` (String) : The name for the new datastream
+  * `: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 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

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/color_profiles/license.txt

@@ -0,0 +1,7 @@
+Terms of use (from http://www.color.org/srgbprofiles.xalter#v2)
+
+To anyone who acknowledges that the files "sRGB_IEC61966-2-1_no_black_scaling.icc" and "sRGB_IEC61966-2-1_black scaled.icc" 
+are provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and distribute these file for any purpose
+is hereby granted without fee, provided that the files are not changed including the ICC copyright notice tag, and that the
+name of ICC shall not be used in advertising or publicity pertaining to distribution of the software without specific, 
+written prior permission. ICC makes no representations about the suitability of this software for any purpose.

data/lib/hydra/derivatives.rb

@@ -1,4 +1,6 @@
 require 'active_fedora'
+require 'hydra/derivatives/railtie' if defined?(Rails)
+
 module Hydra
   module Derivatives
     extend ActiveSupport::Concern
@@ -13,6 +15,7 @@ module Hydra
     autoload :Document
     autoload :ExtractMetadata
     autoload :ShellBasedProcessor
+    autoload :Jpeg2kImage
 
     def self.config
       @config ||= reset_config!
@@ -22,7 +25,9 @@ module Hydra
       @config = Config.new
     end
 
-    [:ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, :enable_ffmpeg].each do |method|
+
+    [:ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, :kdu_compress_path, 
+      :kdu_compress_recipes, :enable_ffmpeg].each do |method|
       module_eval <<-RUBY
         def self.#{method.to_s}
           config.#{method.to_s}

data/lib/hydra/derivatives/config.rb

@@ -1,7 +1,8 @@
 module Hydra
   module Derivatives
     class Config
-      attr_writer :ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, :enable_ffmpeg
+      attr_writer :ffmpeg_path, :libreoffice_path, :temp_file_base, :fits_path, 
+        :enable_ffmpeg, :kdu_compress_path, :kdu_compress_recipes
       def ffmpeg_path
         @ffmpeg_path ||= 'ffmpeg'
       end
@@ -22,6 +23,43 @@ module Hydra
         @enable_ffmpeg ||= true
       end
 
+      def kdu_compress_path
+        @kdu_compress_path ||= 'kdu_compress'
+      end
+
+      def kdu_compress_recipes
+        @kdu_compress_recipes ||= {
+          default_color: %Q{-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 
+            -jp2_space sRGB 
+            -double_buffering 10 
+            -num_threads 4 
+            -no_weights 
+            Clevels=6 
+            Clayers=8 
+            Cblk=\{64,64\} 
+            Cuse_sop=yes 
+            Cuse_eph=yes  
+            Corder=RPCL 
+            ORGgen_plt=yes 
+            ORGtparts=R 
+            Stiles=\{1024,1024\} }.gsub(/\s+/, " ").strip,
+          default_grey: %Q{-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 
+            -jp2_space sLUM 
+            -double_buffering 10 
+            -num_threads 4 
+            -no_weights 
+            Clevels=6 
+            Clayers=8 
+            Cblk=\{64,64\} 
+            Cuse_sop=yes 
+            Cuse_eph=yes  
+            Corder=RPCL 
+            ORGgen_plt=yes 
+            ORGtparts=R 
+            Stiles=\{1024,1024\} }.gsub(/\s+/, " ").strip
+        }
+      end
+
     end
   end
 end

data/lib/hydra/derivatives/extract_metadata.rb

@@ -37,4 +37,4 @@ module Hydra
 
     end
   end
-end
+end

data/lib/hydra/derivatives/ffmpeg.rb

@@ -8,6 +8,9 @@ module Hydra
     module Ffmpeg
       extend ActiveSupport::Concern
 
+      INPUT_OPTIONS=:input_options
+      OUTPUT_OPTIONS=:output_options
+
       included do
         include ShellBasedProcessor
       end
@@ -16,7 +19,11 @@ module Hydra
       module ClassMethods
 
         def encode(path, options, output_file)
-          execute "#{Hydra::Derivatives.ffmpeg_path} -y -i \"#{path}\" #{options} #{output_file}"
+          inopts = options[INPUT_OPTIONS]  if options
+          inopts ||= "-y"
+          outopts = options[OUTPUT_OPTIONS]  if options
+          outopts ||= options
+          execute "#{Hydra::Derivatives.ffmpeg_path} #{inopts} -i \"#{path}\" #{outopts} #{output_file}"
         end
       end
 

data/lib/hydra/derivatives/jpeg2k_config.yml

@@ -0,0 +1,20 @@
+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

data/lib/hydra/derivatives/jpeg2k_image.rb

@@ -0,0 +1,147 @@
+require 'mini_magick'
+require 'nokogiri'
+
+
+module Hydra
+  module Derivatives
+    class Jpeg2kImage < Processor 
+      include ShellBasedProcessor
+
+      def process
+        quality, colorspace = extract_quality_and_colorspace
+        directives.each do |name, args|
+          file_path = nil
+          long_dim = nil
+          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))
+          end
+          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)
+          File.unlink(file_path) unless file_path.nil?
+        end
+      end
+
+      def encode_datastream(dest_dsid, recipe, opts={})
+        output_file = self.class.tmp_file('.jp2')
+        if opts[:file_path]
+          self.class.encode(opts[:file_path], recipe, output_file)
+        else
+          source_datastream.to_tempfile do |f|
+            self.class.encode(f.path, recipe, output_file)
+          end
+        end
+        out_file = File.open(output_file, "rb")
+        object.add_file_datastream(out_file.read, dsid: dest_dsid, mimeType: 'image/jp2')
+        File.unlink(output_file)
+      end
+      
+      protected
+      def preprocess(opts={})
+        # resize: <geometry>, to_srgb: <bool>,src_quality: 'color'|'grey'
+        image = MiniMagick::Image.read(source_datastream.content)
+        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]
+        end
+        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}"
+      end
+
+      def self.srgb_profile_path
+        File.join [
+          File.expand_path('../../../', __FILE__),
+          'color_profiles', 
+          'sRGB_IEC61966-2-1_no_black_scaling.icc'
+        ]
+      end
+
+      def self.tmp_file(ext)
+        Dir::Tmpname.create(['sufia', ext], Hydra::Derivatives.temp_file_base){}
+      end
+
+      def self.long_dim(image)
+        [image[:width], image[:height]].max
+      end
+
+      def self.kdu_compress_recipe(args, quality, long_dim)
+        if args[:recipe].is_a? Symbol
+          recipe = [args[:recipe].to_s, quality].join('_')
+          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."
+            return Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args,quality,long_dim)
+          end
+        elsif args[:recipe].is_a? String
+          return args[:recipe]
+        else
+          return Hydra::Derivatives::Jpeg2kImage.calculate_recipe(args, quality, long_dim)
+        end
+      end
+
+      def self.calculate_recipe(args, quality, long_dim)
+        levels_arg = args.fetch(:levels, Hydra::Derivatives::Jpeg2kImage.level_count_for_size(long_dim))
+        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'
+
+        %Q{-rate #{rates_arg} 
+            -jp2_space #{jp2_space_arg}
+            -double_buffering 10 
+            -num_threads 4 
+            -no_weights 
+            Clevels=#{levels_arg} 
+            Stiles=#{tiles_arg}
+            Cblk=\{64,64\} 
+            Cuse_sop=yes 
+            Cuse_eph=yes  
+            Corder=RPCL 
+            ORGgen_plt=yes 
+            ORGtparts=R  }.gsub(/\s+/, " ").strip
+      end
+
+      def self.level_count_for_size(long_dim)
+        levels = 0
+        level_size = long_dim
+        while level_size >= 96
+          level_size = level_size/2
+          levels+=1
+        end
+        levels-1
+      end
+
+      def self.layer_rates(layer_count,compression_numerator)
+        #e.g. if compression_numerator = 10 then compression is 10:1
+        rates = []
+        cmp = 24.0/compression_numerator
+        layer_count.times do
+          rates << cmp
+          cmp = (cmp/1.618).round(8)
+        end
+        rates.map(&:to_s ).join(',')
+      end
+
+    end
+  end
+end

data/lib/hydra/derivatives/railtie.rb

@@ -0,0 +1,7 @@
+module Hydra::Derivative
+  class Railtie < Rails::Railtie
+    initializer 'hydra-derivative' do
+      require 'hydra-file_characterization'
+    end
+  end
+end

data/lib/hydra/derivatives/video.rb

@@ -6,7 +6,17 @@ module Hydra
       protected
 
       def options_for(format)
-        "-s #{size_attributes} #{video_attributes} #{codecs(format)} #{audio_attributes}"
+        input_options=""
+        output_options = "-s #{size_attributes} #{codecs(format)}"
+
+        if (format == "jpg")
+          input_options +=" -itsoffset -2"
+          output_options+= " -vframes 1 -an -f rawvideo"
+        else
+          output_options +=" #{video_attributes} #{audio_attributes}"
+        end
+
+        { Ffmpeg::OUTPUT_OPTIONS => output_options, Ffmpeg::INPUT_OPTIONS => input_options}
       end
 
       def video_bitrate
@@ -30,14 +40,18 @@ module Hydra
         when 'mp4'
           "-vcodec libx264 -acodec libfdk_aac"
         when 'webm'
-          "-acodec libvorbis"
+          "-vcodec libvpx -acodec libvorbis"
+        when "mkv"
+          "-vcodec ffv1"
+        when "jpg"
+          "-vcodec mjpeg"
         else
           raise ArgumentError, "Unknown format `#{format}'"
         end
       end
 
       def new_mime_type(format)
-        "video/#{format}"
+        format == "jpg" ? "image/jpeg" : "video/#{format}"
       end
     end
   end

data/spec/fixtures/jpeg2k_config.yml

@@ -0,0 +1,20 @@
+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

data/spec/units/config_spec.rb

@@ -9,17 +9,26 @@ describe "the configuration" do
     subject.libreoffice_path.should == 'soffice'
     subject.temp_file_base.should == '/tmp'
     subject.fits_path.should == 'fits.sh'
+    subject.kdu_compress_path.should == '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'
+
+    subject.kdu_compress_path = '/opt/local/bin/kdu_compress'
+    subject.kdu_compress_path.should == '/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'
+
+    subject.kdu_compress_path = '/usr/local/bin/kdu_compress'
+    subject.reset_config!
+    subject.kdu_compress_path.should == 'kdu_compress'
   end
 
 end

data/spec/units/jpeg2k_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'yaml'
+
+describe Hydra::Derivatives::Jpeg2kImage do
+  let(:object) { ActiveFedora::Base.new }
+
+  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
+    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"
+    end
+
+  end
+
+  describe "#kdu_compress_recipe" do
+    before(:all) 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
+
+    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']
+    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]
+    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)
+    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)
+    end
+
+  end
+
+end

data/spec/units/transcoding_spec.rb

@@ -11,7 +11,7 @@ describe "Transcoder" do
           m.field "mime_type", :string
       end
 
-      delegate :mime_type, :to => :characterization, :unique => true
+      has_attributes :mime_type, datastream: :characterization, multiple: false
       has_file_datastream 'content', type: ContentDatastream
 
       makes_derivatives do |obj|
@@ -21,7 +21,8 @@ describe "Transcoder" do
         when 'audio/wav'
           obj.transform_datastream :content, { :mp3 => {format: 'mp3'}, :ogg => {format: 'ogg'} }, processor: :audio
         when 'video/avi'
-          obj.transform_datastream :content, { :mp4 => {format: 'mp4'}, :webm => {format: 'webm'} }, processor: :video
+          obj.transform_datastream :content, { :mp4 => {format: 'mp4'}, :webm => {format: 'webm'},
+                                   :thumbnail=> {:format => 'jpg' , datastream: 'thumbnail'}  }, processor: :video
         when 'image/png', 'image/jpg'
           obj.transform_datastream :content, { :medium => "300x300>", :thumb => "100x100>", :access => {format: 'jpg', datastream: 'access'} }
         when 'application/vnd.ms-powerpoint'
@@ -32,6 +33,14 @@ describe "Transcoder" do
           obj.transform_datastream :content, { :access => { :format=>'pdf' }, :preservation=> {:format => 'docx' } }, processor: 'document'
         when 'application/vnd.ms-excel'
           obj.transform_datastream :content, { :access => { :format=>'pdf' }, :preservation=> {:format => 'xslx' } }, processor: 'document'
+        when 'image/tiff'
+          obj.transform_datastream :content, { 
+            resized: { recipe: :default, resize: "600x600>", datastream: 'resized' },
+            config_lookup: { recipe: :default, datastream: 'config_lookup' },
+            string_recipe: { recipe: '-quiet', datastream: 'string_recipe' },
+            diy: { }
+          }, processor: 'jpeg2k_image'
+
         end
 
       end
@@ -117,6 +126,8 @@ describe "Transcoder" do
       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'
     end
   end
   
@@ -187,4 +198,21 @@ describe "Transcoder" do
     end
   end
 
+  describe "with an attached tiff", unless: ENV['TRAVIS'] == 'true' do
+
+    let(:attachment) { File.open(File.expand_path('../../fixtures/test.tif', __FILE__))}
+    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'
+    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', "-s 320x240 -g 30 -b:v 345k -acodec libvorbis -ac 2 -ab 96k -ar 44100")
+        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=>""})
         subject.process
 
       end
@@ -16,7 +16,17 @@ 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', "-s 320x240 -g 30 -b:v 345k -acodec libvorbis -ac 2 -ab 96k -ar 44100")
+        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=>""})
+        subject.process
+
+      end
+    end
+
+    describe "and jpg is requested" 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"})
         subject.process
 
       end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2014-04-09 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
@@ -148,6 +148,8 @@ files:
 - VERSION
 - config/jetty.yml
 - hydra-derivatives.gemspec
+- lib/color_profiles/license.txt
+- lib/color_profiles/sRGB_IEC61966-2-1_no_black_scaling.icc
 - lib/hydra/derivatives.rb
 - lib/hydra/derivatives/audio.rb
 - lib/hydra/derivatives/config.rb
@@ -155,15 +157,21 @@ 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/processor.rb
+- lib/hydra/derivatives/railtie.rb
 - lib/hydra/derivatives/shell_based_processor.rb
 - lib/hydra/derivatives/video.rb
 - spec/fixtures/FlashPix.ppt
+- spec/fixtures/adobe1998.tif
 - spec/fixtures/countdown.avi
+- spec/fixtures/jpeg2k_config.yml
 - spec/fixtures/piano_note.wav
 - spec/fixtures/sample.rtf
 - spec/fixtures/test.doc
 - spec/fixtures/test.pdf
+- spec/fixtures/test.tif
 - spec/fixtures/test.xls
 - spec/fixtures/world.png
 - spec/lib/hydra/derivatives/extract_metadata_spec.rb
@@ -171,6 +179,7 @@ files:
 - spec/units/config_spec.rb
 - spec/units/extract_spec.rb
 - spec/units/image_spec.rb
+- spec/units/jpeg2k_spec.rb
 - spec/units/transcoding_spec.rb
 - spec/units/video_spec.rb
 homepage: https://github.com/projecthydra/hydra-derivatives
@@ -183,27 +192,30 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra
 test_files:
 - spec/fixtures/FlashPix.ppt
+- spec/fixtures/adobe1998.tif
 - spec/fixtures/countdown.avi
+- spec/fixtures/jpeg2k_config.yml
 - spec/fixtures/piano_note.wav
 - spec/fixtures/sample.rtf
 - spec/fixtures/test.doc
 - spec/fixtures/test.pdf
+- spec/fixtures/test.tif
 - spec/fixtures/test.xls
 - spec/fixtures/world.png
 - spec/lib/hydra/derivatives/extract_metadata_spec.rb
@@ -211,5 +223,6 @@ test_files:
 - spec/units/config_spec.rb
 - spec/units/extract_spec.rb
 - spec/units/image_spec.rb
+- spec/units/jpeg2k_spec.rb
 - spec/units/transcoding_spec.rb
 - spec/units/video_spec.rb