sufia 7.0.0.beta3 → 7.0.0.beta4

data/lib/sufia/resource_sync.rb

@@ -0,0 +1,11 @@
+module Sufia
+  module ResourceSync
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :CapabilityListWriter
+      autoload :ResourceListWriter
+      autoload :SourceDescriptionWriter
+    end
+  end
+end

data/lib/sufia/resource_sync/capability_list_writer.rb

@@ -0,0 +1,31 @@
+module Sufia
+  module ResourceSync
+    class CapabilityListWriter
+      attr_reader :resource_list_url, :description_url
+      def initialize(resource_list_url:, description_url:)
+        @resource_list_url = resource_list_url
+        @description_url = description_url
+      end
+
+      def write
+        builder.to_xml
+      end
+
+      private
+
+        def builder
+          Nokogiri::XML::Builder.new do |xml|
+            xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9',
+                       'xmlns:rs' => 'http://www.openarchives.org/rs/terms/') do
+              xml['rs'].ln(rel: "up", href: description_url)
+              xml['rs'].md(capability: "capabilitylist")
+              xml.url do
+                xml.loc resource_list_url
+                xml['rs'].md(capability: 'resourcelist')
+              end
+            end
+          end
+        end
+    end
+  end
+end

data/lib/sufia/resource_sync/resource_list_writer.rb

@@ -0,0 +1,77 @@
+module Sufia
+  module ResourceSync
+    # TODO: the big assumption I'm making here is that the repository has fewer
+    # than 50,000 resources to list. The Sitemap protocol is limited at 50,000
+    # items, so if we require more than that, we must have multiple Resource
+    # lists and add a Resource List Index to point to all of them.
+    class ResourceListWriter
+      attr_reader :resource_host, :capability_list_url
+
+      def initialize(resource_host:, capability_list_url:)
+        @resource_host = resource_host
+        @capability_list_url = capability_list_url
+      end
+
+      def write
+        builder.to_xml
+      end
+
+      private
+
+        def builder(capability_list_url: 'http://example.com/dataset1/capabilitylist.xml')
+          Nokogiri::XML::Builder.new do |xml|
+            xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9',
+                       'xmlns:rs' => 'http://www.openarchives.org/rs/terms/') do
+              xml['rs'].ln(rel: "up", href: capability_list_url)
+              xml['rs'].md(capability: "resourcelist", at: Time.now.utc.iso8601)
+              build_collections(xml)
+              build_works(xml)
+              build_files(xml)
+            end
+          end
+        end
+
+        def build_collections(xml)
+          Collection.search_in_batches(public_access) do |doc_set|
+            build_resources(xml, doc_set)
+          end
+        end
+
+        def build_works(xml)
+          CurationConcerns::WorkRelation.new.search_in_batches(public_access) do |doc_set|
+            build_resources(xml, doc_set)
+          end
+        end
+
+        def build_files(xml)
+          FileSet.search_in_batches(public_access) do |doc_set|
+            build_resources(xml, doc_set)
+          end
+        end
+
+        def build_resources(xml, doc_set)
+          doc_set.each do |doc|
+            build_resource(xml, doc)
+          end
+        end
+
+        def build_resource(xml, doc)
+          xml.url do
+            key = doc.fetch('has_model_ssim', []).first.constantize.model_name.singular_route_key
+            xml.loc routes.send(key + "_url", doc['id'], host: resource_host)
+            xml.lastmod doc['system_modified_dtsi']
+          end
+        end
+
+        def routes
+          Rails.application.routes.url_helpers
+        end
+
+        delegate :collection_url, to: :routes
+
+        def public_access
+          { Hydra.config.permissions.read.group => 'public' }
+        end
+    end
+  end
+end

data/lib/sufia/resource_sync/source_description_writer.rb

@@ -0,0 +1,30 @@
+module Sufia
+  module ResourceSync
+    class SourceDescriptionWriter
+      attr_reader :capability_list_url
+      def initialize(capability_list_url: 'http://example.com/dataset1/capabilitylist.xml')
+        @capability_list_url = capability_list_url
+      end
+
+      def write
+        builder.to_xml
+      end
+
+      private
+
+        def builder
+          Nokogiri::XML::Builder.new do |xml|
+            xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9',
+                       'xmlns:rs' => 'http://www.openarchives.org/rs/terms/') do
+              xml['rs'].ln(rel: "up", href: capability_list_url)
+              xml['rs'].md(capability: "description")
+              xml.url do
+                xml.loc capability_list_url
+                xml['rs'].md(capability: 'capabilitylist')
+              end
+            end
+          end
+        end
+    end
+  end
+end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "7.0.0.beta3".freeze
+  VERSION = "7.0.0.beta4".freeze
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -9,16 +9,12 @@ describe BatchEditsController, type: :controller do
   routes { Internal::Application.routes }
 
   describe "#edit" do
+    let(:one) { create(:work, creator: ["Fred"], title: ["abc"], language: ['en']) }
+    let(:two) { create(:work, creator: ["Wilma"], title: ["abc2"], publisher: ['Rand McNally'], language: ['en'], resource_type: ['bar']) }
     before do
-      @one = GenericWork.new(creator: ["Fred"], title: ["abc"], language: ['en'])
-      @one.apply_depositor_metadata('mjg36')
-      @two = GenericWork.new(creator: ["Wilma"], title: ["abc2"], publisher: ['Rand McNally'], language: ['en'], resource_type: ['bar'])
-      @two.apply_depositor_metadata('mjg36')
-      @one.save!
-      @two.save!
-      controller.batch = [@one.id, @two.id]
-      expect(controller).to receive(:can?).with(:edit, @one.id).and_return(true)
-      expect(controller).to receive(:can?).with(:edit, @two.id).and_return(true)
+      controller.batch = [one.id, two.id]
+      expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
+      expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)
     end
 
     it "is successful" do

data/spec/controllers/contact_form_controller_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe ContactFormController do
+  let(:user) { create(:user) }
+  let(:required_params) do
+    {
+      category: "Depositing content",
+      name: "Rose Tyler",
+      email: "rose@timetraveler.org",
+      subject: "The Doctor",
+      message: "Run."
+    }
+  end
+
+  before { sign_in(user) }
+
+  describe "#new" do
+    subject { response }
+    before { get :new }
+    it { is_expected.to be_success }
+  end
+
+  describe "#create" do
+    subject { flash }
+    before { post :create, contact_form: params }
+    context "with the required parameters" do
+      let(:params) { required_params }
+      its(:notice) { is_expected.to eq("Thank you for your message!") }
+    end
+
+    context "without a category" do
+      let(:params)  { required_params.except(:category) }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Category can't be blank") }
+    end
+
+    context "without a name" do
+      let(:params)  { required_params.except(:name) }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Name can't be blank") }
+    end
+
+    context "without an email" do
+      let(:params)  { required_params.except(:email) }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Email can't be blank") }
+    end
+
+    context "without a subject" do
+      let(:params)  { required_params.except(:subject) }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Subject can't be blank") }
+    end
+
+    context "without a message" do
+      let(:params)  { required_params.except(:message) }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Message can't be blank") }
+    end
+
+    context "with an invalid email" do
+      let(:params)  { required_params.merge(email: "bad-wolf") }
+      its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Email is invalid") }
+    end
+  end
+
+  describe "#after_deliver" do
+    context "with a successful email" do
+      it "calls #after_deliver" do
+        expect(controller).to receive(:after_deliver)
+        post :create, contact_form: required_params
+      end
+    end
+    context "with an unsuccessful email" do
+      it "does not call #after_deliver" do
+        expect(controller).not_to receive(:after_deliver)
+        post :create, contact_form: required_params.except(:email)
+      end
+    end
+  end
+
+  context "when encoutering a RuntimeError" do
+    let(:logger) { double }
+    before do
+      allow(controller).to receive(:logger).and_return(logger)
+      allow(ContactForm).to receive(:new).and_raise(RuntimeError)
+    end
+    it "is logged via Rails" do
+      expect(logger).to receive(:error).with("Contact form failed to send: #<RuntimeError: RuntimeError>")
+      post :create, contact_form: required_params
+    end
+  end
+end

data/spec/controllers/{file_sets_controller_spec.rb → curation_concerns/file_sets_controller_spec.rb}

@@ -2,7 +2,6 @@ describe CurationConcerns::FileSetsController do
   routes { Rails.application.routes }
   let(:user) { create(:user) }
   before do
-    allow(controller).to receive(:has_access?).and_return(true)
     sign_in user
     allow_any_instance_of(User).to receive(:groups).and_return([])
     # prevents characterization and derivative creation
@@ -250,7 +249,7 @@ describe CurationConcerns::FileSetsController do
       it "shows me the breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
         expect(controller).to receive(:add_breadcrumb).with('My Works', Sufia::Engine.routes.url_helpers.dashboard_works_path)
-        expect(controller).to receive(:add_breadcrumb).with('test title', Sufia::Engine.routes.url_helpers.curation_concerns_generic_work_path(work.id))
+        expect(controller).to receive(:add_breadcrumb).with('test title', main_app.curation_concerns_generic_work_path(work.id))
         expect(controller).to receive(:add_breadcrumb).with('test file', main_app.curation_concerns_file_set_path(file_set))
         get :show, id: file_set
         expect(response).to be_successful

data/spec/controllers/{generic_works_controller_spec.rb → curation_concerns/generic_works_controller_spec.rb}

@@ -83,7 +83,7 @@ describe CurationConcerns::GenericWorksController do
       it "sets breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
         expect(controller).to receive(:add_breadcrumb).with('My Works', Sufia::Engine.routes.url_helpers.dashboard_works_path)
-        expect(controller).to receive(:add_breadcrumb).with('test title', Sufia::Engine.routes.url_helpers.curation_concerns_generic_work_path(work.id))
+        expect(controller).to receive(:add_breadcrumb).with('test title', main_app.curation_concerns_generic_work_path(work.id))
         get :show, id: work
         expect(response).to be_successful
       end

data/spec/controllers/depositors_controller_spec.rb

@@ -36,7 +36,7 @@ describe DepositorsController do
         end
 
         it 'does not send a message to the user' do
-          expect { redundant_request_to_grant_proxy }.to_not change { user.mailbox.inbox.count }
+          expect { redundant_request_to_grant_proxy }.not_to change { user.mailbox.inbox.count }
         end
       end
     end

data/spec/controllers/featured_works_controller_spec.rb

@@ -23,7 +23,7 @@ describe FeaturedWorksController, type: :controller do
       it "does not create another" do
         expect {
           post :create, id: '1234abcd', format: :json
-        }.to_not change { FeaturedWork.count }
+        }.not_to change { FeaturedWork.count }
         expect(response.status).to eq 422
       end
     end

data/spec/controllers/mailbox_controller_spec.rb

@@ -26,7 +26,7 @@ describe MailboxController, type: :controller do
     it "deletes message" do
       expect(mock_box).to receive(:destroy).with("4")
       delete :destroy, id: "4"
-      expect(response).to redirect_to(@routes.url_helpers.notifications_path)
+      expect(response).to redirect_to(routes.url_helpers.notifications_path)
     end
   end
 end

data/spec/controllers/my/highlights_controller_spec.rb

@@ -1,4 +1,3 @@
-
 describe My::HighlightsController, type: :controller do
   describe "logged in user" do
     let(:user) { create(:user) }
@@ -8,16 +7,21 @@ describe My::HighlightsController, type: :controller do
       before do
         GenericWork.destroy_all
         Collection.destroy_all
-        @highlighted_work = create(:generic_work, user: user)
-        user.trophies.create(work_id: @highlighted_work.id)
+      end
 
-        @normal_work = create(:generic_work, user: user)
-        other_user = create(:user)
-        @unrelated_highlighted_work = create(:generic_work, user: other_user).tap do |r|
+      let(:other_user) { create(:user) }
+      let(:highlighted_work) { create(:generic_work, user: user) }
+      let!(:normal_work) { create(:generic_work, user: user) }
+      let(:unrelated_highlighted_work) do
+        create(:generic_work, user: other_user).tap do |r|
           r.edit_users += [user.user_key]
           r.save!
         end
-        other_user.trophies.create(work_id: @unrelated_highlighted_work.id)
+      end
+
+      before do
+        user.trophies.create(work_id: highlighted_work.id)
+        other_user.trophies.create(work_id: unrelated_highlighted_work.id)
       end
 
       it "paginates" do
@@ -35,17 +39,17 @@ describe My::HighlightsController, type: :controller do
         get :index
         expect(response).to be_successful
         # shows documents I've highlighted
-        expect(assigns[:document_list].map(&:id)).to include(@highlighted_work.id)
+        expect(assigns[:document_list].map(&:id)).to include(highlighted_work.id)
         # doesn't show non-highlighted files
-        expect(assigns[:document_list].map(&:id)).to_not include(@normal_work.id)
+        expect(assigns[:document_list].map(&:id)).not_to include(normal_work.id)
         # doesn't show other users' highlighted files
-        expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_highlighted_work.id)
+        expect(assigns[:document_list].map(&:id)).not_to include(unrelated_highlighted_work.id)
       end
     end
 
     describe "when user has no highlights" do
       it "skips the call to Solr" do
-        expect(controller).to_not receive(:search_results)
+        expect(controller).not_to receive(:search_results)
         get :index
       end
     end

data/spec/controllers/stats_controller_spec.rb

@@ -59,7 +59,7 @@ describe StatsController do
       expect(WorkUsage).to receive(:new).with(work.id).and_return(usage)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.works'), Sufia::Engine.routes.url_helpers.dashboard_works_path)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.work.browse_view'), curation_concerns_generic_work_path(work))
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.work.browse_view'), main_app.curation_concerns_generic_work_path(work))
       get :work, id: work
       expect(response).to be_success
       expect(response).to render_template('stats/work')

data/spec/controllers/{homepage_controller_spec.rb → sufia/homepage_controller_spec.rb}

@@ -44,7 +44,7 @@ describe Sufia::HomepageController, type: :controller do
       get :index
       expect(response).to be_success
       titles = assigns(:recent_documents).map { |d| d['title_tesim'][0] }
-      expect(titles).to_not include('Test Private Document')
+      expect(titles).not_to include('Test Private Document')
     end
 
     it "includes only GenericWork objects in recent documents" do

data/spec/controllers/sufia/resource_sync_controller_spec.rb

@@ -0,0 +1,52 @@
+RSpec.describe Sufia::ResourceSyncController do
+  before do
+    Rails.cache.clear
+  end
+
+  describe "source_description" do
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Sufia::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Sufia::ResourceSync::SourceDescriptionWriter).to receive(:new).with(capability_list_url: capability_list).and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :source_description
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+
+  describe "capability_list" do
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Sufia::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Sufia::ResourceSync::CapabilityListWriter).to receive(:new).with(resource_list_url: "http://test.host/resourcelist",
+                                                                             description_url: "http://test.host/.well-known/resourcesync").and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :capability_list
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+
+  describe "resource_list" do
+    before do
+      Rails.cache.clear
+    end
+
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Sufia::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Sufia::ResourceSync::ResourceListWriter).to receive(:new).with(capability_list_url: capability_list, resource_host: "test.host").and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :resource_list
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+end