hydra-core 5.1.0 → 5.2.0

data/app/models/file_asset.rb

@@ -0,0 +1,5 @@
+# model for a FileAsset   ActiveFedora object 
+#   a file asset is a generic notion of a file, which could have, for example, image or text or video behaviors.
+class FileAsset < ActiveFedora::Base
+  include Hydra::Models::FileAsset
+end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end
 

data/lib/hydra/controller/upload_behavior.rb

@@ -9,9 +9,10 @@ module Hydra::Controller::UploadBehavior
     if params.has_key?(:Filedata)
       @file_assets = []
       params[:Filedata].each do |file|
-        @file_asset = create_asset_from_file(file)
-        add_posted_blob_to_asset(@file_asset,file)
-        @file_asset.save
+        @file_asset = FileAsset.new
+        @file_asset.label = file.original_filename
+        add_posted_blob_to_asset(@file_asset, file, file.original_filename)
+        @file_asset.save!
         @file_assets << @file_asset
       end
       return @file_assets
@@ -24,10 +25,13 @@ module Hydra::Controller::UploadBehavior
   # Sets asset label and title to filename if they're empty
   #
   # @param [FileAsset] asset the File Asset to add the blob to
+  # @param [#read] file the IO object that is the blob
+  # @param [String] file the IO object that is the blob
   # @return [FileAsset] file the File Asset  
-  def add_posted_blob_to_asset(asset, file)
-    #file_name = filename_from_params
-    file_name = file.original_filename
+  def add_posted_blob_to_asset(asset, file, file_name = nil)
+    # deprecating 2 argument constructor because it depends on a HTTP request.  If we pass the file name we can use for non-web too.
+    Deprecation.warn(Hydra::Controller::UploadBehavior, "add_posted_blob_to_asset with a 2 argument constructor is deprecated. Pass a filename (e.g. \"file.original_name\") as the third argument. 2 argument constructor will be removed in hydra-core 6" ) if file_name.nil?
+    file_name ||= file.original_filename
     options = {:label=>file_name, :mimeType=>mime_type(file_name)}
     dsid = datastream_id #Only call this once so that it could be a sequence
     options[:dsid] = dsid if dsid
@@ -53,81 +57,7 @@ module Hydra::Controller::UploadBehavior
   end
   deprecation_deprecate :associate_file_asset_with_container
   
-  # Apply any posted file metadata to the file asset
-  def apply_posted_file_metadata         
-    @metadata_update_response = update_document(@file_asset, @sanitized_params)
-    @file_asset.save
-  end
-  
-  
-  # The posted File 
-  # @return [File] the posted file.  Defaults to nil if no file was posted.
-  def posted_file
-    params[:Filedata]
-  end
   
-  # A best-guess filename based on POST params
-  # If Filename was submitted, it uses that.  Otherwise, it calls +original_filename+ on the posted file
-  def filename_from_params
-    if !params[:Filename].nil?
-      file_name = params[:Filename]      
-    else
-      file_name = posted_file.original_filename
-      params[:Filename] = file_name
-    end
-  end
-
-  # Creates a File Asset and sets its label from params[:Filename]
-  #
-  # @return [FileAsset] the File Asset
-  def create_asset_from_params    
-    file_asset = FileAsset.new
-    file_asset.label = params[:Filename]
-    
-    return file_asset
-  end
-  
-  # Creates a File Asset and sets its label from filename
-  #
-  # @return [FileAsset] the File Asset
-  def create_asset_from_file(file)
-    file_asset = FileAsset.new
-    file_asset.label = file.original_filename
-
-    return file_asset
-  end
-  
-  
-  # This is pre-Hydra code that created an AudioAsset, VideoAsset or ImageAsset based on the
-  # current params in the controller.
-  #
-  # @return [Constant] the recommended Asset class 
-  def asset_class_from_params
-    if params.has_key?(:type)
-      chosen_type = case params[:type]
-      when "AudioAsset"
-        AudioAsset
-      when "VideoAsset"
-        VideoAsset
-      when "ImageAsset"
-        ImageAsset
-      else
-        FileAsset
-      end
-    elsif params.has_key?(:Filename)
-      chosen_type = choose_model_by_filename( params[:Filename] )
-    else
-      chosen_type = FileAsset
-    end
-    
-    return chosen_type
-  end
-  
-  def choose_model_by_filename(filename)
-    choose_model_by_filename_extension( File.extname(filename) )
-  end
-  
-
   private
   # Return the mimeType for a given file name
   # @param [String] file_name The filename to use to get the mimeType

data/spec/helpers/upload_behavior_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Hydra::Controller::UploadBehavior do
+
+  it "should respond to datastream_id" do
+    helper.should respond_to :datastream_id  ### API method, test that it's there to be overridden
+  end
+
+  describe "add_posted_blob_to_asset" do
+    it "should set object title and label, relying on datastream_id to set dsId" do
+      mock_file = mock("File")
+      file_name = "Posted Filename.foo"
+      helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
+      mock_fa = mock("file asset")
+      mock_file.should_receive(:original_filename).and_return(file_name)
+      helper.stub(:datastream_id).and_return('bar')
+      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
+      mock_fa.should_receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
+      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
+      helper.add_posted_blob_to_asset(mock_fa,mock_file) # this is the deprecated 2 argument method
+    end
+    
+    it "should support submissions from swfupload" do
+      mock_file = mock("File")
+      file_name = "Posted Filename.foo"
+      helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
+      mock_fa = mock("file asset")
+      mock_file.should_receive(:original_filename).and_return(file_name)
+      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
+      mock_fa.stub(:set_title_and_label)
+      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
+      helper.add_posted_blob_to_asset(mock_fa,mock_file)
+    end
+    it "should support submissions from single-file uploader, defaulting to dsId of content" do
+      mock_file = mock("File")
+      file_name = "Posted Filename.foo"
+      helper.stub(:params).and_return( :Filedata=>[mock_file], :container_id=>"hydrangea:2973" )      
+      mock_file.should_receive(:original_filename).and_return(file_name)
+      mock_fa = mock("file asset")
+      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
+      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
+      mock_fa.stub(:set_title_and_label)
+      helper.add_posted_blob_to_asset(mock_fa,mock_file)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -315,6 +315,7 @@ files:
 - app/helpers/facets_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
 - app/helpers/hydra/facets_helper_behavior.rb
+- app/models/file_asset.rb
 - app/models/hydra/datastream/properties.rb
 - app/models/mods_asset.rb
 - config/jetty.yml
@@ -366,6 +367,7 @@ files:
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
+- spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
 - spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb
@@ -424,6 +426,7 @@ test_files:
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
+- spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
 - spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb