sufia 4.0.0.beta2 → 4.0.0.beta3

data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/export.rb

@@ -46,19 +46,19 @@ module Sufia
         export_text = []
         export_text << "url_ver=Z39.88-2004&ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Adc&rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator"
         field_map = {
-          :title => 'title',
-          :creator => 'creator',
-          :subject => 'subject',
-          :description => 'description',
-          :publisher => 'publisher',
-          :contributor => 'contributor',
-          :date_created => 'date',
-          :resource_type => 'format',
-          :identifier => 'identifier',
-          :language => 'language',
-          :tag => 'relation',
-          :based_near => 'coverage',
-          :rights => 'rights'
+          title: 'title',
+          creator: 'creator',
+          subject: 'subject',
+          description: 'description',
+          publisher: 'publisher',
+          contributor: 'contributor',
+          date_created: 'date',
+          resource_type: 'format',
+          identifier: 'identifier',
+          language: 'language',
+          tag: 'relation',
+          based_near: 'coverage',
+          rights: 'rights'
         }
         field_map.each do |element, kev|
           values = self.send(element)

data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/mime_types.rb

@@ -19,6 +19,10 @@ module Sufia
         self.class.audio_mime_types.include? self.mime_type
       end
 
+      def office_document?
+        self.class.office_document_mime_types.include? self.mime_type
+      end
+
       def file_format
         return nil if self.mime_type.blank? and self.format_label.blank?
         return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
@@ -28,7 +32,7 @@ module Sufia
 
       module ClassMethods
         def image_mime_types
-          ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']
+          ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']
         end
 
         def pdf_mime_types
@@ -44,6 +48,16 @@ module Sufia
           # 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
+
+        def office_document_mime_types
+          ['text/rtf',
+           'application/msword',
+           'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+           'application/vnd.ms-excel',
+           'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+           'application/vnd.ms-powerpoint',
+           'application/vnd.openxmlformats-officedocument.presentationml.presentation']
+        end
       end
     end
   end

data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/permissions.rb

@@ -7,7 +7,7 @@ module Sufia
       include Hydra::AccessControls::Visibility
 
       included do
-        has_metadata "rightsMetadata", :type => ParanoidRightsDatastream
+        has_metadata "rightsMetadata", type: ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
@@ -34,6 +34,10 @@ module Sufia
         perms.map {|p| { name: p.name, access: p.access, type:p.type } }
       end
 
+      def public?
+        read_groups.include?('public')
+      end
+
       private
 
       def permission_hash

data/sufia-models/app/models/concerns/sufia/generic_file/versions.rb

@@ -0,0 +1,16 @@
+module Sufia
+  module GenericFile
+    module Versions
+      def record_version_committer(user)
+        version = content.latest_version
+        # content datastream not (yet?) present
+        return if version.nil?
+        VersionCommitter.create(obj_id: version.pid,
+                                datastream_id: version.dsid,
+                                version_id: version.versionID,
+                                committer_login: user.user_key)
+      end
+
+    end
+  end
+end

data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/virus_check.rb

@@ -20,14 +20,13 @@ module Sufia
                    t.path
                  end
                end
-        Sufia::GenericFile::Actions.virus_check(path)
+        Sufia::GenericFile::Actor.virus_check(path)
         true
       rescue Sufia::VirusFoundError => virus
         logger.warn(virus.message)
-        errors.add(:content, virus.message)
+        errors.add(:base, virus.message)
         false
       end
-
     end
   end
 end

data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/web_form.rb

@@ -28,7 +28,14 @@ module Sufia
       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 - [:part_of]
+        self.class.terms_for_display
+      end
+
+      module ClassMethods
+        def terms_for_display
+          [:resource_type, :title, :creator, :contributor, :description, :tag, :rights, :publisher, :date_created,
+           :date_uploaded, :date_modified, :subject, :language, :identifier, :based_near, :related_url]
+        end
       end
 
       def to_jq_upload
@@ -37,7 +44,7 @@ module Sufia
           "size" => self.file_size,
           "url" => "/files/#{noid}",
           "thumbnail_url" => self.pid,
-          "delete_url" => "deleteme", # generic_file_path(:id => id),
+          "delete_url" => "deleteme", # generic_file_path(id: id),
           "delete_type" => "DELETE"
         }
       end

data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb

@@ -4,12 +4,12 @@ module Sufia
 
     included do
       set_terminology do |t|
-        t.root(:path=>"fields" )
+        t.root(path: "fields")
         # This is where we put the user id of the object depositor -- impacts permissions/access controls
-        t.depositor :index_as=>[:stored_searchable]
+        t.depositor index_as: [:symbol, :stored_searchable]
         # This is where we put the relative path of the file if submitted as a folder
         t.relative_path
-        t.import_url path: 'importUrl', :index_as=>:symbol
+        t.import_url path: 'importUrl', index_as: :symbol
       end
     end
 
@@ -25,6 +25,5 @@ module Sufia
     def prefix
       ""
     end
-
   end
 end

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -8,7 +8,7 @@ module Sufia::User
     include Blacklight::User
     include Hydra::User
 
-    delegate :can?, :cannot?, :to => :ability
+    delegate :can?, :cannot?, to: :ability
 
     # set this up as a messageable object
     acts_as_messageable
@@ -18,7 +18,7 @@ module Sufia::User
     # Users should be followable
     acts_as_followable
 
-    mount_uploader :avatar, AvatarUploader, :mount_on => :avatar_file_name
+    mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
     validates_with AvatarValidator
     has_many :trophies
   end

data/sufia-models/app/models/datastreams/fits_datastream.rb

@@ -1,182 +1,183 @@
 class FitsDatastream < ActiveFedora::OmDatastream
   include OM::XML::Document
+
   def prefix
     ""
   end
 
   set_terminology do |t|
-    t.root(:path => "fits", 
-           :xmlns => "http://hul.harvard.edu/ois/xml/ns/fits/fits_output", 
-           :schema => "http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd")
+    t.root(path: "fits",
+           xmlns: "http://hul.harvard.edu/ois/xml/ns/fits/fits_output",
+           schema: "http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd")
     t.identification {
       t.identity {
-        t.format_label(:path=>{:attribute=>"format"})
-        t.mime_type(:path=>{:attribute=>"mimetype"}, index_as: [:stored_searchable])
+        t.format_label(path: {attribute: "format"})
+        t.mime_type(path: {attribute: "mimetype"}, index_as: [:stored_searchable])
       }
     }
     t.fileinfo {
-      t.file_size(:path=>"size")
-      t.last_modified(:path=>"lastmodified")
-      t.filename(:path=>"filename")
-      t.original_checksum(:path=>"md5checksum")
-      t.rights_basis(:path=>"rightsBasis")
-      t.copyright_basis(:path=>"copyrightBasis")
-      t.copyright_note(:path=>"copyrightNote")
+      t.file_size(path: "size")
+      t.last_modified(path: "lastmodified")
+      t.filename(path: "filename")
+      t.original_checksum(path: "md5checksum")
+      t.rights_basis(path: "rightsBasis")
+      t.copyright_basis(path: "copyrightBasis")
+      t.copyright_note(path: "copyrightNote")
     }
-    t.filestatus { 
-      t.well_formed(:path=>"well-formed")
-      t.valid(:path=>"valid")
-      t.status_message(:path=>"message")
+    t.filestatus {
+      t.well_formed(path: "well-formed")
+      t.valid(path: "valid")
+      t.status_message(path: "message")
     }
     t.metadata {
       t.document {
-        t.file_title(:path=>"title")
-        t.file_author(:path=>"author")
-        t.file_language(:path=>"language")
-        t.page_count(:path=>"pageCount")
-        t.word_count(:path=>"wordCount")
-        t.character_count(:path=>"characterCount")
-        t.paragraph_count(:path=>"paragraphCount")
-        t.line_count(:path=>"lineCount")
-        t.table_count(:path=>"tableCount")
-        t.graphics_count(:path=>"graphicsCount")
+        t.file_title(path: "title")
+        t.file_author(path: "author")
+        t.file_language(path: "language")
+        t.page_count(path: "pageCount")
+        t.word_count(path: "wordCount")
+        t.character_count(path: "characterCount")
+        t.paragraph_count(path: "paragraphCount")
+        t.line_count(path: "lineCount")
+        t.table_count(path: "tableCount")
+        t.graphics_count(path: "graphicsCount")
       }
       t.image {
-        t.byte_order(:path=>"byteOrder")
-        t.compression(:path=>"compressionScheme")
-        t.width(:path=>"imageWidth")
-        t.height(:path=>"imageHeight")
-        t.color_space(:path=>"colorSpace")
-        t.profile_name(:path=>"iccProfileName")
-        t.profile_version(:path=>"iccProfileVersion")
-        t.orientation(:path=>"orientation")
-        t.color_map(:path=>"colorMap")
-        t.image_producer(:path=>"imageProducer")
-        t.capture_device(:path=>"captureDevice")
-        t.scanning_software(:path=>"scanningSoftwareName")
-        t.exif_version(:path=>"exifVersion")
-        t.gps_timestamp(:path=>"gpsTimeStamp")
-        t.latitude(:path=>"gpsDestLatitude")
-        t.longitude(:path=>"gpsDestLongitude")
+        t.byte_order(path: "byteOrder")
+        t.compression(path: "compressionScheme")
+        t.width(path: "imageWidth")
+        t.height(path: "imageHeight")
+        t.color_space(path: "colorSpace")
+        t.profile_name(path: "iccProfileName")
+        t.profile_version(path: "iccProfileVersion")
+        t.orientation(path: "orientation")
+        t.color_map(path: "colorMap")
+        t.image_producer(path: "imageProducer")
+        t.capture_device(path: "captureDevice")
+        t.scanning_software(path: "scanningSoftwareName")
+        t.exif_version(path: "exifVersion")
+        t.gps_timestamp(path: "gpsTimeStamp")
+        t.latitude(path: "gpsDestLatitude")
+        t.longitude(path: "gpsDestLongitude")
       }
       t.text {
-        t.character_set(:path=>"charset")
-        t.markup_basis(:path=>"markupBasis")
-        t.markup_language(:path=>"markupLanguage")
+        t.character_set(path: "charset")
+        t.markup_basis(path: "markupBasis")
+        t.markup_language(path: "markupLanguage")
       }
       t.audio {
-        t.duration(:path=>"duration")
-        t.bit_depth(:path=>"bitDepth")
-        t.sample_rate(:path=>"sampleRate")
-        t.channels(:path=>"channels")
-        t.data_format(:path=>"dataFormatType")
-        t.offset(:path=>"offset")
+        t.duration(path: "duration")
+        t.bit_depth(path: "bitDepth")
+        t.sample_rate(path: "sampleRate")
+        t.channels(path: "channels")
+        t.data_format(path: "dataFormatType")
+        t.offset(path: "offset")
       }
       t.video {
-        t.width(:path=>"imageWidth")
-        t.height(:path=>"imageHeight")
-        t.duration(:path=>"duration")
-        t.sample_rate(:path=>"sampleRate")
-        t.frame_rate(:path=>"frameRate")
+        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])
-    t.mime_type(:proxy=>[:identification, :identity, :mime_type])
-    t.file_size(:proxy=>[:fileinfo, :file_size])
-    t.last_modified(:proxy=>[:fileinfo, :last_modified])
-    t.filename(:proxy=>[:fileinfo, :filename])
-    t.original_checksum(:proxy=>[:fileinfo, :original_checksum])
-    t.rights_basis(:proxy=>[:fileinfo, :rights_basis])
-    t.copyright_basis(:proxy=>[:fileinfo, :copyright_basis])
-    t.copyright_note(:proxy=>[:fileinfo, :copyright_note])
-    t.well_formed(:proxy=>[:filestatus, :well_formed])
-    t.valid(:proxy=>[:filestatus, :valid])
-    t.status_message(:proxy=>[:filestatus, :status_message])
-    t.file_title(:proxy=>[:metadata, :document, :file_title])
-    t.file_author(:proxy=>[:metadata, :document, :file_author])
-    t.page_count(:proxy=>[:metadata, :document, :page_count])
-    t.file_language(:proxy=>[:metadata, :document, :file_language])
-    t.word_count(:proxy=>[:metadata, :document, :word_count])
-    t.character_count(:proxy=>[:metadata, :document, :character_count])
-    t.paragraph_count(:proxy=>[:metadata, :document, :paragraph_count])
-    t.line_count(:proxy=>[:metadata, :document, :line_count])
-    t.table_count(:proxy=>[:metadata, :document, :table_count])
-    t.graphics_count(:proxy=>[:metadata, :document, :graphics_count])
-    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])
-    t.orientation(:proxy=>[:metadata, :image, :orientation])
-    t.color_map(:proxy=>[:metadata, :image, :color_map])
-    t.image_producer(:proxy=>[:metadata, :image, :image_producer])
-    t.capture_device(:proxy=>[:metadata, :image, :capture_device])
-    t.scanning_software(:proxy=>[:metadata, :image, :scanning_software])
-    t.exif_version(:proxy=>[:metadata, :image, :exif_version])
-    t.gps_timestamp(:proxy=>[:metadata, :image, :gps_timestamp])
-    t.latitude(:proxy=>[:metadata, :image, :latitude])
-    t.longitude(:proxy=>[:metadata, :image, :longitude])
-    t.character_set(:proxy=>[:metadata, :text, :character_set])
-    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])
+    t.format_label(proxy: [:identification, :identity, :format_label])
+    t.mime_type(proxy: [:identification, :identity, :mime_type])
+    t.file_size(proxy: [:fileinfo, :file_size])
+    t.last_modified(proxy: [:fileinfo, :last_modified])
+    t.filename(proxy: [:fileinfo, :filename])
+    t.original_checksum(proxy: [:fileinfo, :original_checksum])
+    t.rights_basis(proxy: [:fileinfo, :rights_basis])
+    t.copyright_basis(proxy: [:fileinfo, :copyright_basis])
+    t.copyright_note(proxy: [:fileinfo, :copyright_note])
+    t.well_formed(proxy: [:filestatus, :well_formed])
+    t.valid(proxy: [:filestatus, :valid])
+    t.status_message(proxy: [:filestatus, :status_message])
+    t.file_title(proxy: [:metadata, :document, :file_title])
+    t.file_author(proxy: [:metadata, :document, :file_author])
+    t.page_count(proxy: [:metadata, :document, :page_count])
+    t.file_language(proxy: [:metadata, :document, :file_language])
+    t.word_count(proxy: [:metadata, :document, :word_count])
+    t.character_count(proxy: [:metadata, :document, :character_count])
+    t.paragraph_count(proxy: [:metadata, :document, :paragraph_count])
+    t.line_count(proxy: [:metadata, :document, :line_count])
+    t.table_count(proxy: [:metadata, :document, :table_count])
+    t.graphics_count(proxy: [:metadata, :document, :graphics_count])
+    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])
+    t.orientation(proxy: [:metadata, :image, :orientation])
+    t.color_map(proxy: [:metadata, :image, :color_map])
+    t.image_producer(proxy: [:metadata, :image, :image_producer])
+    t.capture_device(proxy: [:metadata, :image, :capture_device])
+    t.scanning_software(proxy: [:metadata, :image, :scanning_software])
+    t.exif_version(proxy: [:metadata, :image, :exif_version])
+    t.gps_timestamp(proxy: [:metadata, :image, :gps_timestamp])
+    t.latitude(proxy: [:metadata, :image, :latitude])
+    t.longitude(proxy: [:metadata, :image, :longitude])
+    t.character_set(proxy: [:metadata, :text, :character_set])
+    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
     builder = Nokogiri::XML::Builder.new do |xml|
-      xml.fits(:xmlns => 'http://hul.harvard.edu/ois/xml/ns/fits/fits_output',
+      xml.fits(xmlns: 'http://hul.harvard.edu/ois/xml/ns/fits/fits_output',
                'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                'xsi:schemaLocation' =>
     "http://hul.harvard.edu/ois/xml/ns/fits/fits_output
     http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd",
-               :version => "0.6.0",
-               :timestamp => "1/25/12 11:04 AM") {
+               version: "0.6.0",
+               timestamp: "1/25/12 11:04 AM") {
         xml.identification {
-          xml.identity(:format => '', :mimetype => '', 
-                       :toolname => 'FITS', :toolversion => '') {
-            xml.tool(:toolname => '', :toolversion => '')
-            xml.version(:toolname => '', :toolversion => '')
-            xml.externalIdentifier(:toolname => '', :toolversion => '')
+          xml.identity(format: '', mimetype: '',
+                       toolname: 'FITS', toolversion: '') {
+            xml.tool(toolname: '', toolversion: '')
+            xml.version(toolname: '', toolversion: '')
+            xml.externalIdentifier(toolname: '', toolversion: '')
           }
         }
         xml.fileinfo {
-          xml.size(:toolname => '', :toolversion => '')
-          xml.creatingApplicatioName(:toolname => '', :toolversion => '',
-                                     :status => '')
-          xml.lastmodified(:toolname => '', :toolversion => '', :status => '')
-          xml.filepath(:toolname => '', :toolversion => '', :status => '')
-          xml.filename(:toolname => '', :toolversion => '', :status => '')
-          xml.md5checksum(:toolname => '', :toolversion => '', :status => '')
-          xml.fslastmodified(:toolname => '', :toolversion => '', :status => '')
+          xml.size(toolname: '', toolversion: '')
+          xml.creatingApplicatioName(toolname: '', toolversion: '',
+                                     status: '')
+          xml.lastmodified(toolname: '', toolversion: '', status: '')
+          xml.filepath(toolname: '', toolversion: '', status: '')
+          xml.filename(toolname: '', toolversion: '', status: '')
+          xml.md5checksum(toolname: '', toolversion: '', status: '')
+          xml.fslastmodified(toolname: '', toolversion: '', status: '')
         }
         xml.filestatus {
-          xml.tag! "well-formed", :toolname => '', :toolversion => '', :status => ''
-          xml.valid(:toolname => '', :toolversion => '', :status => '')
+          xml.tag! "well-formed", toolname: '', toolversion: '', status: ''
+          xml.valid(toolname: '', toolversion: '', status: '')
         }
         xml.metadata {
           xml.document {
-            xml.title(:toolname => '', :toolversion => '', :status => '')
-            xml.author(:toolname => '', :toolversion => '', :status => '')
-            xml.pageCount(:toolname => '', :toolversion => '')
-            xml.isTagged(:toolname => '', :toolversion => '')
-            xml.hasOutline(:toolname => '', :toolversion => '')
-            xml.hasAnnotations(:toolname => '', :toolversion => '')
-            xml.isRightsManaged(:toolname => '', :toolversion => '', 
-                                :status => '')
-            xml.isProtected(:toolname => '', :toolversion => '')
-            xml.hasForms(:toolname => '', :toolversion => '', :status => '')
+            xml.title(toolname: '', toolversion: '', status: '')
+            xml.author(toolname: '', toolversion: '', status: '')
+            xml.pageCount(toolname: '', toolversion: '')
+            xml.isTagged(toolname: '', toolversion: '')
+            xml.hasOutline(toolname: '', toolversion: '')
+            xml.hasAnnotations(toolname: '', toolversion: '')
+            xml.isRightsManaged(toolname: '', toolversion: '',
+                                status: '')
+            xml.isProtected(toolname: '', toolversion: '')
+            xml.hasForms(toolname: '', toolversion: '', status: '')
           }
         }
       }