sufia 7.0.0.beta3 → 7.0.0.beta4

data/spec/features/search_spec.rb

@@ -30,10 +30,10 @@ describe 'searching' do
       visit '/'
       expect(page).to have_content("All")
       expect(page).to have_css("a[data-search-label*=All]", visible: false)
-      expect(page).to_not have_css("a[data-search-label*='My Works']", visible: false)
-      expect(page).to_not have_css("a[data-search-label*='My Collections']", visible: false)
-      expect(page).to_not have_css("a[data-search-label*='My Highlights']", visible: false)
-      expect(page).to_not have_css("a[data-search-label*='My Shares']", visible: false)
+      expect(page).not_to have_css("a[data-search-label*='My Works']", visible: false)
+      expect(page).not_to have_css("a[data-search-label*='My Collections']", visible: false)
+      expect(page).not_to have_css("a[data-search-label*='My Highlights']", visible: false)
+      expect(page).not_to have_css("a[data-search-label*='My Shares']", visible: false)
 
       click_button("All")
       expect(page).to have_content("All of Sufia")
@@ -49,9 +49,9 @@ describe 'searching' do
     it "does not display search options for dashboard files" do
       visit "/"
       within(".input-group-btn") do
-        expect(page).to_not have_content("My Works")
-        expect(page).to_not have_content("My Collections")
-        expect(page).to_not have_content("My Shares")
+        expect(page).not_to have_content("My Works")
+        expect(page).not_to have_content("My Collections")
+        expect(page).not_to have_content("My Shares")
       end
     end
   end

data/spec/features/users_spec.rb

@@ -44,7 +44,7 @@ describe "User Profile", type: :feature do
       expect(page).to have_xpath("//td/a[@href='#{dewey_path}']")
       fill_in 'user_search', with: 'Dewey'
       click_button "user_submit"
-      expect(page).to_not have_xpath("//td/a[@href='#{profile_path}']")
+      expect(page).not_to have_xpath("//td/a[@href='#{profile_path}']")
       expect(page).to have_xpath("//td/a[@href='#{dewey_path}']")
     end
   end

data/spec/helpers/blacklight_helper_spec.rb

@@ -0,0 +1,91 @@
+RSpec.describe BlacklightHelper, type: :helper do
+  let(:blacklight_config) { CatalogController.blacklight_config }
+  let(:attributes) do
+    { 'creator_tesim' => ['Justin', 'Joe'],
+      'depositor_tesim' => ['jcoyne@justincoyne.com'],
+      'proxy_depositor_ssim' => ['atz@stanford.edu'],
+      'description_tesim' => ['This links to http://example.com/ What about that?'],
+      'date_uploaded_dtsi' => '2013-03-14T00:00:00Z',
+      'rights_tesim' => ["http://creativecommons.org/publicdomain/zero/1.0/",
+                         "http://creativecommons.org/publicdomain/mark/1.0/",
+                         "http://www.europeana.eu/portal/rights/rr-r.html"],
+      'identifier_tesim' => ['65434567654345654'],
+      'keyword_tesim' => ['taco', 'mustache'],
+      'subject_tesim' => ['Awesome'],
+      'contributor_tesim' => ['Bird, Big'],
+      'publisher_tesim' => ['Penguin Random House'],
+      'based_near_tesim' => ['Pennsylvania'],
+      'language_tesim' => ['English'],
+      'resource_type_tesim' => ['Capstone Project'] }
+  end
+
+  let(:document) { SolrDocument.new(attributes) }
+  before do
+    allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+  end
+
+  describe "render_index_field_value" do
+    include SufiaHelper
+    subject { render_index_field_value document, field: field_name }
+
+    context "rights_tesim" do
+      let(:field_name) { 'rights_tesim' }
+      it { is_expected.to eq "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a>, <a href=\"http://creativecommons.org/publicdomain/mark/1.0/\">Public Domain Mark 1.0</a>, and <a href=\"http://www.europeana.eu/portal/rights/rr-r.html\">All rights reserved</a>" }
+    end
+
+    context "metadata index links" do
+      let(:search_state) { Blacklight::SearchState.new(params, CatalogController.blacklight_config) }
+      before do
+        allow(controller).to receive(:search_state).and_return(search_state)
+        def search_action_path(stuff)
+          search_catalog_path(stuff)
+        end
+      end
+
+      context "keyword_tesim" do
+        let(:field_name) { 'keyword_tesim' }
+        it { is_expected.to eq "<span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=taco\"><span itemprop=\"keywords\">taco</span></a></span> and <span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=mustache\"><span itemprop=\"keywords\">mustache</span></a></span>" }
+      end
+
+      context "subject_tesim" do
+        let(:field_name) { 'subject_tesim' }
+        it { is_expected.to eq "<span itemprop=\"about\"><a href=\"/catalog?f%5Bsubject_sim%5D%5B%5D=Awesome\"><span itemprop=\"about\">Awesome</span></a></span>" }
+      end
+
+      context "creator_tesim" do
+        let(:field_name) { 'creator_tesim' }
+        it { is_expected.to eq "<span itemprop=\"creator\"><a href=\"/catalog?f%5Bcreator_sim%5D%5B%5D=Justin\"><span itemprop=\"creator\">Justin</span></a></span> and <span itemprop=\"creator\"><a href=\"/catalog?f%5Bcreator_sim%5D%5B%5D=Joe\"><span itemprop=\"creator\">Joe</span></a></span>" }
+      end
+
+      context "contributor_tesim" do
+        let(:field_name) { 'contributor_tesim' }
+        it { is_expected.to eq "<span itemprop=\"contributor\"><a href=\"/catalog?Bird%2C+Big=%22contributor%22&amp;search_field=advanced\">Bird, Big</a></span>" }
+      end
+
+      context "publisher_tesim" do
+        let(:field_name) { 'publisher_tesim' }
+        it { is_expected.to eq "<span itemprop=\"publisher\"><a href=\"/catalog?f%5Bpublisher_sim%5D%5B%5D=Penguin+Random+House\"><span itemprop=\"publisher\">Penguin Random House</span></a></span>" }
+      end
+
+      context "location_tesim" do
+        let(:field_name) { 'based_near_tesim' }
+        it { is_expected.to eq "<span itemprop=\"contentLocation\"><a href=\"/catalog?f%5Bbased_near_sim%5D%5B%5D=Pennsylvania\"><span itemprop=\"contentLocation\">Pennsylvania</span></a></span>" }
+      end
+
+      context "language_tesim" do
+        let(:field_name) { 'language_tesim' }
+        it { is_expected.to eq "<span itemprop=\"inLanguage\"><a href=\"/catalog?f%5Blanguage_sim%5D%5B%5D=English\"><span itemprop=\"inLanguage\">English</span></a></span>" }
+      end
+
+      context "resource_type_tesim" do
+        let(:field_name) { 'resource_type_tesim' }
+        it { is_expected.to eq "<a href=\"/catalog?f%5Bresource_type_sim%5D%5B%5D=Capstone+Project\">Capstone Project</a>" }
+      end
+
+      context "identifier_tesim" do
+        let(:field_name) { 'identifier_tesim' }
+        it { is_expected.to eq "<a href=\"/catalog?65434567654345654=%22identifier%22&amp;search_field=advanced\">65434567654345654</a>" }
+      end
+    end
+  end
+end

data/spec/helpers/dashboard_helper_spec.rb

@@ -20,7 +20,7 @@ describe DashboardHelper, type: :helper do
   describe "#on_the_dashboard?" do
     it "returns false for controllers that aren't a part of the dashboard" do
       allow(helper).to receive(:params).and_return(controller: "foo")
-      expect(helper).to_not be_on_the_dashboard
+      expect(helper).not_to be_on_the_dashboard
     end
 
     it "returns true for controllers that are part of the dashboard" do
@@ -38,7 +38,7 @@ describe DashboardHelper, type: :helper do
   describe "#on_my_works" do
     it "returns false when the controller isn't my works" do
       allow(helper).to receive(:params).and_return(controller: "my/collections")
-      expect(helper).to_not be_on_my_works
+      expect(helper).not_to be_on_my_works
     end
     it "returns true when the controller is my works" do
       allow(helper).to receive(:params).and_return(controller: "my/works")

data/spec/helpers/sufia_helper_spec.rb

@@ -69,21 +69,16 @@ describe SufiaHelper, type: :helper do
   end
 
   describe "#link_to_telephone" do
-    before do
-      @user = mock_model(User)
-      allow(@user).to receive(:telephone).and_return('867-5309')
-    end
+    subject { helper.link_to_telephone(user) }
 
-    context "when @user is set" do
-      it "returns a link to the user's telephone" do
-        expect(helper.link_to_telephone).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
-      end
+    context "when user is set" do
+      let(:user) { mock_model(User, telephone: '867-5309') }
+      it { is_expected.to eq "<a href=\"wtai://wp/mc;867-5309\">867-5309</a>" }
     end
 
-    context "when @user is not set" do
-      it "returns a link to the user's telephone" do
-        expect(helper.link_to_telephone(@user)).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
-      end
+    context "when user is not set" do
+      let(:user) { nil }
+      it { is_expected.to be_nil }
     end
   end
 

data/spec/helpers/trophy_helper_spec.rb

@@ -4,7 +4,7 @@ describe TrophyHelper, type: :helper do
     let(:id) { '9999' }
 
     let(:text_attributes) { '[data-add-text="Highlight Work on Profile"][data-remove-text="Unhighlight Work"]' }
-    let(:url_attribute) { "[data-url=\"/users/#{user.to_param}/trophy?work_id=#{id}\"]" }
+    let(:url_attribute) { "[data-url=\"/works/#{id}/trophy\"]" }
 
     context "when there is no trophy" do
       it "has a link for highlighting" do

data/spec/javascripts/jasmine_spec.rb

@@ -15,7 +15,7 @@ describe "Jasmine" do
       puts "************************  Jasmine Output *************\n\n"
     end
     expect(jasmine_out).to include "0 failures"
-    expect(jasmine_out).to_not include "\n0 specs"
+    expect(jasmine_out).not_to include "\n0 specs"
   end
 end
 

data/spec/lib/sufia/resource_sync/capability_list_writer_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::ResourceSync::CapabilityListWriter do
+  let(:sitemap) { 'http://www.sitemaps.org/schemas/sitemap/0.9' }
+  let(:rs) { 'http://www.openarchives.org/rs/terms/' }
+
+  let(:resource_list) { 'http://example.com/resourcelist.xml' }
+  let(:description) { 'http://example.com/resourcesync_description.xml' }
+
+  subject { described_class.new(resource_list_url: resource_list,
+                                description_url: description).write }
+  let(:xml) { Nokogiri::XML.parse(subject) }
+
+  it "has url to the capability list" do
+    description_href = xml.xpath('/x:urlset/rs:ln[@rel="up"]/@href', 'x' => sitemap, 'rs' => rs).map(&:value)
+    expect(description_href).to eq [description]
+
+    capability = xml.xpath('/x:urlset/rs:md/@capability', 'x' => sitemap, 'rs' => rs).map(&:value)
+    expect(capability).to eq ["capabilitylist"]
+
+    url = xml.xpath('//x:url[1]/x:loc', 'x' => sitemap).text
+    expect(url).to eq resource_list
+    capability = xml.xpath('//x:url[1]/rs:md/@capability', 'x' => sitemap, 'rs' => rs).map(&:value)
+    expect(capability).to eq ["resourcelist"]
+  end
+end

data/spec/lib/sufia/resource_sync/resource_list_writer_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::ResourceSync::ResourceListWriter do
+  let(:sitemap) { 'http://www.sitemaps.org/schemas/sitemap/0.9' }
+  let!(:private_collection) { create(:private_collection) }
+  let!(:public_collection) { create(:public_collection) }
+  let!(:public_work) { create(:public_generic_work) }
+  let!(:private_work) { create(:work) }
+  let!(:file_set) { create(:file_set, :public) }
+  let(:capability_list) { 'http://example.com/capabilityList.xml' }
+
+  subject { described_class.new(resource_host: 'example.com', capability_list_url: capability_list).write }
+  let(:xml) { Nokogiri::XML.parse(subject) }
+
+  it "has two urls" do
+    first_url = xml.xpath('//x:url[1]/x:loc', 'x' => sitemap).text
+    second_url = xml.xpath('//x:url[2]/x:loc', 'x' => sitemap).text
+    third_url = xml.xpath('//x:url[3]/x:loc', 'x' => sitemap).text
+    expect(first_url).to eq "http://example.com/collections/#{public_collection.id}"
+    expect(second_url).to eq "http://example.com/concern/generic_works/#{public_work.id}"
+    expect(third_url).to eq "http://example.com/concern/file_sets/#{file_set.id}"
+    expect(xml.xpath('//x:url', 'x' => sitemap).count).to eq 3
+  end
+end

data/spec/lib/sufia/resource_sync/source_description_writer_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::ResourceSync::SourceDescriptionWriter do
+  let(:sitemap) { 'http://www.sitemaps.org/schemas/sitemap/0.9' }
+  let(:rs) { 'http://www.openarchives.org/rs/terms/' }
+
+  let(:capability_list) { 'http://example.com/capabilityList.xml' }
+
+  subject { described_class.new(capability_list_url: capability_list).write }
+  let(:xml) { Nokogiri::XML.parse(subject) }
+
+  it "has url to the capability list" do
+    capability = xml.xpath('/x:urlset/rs:md/@capability', 'x' => sitemap, 'rs' => rs).map(&:value)
+    expect(capability).to eq ["description"]
+
+    url = xml.xpath('//x:url[1]/x:loc', 'x' => sitemap).text
+    expect(url).to eq capability_list
+    capability = xml.xpath('//x:url[1]/rs:md/@capability', 'x' => sitemap, 'rs' => rs).map(&:value)
+    expect(capability).to eq ["capabilitylist"]
+  end
+end

data/spec/models/featured_work_spec.rb

@@ -7,7 +7,7 @@ describe FeaturedWork, type: :model do
 
   it "does not allow six features" do
     5.times do |n|
-      expect(described_class.create(work_id: n.to_s)).to_not be_new_record
+      expect(described_class.create(work_id: n.to_s)).not_to be_new_record
     end
     described_class.create(work_id: "6").tap do |sixth|
       expect(sixth).to be_new_record

data/spec/models/generic_work_spec.rb

@@ -36,19 +36,16 @@ describe GenericWork do
   end
 
   describe "trophies" do
-    before do
-      u = create(:user)
-      @w = described_class.create!(title: ['demoname']) do |gw|
-        gw.apply_depositor_metadata(u)
-      end
-      @t = Trophy.create(user_id: u.id, work_id: @w.id)
-    end
+    let(:user) { create(:user) }
+    let(:w) { create(:work, user: user) }
+    let!(:t) { Trophy.create(user_id: user.id, work_id: w.id) }
+
     it "has a trophy" do
-      expect(Trophy.where(work_id: @w.id).count).to eq 1
+      expect(Trophy.where(work_id: w.id).count).to eq 1
     end
     it "removes all trophies when work is deleted" do
-      @w.destroy
-      expect(Trophy.where(work_id: @w.id).count).to eq 0
+      w.destroy
+      expect(Trophy.where(work_id: w.id).count).to eq 0
     end
   end
 

data/spec/models/local_authority_spec.rb

@@ -7,14 +7,6 @@ describe LocalAuthority, type: :model do
     LocalAuthority.harvest_tsv("geo", [fixture_path + '/cities15000.tsv'], prefix: 'http://sws.geonames.org/')
   end
 
-  before :all do
-    class Manuscript < ActiveFedora::Base; end
-  end
-
-  after :all do
-    Object.send(:remove_const, :Manuscript)
-  end
-
   it "harvests an ntriples RDF vocab" do
     harvest_nt
     expect(described_class.count).to eq(1)
@@ -59,14 +51,14 @@ describe LocalAuthority, type: :model do
       expect(LocalAuthorityEntry.count).to eq(num_entries)
     end
     it "registers a vocab" do
-      described_class.register_vocabulary(Manuscript, "geographic", "geo")
+      described_class.register_vocabulary('manuscripts', "geographic", "geo")
       expect(DomainTerm.count).to eq(1)
     end
 
     describe "when vocabs are registered" do
       before do
-        described_class.register_vocabulary(Manuscript, "geographic", "geo")
-        described_class.register_vocabulary(Manuscript, "genre", "genres")
+        described_class.register_vocabulary('manuscripts', "geographic", "geo")
+        described_class.register_vocabulary('manuscripts', "genre", "genres")
       end
 
       it "has some domain terms" do

data/spec/models/sufia/download_spec.rb

@@ -0,0 +1,13 @@
+describe Sufia::Download, type: :model do
+  it 'has an events metric' do
+    expect(described_class.metrics).to be == Legato::ListParameter.new(:metrics, [:totalEvents])
+  end
+
+  it 'has dimensions' do
+    expect(described_class.dimensions).to be == Legato::ListParameter.new(:dimensions, [:eventCategory, :eventAction, :eventLabel, :date])
+  end
+
+  it 'responds to :for_file' do
+    expect(described_class).to respond_to(:for_file)
+  end
+end

data/spec/models/sufia/pageview_spec.rb

@@ -0,0 +1,13 @@
+describe Sufia::Pageview, type: :model do
+  it 'has a pageviews metric' do
+    expect(described_class.metrics).to be == Legato::ListParameter.new(:metrics, [:pageviews])
+  end
+
+  it 'has a date dimension' do
+    expect(described_class.dimensions).to be == Legato::ListParameter.new(:dimensions, [:date])
+  end
+
+  it 'responds to :for_path' do
+    expect(described_class).to respond_to(:for_path)
+  end
+end

data/spec/models/sufia/uploaded_file_spec.rb

@@ -1,6 +1,6 @@
 describe Sufia::UploadedFile do
   let(:file1) { File.open(fixture_path + '/world.png') }
-  subject { Sufia::UploadedFile.create(file: file1) }
+  subject { described_class.create(file: file1) }
 
   it "is not in the public directory" do
     temp_dir = Rails.root + 'tmp'

data/spec/models/trophy_spec.rb

@@ -1,16 +1,14 @@
 describe Trophy, type: :model do
-  before(:all) do
-    @trophy = described_class.create(user_id: 99, work_id: "99")
-  end
+  let(:trophy) { described_class.create(user_id: 99, work_id: "99") }
 
   it "has a user" do
-    expect(@trophy).to respond_to(:user_id)
-    expect(@trophy.user_id).to eq(99)
+    expect(trophy).to respond_to(:user_id)
+    expect(trophy.user_id).to eq(99)
   end
 
   it "has a work" do
-    expect(@trophy).to respond_to(:work_id)
-    expect(@trophy.work_id).to eq("99")
+    expect(trophy).to respond_to(:work_id)
+    expect(trophy.work_id).to eq("99")
   end
 
   it "does not allow six trophies" do

data/spec/models/user_spec.rb

@@ -105,14 +105,14 @@ describe User, type: :model do
 
     it "is able to follow another user" do
       expect(user).to be_following(another_user)
-      expect(another_user).to_not be_following(user)
+      expect(another_user).not_to be_following(user)
       expect(another_user).to be_followed_by(user)
-      expect(user).to_not be_followed_by(another_user)
+      expect(user).not_to be_followed_by(another_user)
     end
     it "is able to unfollow another user" do
       user.stop_following(another_user)
-      expect(user).to_not be_following(another_user)
-      expect(another_user).to_not be_followed_by(user)
+      expect(user).not_to be_following(another_user)
+      expect(another_user).not_to be_followed_by(user)
     end
   end
 
@@ -154,19 +154,19 @@ describe User, type: :model do
     end
   end
   describe "proxy_deposit_rights" do
+    subject { create :user }
     before do
-      @subject = create :user
-      @subject.can_receive_deposits_from << user
-      @subject.can_make_deposits_for << another_user
-      @subject.save!
+      subject.can_receive_deposits_from << user
+      subject.can_make_deposits_for << another_user
+      subject.save!
     end
     it "can_receive_deposits_from" do
-      expect(@subject.can_receive_deposits_from.to_a).to eq [user]
-      expect(user.can_make_deposits_for.to_a).to eq [@subject]
+      expect(subject.can_receive_deposits_from.to_a).to eq [user]
+      expect(user.can_make_deposits_for.to_a).to eq [subject]
     end
     it "can_make_deposits_for" do
-      expect(@subject.can_make_deposits_for.to_a).to eq [another_user]
-      expect(another_user.can_receive_deposits_from.to_a).to eq [@subject]
+      expect(subject.can_make_deposits_for.to_a).to eq [another_user]
+      expect(another_user.can_receive_deposits_from.to_a).to eq [subject]
     end
   end
   describe "class methods" do