sufia 3.0.0 → 3.1.0

data/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/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

data/sufia.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sufia"
   gem.require_paths = ["lib"]
-  gem.version       = version 
+  gem.version       = version
+  gem.license       = 'APACHE2'
 
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight', '~> 4.0'

data/tasks/sufia-dev.rake

@@ -27,7 +27,7 @@ gem_home = File.expand_path('../../', __FILE__)
 desc "Run specs"
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = '../**/*_spec.rb'
-  t.rspec_opts = "--colour"
+  t.rspec_opts = "--colour -I ../"
 end
 
 desc "Load fixtures"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Justin Coyne
 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: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -252,8 +252,6 @@ files:
 - app/assets/stylesheets/fileupload/style.css
 - app/assets/stylesheets/fileupload/thumbnail-scaling.css
 - app/assets/stylesheets/generic_files.css
-- app/assets/stylesheets/jquery-ui-1.8.1.custom.css
-- app/assets/stylesheets/jquery-ui-1.8.23.custom.css
 - app/assets/stylesheets/jquery-ui.css
 - app/assets/stylesheets/reset_body.css
 - app/assets/stylesheets/sufia.css.scss
@@ -285,6 +283,7 @@ files:
 - app/jobs/content_restored_version_event_job.rb
 - app/jobs/content_update_event_job.rb
 - app/jobs/event_job.rb
+- app/jobs/ingest_local_file_job.rb
 - app/jobs/user_edit_profile_event_job.rb
 - app/jobs/user_follow_event_job.rb
 - app/jobs/user_unfollow_event_job.rb
@@ -403,6 +402,7 @@ files:
 - app/views/generic_files/_field_display.html.erb
 - app/views/generic_files/_field_form.html.erb
 - app/views/generic_files/_groups_description.html.erb
+- app/views/generic_files/_local_file_import.html.erb
 - app/views/generic_files/_media_display.html.erb
 - app/views/generic_files/_multiple_upload.html.erb
 - app/views/generic_files/_permission.html.erb
@@ -428,6 +428,7 @@ files:
 - app/views/generic_files/upload/_dropbox_chooser.html.erb
 - app/views/generic_files/upload/_form.html.erb
 - app/views/generic_files/upload/_form_fields.html.erb
+- app/views/generic_files/upload/_local_file_import_chooser.html.erb
 - app/views/generic_files/upload/_script_templates.html.erb
 - app/views/generic_files/upload/_tos_checkbox.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
@@ -499,6 +500,8 @@ files:
 - lib/sufia/controller.rb
 - lib/sufia/dashboard_controller_behavior.rb
 - lib/sufia/downloads_controller_behavior.rb
+- lib/sufia/files_controller/local_ingest_behavior.rb
+- lib/sufia/files_controller/upload_complete_behavior.rb
 - lib/sufia/files_controller_behavior.rb
 - lib/sufia/role_mapper.rb
 - lib/sufia/single_use_error.rb
@@ -579,8 +582,12 @@ files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/generic_file_helper_spec.rb
+- spec/helpers/render_constraints_helper_behavior_spec.rb
 - spec/helpers/sufia_helper_spec.rb
+- spec/jobs/import_url_job_spec.rb
+- spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
+- spec/lib/sufia/upload_complete_behavior_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -589,6 +596,7 @@ files:
 - spec/models/event_jobs_spec.rb
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
+- spec/models/generic_file/actions_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
@@ -640,22 +648,23 @@ files:
 - sufia-models/lib/sufia/models/active_support/core_ext/marshal.rb
 - sufia-models/lib/sufia/models/engine.rb
 - sufia-models/lib/sufia/models/file_content.rb
-- sufia-models/lib/sufia/models/file_content/extract_metadata.rb
 - sufia-models/lib/sufia/models/file_content/versions.rb
 - sufia-models/lib/sufia/models/generic_file.rb
 - sufia-models/lib/sufia/models/generic_file/accessible_attributes.rb
 - sufia-models/lib/sufia/models/generic_file/actions.rb
 - sufia-models/lib/sufia/models/generic_file/audit.rb
 - sufia-models/lib/sufia/models/generic_file/characterization.rb
+- sufia-models/lib/sufia/models/generic_file/derivatives.rb
 - sufia-models/lib/sufia/models/generic_file/export.rb
+- sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
 - sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/id_service.rb
+- sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb
 - sufia-models/lib/sufia/models/jobs/audit_job.rb
 - sufia-models/lib/sufia/models/jobs/batch_update_job.rb
 - sufia-models/lib/sufia/models/jobs/characterize_job.rb
-- sufia-models/lib/sufia/models/jobs/ffmpeg_transcode_job.rb
 - sufia-models/lib/sufia/models/jobs/import_url_job.rb
 - sufia-models/lib/sufia/models/jobs/resolrize_job.rb
 - sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb
@@ -666,6 +675,7 @@ files:
 - sufia-models/lib/sufia/models/resque.rb
 - sufia-models/lib/sufia/models/solr_document_behavior.rb
 - sufia-models/lib/sufia/models/user.rb
+- sufia-models/lib/sufia/models/user_local_directory_behavior.rb
 - sufia-models/lib/sufia/models/utils.rb
 - sufia-models/lib/sufia/models/version.rb
 - sufia-models/lib/tasks/resque.rake
@@ -707,7 +717,8 @@ files:
 - vendor/assets/javascripts/video.js
 - vendor/plugins/.gitkeep
 homepage: ''
-licenses: []
+licenses:
+- APACHE2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -725,7 +736,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: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -800,8 +811,12 @@ test_files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/generic_file_helper_spec.rb
+- spec/helpers/render_constraints_helper_behavior_spec.rb
 - spec/helpers/sufia_helper_spec.rb
+- spec/jobs/import_url_job_spec.rb
+- spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
+- spec/lib/sufia/upload_complete_behavior_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -810,6 +825,7 @@ test_files:
 - spec/models/event_jobs_spec.rb
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
+- spec/models/generic_file/actions_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb