sufia 1.2.0 → 1.3.0

data/lib/sufia/files_controller_behavior.rb

@@ -53,14 +53,14 @@ module Sufia
 
     # routed to /files/:id/edit
     def edit
-      initialize_fields(@generic_file)
+      @generic_file.initialize_fields
       @groups = current_user.groups
     end
 
     # routed to /files/:id (DELETE)
     def destroy
       pid = @generic_file.noid
-      @generic_file.delete
+      @generic_file.destroy
       Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
       redirect_to sufia.dashboard_index_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
     end
@@ -115,7 +115,7 @@ module Sufia
 
       if params.has_key?(:revision) and params[:revision] !=  @generic_file.content.latest_version.versionID
         revision = @generic_file.content.get_version(params[:revision])
-        @generic_file.add_file_datastream(revision.content, :dsid => 'content')
+        @generic_file.add_file_datastream(revision.content, :dsid => 'content', :mimeType => revision.mimeType)
         version_event = true
         Sufia.queue.push(ContentRestoredVersionEventJob.new(@generic_file.pid, current_user.user_key, params[:revision]))
       end
@@ -182,13 +182,13 @@ module Sufia
     end
 
     # override this method if you need to initialize more complex RDF assertions (b-nodes)
+    # @deprecated use @generic_file.initialize_fields instead
     def initialize_fields(file)
-      file.terms_for_editing.each do |key|
-        # if value is empty, we create an one element array to loop over for output 
-        file[key] = [''] if file[key].empty?
-      end
+      file.initialize_fields
     end
 
+    ActiveSupport::Deprecation.deprecate_methods(FilesControllerBehavior, :initialize_fields)
+
     # The name of the datastream where we store the file data
     def datastream_id
       'content'

data/lib/sufia/generic_file.rb

@@ -12,6 +12,7 @@ module Sufia
     autoload :Audit
     autoload :Actions
     autoload :Permissions
+    autoload :WebForm
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::Thumbnail
@@ -19,6 +20,7 @@ module Sufia
     include Sufia::GenericFile::Characterization
     include Sufia::GenericFile::Audit
     include Sufia::GenericFile::Permissions
+    include Sufia::GenericFile::WebForm
 
     included do
       has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
@@ -37,11 +39,7 @@ module Sufia
 
       around_save :characterize_if_changed, :retry_warming
       before_save :remove_blank_assertions
-    end
-
-    def delete
-      self.cleanup_trophies
-      super
+      before_destroy :cleanup_trophies
     end
 
     def remove_blank_assertions

data/lib/sufia/generic_file/web_form.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module GenericFile
+    module WebForm
+
+      # override this method if you need to initialize more complex RDF assertions (b-nodes)
+      def initialize_fields
+        terms_for_editing.each do |key|
+          # if value is empty, we create an one element array to loop over for output 
+          self[key] = [''] if self[key].empty?
+        end
+      end
+
+    end
+  end
+end

data/lib/sufia/jobs/batch_update_job.rb

@@ -14,7 +14,6 @@
 
 class BatchUpdateJob
   include Hydra::PermissionsQuery
-  include GenericFileHelper
   include Rails.application.routes.url_helpers 
 
   def queue_name
@@ -79,7 +78,7 @@ class BatchUpdateJob
   end
   
   def file_list ( files)
-    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+display_title(gf)+'</a>'}.join(', ')
+    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>'}.join(', ')
     
   end
   

data/lib/sufia/jobs/transcode_audio_job.rb

@@ -28,10 +28,9 @@ class TranscodeAudioJob < FfmpegTranscodeJob
       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/mp3')
-        #generic_file.content.rewind
+        generic_file.add_file_datastream(generic_file.content.read, :dsid=>'mp3', :mimeType=>'audio/mpeg')
       else
-        encode_datastream('mp3', 'audio/mp3', opts)
+        encode_datastream('mp3', 'audio/mpeg', opts)
       end
     end
 

data/lib/sufia/jobs/unzip_job.rb

@@ -24,22 +24,31 @@ class UnzipJob
   end
 
   def run
-    zip_file = GenericFile.find(pid)
     Zip::Archive.open_buffer(zip_file.content.content) do |archive|
       archive.each do |f|
-        @generic_file = GenericFile.new
-        @generic_file.batch_id = zip_file.batch.pid
-        file_name = f.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(f.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.date_uploaded = Time.now.ctime
-        @generic_file.date_modified = Time.now.ctime
-        @generic_file.save
+        create_file(f)
       end
     end
   end
+
+  protected
+
+  def create_file(f)
+    @generic_file = GenericFile.new
+    @generic_file.batch_id = zip_file.batch.pid
+    file_name = f.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(f.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.date_uploaded = Time.now.ctime
+    @generic_file.date_modified = Time.now.ctime
+    @generic_file.save
+  end
+
+  def zip_file
+    @zip_file ||= GenericFile.find(pid)
+  end
 end

data/lib/sufia/model_methods.rb

@@ -35,5 +35,11 @@ module Sufia
 
       return true
     end
+
+    def to_s
+      return Array(title).join(" | ") if title.present?
+      label || "No Title"
+    end
+
   end
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -20,8 +20,7 @@ describe BatchEditsController do
       @two.apply_depositor_metadata('mjg36')
       @one.save!
       @two.save!
-      put :add, :id =>@one.pid
-      put :add, :id =>@two.pid
+      controller.batch = [@one.pid, @two.pid]
       controller.should_receive(:can?).with(:edit, @one.pid).and_return(true)
       controller.should_receive(:can?).with(:edit, @two.pid).and_return(true)
     end
@@ -35,4 +34,25 @@ describe BatchEditsController do
       assigns[:show_file].language.should == ["en"]
     end
   end
+  
+  describe "update" do
+    before do
+      @one = GenericFile.new(:creator=>"Fred", :language=>'en')
+      @one.apply_depositor_metadata('mjg36')
+      @two = GenericFile.new(:creator=>"Wilma", :publisher=>'Rand McNally', :language=>'en')
+      @two.apply_depositor_metadata('mjg36')
+      @one.save!
+      @two.save!
+      controller.batch = [@one.pid, @two.pid]
+      controller.should_receive(:can?).with(:edit, @one.pid).and_return(true)
+      controller.should_receive(:can?).with(:edit, @two.pid).and_return(true)
+    end
+    it "should be successful" do
+      put :update , update_type:"delete_all"
+      response.should be_redirect
+      expect {GenericFIle.find(@one.id)}.to raise_error
+      expect {GenericFIle.find(@two.id)}.to raise_error
+    end
+  end
+
 end

data/spec/controllers/downloads_controller_spec.rb

@@ -16,17 +16,6 @@ require 'spec_helper'
 
 describe DownloadsController do
 
-  describe "default_datastream?" do
-    it "should be true when no datastram_id is passed" do
-      controller.should be_default_datastream
-    end
-    it "should be false when a datastream_id is passed" do
-      controller.params[:datastream_id] = 'descMetadata'
-      controller.should_not be_default_datastream
-    end
-  end
-
-
   describe "with a file" do
     before do
       @f = GenericFile.new(:pid => 'sufia:test1')
@@ -56,29 +45,34 @@ describe DownloadsController do
           DownloadsController.default_content_dsid.should == "content"
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1").content.content
-          controller.should_receive(:send_data).with(expected_content, {:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
+          controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1"
+          response.body.should == expected_content
           response.should be_success
         end
         it "should return requested datastreams" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1").descMetadata.content
-          controller.should_receive(:send_data).with(expected_content, {:filename=>"descMetadata", :disposition=>"inline", :type=>"text/plain"})
+          controller.should_receive(:send_file_headers!).with({:filename => 'descMetadata', :disposition => 'inline', :type => 'text/plain' })
           get "show", :id => "test1", :datastream_id => "descMetadata"
+          response.body.should == expected_content
           response.should be_success
         end
         it "should support setting disposition to inline" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1").content.content
-          controller.should_receive(:send_data).with(expected_content, {:filename => 'world.png', :type => 'image/png', :disposition => "inline"})
+          controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", :disposition => "inline"
+          response.body.should == expected_content
           response.should be_success
         end
+
         it "should allow you to specify filename for download" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1").content.content
-          controller.should_receive(:send_data).with(expected_content, {:filename => "my%20dog.png", :disposition => 'inline', :type => 'image/png'}) 
+          controller.should_receive(:send_file_headers!).with({:filename => 'my%20dog.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", "filename" => "my%20dog.png"
+          response.body.should == expected_content
         end
       end
     end

data/spec/controllers/generic_files_controller_spec.rb

@@ -260,6 +260,38 @@ describe GenericFilesController do
       @user.delete
     end
 
+    it "should change mime type when restoring a revision with a different mime type" do
+      @user = FactoryGirl.find_or_create(:user)
+      sign_in @user
+
+      file = fixture_file_upload('/world.png','image/png')
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+
+      posted_file = GenericFile.find(@generic_file.pid)
+      version1 = posted_file.content.latest_version
+      posted_file.content.version_committer(version1).should == @user.user_key
+      
+      file = fixture_file_upload('/image.jp2','image/jp2')
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+
+      posted_file = GenericFile.find(@generic_file.pid)
+      version2 = posted_file.content.latest_version
+      posted_file.content.version_committer(version2).should == @user.user_key
+
+      posted_file.content.mimeType.should == "image/jp2"
+      post :update, :id=>@generic_file.pid, :revision=>'content.0'
+
+
+      restored_file = GenericFile.find(@generic_file.pid)
+      version3 = restored_file.content.latest_version
+      version3.versionID.should_not == version2.versionID
+      version3.versionID.should_not == version1.versionID
+      restored_file.content.version_committer(version3).should == @user.user_key
+      restored_file.content.mimeType.should == "image/png"
+      @user.delete
+    end
+
+
     it "should record what user added a new version" do
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user

data/spec/controllers/single_use_link_controller_spec.rb

@@ -85,8 +85,9 @@ describe SingleUseLinkController do
       it "and_return http success" do
         controller.stub(:render)
         expected_content = ActiveFedora::Base.find(@file.pid).content.content
-        controller.should_receive(:send_data).with(expected_content, {:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
+        controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
         get :download, id:@dhash 
+        response.body.should == expected_content
         response.should be_success
       end
       it "and_return 404 on second attempt" do

data/spec/controllers/users_controller_spec.rb

@@ -139,6 +139,19 @@ describe UsersController do
       u.facebook_handle.should == 'face'
       u.googleplus_handle.should == 'goo'
     end
+    it "should remove a trophy" do
+      f = GenericFile.create(title:"myFile")
+      f.apply_depositor_metadata(@user.user_key)
+      f.save
+      file_id = f.pid.split(":").last
+      Trophy.create(:generic_file_id => file_id, :user_id => @user.id)
+      @user.trophy_ids.length.should == 1
+      post :update, uid: @user.user_key,  'remove_trophy_'+file_id=> 'yes' 
+      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      flash[:notice].should include("Your profile has been updated")
+      @user.trophy_ids.length.should == 0
+      f.destroy 
+    end
   end
   describe "#follow" do
     after(:all) do

data/spec/models/generic_file_spec.rb

@@ -20,6 +20,25 @@ describe GenericFile do
     @file = subject #TODO remove this line someday (use subject instead)
   end
 
+  describe '#to_s' do
+    it 'uses the provided titles' do
+      subject.title = ["Hello", "World"]
+      expect(subject.to_s).to eq("Hello | World")
+    end
+
+    it 'falls back on label if no titles are given' do
+      subject.title = []
+      subject.label = 'Spam'
+      expect(subject.to_s).to eq("Spam")
+    end
+
+    it 'with no label or titles it is "No Title"' do
+      subject.title = []
+      subject.label = nil
+      expect(subject.to_s).to eq("No Title")
+    end
+  end
+
   describe "terms_for_editing" do
     it "should return a list" do
       @file.terms_for_editing.should == [ :contributor, :creator, :title, :description, :publisher,
@@ -346,6 +365,28 @@ describe GenericFile do
       end
     end
   end
+  describe "trophies" do
+    before(:all) do
+      @u = FactoryGirl.create(:user)
+      @f = GenericFile.new.tap do |gf|
+        gf.apply_depositor_metadata(@u.user_key)
+        gf.stub(:characterize_if_changed).and_yield #don't run characterization
+        gf.save!
+      end
+      @t = Trophy.create(user_id: @u.id, generic_file_id: @f.pid)
+    end
+    after(:all) do
+      @u.destroy
+    end
+    it "should have a trophy" do
+      Trophy.where(generic_file_id: @f.pid).count.should == 1
+    end
+    it "should remove all trophies when file is deleted" do
+      @f.should_receive(:cleanup_trophies)
+      @f.destroy
+      Trophy.where(generic_file_id: @f.pid).count.should == 0
+    end
+  end
   describe "audit" do
     before(:each) do
       u = FactoryGirl.create(:user)

data/spec/support/Gemfile

@@ -7,6 +7,7 @@ gem 'sqlite3'
 gem 'devise' #BL adds this later, so check to see if we can remove this
 gem 'blacklight'
 gem 'hydra-head'
+gem 'hydra-batch-edit', '~>1.0.1'
 
 
 gem 'sufia', :path=>'../../'

data/sufia.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "hydra-head", "~> 6.0"
 
   gem.add_dependency 'noid', '~> 0.6.6'
-  gem.add_dependency 'hydra-batch-edit', '~> 0.3'
+  gem.add_dependency 'hydra-batch-edit', '~> 1.0'
 
   gem.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
   gem.add_dependency 'resque-pool', '0.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -623,7 +623,6 @@ files:
 - app/views/static/mendeley.html.erb
 - app/views/static/subject_libraries.html.erb
 - app/views/static/terms.html.erb
-- app/views/static/versions.html.erb
 - app/views/static/zotero.html.erb
 - app/views/users/_activity_log.html.erb
 - app/views/users/_notify_link.html.erb
@@ -686,7 +685,9 @@ files:
 - lib/sufia/active_fedora/redis.rb
 - lib/sufia/active_record/redis.rb
 - lib/sufia/batch_edits_controller_behavior.rb
+- lib/sufia/contact_form_controller_behavior.rb
 - lib/sufia/controller.rb
+- lib/sufia/dashboard_controller_behavior.rb
 - lib/sufia/downloads_controller_behavior.rb
 - lib/sufia/file_content.rb
 - lib/sufia/file_content/extract_metadata.rb
@@ -699,6 +700,7 @@ files:
 - lib/sufia/generic_file/export.rb
 - lib/sufia/generic_file/permissions.rb
 - lib/sufia/generic_file/thumbnail.rb
+- lib/sufia/generic_file/web_form.rb
 - lib/sufia/id_service.rb
 - lib/sufia/jobs/audit_job.rb
 - lib/sufia/jobs/batch_update_job.rb
@@ -1003,4 +1005,3 @@ test_files:
 - spec/views/single_user_link/generate_download.html.erb_spec.rb
 - spec/views/single_user_link/generate_show.html.erb_spec.rb
 - spec/views/single_user_link/show.html.erb_spec.rb
-has_rdoc: