sufia-models 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72bf8a603a87562ce5ccea4c07d3f798e67e0e1a
-  data.tar.gz: 36e09e6555144dff4016e718afcb08c3279a28b2
+  metadata.gz: f7000540d10c6082fbe78b05a2043eb11f555635
+  data.tar.gz: 60e2c7dc3e31acd37648c671f5df9835f151b913
 SHA512:
-  metadata.gz: e418a2ce57e7c53a0833f52c458cb4c30079a327c86b48ae3ad5b1de714afa84e886a90d9228c4bbc64749edbbe3cd347d2814a3b5e490b3069d7f8c7f345fba
-  data.tar.gz: 5c41bf3927b9a23c5fa8541ea5ae8f841253fa3fe76dc532c8ae4b51389d73716b4104627e4348d69cb2c71fe736273b9d9422809ad2de4f062051bc3ad2bbf4
+  metadata.gz: 61cb90f5d5c5cbf94aca85a2e23a69f20b03b33105808febb2492c4cc55779c49177abbbcfcbdf65b276617281ccf86eadcb2b55674e2c94130cf4364225c2ed
+  data.tar.gz: d0226b74b4c91b7ee635afdf6f37baacd31e8025b53e079a1c123cfa97f1fbd2dfc7851c585f82053e498ab12857600041047d5fce3bbe7541ae69424e762caf

data/app/models/datastreams/fits_datastream.rb

@@ -70,7 +70,11 @@ class FitsDatastream < ActiveFedora::OmDatastream
         t.offset(:path=>"offset")
       }
       t.video {
-        # Not yet implemented in FITS
+        t.width(:path=>"imageWidth")
+        t.height(:path=>"imageHeight")
+        t.duration(:path=>"duration")
+        t.sample_rate(:path=>"sampleRate")
+        t.frame_rate(:path=>"frameRate")
       }
     }
     t.format_label(:proxy=>[:identification, :identity, :format_label])
@@ -98,7 +102,9 @@ class FitsDatastream < ActiveFedora::OmDatastream
     t.byte_order(:proxy=>[:metadata, :image, :byte_order])
     t.compression(:proxy=>[:metadata, :image, :compression])
     t.width(:proxy=>[:metadata, :image, :width])
+    t.video_width( :proxy=>[:metadata, :video, :width])
     t.height(:proxy=>[:metadata, :image, :height])
+    t.video_height(:proxy=>[:metadata, :video, :height])
     t.color_space(:proxy=>[:metadata, :image, :color_space])
     t.profile_name(:proxy=>[:metadata, :image, :profile_name])
     t.profile_version(:proxy=>[:metadata, :image, :profile_version])
@@ -115,11 +121,14 @@ class FitsDatastream < ActiveFedora::OmDatastream
     t.markup_basis(:proxy=>[:metadata, :text, :markup_basis])
     t.markup_language(:proxy=>[:metadata, :text, :markup_language])
     t.duration(:proxy=>[:metadata, :audio, :duration])
+    t.video_duration(:proxy=>[:metadata, :video, :duration])
     t.bit_depth(:proxy=>[:metadata, :audio, :bit_depth])
     t.sample_rate(:proxy=>[:metadata, :audio, :sample_rate])
+    t.video_sample_rate(:proxy=>[:metadata, :video, :sample_rate])
     t.channels(:proxy=>[:metadata, :audio, :channels])
     t.data_format(:proxy=>[:metadata, :audio, :data_format])
     t.offset(:proxy=>[:metadata, :audio, :offset])
+    t.frame_rate(:proxy=>[:metadata, :video, :frame_rate])
   end
 
   def self.xml_template

data/lib/generators/sufia/models/install_generator.rb

@@ -55,7 +55,7 @@ This generator makes the following changes to your application:
   def inject_sufia_user_behavior
     file_path = "app/models/#{model_name.underscore}.rb"
     if File.exists?(file_path)
-      inject_into_class file_path, model_name.classify do
+      inject_into_file file_path, after: /include Hydra\:\:User.*$/ do
         "# Connects this user object to Sufia behaviors. " +
           "\n include Sufia::User\n"
       end

data/lib/sufia/models/generic_file.rb

@@ -1,3 +1,4 @@
+require 'sufia/virus_found_error'
 module Sufia
   module GenericFile
     extend ActiveSupport::Concern
@@ -9,6 +10,7 @@ module Sufia
     autoload :Trophies, 'sufia/models/generic_file/trophies'
     autoload :Metadata, 'sufia/models/generic_file/metadata'
     autoload :Versions, 'sufia/models/generic_file/versions'
+    autoload :VirusCheck, 'sufia/models/generic_file/virus_check'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -22,6 +24,7 @@ module Sufia
     include Sufia::GenericFile::Trophies
     include Sufia::GenericFile::Metadata
     include Sufia::GenericFile::Versions
+    include Sufia::GenericFile::VirusCheck
 
     included do
       belongs_to :batch, :property => :is_part_of

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

@@ -2,7 +2,6 @@ module Sufia::GenericFile
   # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
   module Actions
     def self.create_metadata(generic_file, user, batch_id)
-
       generic_file.apply_depositor_metadata(user)
       generic_file.date_uploaded = Date.today
       generic_file.date_modified = Date.today
@@ -16,7 +15,7 @@ module Sufia::GenericFile
       yield(generic_file) if block_given?
       generic_file.save!
     end
-    
+
     def self.create_content(generic_file, file, file_name, dsid, user)
       generic_file.add_file(file, dsid, file_name)
 
@@ -40,15 +39,13 @@ module Sufia::GenericFile
     end
 
     def self.virus_check(file)
-      if defined? ClamAV
-        stat = ClamAV.instance.scanfile(file.path)
-        logger.warn "Virus checking did not pass for #{file.inspect} status = #{stat}" unless stat == 0
-        stat
-      else
-        logger.warn "Virus checking disabled for #{file.inspect}"
-        0
+      path = file.is_a?(String) ? file : file.path
+      unless defined?(ClamAV)
+        logger.warn "Virus checking disabled, #{path} not checked"
+        return
       end
-    end 
-
+      scan_result = ClamAV.instance.scanfile(path)
+      raise Sufia::VirusFoundError.new("A virus was found in #{path}: #{scan_result}") unless scan_result == 0
+    end
   end
 end

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

@@ -13,21 +13,36 @@ module Sufia
                                         :file_language, :word_count, :character_count,
                                         :paragraph_count, :line_count, :table_count,
                                         :graphics_count, :byte_order, :compression,
-                                        :width, :height, :color_space, :profile_name,
+                                        :color_space, :profile_name,
                                         :profile_version, :orientation, :color_map,
                                         :image_producer, :capture_device,
                                         :scanning_software, :exif_version,
                                         :gps_timestamp, :latitude, :longitude,
                                         :character_set, :markup_basis,
-                                        :markup_language, :duration, :bit_depth,
-                                        :sample_rate, :channels, :data_format, :offset, datastream: :characterization, multiple: true
+                                        :markup_language, :bit_depth,
+                                        :channels, :data_format, :offset, :frame_rate, datastream: :characterization, multiple: true
 
       end
 
+      def width
+        characterization.width.blank? ? characterization.video_width : characterization.width
+      end
+
+      def height
+        characterization.height.blank? ? characterization.video_height : characterization.height
+      end
+
+      def duration
+        characterization.duration.blank? ? characterization.video_duration : characterization.duration
+      end
+
+      def sample_rate
+        characterization.sample_rate.blank? ? characterization.video_sample_rate : characterization.sample_rate
+      end
+
       def characterize_if_changed
         content_changed = self.content.changed?
         yield
-        #logger.debug "DOING CHARACTERIZE ON #{self.pid}"
         Sufia.queue.push(CharacterizeJob.new(self.pid)) if content_changed
       end
 

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

@@ -0,0 +1,33 @@
+module Sufia
+  module GenericFile
+    module VirusCheck
+      extend ActiveSupport::Concern
+
+      included do
+        validate :detect_viruses
+      end
+
+      # Default behavior is to raise a validation error and halt the save if a virus is found
+      def detect_viruses
+        return unless content.changed?
+        path = if content.content.respond_to?(:path)
+                 content.content.path
+               else
+                 Tempfile.open('') do |t|
+                   t.binmode
+                   t.write(content.content)
+                   t.close
+                   t.path
+                 end
+               end
+        Sufia::GenericFile::Actions.virus_check(path)
+        true
+      rescue Sufia::VirusFoundError => virus
+        logger.warn(virus.message)
+        errors.add(:content, virus.message)
+        false
+      end
+
+    end
+  end
+end

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

@@ -22,14 +22,13 @@ module Sufia
       end
 
       def terms_for_editing
-        terms_for_display -
-         [:part_of, :date_modified, :date_uploaded, :format] #, :resource_type]
+        terms_for_display - [:date_modified, :date_uploaded, :format]
       end
 
       def terms_for_display
         # 'type' is the RDF.type assertion, which is not present by default, but may be
         # provided in some RDF schemas
-        self.descMetadata.class.fields
+        self.descMetadata.class.fields - [:part_of]
       end
 
       def to_jq_upload

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

@@ -9,40 +9,38 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
   end
 
   def run
-    f = Tempfile.new(self.pid)
-    f.binmode
-
-    # download file from url
-    uri = URI(generic_file.import_url)
-    http = Net::HTTP.new(uri.host, uri.port) 
-    http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-    http.start do  
-      http.request_get(uri.request_uri) do |resp|
-        resp.read_body do |segment|
-          f.write(segment)
+    user = User.find_by_user_key(generic_file.depositor)
+
+    Tempfile.open(self.pid) do |f|
+      f.binmode
+
+      # download file from url
+      uri = URI(generic_file.import_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      http.start do
+        http.request_get(uri.request_uri) do |resp|
+          resp.read_body do |segment|
+            f.write(segment)
+          end
         end
       end
-    end 
-    job_user = User.batchuser()
-    user = User.find_by_user_key(generic_file.depositor)
-    # check for virus
-    if Sufia::GenericFile::Actions.virus_check(f) != 0
-      message = "The file (#{File.basename(uri.path)}) was unable to be imported because it contained a virus."
-      job_user.send_message(user, message, 'File Import Error') 
-      return
+
+      f.rewind
+      # attach downloaded file to generic file stubbed out
+      Sufia::GenericFile::Actions.create_content(generic_file, f, File.basename(uri.path), 'content', user)
+      Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, generic_file.depositor))
+      # add message to user for downloaded file
+      message = "The file (#{File.basename(uri.path)}) was successfully imported."
+      job_user.send_message(user, message, 'File Import')
     end
+  rescue => error
+    job_user.send_message(user, error.message, 'File Import Error')
+  end
 
-    f.rewind
-    # attach downloaded file to generic file stubbed out
-    Sufia::GenericFile::Actions.create_content(generic_file, f, File.basename(uri.path), 'content', user)
-    # add message to user for downloaded file
-    message = "The file (#{File.basename(uri.path)}) was successfully imported." 
-    job_user.send_message(user, message, 'File Import') 
- 
-  ensure
-    f.close
-    f.unlink
+  def job_user
+    User.batchuser
   end
 end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.4.0"
+    VERSION = "3.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -333,6 +333,7 @@ files:
 - lib/sufia/models/generic_file/thumbnail.rb
 - lib/sufia/models/generic_file/trophies.rb
 - lib/sufia/models/generic_file/versions.rb
+- lib/sufia/models/generic_file/virus_check.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
@@ -374,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia