Skip to content

Commit

Permalink
load subsites for repository reading room controllers (DLC-1157)
Browse files Browse the repository at this point in the history
  • Loading branch information
barmintor committed Sep 25, 2024
1 parent 296924e commit c7285e4
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 7 deletions.
14 changes: 14 additions & 0 deletions app/controllers/concerns/dcv/sites/reading_rooms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,18 @@ def repository_ids_for_client(remote_ip = request.remote_ip)
end
end.compact
end

def subsite_key
return unless params[:repository_id]
key = params[:repository_id].dup
key.downcase!
key.gsub!('-','')
key
end

def load_subsite
@subsite ||= Site.find_by(slug: subsite_key) if params[:repository_id]
super
@subsite
end
end
7 changes: 0 additions & 7 deletions app/controllers/repositories/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ def default_search_mode_cookie
end
end

def subsite_key
key = params[:repository_id].dup
key.downcase!
key.gsub!('-','')
key
end

def subsite_layout
'gallery'
end
Expand Down
1 change: 1 addition & 0 deletions app/controllers/repositories_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class RepositoriesController < ApplicationController
end

before_action :set_repository_id, only:[:show]
before_action :load_subsite, only:[:show, :about, :reading_room]

prepend_view_path('app/views/repositories')

Expand Down
32 changes: 32 additions & 0 deletions spec/controllers/repositories/catalog_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
require 'rails_helper'

describe Repositories::CatalogController, type: :controller do
let(:default_catalog_styles) { ["gallery-#{Dcv::Sites::Constants.default_palette}", "catalog"] }
let(:view_context) { controller.view_context }
let(:site_attr) { { slug: 'nncrb', layout: 'default', palette: 'monochrome' } }
let(:search_service) { instance_double(Blacklight::SearchService) }
let(:subsite) { FactoryBot.create(:site, **site_attr) }

before do
expect(subsite).not_to be_nil
expect(controller).not_to be_nil
expect(controller.controller_name).not_to be_nil
controller.set_view_path
allow(controller).to receive(:search_service).and_return(search_service)
allow(search_service).to receive(:search_results)
allow(controller).to receive(:view_context).and_return(view_context)
allow(view_context).to receive(:current_user).and_return(nil)
end

after do
subsite.destroy
end

describe '#index' do
it "responds" do
get :index, params: { repository_id: 'NNC-RB' }
expect(response.status).to eq(200)
expect(controller.load_subsite.palette).to eql 'monochrome'
end
end
end
37 changes: 37 additions & 0 deletions spec/controllers/repositories_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
require 'rails_helper'

describe RepositoriesController, type: :controller do
let(:default_catalog_styles) { ["gallery-#{Dcv::Sites::Constants.default_palette}", "catalog"] }
let(:view_context) { controller.view_context }
let(:site_attr) { { slug: 'nncrb', layout: 'default', palette: 'monochrome' } }
let(:subsite) { FactoryBot.create(:site, **site_attr) }

before do
expect(subsite).not_to be_nil
expect(controller).not_to be_nil
expect(controller.controller_name).not_to be_nil
controller.set_view_path

allow(controller).to receive(:view_context).and_return(view_context)
allow(view_context).to receive(:current_user).and_return(nil)
end

after do
subsite.destroy
end

describe '#reading_room' do
it "responds with 200" do
get :reading_room, params: { repository_id: 'NNC-RB' }
expect(response.status).to eq(200)
expect(controller.load_subsite.palette).to eql 'monochrome'
end
end
describe '#about' do
it "responds with 200" do
get :about, params: { repository_id: 'NNC-RB' }
expect(response.status).to eq(200)
expect(controller.load_subsite.palette).to eql 'monochrome'
end
end
end
15 changes: 15 additions & 0 deletions spec/routing/repositories_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

describe RepositoriesController, :type => :routing do
describe "routing" do
it "routes to #show" do
expect(:get => "/NNC-RB").to route_to(controller: "repositories", action:"show", id: "NNC-RB")
end
it "routes to #about" do
expect(:get => "/NNC-RB/about").to route_to(controller: "repositories", action:"about", repository_id: "NNC-RB", slug: "about")
end
it "routes to #reading-room" do
expect(:get => "/NNC-RB/reading-room").to route_to(controller: "repositories", action:"reading_room", repository_id: "NNC-RB")
end
end
end

0 comments on commit c7285e4

Please sign in to comment.