sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/models/file_usage_spec.rb

@@ -68,7 +68,7 @@ describe FileUsage, :type => :model do
     end
 
     it "should set the path" do
-      expect(usage.path).to eq("/files/#{URI.encode(Sufia::Noid.noidify(file.id), '/')}")
+      expect(usage.path).to eq("/files/#{URI.encode(file.id, '/')}")
     end
 
     it "should set the created date" do

data/spec/models/fits_datastream_spec.rb

@@ -4,7 +4,7 @@ describe FitsDatastream, type: :model, unless: $in_travis do
   describe "image" do
     before(:all) do
       @file = GenericFile.new(id: 'foo123')
-      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      @file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       @file.characterize
     end
     it "should have a format label" do
@@ -43,13 +43,13 @@ describe FitsDatastream, type: :model, unless: $in_travis do
 
     it "should index into solr" do
       expect(solr_doc[Solrizer.solr_name("mime_type")].first).to eq "image/png"
-    end 
+    end
   end
 
   describe "video" do
     before(:all) do
       @file = GenericFile.new(id: 'foo123')
-      @file.add_file(File.open(fixture_path + '/sample_mpeg4.mp4'), 'content', 'sample_mpeg4.mp4')
+      @file.add_file(File.open(fixture_path + '/sample_mpeg4.mp4'), path: 'content', original_name: 'sample_mpeg4.mp4')
       @file.characterize
     end
     it "should have a format label" do
@@ -91,7 +91,7 @@ describe FitsDatastream, type: :model, unless: $in_travis do
   describe "pdf" do
     before do
       @myfile = GenericFile.new(id: 'foo123')
-      @myfile.add_file(File.open(fixture_path + '/sufia/sufia_test4.pdf', 'rb').read, 'content', 'sufia_test4.pdf')
+      @myfile.add_file(File.open(fixture_path + '/sufia/sufia_test4.pdf', 'rb').read, path: 'content', original_name: 'sufia_test4.pdf', mime_type: 'application/pdf')
       @myfile.apply_depositor_metadata('mjg36')
       # characterize method saves
       @myfile.characterize

data/spec/models/generic_file_spec.rb

@@ -52,10 +52,10 @@ describe GenericFile, :type => :model do
     end
   end
 
-  describe "assign_pid" do
-    it "should use the noid id service" do
+  describe "assign_id" do
+    it "should use the id service" do
       expect(Sufia::IdService).to receive(:mint)
-      subject.assign_pid
+      subject.assign_id
     end
   end
 
@@ -179,7 +179,7 @@ describe GenericFile, :type => :model do
     end
 
     it "should have content datastream" do
-      subject.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      subject.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       expect(subject.content).to be_kind_of FileContentDatastream
     end
   end
@@ -218,7 +218,7 @@ describe GenericFile, :type => :model do
       expect(subject).to respond_to(:page_count)
     end
     it "should redefine to_param to make redis keys more recognizable" do
-      expect(subject.to_param).to eq subject.noid
+      expect(subject.to_param).to eq subject.id
     end
 
     describe "that have been saved" do
@@ -310,7 +310,6 @@ describe GenericFile, :type => :model do
       expect(local[Solrizer.solr_name("identifier")]).to eq ["urn:isbn:1234567890"]
       expect(local[Solrizer.solr_name("based_near")]).to eq ["Medina, Saudi Arabia"]
       expect(local[Solrizer.solr_name("mime_type")]).to eq ["image/jpeg"]
-      expect(local["noid_tsi"]).to eq 'stubbed_pid'
       expect(local['all_text_timv']).to eq('abcxyz')
     end
   end
@@ -331,7 +330,7 @@ describe GenericFile, :type => :model do
     describe "with a video", if: Sufia.config.enable_ffmpeg do
       before do
         allow(@f).to receive(mime_type: 'video/quicktime')  #Would get set by the characterization job
-        @f.add_file(File.open("#{fixture_path}/countdown.avi", 'rb'), 'content', 'countdown.avi')
+        @f.add_file(File.open("#{fixture_path}/countdown.avi", 'rb'), path: 'content', original_name: 'countdown.avi')
         @f.save
       end
       it "should make a png thumbnail" do
@@ -348,14 +347,14 @@ describe GenericFile, :type => :model do
         gf.apply_depositor_metadata(u)
         gf.save!
       end
-      @t = Trophy.create(user_id: u.id, generic_file_id: @f.noid)
+      @t = Trophy.create(user_id: u.id, generic_file_id: @f.id)
     end
     it "should have a trophy" do
-      expect(Trophy.where(generic_file_id: @f.noid).count).to eq 1
+      expect(Trophy.where(generic_file_id: @f.id).count).to eq 1
     end
     it "should remove all trophies when file is deleted" do
       @f.destroy
-      expect(Trophy.where(generic_file_id: @f.noid).count).to eq 0
+      expect(Trophy.where(generic_file_id: @f.id).count).to eq 0
     end
   end
 
@@ -403,10 +402,27 @@ describe GenericFile, :type => :model do
   end
 
   describe "noid integration" do
-    subject { GenericFile.new(id: 'wd3763094') }
+    before do
+      allow(Sufia::IdService).to receive(:mint).once.and_return(noid)
+    end
+
+    let(:noid) { 'wd3763094' }
+
+    subject do
+      GenericFile.create do |f|
+        f.apply_depositor_metadata('mjg36')
+      end
+    end
+
+    it "runs the overridden #assign_id method" do
+      expect(Sufia::IdService).to receive(:mint).once
+      GenericFile.create do |f|
+        f.apply_depositor_metadata('mjg36')
+      end
+    end
 
     it "should return the expected identifier" do
-      expect(subject.noid).to eq 'wd3763094'
+      expect(subject.id).to eq noid
     end
 
     it "should have a tree-like URL" do
@@ -507,7 +523,7 @@ describe GenericFile, :type => :model do
       let(:f) { File.new(fixture_path + '/small_file.txt') }
 
       before do
-        subject.add_file(f, 'content', 'small_file.txt')
+        subject.add_file(f, path: 'content', original_name: 'small_file.txt')
         subject.apply_depositor_metadata('mjg36')
       end
 
@@ -521,7 +537,7 @@ describe GenericFile, :type => :model do
       it "does not save a new version of a GenericFile" do
         subject.save!
         allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError)
-        subject.add_file(File.new(fixture_path + '/sufia_generic_stub.txt') , 'content', 'sufia_generic_stub.txt')
+        subject.add_file(File.new(fixture_path + '/sufia_generic_stub.txt') , path: 'content', original_name: 'sufia_generic_stub.txt')
         subject.save
         expect(subject.reload.content.content).to eq "small\n"
       end
@@ -540,7 +556,7 @@ describe GenericFile, :type => :model do
     let(:title_key) { Solrizer.solr_name("title", :stored_searchable, type: :string) }
     let(:title) { ["abc123"] }
     let(:no_terms) { GenericFile.find(subject.id).to_solr }
-    let(:terms) { 
+    let(:terms) {
       file = GenericFile.find(subject.id)
       file.title = title
       file.save

data/spec/models/single_use_link_spec.rb

@@ -34,7 +34,7 @@ describe SingleUseLink do
   describe "find" do
      describe "not expired" do
        before do
-          @su = SingleUseLink.create(downloadKey: 'sha2hashb', itemId: file.id, path: Sufia::Engine.routes.url_helpers.download_path(file.noid), expires: DateTime.now.advance(hours: 1))
+          @su = SingleUseLink.create(downloadKey: 'sha2hashb', itemId: file.id, path: Sufia::Engine.routes.url_helpers.download_path(file), expires: DateTime.now.advance(hours: 1))
        end
        it "should retrieve link" do
           link = SingleUseLink.where(downloadKey: 'sha2hashb').first
@@ -51,7 +51,7 @@ describe SingleUseLink do
      end
      describe "expired" do
        before do
-          @su = SingleUseLink.create!(downloadKey: 'sha2hashb', itemId:file.id, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
+          @su = SingleUseLink.create!(downloadKey: 'sha2hashb', itemId:file.id, path:Sufia::Engine.routes.url_helpers.download_path(file))
 
           @su.update_attribute :expires, DateTime.now.advance(hours: -1)
        end

data/spec/models/solr_document_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SolrDocument, :type => :model do
+describe SolrDocument, type: :model do
 
   describe "date_uploaded" do
     before do
@@ -11,12 +11,15 @@ describe SolrDocument, :type => :model do
     end
   end
 
-  describe "to_param" do
+  describe '#to_param' do
+    let(:id) { '1v53kn56d' }
+
     before do
-      subject['noid_tsi'] = '1v53kn56d'
+      subject[:id] = id
     end
-    it "should be noid" do
-      expect(subject.to_param).to eq '1v53kn56d'
+
+    it 'returns the object identifier' do
+      expect(subject.to_param).to eq id
     end
   end
 

data/spec/models/user_spec.rb

@@ -90,9 +90,9 @@ describe User, :type => :model do
     let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
     let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
     let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
-    let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
-    let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
-    let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+    let!(:trophy1) { user.trophies.create!(generic_file_id: file1.id) }
+    let!(:trophy2) { user.trophies.create!(generic_file_id: file2.id) }
+    let!(:trophy3) { user.trophies.create!(generic_file_id: file3.id) }
 
     it "should return a list of generic files" do
       expect(user.trophy_files).to eq [file1, file2, file3]

data/spec/presenters/sufia/collection_presenter_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Sufia::CollectionPresenter do
+  describe ".terms" do
+    subject { described_class.terms }
+    it { is_expected.to eq [:title, :total_items, :size, :resource_type, :description, :creator,
+                            :contributor, :tag, :rights, :publisher, :date_created, :subject,
+                            :language, :identifier, :based_near, :related_url] }
+  end
+
+  let(:collection) { Collection.new(description: 'a nice collection', title: 'A clever title') }
+  let(:presenter) { described_class.new(collection) }
+
+  describe "#terms_with_values" do
+    subject { presenter.terms_with_values }
+
+    it { is_expected.to eq [:title, :total_items, :size, :description] }
+  end
+
+  describe "#title" do
+    subject { presenter.title }
+    it { is_expected.to eq 'A clever title' }
+  end
+
+  describe "#size" do
+    subject { presenter.size }
+    it { is_expected.to eq '0 Bytes' }
+  end
+
+  describe "#total_items" do
+    subject { presenter.total_items }
+    it { is_expected.to eq 0 }
+  end
+end

data/spec/presenters/sufia/generic_file_presenter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Sufia::GenericFilePresenter do
-  describe "#terms" do
+  describe ".terms" do
     it "should return a list" do
       expect(described_class.terms).to eq([:resource_type, :title,
         :creator, :contributor, :description, :tag, :rights, :publisher,
@@ -9,4 +9,44 @@ describe Sufia::GenericFilePresenter do
         :related_url])
     end
   end
+
+  let(:presenter) { Sufia::GenericFilePresenter.new(file) }
+
+  describe '#tweeter' do
+    let(:file) { build(:generic_file).tap { |f| f.apply_depositor_metadata(user) } }
+    subject { presenter.tweeter }
+
+    context "with a user that can be found" do
+      let(:user) { create :user, twitter_handle: 'test' }
+      it { is_expected.to eq '@test' }
+    end
+
+    context "with a user that doesn't have a twitter handle" do
+      let(:user) { create :user, twitter_handle: '' }
+      it { is_expected.to eq '@HydraSphere' }
+    end
+
+    context "with a user that can't be found" do
+      let(:user) { 'sarah' }
+      it { is_expected.to eq '@HydraSphere' }
+    end
+  end
+
+  describe '#itemtype' do
+    let(:file) { build(:generic_file, resource_type: type) }
+
+    subject { presenter.itemtype }
+
+    context 'when resource_type is Audio' do
+      let(:type) { ['Audio'] }
+
+      it { is_expected.to eq 'http://schema.org/AudioObject' }
+    end
+
+    context 'when resource_type is Conference Proceeding' do
+      let(:type) { ['Conference Proceeding'] }
+
+      it { is_expected.to eq 'http://schema.org/ScholarlyArticle' }
+    end
+  end
 end

data/spec/presenters/sufia/version_list_presenter_spec.rb

@@ -9,14 +9,24 @@ describe Sufia::VersionListPresenter, :no_clean do
     end
   end
 
-  subject { Sufia::VersionListPresenter.new([resource_version]) }
+  let(:resource_version2) do
+    ActiveFedora::VersionsGraph::ResourceVersion.new.tap do |v|
+      v.uri = 'http://example.com/version2'
+      v.label = 'version2'
+      v.created = '2014-12-19T02:03:18.296Z'
+    end
+  end
+
+  subject { Sufia::VersionListPresenter.new([resource_version, resource_version2]) }
 
   describe "#each" do
     it "should yield version_presenters" do
+      versions_descending = []
       subject.each do |v|
         expect(v).to be_kind_of Sufia::VersionPresenter
-        expect(v.label).to eq 'version1'
+        versions_descending.push(v.label)
       end
+      expect(versions_descending).to eq ['version2', 'version1']
     end
   end
 end

data/spec/services/generic_file_audit_service_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Sufia::GenericFileAuditService do
   let(:f) do
     GenericFile.create do |f|
-      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       f.apply_depositor_metadata('mjg36')
     end
   end
@@ -14,7 +14,7 @@ describe Sufia::GenericFileAuditService do
     before do
       # force a second version
       gf = GenericFile.find(f.id)
-      gf.add_file('hello two', 'content', 'hello2.txt')
+      gf.add_file('hello two', path: 'content', original_name: 'hello2.txt')
       gf.save!
     end
 
@@ -30,7 +30,7 @@ describe Sufia::GenericFileAuditService do
     before do
       # force a second version
       gf = GenericFile.find(f.id)
-      gf.add_file('hello two', 'content', 'hello2.txt')
+      gf.add_file('hello two', path: 'content', original_name: 'hello2.txt')
       gf.save!
     end
 

data/spec/services/noid_spec.rb

@@ -1,16 +1,9 @@
 require 'spec_helper'
 
 describe Sufia::Noid do
-  describe "#namespaceize" do
-    subject { Sufia::Noid.namespaceize(id) }
-
-    context "when the passed in pid doesn't have a namespace" do
-      let(:id) { 'abc123' }
-      it { is_expected.to eq 'sufia:abc123' }
-    end
-    context "when the passed in pid has a namespace" do
-      let(:id) { 'ksl:abc123' }
-      it { is_expected.to eq 'ksl:abc123' }
-    end
+  describe "#treeify" do
+    subject { Sufia::Noid.treeify(id) }
+    let(:id) { 'abc123def45' }
+    it { is_expected.to eq 'ab/c1/23/de/abc123def45' }
   end
 end

data/spec/services/repository_audit_service_spec.rb

@@ -4,7 +4,7 @@ describe Sufia::RepositoryAuditService do
   let(:user) { FactoryGirl.create(:user) }
   let!(:file) do
     GenericFile.create! do |file|
-      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       file.apply_depositor_metadata(user)
     end
   end

data/spec/spec_helper.rb

@@ -128,6 +128,7 @@ RSpec.configure do |config|
 
   config.include InputSupport, type: :input
   config.include Capybara::RSpecMatchers, type: :input
+  config.include FactoryGirl::Syntax::Methods
 
   config.infer_spec_type_from_file_location!
 end

data/spec/support/fixture_helpers.rb

@@ -1,8 +1,7 @@
 # spec/support/fixture_helpers.rb
 module FixtureHelpers
-  def create_file_fixtures(depositor="archivist1@example.com")
+  def create_file_fixtures(depositor = 'archivist1@example.com')
     handles = [:public_pdf, :public_mp3, :public_wav]
-    handles.map {|handle| FactoryGirl.create(handle, depositor: depositor) }
+    handles.map { |handle| FactoryGirl.create(handle, depositor: depositor) }
   end
 end
-

data/spec/support/selectors.rb

@@ -18,26 +18,26 @@ module Selectors
   module Dashboard
 
     def db_item_actions_toggle item
-      within "#document_#{item.noid}" do
+      within "#document_#{item.id}" do
         find '.dropdown-toggle'
       end
     end
 
     def db_item_title item
-      within "#document_#{item.noid}" do
-        find "#src_copy_link#{item.noid}"
+      within "#document_#{item.id}" do
+        find "#src_copy_link#{item.id}"
       end
     end
 
     def db_file_checkbox file
-      within "#document_#{file.noid}" do
+      within "#document_#{file.id}" do
         find '.batch_document_selector'
       end
     end
 
     def db_collection_radio_button collection
       within '#collection-list-container' do
-        find "input[id*='#{collection.noid}']"
+        find "input[id*='#{collection.id}']"
       end
     end
 
@@ -52,8 +52,8 @@ module Selectors
     end
 
     def db_visibility_link file
-      within "#document_#{file.noid}" do
-        find "a#permission_#{file.noid}"
+      within "#document_#{file.id}" do
+        find "a#permission_#{file.id}"
       end
     end