sufia-models 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8e62620ca985d9111fbcf1486646a1fbf8aabb
-  data.tar.gz: 83104eb983f38d1b77e9b6347452e1630dc28f4a
+  metadata.gz: 9476084b14b4f2ae7d223df7c2fa01adfe908d2b
+  data.tar.gz: 13905aa01d70e375b30ab10ab9b1976b64370076
 SHA512:
-  metadata.gz: c446b6fbccabcf456e201e5680c09086c1b15f3fc2305a676ee30851389f822cfc011c5c718d94c8ea6b1b8d407a0c29c00f679dc3a2dd4e31dcd89f29672951
-  data.tar.gz: e825707338bfdd0091187f82269f9834edda62ad34227dd21e27aa95d5c1500203fea6a724fbba634535f6444fc21b9c621fe0706e2cc23428948dd3d6533219
+  metadata.gz: 12b4d9d871804e7627179916e96e9b811589db27bdfdec2b826800e5b0cacb736d13994081e31118f06c3d93a4a4a4a7a86fab4dc1c686c2e8ebb76ff9a8b0b8
+  data.tar.gz: e46ccc9c4efc212f32cefea6dad8bc97cb90bd7b057f6c335371042c76f46af36bcb9d27ca59bad3a3365c58b31e58c4c46b1f1fc3154a3dbc3516acae02af2d

data/app/models/datastreams/file_content_datastream.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class FileContentDatastream < ActiveFedora::Datastream
-  include Sufia::FileContent::ExtractMetadata
+  include Hydra::Derivatives::ExtractMetadata
   include Sufia::FileContent::Versions
 end

data/app/models/geo_names_resource.rb

@@ -1,5 +1,3 @@
-require 'active_resource'
-
 class GeoNamesResource < ActiveResource::Base
   self.site = "http://api.geonames.org/"
   self.element_name = "searchJSON"

data/lib/sufia/models.rb

@@ -5,7 +5,7 @@ require 'nest'
 require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
-require 'RMagick'
+require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
 begin
   # activerecord-import 0.3.1 does not support rails 4, so we don't require it.
   require 'activerecord-import'

data/lib/sufia/models/engine.rb

@@ -22,6 +22,7 @@ module Sufia
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
       config.dropbox_api_key = nil
+      config.enable_local_ingest = nil      
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(
@@ -40,22 +41,32 @@ module Sufia
       end
 
       initializer 'requires' do
+        require 'hydra/derivatives'
         require 'sufia/models/model_methods'
         require 'sufia/models/noid'
         require 'sufia/models/file_content'
-        require 'sufia/models/file_content/extract_metadata'
         require 'sufia/models/file_content/versions'
         require 'sufia/models/generic_file/actions'
         require 'sufia/models/generic_file/audit'
         require 'sufia/models/generic_file/characterization'
+        require 'sufia/models/generic_file/derivatives'
         require 'sufia/models/generic_file/export'
+        require 'sufia/models/generic_file/mime_types'
         require 'sufia/models/generic_file/permissions'
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
         require 'sufia/models/user'
+        require 'sufia/models/user_local_directory_behavior'
         require 'sufia/models/id_service'
         require 'sufia/models/solr_document_behavior'
       end
+
+      initializer 'configure' do
+        Hydra::Derivatives.ffmpeg_path    = Sufia.config.ffmpeg_path
+        Hydra::Derivatives.temp_file_base = Sufia.config.temp_file_base
+        Hydra::Derivatives.fits_path      = Sufia.config.fits_path
+        Hydra::Derivatives.enable_ffmpeg  = Sufia.config.enable_ffmpeg
+      end
     end
   end
 end

data/lib/sufia/models/file_content.rb

@@ -1,9 +1,6 @@
 module Sufia
   module FileContent
     extend ActiveSupport::Autoload
-
-    autoload :ExtractMetadata, 'sufia/models/file_content/extract_metadata'
     autoload :Versions, 'sufia/models/file_content/versions'
-
   end
 end

data/lib/sufia/models/generic_file.rb

@@ -2,22 +2,20 @@ module Sufia
   module GenericFile
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    autoload :Export
-    autoload :Thumbnail
-    autoload :Characterization
-    autoload :Audit
     autoload :Actions
     autoload :Permissions
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
     include Sufia::ModelMethods
     include Sufia::Noid
+    include Sufia::GenericFile::MimeTypes
     include Sufia::GenericFile::Thumbnail
     include Sufia::GenericFile::Export
     include Sufia::GenericFile::Characterization
     include Sufia::GenericFile::Audit
     include Sufia::GenericFile::Permissions
     include Sufia::GenericFile::WebForm
+    include Sufia::GenericFile::Derivatives
 
     included do
       has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
@@ -52,21 +50,19 @@ module Sufia
     end
 
     def pdf?
-      ['application/pdf'].include? self.mime_type
+      self.class.pdf_mime_types.include? self.mime_type
     end
 
     def image?
-      ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif'].include? self.mime_type
+      self.class.image_mime_types.include? self.mime_type
     end
 
     def video?
-      ['video/mpeg', 'video/mp4', 'video/webm', 'video/x-msvideo', 'video/avi', 'video/quicktime', 'application/mxf'].include? self.mime_type
+      self.class.video_mime_types.include? self.mime_type
     end
 
     def audio?
-      # audio/x-wave is the mime type that fits 0.6.0 returns for a wav file.
-      # audio/mpeg is the mime type that fits 0.6.0 returns for an mp3 file.
-      ['audio/mp3', 'audio/mpeg', 'audio/x-wave', 'audio/x-wav', 'audio/ogg'].include? self.mime_type
+      self.class.audio_mime_types.include? self.mime_type
     end
 
     def persistent_url

data/lib/sufia/models/generic_file/actions.rb

@@ -3,7 +3,7 @@ module Sufia::GenericFile
   module Actions
     def self.create_metadata(generic_file, user, batch_id)
 
-      generic_file.apply_depositor_metadata(user.user_key)
+      generic_file.apply_depositor_metadata(user)
       generic_file.date_uploaded = Date.today
       generic_file.date_modified = Date.today
       generic_file.creator = user.name

data/lib/sufia/models/generic_file/characterization.rb

@@ -36,7 +36,7 @@ module Sufia
         self.characterization.ng_xml = self.content.extract_metadata
         self.append_metadata
         self.filename = self.label
-        save unless self.new_object?
+        save
       end
 
       # Populate descMetadata with fields from FITS (e.g. Author from pdfs)

data/lib/sufia/models/generic_file/derivatives.rb

@@ -0,0 +1,31 @@
+module Sufia
+  module GenericFile
+    module Derivatives
+      extend ActiveSupport::Concern
+
+      included do
+        include Hydra::Derivatives
+
+        makes_derivatives do |obj| 
+          case obj.mime_type
+          when *pdf_mime_types
+            obj.transform_datastream :content, 
+              { :thumbnail => {size: "338x493", datastream: 'thumbnail'} }
+          when *audio_mime_types
+            obj.transform_datastream :content,
+              { :mp3 => {format: 'mp3', datastream: 'mp3'},
+                :ogg => {format: 'ogg', datastream: 'ogg'} }, processor: :audio
+          when *video_mime_types
+            obj.transform_datastream :content,
+              { :webm => {format: "webm", datastream: 'webm'}, 
+                :mp4 => {format: "mp4", datastream: 'mp4'} }, processor: :video
+          when *image_mime_types
+            obj.transform_datastream :content, { :thumbnail => {size: "200x150>", datastream: 'thumbnail'} }
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/sufia/models/generic_file/mime_types.rb

@@ -0,0 +1,27 @@
+module Sufia
+  module GenericFile
+    module MimeTypes
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def image_mime_types
+          ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']
+        end
+
+        def pdf_mime_types
+          ['application/pdf']
+        end
+
+        def video_mime_types
+          ['video/mpeg', 'video/mp4', 'video/webm', 'video/x-msvideo', 'video/avi', 'video/quicktime', 'application/mxf']
+        end
+
+        def audio_mime_types
+          # audio/x-wave is the mime type that fits 0.6.0 returns for a wav file.
+          # audio/mpeg is the mime type that fits 0.6.0 returns for an mp3 file.
+          ['audio/mp3', 'audio/mpeg', 'audio/wav', 'audio/x-wave', 'audio/x-wav', 'audio/ogg']
+        end
+      end
+    end
+  end
+end

data/lib/sufia/models/generic_file/thumbnail.rb

@@ -1,17 +1,18 @@
 module Sufia
   module GenericFile
     module Thumbnail
+      extend ActiveSupport::Concern
       # Create thumbnail requires that the characterization has already been run (so mime_type, width and height is available)
       # and that the object is already has a pid set
       def create_thumbnail
         return unless self.content.has_content?
-        if pdf?
-          create_pdf_thumbnail
-        elsif image?
-          create_image_thumbnail
-        elsif video?
+
+        if video?
           create_video_thumbnail
+        else
+          create_derivatives
         end
+        self.save
       end
 
       protected
@@ -29,61 +30,6 @@ module Sufia
 
         self.thumbnail.content = File.open(output_file, 'rb').read
         self.thumbnail.mimeType = 'image/png'
-        self.save
-      end
-
-      def create_pdf_thumbnail
-        retryCnt = 0
-        stat = false;
-        for retryCnt in 1..3
-          begin
-            pdf = load_image_transformer
-            first = pdf.to_a[0]
-            first.format = "PNG"
-            thumb = first.scale(338, 493)
-            self.thumbnail.content = thumb.to_blob { self.format = "PNG" }
-            self.thumbnail.mimeType = 'image/png'
-            self.save
-            break
-          rescue => e
-            logger.warn "Rescued an error #{e.inspect} retry count = #{retryCnt}"
-            sleep 1
-          end
-        end
-        return stat
-      end
-
-      def create_image_thumbnail
-        self.thumbnail.content = scale_image.to_blob { self.format = "PNG" }
-        self.thumbnail.mimeType = 'image/png'
-        #logger.debug "Has the content before saving? #{self.content.changed?}"
-        self.save
-      end
-
-      def scale_image
-        img = load_image_transformer
-        height = Float(self.height.first.to_i)
-        width = Float(self.width.first.to_i)
-        if width > height && width > 150 && height > 105
-          # horizontal img
-          scale  = 150 / width
-          img.scale(150, height * scale)
-        elsif height >= width && width > 150 && height > 200
-          # vertical or square
-          scale  = 200 / height
-          img.scale(width*scale, 200)
-        else
-          # Too small to worry about resizing
-          img
-        end
-      end
-
-      # Override this method if you want a different transformer, or need to load the 
-      # raw image from a different source (e.g.  external datastream)
-      def load_image_transformer
-        xformer = Magick::ImageList.new
-        xformer.from_blob(content.content)
-        xformer
       end
 
     end

data/lib/sufia/models/jobs/active_fedora_pid_based_job.rb

@@ -0,0 +1,19 @@
+class ActiveFedoraPidBasedJob
+  def queue_name
+    :pid_based
+  end
+
+  attr_accessor :pid
+  def initialize(pid)
+    self.pid = pid
+  end
+  def object
+    @object ||= ActiveFedora::Base.find(pid, cast:true)
+  end
+  alias_method :generic_file, :object
+  alias_method :generic_file_id, :pid
+
+  def run
+    raise RuntimeError, "Define #run in a subclass"
+  end
+end

data/lib/sufia/models/jobs/audit_job.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class AuditJob
+class AuditJob < ActiveFedoraPidBasedJob
   def queue_name
     :audit
   end
@@ -20,16 +20,15 @@ class AuditJob
   PASS = 'Passing Audit Run'
   FAIL = 'Failing Audit Run'
 
-  attr_accessor :generic_file_id, :datastream_id, :version_id
+  attr_accessor :pid, :datastream_id, :version_id
 
-  def initialize(generic_file_id, datastream_id, version_id)
-    self.generic_file_id = generic_file_id
+  def initialize(pid, datastream_id, version_id)
+    super(pid)
     self.datastream_id = datastream_id
     self.version_id = version_id
   end
 
   def run
-    generic_file = GenericFile.find(generic_file_id)
     #logger.info "GF is #{generic_file.pid}"
     if generic_file
       datastream = generic_file.datastreams[datastream_id]
@@ -37,7 +36,7 @@ class AuditJob
       if datastream
         #logger.info "Datastream for audit = #{datastream.inspect}"
         version =  datastream.versions.select { |v| v.versionID == version_id}.first
-        log = GenericFile.run_audit(version)
+        log = run_audit(version)
 
         # look up the user for sending the message to
         login = generic_file.depositor
@@ -56,10 +55,15 @@ class AuditJob
           end 
         end
       else
-        logger.warn "No datastream for audit!!!!! pid: #{generic_file_id} dsid: #{datastream_id}"
+        logger.warn "No datastream for audit!!!!! pid: #{pid} dsid: #{datastream_id}"
       end
     else
-      logger.warn "No generic file for data stream audit!!!!! pid: #{generic_file_id} dsid: #{datastream_id}"
+      logger.warn "No generic file for data stream audit!!!!! pid: #{pid} dsid: #{datastream_id}"
     end
   end
+
+  private
+  def run_audit(version)
+    object.class.run_audit(version)
+  end
 end

data/lib/sufia/models/jobs/characterize_job.rb

@@ -12,20 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class CharacterizeJob
+class CharacterizeJob < ActiveFedoraPidBasedJob
 
   def queue_name
     :characterize
   end
 
-  attr_accessor :generic_file_id, :generic_file
-
-  def initialize(generic_file_id)
-    self.generic_file_id = generic_file_id
-  end
-
   def run
-    self.generic_file = GenericFile.find(generic_file_id)
     generic_file.characterize
     after_characterize
   end
@@ -35,9 +28,9 @@ class CharacterizeJob
       generic_file.create_thumbnail
     end
     if generic_file.video?
-      Sufia.queue.push(TranscodeVideoJob.new(generic_file_id, 'content'))
+      Sufia.queue.push(TranscodeVideoJob.new(generic_file_id))
     elsif generic_file.audio?
-      Sufia.queue.push(TranscodeAudioJob.new(generic_file_id, 'content'))
+      Sufia.queue.push(TranscodeAudioJob.new(generic_file_id))
     end
   end
 end

data/lib/sufia/models/jobs/import_url_job.rb

@@ -2,20 +2,13 @@ require 'net/https'
 require 'uri'
 require 'tempfile'
 
-class ImportUrlJob 
+class ImportUrlJob < ActiveFedoraPidBasedJob
 
   def queue_name
     :import_url
   end
 
-  attr_accessor :pid
-
-  def initialize(pid)
-    self.pid = pid 
-  end
-
   def run
-    generic_file = GenericFile.find(self.pid)
     f = Tempfile.new(self.pid)
     f.binmode
 
@@ -26,7 +19,7 @@ class ImportUrlJob
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
     http.start do  
-      http.request_get(uri) do |resp|
+      http.request_get(uri.request_uri) do |resp|
         resp.read_body do |segment|
           f.write(segment)
         end

data/lib/sufia/models/jobs/resolrize_job.rb

@@ -18,6 +18,13 @@ class ResolrizeJob
   end
 
   def run
-    ActiveFedora::Base.reindex_everything
+    require 'active_fedora/version'
+    active_fedora_version = Gem::Version.new(ActiveFedora::VERSION)
+    minimum_feature_version = Gem::Version.new('6.4.4')
+    if active_fedora_version >= minimum_feature_version
+      ActiveFedora::Base.reindex_everything("pid~#{Sufia.config.id_namespace}:*")
+    else
+      ActiveFedora::Base.reindex_everything
+    end
   end
 end

data/lib/sufia/models/jobs/transcode_audio_job.rb

@@ -2,38 +2,14 @@
 # 7 Feb 2013
 # An asyncronous job for transcoding audio files using FFMpeg
 
-class TranscodeAudioJob < FfmpegTranscodeJob
+class TranscodeAudioJob < ActiveFedoraPidBasedJob
   def queue_name
     :audio
   end
 
-  def process
-    encode_mp3()
-    encode_ogg()
+  def run
+    generic_file.create_derivatives
+    generic_file.save
   end
 
-  private 
-    def encode_ogg
-      opts = ""
-      if generic_file.mime_type == 'audio/ogg'
-        # Don't re-encode, just copy
-        generic_file.add_file_datastream(generic_file.content.read, :dsid=>'ogg', :mimeType=>'audio/ogg')
-        #generic_file.content.rewind
-      else
-        encode_datastream('ogg', 'audio/ogg', opts)
-      end
-    end
-
-    def encode_mp3
-      opts = ""
-      if generic_file.mime_type == 'audio/mpeg'
-        # Don't re-encode, just copy
-        generic_file.add_file_datastream(generic_file.content.read, :dsid=>'mp3', :mimeType=>'audio/mpeg')
-      else
-        encode_datastream('mp3', 'audio/mpeg', opts)
-      end
-    end
-
-
 end
-

data/lib/sufia/models/jobs/transcode_video_job.rb

@@ -2,38 +2,14 @@
 # 13 Dec 2012
 # An asyncronous job for transcoding video files using FFMpeg
 
-class TranscodeVideoJob < FfmpegTranscodeJob
+class TranscodeVideoJob < ActiveFedoraPidBasedJob
   def queue_name
     :video
   end
 
-  def process
-    encode_mp4()
-    encode_webm()
-  end
-
-  private 
-
-  def encode_webm
-    # -g 30 enforces keyframe generation every second (30fps)
-    # -b:v is the video bitrate
-    # -acodec is the audio codec
-    opts = "#{size_attributes}  -g 30 -b:v 345k -acodec libvorbis #{audio_attributes}"
-    encode_datastream('webm', 'video/webm', opts)
-  end
-
-  def encode_mp4
-    opts = "#{size_attributes} -b:v 345k -vcodec libx264 -acodec libfaac #{audio_attributes} "
-    encode_datastream('mp4', 'video/mp4', opts)
-  end
-
-
-  def size_attributes
-    "-s 320x240"
-  end
-
-  def audio_attributes 
-    "-ac 2 -ab 96k -ar 44100"
+  def run
+    generic_file.create_derivatives
+    generic_file.save
   end
 end
 

data/lib/sufia/models/jobs/unzip_job.rb

@@ -12,19 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class UnzipJob
+class UnzipJob < ActiveFedoraPidBasedJob
   def queue_name
     :unzip
   end
 
-  attr_accessor :pid
-
-  def initialize(pid)
-    self.pid = pid
-  end
-
   def run
-    Zip::Archive.open_buffer(zip_file.content.content) do |archive|
+    Zip::Archive.open_buffer(object.content.content) do |archive|
       archive.each do |f|
         if f.directory?
           create_directory(f)
@@ -41,14 +35,9 @@ class UnzipJob
   # @param file [Zip::File]
   def create_file(file)
     @generic_file = GenericFile.new
-    @generic_file.batch_id = zip_file.batch.pid
-    file_name = file.name
-    mime_types = MIME::Types.of(file_name)
-    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-    options = {:label=>file_name, :dsid=>'content', :mimeType=>mime_type}
-    @generic_file.add_file_datastream(file.read, options)
-    @generic_file.set_title_and_label( file_name, :only_if_blank=>true )
-    @generic_file.apply_depositor_metadata(zip_file.edit_users.first)
+    @generic_file.batch_id = object.batch.pid
+    @generic_file.add_file(file.read, 'content', file.name)
+    @generic_file.apply_depositor_metadata(object.edit_users.first)
     @generic_file.date_uploaded = Time.now.ctime
     @generic_file.date_modified = Time.now.ctime
     @generic_file.save
@@ -60,7 +49,4 @@ class UnzipJob
   def create_directory(file)
   end
 
-  def zip_file
-    @zip_file ||= GenericFile.find(pid)
-  end
 end

data/lib/sufia/models/model_methods.rb

@@ -1,18 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'hydra/model_methods'
 module Sufia
   module ModelMethods
     extend ActiveSupport::Concern
@@ -26,9 +11,10 @@ module Sufia
     # Adds metadata about the depositor to the asset
     # Most important behavior: if the asset has a rightsMetadata datastream, this method will add +depositor_id+ to its individual edit permissions.
 
-    def apply_depositor_metadata(depositor_id)
+    def apply_depositor_metadata(depositor)
       rights_ds = self.datastreams["rightsMetadata"]
       prop_ds = self.datastreams["properties"]
+      depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
 
       rights_ds.update_indexed_attributes([:edit_access, :person]=>depositor_id) unless rights_ds.nil?
       prop_ds.depositor = depositor_id unless prop_ds.nil?

data/lib/sufia/models/user_local_directory_behavior.rb

@@ -0,0 +1,29 @@
+# To enable local file ingest, 
+# - Make User model define .directory method that returns a String corresponding to the User's personal import directory on the server. This can be a simple ActiveRecord attribute on the User model, or it can be something more elaborate. 
+# - Include this module in your User model, or define a .files() method that behaves the same
+# - Set Sufia.config.enable_local_ingest to true
+# 
+module Sufia::UserLocalDirectoryBehavior
+  
+  # You can use this validator in your User model.
+  # Ensures that a string defining the path to the user's directory has been provided 
+  # and corresponds to a real directory on the server.
+  # @example
+  #   validate :directory_must_exist
+  def directory_must_exist
+    unless directory.blank? || File.directory?(directory)
+      errors.add(:directory, "must be an existing directory")
+    end
+  end
+
+  # List the contents of the user's directory on the server
+  # Indicates whether each item is a directory or not.
+  def files
+    return [] unless directory.present? && File.directory?(directory)
+    Dir[File.join(directory, '*')].inject([]) do |accum, val|
+      accum << { name: File.basename(val), directory: File.directory?(val)}
+      accum
+    end
+  end
+  
+end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

data/sufia-models.gemspec

@@ -38,9 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'curationexperts-mailboxer', '0.10.3'
   spec.add_dependency 'acts_as_follower', '0.1.1'
-  spec.add_dependency 'rmagick'
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
+  spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
   # https://github.com/zdennis/activerecord-import/pull/79
   #spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,20 +184,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rmagick
-  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: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +212,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: hydra-derivatives
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: Models and services for sufia
 email:
 - jeremy.n.friesen@gmail.com
@@ -264,22 +264,23 @@ files:
 - lib/sufia/models/active_support/core_ext/marshal.rb
 - lib/sufia/models/engine.rb
 - lib/sufia/models/file_content.rb
-- lib/sufia/models/file_content/extract_metadata.rb
 - lib/sufia/models/file_content/versions.rb
 - lib/sufia/models/generic_file.rb
 - lib/sufia/models/generic_file/accessible_attributes.rb
 - lib/sufia/models/generic_file/actions.rb
 - lib/sufia/models/generic_file/audit.rb
 - lib/sufia/models/generic_file/characterization.rb
+- lib/sufia/models/generic_file/derivatives.rb
 - lib/sufia/models/generic_file/export.rb
+- lib/sufia/models/generic_file/mime_types.rb
 - lib/sufia/models/generic_file/permissions.rb
 - lib/sufia/models/generic_file/thumbnail.rb
 - lib/sufia/models/generic_file/web_form.rb
 - lib/sufia/models/id_service.rb
+- lib/sufia/models/jobs/active_fedora_pid_based_job.rb
 - lib/sufia/models/jobs/audit_job.rb
 - lib/sufia/models/jobs/batch_update_job.rb
 - lib/sufia/models/jobs/characterize_job.rb
-- lib/sufia/models/jobs/ffmpeg_transcode_job.rb
 - lib/sufia/models/jobs/import_url_job.rb
 - lib/sufia/models/jobs/resolrize_job.rb
 - lib/sufia/models/jobs/transcode_audio_job.rb
@@ -290,6 +291,7 @@ files:
 - lib/sufia/models/resque.rb
 - lib/sufia/models/solr_document_behavior.rb
 - lib/sufia/models/user.rb
+- lib/sufia/models/user_local_directory_behavior.rb
 - lib/sufia/models/utils.rb
 - lib/sufia/models/version.rb
 - lib/tasks/resque.rake
@@ -315,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia

data/lib/sufia/models/file_content/extract_metadata.rb

@@ -1,60 +0,0 @@
-require 'open3'
-module Sufia
-  module FileContent
-    module ExtractMetadata
-      include Open3
-
-      def extract_metadata
-        out = nil
-        to_tempfile do |f|
-          out = run_fits!(f.path)
-        end
-        out
-      end
-
-      def to_tempfile &block
-        return unless has_content?
-        tmp_base = Sufia.config.temp_file_base
-        f = Tempfile.new("#{pid}-#{dsVersionID}")
-        f.binmode
-        if content.respond_to? :read
-          f.write(content.read)
-        else
-          f.write(content)
-        end
-        f.close
-        content.rewind if content.respond_to? :rewind
-        yield(f)
-        f.unlink
-      end
-
-      # Return true if the content is present
-      # You can override this method if your content is an external datastream
-      def has_content?
-        !content.nil?
-      end
-
-      private 
-
-
-        def run_fits!(file_path)
-            command = "#{fits_path} -i \"#{file_path}\""
-            stdin, stdout, stderr, wait_thr = popen3(command)
-            stdin.close
-            out = stdout.read
-            stdout.close
-            err = stderr.read
-            stderr.close
-            exit_status = wait_thr.value
-            raise "Unable to execute command \"#{command}\"\n#{err}" unless exit_status.success?
-            out
-        end
-
-
-        def fits_path
-          Sufia.config.fits_path
-        end
-
-      end
-    end
-end

data/lib/sufia/models/jobs/ffmpeg_transcode_job.rb

@@ -1,61 +0,0 @@
-# Created by: Justin Coyne
-# 7 Feb 2013
-# An abstract class for asyncronous jobs that transcode files using FFMpeg
-
-require 'tmpdir'
-
-class FfmpegTranscodeJob
-  extend Open3
-
-  attr_accessor :generic_file_id, :datastream_in, :datastream, :generic_file
-
-  def initialize(generic_file_id, datastream_in)
-    self.generic_file_id = generic_file_id
-    self.datastream_in = datastream_in
-  end
-
-  def process
-    raise "You attempted to call process() on an abstract class.  Implement process() on the concrete class"
-  end
-
-  def run
-    return unless Sufia.config.enable_ffmpeg
-    self.generic_file = GenericFile.find(generic_file_id)
-    self.datastream = generic_file.datastreams[datastream_in]
-    if datastream
-      process 
-      generic_file.save!
-    else
-      logger.warn "No datastream for transcoding!!!!! pid: #{generic_file_id} dsid: #{datastream_in}"
-    end
-  end
-
-  def encode_datastream(dest_dsid, mime_type, options)
-    file_suffix = dest_dsid
-    out_file = nil
-    output_file = Dir::Tmpname.create(['sufia', ".#{file_suffix}"], Sufia.config.temp_file_base){}
-    datastream.to_tempfile do |f|
-      self.class.encode(f.path, options, output_file)
-    end
-    out_file = File.open(output_file, "rb")
-    generic_file.add_file_datastream(out_file.read, :dsid=>dest_dsid, :mimeType=>mime_type)
-    File.unlink(output_file)
-  end
-
-  def self.encode(path, options, output_file)
-    command = "#{ffmpeg_path} -y -i \"#{path}\" #{options} #{output_file}"
-    stdin, stdout, stderr, wait_thr = popen3(command)
-    stdin.close
-    out = stdout.read
-    stdout.close
-    err = stderr.read
-    stderr.close
-    raise "Unable to execute command \"#{command}\"\n#{err}" unless wait_thr.value.success?
-  end
-
-  def self.ffmpeg_path
-    Sufia.config.ffmpeg_path
-  end
-end
-
-