hydra-derivatives 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e62821ad5807bc96b9df2c9e2fda733081bb06a
-  data.tar.gz: c3d04f3be7dbb1241f6c51043fbca299370a255b
+  metadata.gz: 168e645949c93b6ed1981c164f86969d71024cea
+  data.tar.gz: cecd38bd8f89d9de5d6e709cd3a409ee1792f4c7
 SHA512:
-  metadata.gz: 01e2f3cfdc4a190d122219cbf16f455f50a98fa1b7eab0598350aecdd58ac3bcaa53e07d5d7b0af0845788aabd91d9025e34aa9c35c17020165f0f69c6dc6adc
-  data.tar.gz: 7004d501623dc2667189951292421b436d8c441b5e8373f7d393a951a793ae226a1f0f721ec8b234373044c4d8900724f1bc3012924ac14d894e14d8c0abf5af
+  metadata.gz: 5ccf06b680a87e68f1375d662439edaa451560bd3895c0262032fd8357b7d4f235b2ebf142ac5d2eb78d2aeeac3da2f337cf04473b329ce0e3063a329c4f46fd
+  data.tar.gz: dc693c6c09dde061948bccae85c67576cea915e668d5b7d7bb5e9ca9544950ba9678e087df0b68360e4be5d90e1b9ed60c96c1c7276df37e73dd80c70ea9900a

data/History.md

@@ -1,3 +1,6 @@
+## 0.0.5 (2013-07-25)
+- Allow images to change format without being resize [Justin Coyne]
+
 ## 0.0.4 (2013-07-25)
 - Handle invalid mime-type on the datastream [Justin Coyne]
 

data/README.md

@@ -67,7 +67,15 @@ Then when you call `obj.create_derivatives` a new datastream, called 'thumbnail'
 
 We recommend you run `obj.create_derivatives` in a background worker, because some derivative creation (especially videos) can take a long time.
 
-You may want to adjust your path to add LibreOffice and Fits.sh support:
+# Installation 
+
+## Dependencies
+
+* [Fits](https://code.google.com/p/fits/)
+* [LibreOffice](https://www.libreoffice.org/)
+
+To enable LibreOffice and Fits.sh support, you must make sure they are on your path.  Most people will put that in their .bash_profile or somewhere similar.  For example:
+
 ```bash
 # in .bash_profile
 export PATH=${PATH}:/Users/justin/workspace/fits-0.6.2:/Applications/LibreOffice.app/Contents/MacOS

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/hydra/derivatives/image.rb

@@ -3,42 +3,38 @@ module Hydra
     class Image < Processor
       def process
         directives.each do |name, args| 
-          size = args
-          output_datastream_name = output_datastream_id(name)
-          if args.kind_of? Hash
-            size = args[:size]
-            output_datastream_name = args[:datastream] if args[:datastream]
-          end
-          create_resized_image(output_datastream_name, size, new_mime_type)
+          opts = args.kind_of?(Hash) ? args : {size: args}
+          format = opts.fetch(:format, 'png')
+          output_datastream_name = opts.fetch(:datastream, output_datastream_id(name))
+          create_resized_image(output_datastream(output_datastream_name), opts[:size], format)
         end
       end
 
-
       protected
 
-      def new_mime_type
-        'image/png'
+      def new_mime_type(format)
+        MIME::Types.type_for(format).first.to_s
       end
 
-
-      def create_resized_image(output_dsid, size, mime_type, quality=nil)
-        create_image(output_dsid, mime_type, quality) do |xfrm|
-          xfrm.change_geometry!(size) do |cols, rows, img|
-           img.resize!(cols, rows)
+      def create_resized_image(output_ds, size, format, quality=nil)
+        create_image(output_ds, format, quality) do |xfrm|
+          if size
+            xfrm.change_geometry!(size) do |cols, rows, img|
+             img.resize!(cols, rows)
+            end
           end
         end
+        output_ds.mimeType = new_mime_type(format)
       end
 
-      def create_image(dsid, mime_type, quality=nil)
+      def create_image(output_datastream, format, quality=nil)
         xfrm = load_image_transformer
         yield(xfrm) if block_given?
-        #out = output_datastream
-        output_datastream(dsid).content = if quality
-          xfrm.to_blob { self.quality = quality }
+        output_datastream.content = if quality
+          xfrm.to_blob { self.quality = quality; self.format = format.upcase }
         else
-          xfrm.to_blob
+          xfrm.to_blob { self.format = format.upcase }
         end
-        output_datastream(dsid).mimeType = mime_type
       end
 
       # Override this method if you want a different transformer, or need to load the 

data/spec/units/image_spec.rb

@@ -1,20 +1,25 @@
 require 'spec_helper'
 
 describe Hydra::Derivatives::Image do
+  let(:object) { ActiveFedora::Base.new }
   describe "when arguments are passed as a string" do
     let(:directives) {{ :thumb => "100x100>" } }
-    subject { Hydra::Derivatives::Image.new(double(:obj), 'content', directives)}
+    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("content_thumb", "100x100>", 'image/png')
+      subject.should_receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "100x100>", 'png') do |ds|
+        ds.dsid.should == 'content_thumb'
+      end
       subject.process
     end
   end
   describe "when arguments are passed as a hash" do
     let(:directives) {{ :thumb => {size: "200x300>", datastream: 'thumbnail'} }}
-    subject { Hydra::Derivatives::Image.new(double(:obj), 'content', directives)}
+    subject { Hydra::Derivatives::Image.new(object, 'content', directives)}
     it "should use the specified size and name" do
-      subject.should_receive(:create_resized_image).with("thumbnail", "200x300>", 'image/png')
+      subject.should_receive(:create_resized_image).with(an_instance_of(ActiveFedora::Datastream), "200x300>", 'png') do |ds|
+        ds.dsid.should == 'thumbnail'
+      end
       subject.process
 
     end

data/spec/units/transcoding_spec.rb

@@ -23,7 +23,7 @@ describe "Transcoder" do
         when 'video/avi'
           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>" }
+          obj.transform_datastream :content, { :medium => "300x300>", :thumb => "100x100>", :access => {format: 'jpg', datastream: 'access'} }
         when 'application/vnd.ms-powerpoint'
           obj.transform_datastream :content, { :access => { :format=>'pdf' } }, processor: 'document'
         when 'text/rtf'
@@ -53,6 +53,8 @@ describe "Transcoder" do
       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 
     end
   end
@@ -82,12 +84,12 @@ describe "Transcoder" do
     end
   end
 
-  describe "when the source datastrem has an unknown mime_type" do
+  describe "when the source datastrem has an unknown mime_type", unless: ENV['TRAVIS'] == 'true' do
     let(:attachment) { File.open(File.expand_path('../../fixtures/piano_note.wav', __FILE__))}
     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
+      expect(logger).to receive(:warn).with("Unable to find a registered mime type for \"audio/vnd.wav\" on #{file.pid}").at_least(1).times
       file.create_derivatives
       file.datastreams['content_mp3'].should have_content
       file.datastreams['content_mp3'].mimeType.should == 'audio/mpeg'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Justin Coyne