hydra-derivatives 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc081eda663412c44512d4b336226d4c88c08662
-  data.tar.gz: 415d09b21e47399744d0a0b36fe9a0bab8459f8d
+  metadata.gz: e418eb7b224258c51b95ad6746452c9ffbf31676
+  data.tar.gz: ebef5a24146e2eff209b238dadb307a0b7e98c8d
 SHA512:
-  metadata.gz: 3e413c0dfa5b730da9e0baf62cc52093ad495f5da10baf19da2ece4bcdad2c35c910cd8888b5254b6045bcad491d198246a638c23aec59a3786c27fe4469acba
-  data.tar.gz: 89b012cb0cd07053335c9f70b464d7a3cf8cac855e27afcafddbb41c7868e7a98e2f37d618ae24fa1e70066fcaef81e09488d0fdb12a887f4099f68378bd92af
+  metadata.gz: a7e457990c5b95c834944b319f9355c6abc12870e733b652d4b05f898be684071f4e5595a56feaaf6c7348b90a6810e780f00096b206c30a02e7202d1133d1d3
+  data.tar.gz: 4c5a120d2287b7f315bf78a01c644a08efc70ba0733fa295c62cce4d15ba64ef4aa15f3991afd3ce7a0c9fbd312e952b11bd4b7feaa7f9ae7792bd45a7e078a3

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/hydra-derivatives.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hydra-file_characterization', '~> 0.3'
   spec.add_dependency 'mini_magick', '>= 3.2', '< 5'
   spec.add_dependency 'activesupport', '~> 4.0'
-  spec.add_dependency 'mime-types', '~> 1'
+  spec.add_dependency 'mime-types', '>= 1'
   spec.add_dependency 'deprecation', '~> 0.1'
 end
 

data/lib/hydra/derivatives.rb

@@ -19,6 +19,7 @@ module Hydra
     autoload :ShellBasedProcessor
     autoload :Jpeg2kImage
     autoload :Logger
+    autoload :TempfileService
 
     # Raised if the timout elapses
     class TimeoutError < ::Timeout::Error; end

data/lib/hydra/derivatives/document.rb

@@ -11,7 +11,7 @@ module Hydra
 
       def encode_file(dest_path, file_suffix, mime_type, options = { })
         new_output = ''
-        source_file.to_tempfile do |f|
+        Hydra::Derivatives::TempfileService.create(source_file) do |f|
           if mime_type == 'image/jpeg'
             temp_file = File.join(Hydra::Derivatives.temp_file_base, [File.basename(f.path).sub(File.extname(f.path), ''), 'pdf'].join('.'))
             new_output = File.join(Hydra::Derivatives.temp_file_base, [File.basename(temp_file).sub(File.extname(temp_file), ''), file_suffix].join('.'))

data/lib/hydra/derivatives/extract_metadata.rb

@@ -12,22 +12,6 @@ module Hydra
         end
       end
 
-      # Restored method. It was required by other creatures
-      def to_tempfile(&block)
-        return unless has_content?
-        Tempfile.open(filename_for_characterization) do |f|
-          f.binmode
-          if content.respond_to? :read
-            f.write(content.read)
-          else
-            f.write(content)
-          end
-          content.rewind if content.respond_to? :rewind
-          f.rewind
-          yield(f)
-        end
-      end
-
       protected
 
       def filename_for_characterization

data/lib/hydra/derivatives/jpeg2k_image.rb

@@ -30,7 +30,7 @@ module Hydra
         if opts[:file_path]
           self.class.encode(opts[:file_path], recipe, output_file)
         else
-          source_file.to_tempfile do |f|
+          Hydra::Derivatives::TempfileService.create(source_file) do |f|
             self.class.encode(f.path, recipe, output_file)
           end
         end

data/lib/hydra/derivatives/shell_based_processor.rb

@@ -32,7 +32,7 @@ module Hydra
       def encode_file(dest_path, file_suffix, mime_type, options)
         out_file = nil
         output_file = Dir::Tmpname.create(['sufia', ".#{file_suffix}"], Hydra::Derivatives.temp_file_base){}
-        source_file.to_tempfile do |f|
+        Hydra::Derivatives::TempfileService.create(source_file) do |f|
           self.class.encode(f.path, options, output_file)
         end
         out_file = File.open(output_file, "rb")

data/lib/hydra/derivatives/tempfile_service.rb

@@ -0,0 +1,47 @@
+require 'mime/types'
+
+module Hydra::Derivatives
+  class TempfileService
+
+    def self.create(file, &block)
+      new(file).tempfile(&block)
+    end
+
+    attr_reader :source_file
+
+    def initialize(source_file)
+      @source_file = source_file
+    end
+
+    def tempfile(&block)
+      if source_file.respond_to? :to_tempfile
+        source_file.send(:to_tempfile, &block)
+      elsif source_file.has_content?
+        default_tempfile(&block)
+      end
+    end
+
+    def default_tempfile(&block)
+      Tempfile.open(filename_for_characterization) do |f|
+        f.binmode
+        if source_file.content.respond_to? :read
+          f.write(source_file.content.read)
+        else
+          f.write(source_file.content)
+        end
+        source_file.content.rewind if source_file.content.respond_to? :rewind
+        f.rewind
+        yield(f)
+      end
+    end
+
+    def filename_for_characterization
+      registered_mime_type = MIME::Types[source_file.mime_type].first
+      Logger.warn "Unable to find a registered mime type for #{source_file.mime_type.inspect} on #{source_file.uri}" unless registered_mime_type
+      extension = registered_mime_type ? ".#{registered_mime_type.extensions.first}" : ''
+      version_id = 1 # TODO fixme
+      m = /\/([^\/]*)$/.match(source_file.uri)
+      ["#{m[1]}-#{version_id}", "#{extension}"]
+    end
+  end
+end

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

@@ -35,11 +35,5 @@ module Hydra::Derivatives
         end
       end
     end
-
-    context '#to_tempfile' do
-      it 'has a method called to_tempfile' do
-        expect { |b| subject.to_tempfile(&b) }.to yield_with_args(Tempfile)
-      end
-    end
   end
 end

data/spec/services/tempfile_service_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Hydra::Derivatives::TempfileService do
+  let(:class_with_metadata_extraction) do
+    Class.new do
+      attr_reader :content, :mime_type, :uri
+
+      def initialize(options = {})
+        @content = options.fetch(:content, '')
+        @mime_uype = options.fetch(:mime_type, nil)
+        @uri = 'http://example.com/pid/123'
+      end
+
+      def has_content?; content.present?; end
+    end
+  end
+
+  let(:initialization_options) { { content: 'abc', mime_type: 'text/plain' } }
+
+  let(:file) { class_with_metadata_extraction.new(initialization_options) }
+
+  subject { Hydra::Derivatives::TempfileService.new(file) }
+  context '#tempfile' do
+    it 'has a method called to_tempfile' do
+      expect { |b| subject.tempfile(&b) }.to yield_with_args(Tempfile)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -132,14 +132,14 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
@@ -190,6 +190,7 @@ files:
 - lib/hydra/derivatives/processor.rb
 - lib/hydra/derivatives/railtie.rb
 - lib/hydra/derivatives/shell_based_processor.rb
+- lib/hydra/derivatives/tempfile_service.rb
 - lib/hydra/derivatives/video.rb
 - lib/hydra/derivatives/video/config.rb
 - lib/hydra/derivatives/video/processor.rb
@@ -208,6 +209,7 @@ files:
 - spec/fixtures/test.xlsx
 - spec/fixtures/world.png
 - spec/lib/hydra/derivatives/extract_metadata_spec.rb
+- spec/services/tempfile_service_spec.rb
 - spec/spec_helper.rb
 - spec/units/config_spec.rb
 - spec/units/derivatives_spec.rb
@@ -258,6 +260,7 @@ test_files:
 - spec/fixtures/test.xlsx
 - spec/fixtures/world.png
 - spec/lib/hydra/derivatives/extract_metadata_spec.rb
+- spec/services/tempfile_service_spec.rb
 - spec/spec_helper.rb
 - spec/units/config_spec.rb
 - spec/units/derivatives_spec.rb