sufia 3.0.0 → 3.1.0

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/spec/active_fedora/unsaved_digital_object_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe ActiveFedora::UnsavedDigitalObject do
   it "should have an ARK-style pid" do    

data/spec/controllers/authorities_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe AuthoritiesController do
   describe "#query" do

data/spec/controllers/batch_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe BatchController do
   before do
@@ -16,7 +16,7 @@ describe BatchController do
       @batch = Batch.new
       @batch.save
       @file = GenericFile.new(:batch=>@batch)
-      @file.apply_depositor_metadata(@user.user_key)
+      @file.apply_depositor_metadata(@user)
       @file.save
       @file2 = GenericFile.new(:batch=>@batch)
       @file2.apply_depositor_metadata('otherUser')
@@ -118,10 +118,10 @@ describe BatchController do
       @b1 = Batch.new
       @b1.save
       @file = GenericFile.new(:batch=>@b1, :label=>'f1')
-      @file.apply_depositor_metadata(@user.user_key)
+      @file.apply_depositor_metadata(@user)
       @file.save
       @file2 = GenericFile.new(:batch=>@b1, :label=>'f2')
-      @file2.apply_depositor_metadata(@user.user_key)
+      @file2.apply_depositor_metadata(@user)
       @file2.save
     end
     after do

data/spec/controllers/batch_edits_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe BatchEditsController do
   before do

data/spec/controllers/catalog_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe CatalogController do
   before do

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe DashboardController do
   before do
@@ -54,7 +54,7 @@ describe DashboardController do
           files_count = assigns(:document_list).count
           until files_count == 3
             gf = GenericFile.new()
-            gf.apply_depositor_metadata(@user.user_key)
+            gf.apply_depositor_metadata(@user)
             gf.save
             files_count += 1
           end

data/spec/controllers/downloads_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe DownloadsController do
 
@@ -6,8 +6,7 @@ describe DownloadsController do
     before do
       @f = GenericFile.new(:pid => 'sufia:test1')
       @f.apply_depositor_metadata('archivist1@example.com')
-      @f.set_title_and_label('world.png')
-      @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content', :mimeType => 'image/png')
+      @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @f.should_receive(:characterize_if_changed).and_yield
       @f.save!
     end

data/spec/controllers/generic_files_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe GenericFilesController do
   before do
@@ -16,6 +16,7 @@ describe GenericFilesController do
       GenericFile.stub(:new).and_return(@mock)
     end
     after do
+      GenericFile.unstub(:new)
       begin
         Batch.find("sample:batch_id").delete
       rescue
@@ -30,6 +31,8 @@ describe GenericFilesController do
       JSON.parse(response.body).first['error'].should match(/no file for upload/i)
     end
 
+
+
     it "should spawn a content deposit event job" do
       file = fixture_file_upload('/world.png','image/png')
       s1 = double('one')
@@ -60,6 +63,7 @@ describe GenericFilesController do
     end
 
     it "should download and import a file from a given url" do
+      pending "This is just downloading a 401 error page"
       date_today = Date.today
       Date.stub(:today).and_return(date_today)
       generic_file = GenericFile.new      #find(self.pid)
@@ -168,30 +172,7 @@ describe GenericFilesController do
       Sufia.queue.should_receive(:push).with(s2).once
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
-
-    describe "#virus_check" do
-      before do
-        unless defined? ClamAV
-          class ClamAV
-            def self.instance
-              new
-            end
-          end
-          @stubbed_clamav = true
-        end
-      end
-      after do
-        Object.send(:remove_const, :ClamAV) if @stubbed_clamav
-      end
-      it "failing virus check should create flash" do
-        GenericFile.any_instance.stub(:to_solr).and_return({})
-        ClamAV.any_instance.should_receive(:scanfile).and_return(1)      
-        file = fixture_file_upload('/world.png','image/png')
-        controller.send :virus_check, file
-        flash[:error].should_not be_empty
-      end
-    end
-
+    
     it "should error out of create and save after on continuos rsolr error" do
       GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))  
           
@@ -199,14 +180,116 @@ describe GenericFilesController do
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
       response.body.should include("Error occurred while creating generic file.")
     end
-
+  end
+    
+  describe "#create with local_file" do
+    let (:mock_url) {"http://example.com"}
+    before do
+      Sufia.config.enable_local_ingest = true
+      GenericFile.delete_all
+      @mock_upload_directory = 'spec/mock_upload_directory'
+      # Dir.mkdir @mock_upload_directory unless File.exists? @mock_upload_directory
+      FileUtils.mkdir_p([File.join(@mock_upload_directory, "import/files"),File.join(@mock_upload_directory, "import/metadata")])   
+      FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
+      FileUtils.copy(File.expand_path('../../fixtures/image.jp2', __FILE__), @mock_upload_directory)
+      FileUtils.copy(File.expand_path('../../fixtures/dublin_core_rdf_descMetadata.nt', __FILE__), File.join(@mock_upload_directory, "import/metadata"))
+      FileUtils.copy(File.expand_path('../../fixtures/icons.zip', __FILE__), File.join(@mock_upload_directory, "import/files"))
+      FileUtils.copy(File.expand_path('../../fixtures/Example.ogg', __FILE__), File.join(@mock_upload_directory, "import/files"))
+    end
+    after do
+      Sufia.config.enable_local_ingest = false
+      FileContentDatastream.any_instance.stub(:live?).and_return(true)
+      GenericFile.destroy_all
+    end
+    context "when User model defines a directory path" do
+      before do 
+        User.any_instance.stub(:directory).and_return(@mock_upload_directory)
+      end
+      it "should ingest files from the filesystem" do
+        if $in_travis
+          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
+          # In order to avoid an invalid derivative creation, just stub out the derivatives.
+          GenericFile.any_instance.stub(:create_derivatives)
+        end
+        lambda { post :create, local_file: ["world.png", "image.jp2"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(2)
+        response.should redirect_to Sufia::Engine.routes.url_helpers.batch_edit_path('xw42n7934')
+        # These files should have been moved out of the upload directory
+        File.exist?("#{@mock_upload_directory}/image.jp2").should be_false
+        File.exist?("#{@mock_upload_directory}/world.png").should be_false
+        # And into the storage directory
+        files = GenericFile.find(Solrizer.solr_name("is_part_of",:symbol) => 'info:fedora/sufia:xw42n7934')
+        files.first.label.should == 'world.png'
+        files.last.label.should == 'image.jp2'
+      end
+      it "should ingest redirect to another location" do
+        if $in_travis
+          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
+          # In order to avoid an invalid derivative creation, just stub out the derivatives.
+          GenericFile.any_instance.stub(:create_derivatives)
+        end
+        GenericFilesController.should_receive(:upload_complete_path).and_return(mock_url)
+        lambda { post :create, local_file: ["world.png"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(1)
+        response.should redirect_to mock_url
+        # These files should have been moved out of the upload directory
+        File.exist?("#{@mock_upload_directory}/world.png").should be_false
+        # And into the storage directory
+        files = GenericFile.find(Solrizer.solr_name("is_part_of",:symbol) => 'info:fedora/sufia:xw42n7934')
+        files.first.label.should == 'world.png'
+      end
+      it "should ingest directories from the filesystem" do
+        #TODO this test is very slow because it kicks off CharacterizeJob.
+        if $in_travis
+          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
+          # In order to avoid an invalid derivative creation, just stub out the derivatives.
+          GenericFile.any_instance.stub(:create_derivatives)
+        end
+        lambda { post :create, local_file: ["world.png", "import"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(4)
+        response.should redirect_to Sufia::Engine.routes.url_helpers.batch_edit_path('xw42n7934')
+        # These files should have been moved out of the upload directory
+        File.exist?("#{@mock_upload_directory}/import/files/Example.ogg").should be_false
+        File.exist?("#{@mock_upload_directory}/import/files/icons.zip").should be_false
+        File.exist?("#{@mock_upload_directory}/import/metadata/dublin_core_rdf_descMetadata.nt").should be_false
+        File.exist?("#{@mock_upload_directory}/world.png").should be_false
+        # And into the storage directory
+        files = GenericFile.find(Solrizer.solr_name("is_part_of",:symbol) => 'info:fedora/sufia:xw42n7934')
+        files.first.label.should == 'world.png'
+        ['icons.zip', 'Example.ogg'].each do |filename|
+          files.select{|f| f.label == filename}.first.relative_path.should == "import/files/#{filename}"
+        end
+        files.select{|f| f.label == 'dublin_core_rdf_descMetadata.nt'}.first.relative_path.should == 'import/metadata/dublin_core_rdf_descMetadata.nt'
+      end
+    end
+    context "when User model does not define directory path" do
+      it "should return an error message and redirect to file upload page" do
+        lambda { post :create, local_file: ["world.png", "image.jp2"], batch_id: "xw42n7934"}.should_not change(GenericFile, :count)
+        response.should render_template :new
+        flash[:alert].should == 'Your account is not configured for importing files from a user-directory on the server.'
+      end
+    end
+  end
+  
+  describe "#virus_check" do
+    it "passing virus check should not create flash error" do
+      GenericFile.any_instance.stub(:to_solr).and_return({})
+      file = fixture_file_upload('/world.png','image/png')  
+      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file).and_return(0)    
+      controller.send :virus_check, file
+      flash[:error].should be_nil
+    end
+    it "failing virus check should create flash" do
+      GenericFile.any_instance.stub(:to_solr).and_return({})
+      file = fixture_file_upload('/world.png','image/png')  
+      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file).and_return(1)    
+      controller.send :virus_check, file
+      flash[:error].should_not be_empty
+    end
   end
 
   describe "audit" do
     before do
       #GenericFile.any_instance.stub(:to_solr).and_return({})
       @generic_file = GenericFile.new
-      @generic_file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @generic_file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @generic_file.apply_depositor_metadata('mjg36')
       @generic_file.save
     end
@@ -225,7 +308,7 @@ describe GenericFilesController do
   describe "destroy" do
     before(:each) do
       @generic_file = GenericFile.new
-      @generic_file.apply_depositor_metadata(@user.user_key)
+      @generic_file.apply_depositor_metadata(@user)
       @generic_file.save
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
@@ -250,7 +333,7 @@ describe GenericFilesController do
     before do
       #controller.should_receive(:virus_check).and_return(0)      
       @generic_file = GenericFile.new
-      @generic_file.apply_depositor_metadata(@user.user_key)
+      @generic_file.apply_depositor_metadata(@user)
       @generic_file.save
     end
     after do
@@ -412,8 +495,7 @@ describe GenericFilesController do
     before do
       f = GenericFile.new(:pid => 'sufia:test5')
       f.apply_depositor_metadata('archivist1@example.com')
-      f.set_title_and_label('world.png')
-      f.add_file_datastream(File.new(fixture_path +  '/world.png'))
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       # grant public read access explicitly
       f.read_groups = ['public']
       f.should_receive(:characterize_if_changed).and_yield

data/spec/controllers/mailbox_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe MailboxController do
   before(:each) do

data/spec/controllers/single_use_link_controller_spec.rb

@@ -1,15 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe SingleUseLinkController do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
     @file = GenericFile.new
-    @file.set_title_and_label('world.png')
-    @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content', :mimeType => 'image/png')
-    @file.apply_depositor_metadata(@user.user_key)
+    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    @file.apply_depositor_metadata(@user)
     @file.save
     @file2 = GenericFile.new
-    @file2.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content', :mimeType => 'image/png')
+    @file2.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
     @file2.apply_depositor_metadata('mjg36')
     @file2.save
   end

data/spec/controllers/users_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe UsersController do
   before(:each) do
@@ -127,7 +127,7 @@ describe UsersController do
     end
     it "should remove a trophy" do
       f = GenericFile.create(title:"myFile")
-      f.apply_depositor_metadata(@user.user_key)
+      f.apply_depositor_metadata(@user)
       f.save
       file_id = f.pid.split(":").last
       Trophy.create(:generic_file_id => file_id, :user_id => @user.id)
@@ -197,7 +197,7 @@ describe UsersController do
   describe "#toggle_trophy" do
      before do
        @file = GenericFile.new()
-       @file.apply_depositor_metadata(@user.user_key)
+       @file.apply_depositor_metadata(@user)
        @file.save
        @file_id = @file.pid.split(":").last
      end

data/spec/features/browse_dashboard_files.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Browse Dashboard files" do
 

data/spec/features/browse_files.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Browse files" do
 

data/spec/features/contact_form.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Sending an email via the contact form" do
 

data/spec/features/display_dashboard.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Display Dashboard files" do
 

data/spec/features/ingest_upload_files.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Uploading files via web form" do
 

data/spec/features/users_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "User Profile" do
 

data/spec/helpers/generic_file_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe GenericFileHelper do
   it "draws add button" do

data/spec/helpers/render_constraints_helper_behavior_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Blacklight::RenderConstraintsHelperBehavior do
+
+  describe "render_filter_element" do
+    let(:blacklight_config) { Blacklight::Configuration.new }
+
+    before(:each) do
+      helper.stub(:blacklight_config).and_return blacklight_config
+    end
+
+
+    describe "render_selected_facet_value" do
+      it "be html_safe and not have the remove link" do
+        item = double("item", :value=>'two', :hits=>9)
+        ret_val = helper.render_filter_element("one", [item],{})
+        doc = Nokogiri::HTML(ret_val.first)
+        filter = doc.xpath("//span[@class='filterValue']")
+        filter.text.should == item.value
+      end
+      it "use facet_display_value" do
+        helper.stub(:facet_display_value).and_return('four')
+        item = double("item", :value=>'two', :hits=>9)
+        ret_val = helper.render_filter_element("one", [item],{})
+        doc = Nokogiri::HTML(ret_val.first)
+        filter = doc.xpath("//span[@class='filterValue']")
+        filter.text.should == 'four'
+      end
+      it "use facet_display_value for dashboard" do
+        params[:controller] = "dashboard"
+        helper.stub(:facet_display_value).and_return('four')
+        helper.stub(:dashboard_index_path).and_return("abc")
+        item = double("item", :value=>'two', :hits=>9)
+        ret_val = helper.render_filter_element("one", [item],{})
+        doc = Nokogiri::HTML(ret_val.first)
+        filter = doc.xpath("//span[@class='filterValue']")
+        filter.text.should == 'four'
+      end
+
+    end
+  end
+end

data/spec/helpers/sufia_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe SufiaHelper do
   describe "link_to_profile" do
@@ -9,4 +9,43 @@ describe SufiaHelper do
       helper.link_to_profile('justin@example.com').should == "<a href=\"/users/justin@example-dot-com\">justin@example.com</a>"
     end
   end
+
+  describe "selected facet" do
+    let(:blacklight_config) { Blacklight::Configuration.new }
+
+    before(:each) do
+      helper.stub(:blacklight_config).and_return blacklight_config
+      helper.stub(:url_for).and_return('http://example.com')
+    end
+
+
+    describe "render_selected_facet_value" do
+      it "be html_safe and not have the remove link" do
+        item = double("item", :value=>'two', :hits=>9)
+        ret_val = helper.render_facet_value("one", item)
+        doc = Nokogiri::HTML(ret_val)
+        filter = doc.xpath("//a[@class='facet_select']")
+        filter.text.should == item.value
+        ret_val.should be_html_safe
+      end
+      it "use facet_display_value" do
+        item = double("item", :value=>'two', :hits=>9)
+        helper.stub(:facet_display_value).and_return('four')
+        ret_val = helper.render_facet_value("one", item)
+        doc = Nokogiri::HTML(ret_val)
+        filter = doc.xpath("//a[@class='facet_select']")
+        filter.text.should == 'four'
+      end
+      it "use facet_display_value for dashboard" do
+        params[:controller] = "dashboard"
+        item = double("item", :value=>'two', :hits=>9)
+        helper.stub(:facet_display_value).and_return('four')
+        ret_val = helper.render_facet_value("one", item)
+        doc = Nokogiri::HTML(ret_val)
+        filter = doc.xpath("//a[@class='facet_select']")
+        filter.text.should == 'four'
+      end
+
+    end
+  end
 end