Test 0.3.7 b

hyrax/app/actors/hyrax/actors/file_actor.rb

@@ -84,7 +84,7 @@ module Hyrax
         file_set.characterization_proxy.original_checksum = uploaded_file.characterization_data['original_checksum']
         file_set.characterization_proxy.format_label = []
 
-        if file_set.image?
+        if file_set.mime_type_image?
           file_set.characterization_proxy.height = uploaded_file.characterization_data['height']
           file_set.characterization_proxy.width  = uploaded_file.characterization_data['width']
 
@@ -151,43 +151,10 @@ module Hyrax
         target_bucket = Aws::S3::Bucket.new(target_bucket_name)
 
         s3.create_bucket(target_bucket_name) unless s3.bucket_exists?(target_bucket_name)
-        target_object_key = generate_target_object_key(file_set)
 
-        s3.move_object(source_object_key, target_bucket_name, target_object_key, { uploaded_file_path: source_object_key })
-        target_object = target_bucket.object(target_object_key)
+        s3.move_object(source_object_key, target_bucket_name, file_set.object_key_on_s3, { uploaded_file_path: source_object_key })
 
-        download_bucket = Aws::S3::Resource.new(region: ENV['S3_REGION']).bucket(target_bucket_name)
-
-        url_options = {
-          response_content_disposition: "attachment; filename=\"#{target_object_key}\""
-        }
-        object = download_bucket.object(target_object_key)
-
-        return object.exists? ? object.presigned_url(:get, url_options).to_s : nil
-      end
-
-      def change_repository_file_content(uploaded_file, repository_file, target_object)
-        uploaded_file.file.file.file = target_object
-
-        repository_file.content = uploaded_file.file_url
-      end
-
-      def generate_target_object_key(file_set)
-        prefix = case file_set.for_complex_type
-                 when 'ComplexSubject'
-                    complex_subject = ComplexSubject.find_by(source_identifier: file_set.for_complex_identifier)
-                   "#{complex_subject.subject_title}/files"
-                 when 'ComplexSession'
-                   complex_session = ComplexSession.find_by(source_identifier: file_set.for_complex_identifier)
-                   "#{complex_session.complex_subject.subject_title}/#{complex_session.session_title}/files"
-                 when 'ComplexModality'
-                   complex_modality = ComplexModality.find_by(source_identifier: file_set.for_complex_identifier)
-                   "#{complex_modality.complex_subject.subject_title}/#{complex_modality.complex_session.session_title}/#{complex_modality.modality_title}/files"
-                 else
-                   'files'
-                 end
-
-        "/#{prefix}/#{file_set.title.first}"
+        s3.presigned_url_for_downlad(target_bucket_name, file_set.object_key_on_s3)
       end
 
       def clear_metadata(file_set)