geoblacklight 4.0.0 → 4.1.0

data/spec/support/backport_test_helpers.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 # Backport the Rails 5 controller test methods to Rails 4
 module BackportTestHelpers
   def delete(*args)
     (action, rest) = *args
     rest ||= {}
 
-    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if rest[:xhr]
 
     super(action, rest[:params])
   end
@@ -13,7 +14,7 @@ module BackportTestHelpers
   def get(*args)
     (action, rest) = *args
     rest ||= {}
-    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if rest[:xhr]
     super(action, rest[:params])
   end
 
@@ -21,7 +22,7 @@ module BackportTestHelpers
     (action, rest) = *args
     rest ||= {}
     body = rest[:body]
-    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if rest[:xhr]
 
     if body
       super(action, body, rest.except(:params).merge(rest[:params]))
@@ -33,14 +34,14 @@ module BackportTestHelpers
   def put(*args)
     (action, rest) = *args
     rest ||= {}
-    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if rest[:xhr]
     super(action, rest[:params])
   end
 
   def patch(*args)
     (action, rest) = *args
     rest ||= {}
-    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if rest[:xhr]
     super(action, rest[:params])
   end
 end

data/spec/support/features/session_helpers.rb

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
+
 module Features
   module SessionHelpers
     def sign_up_with(email, password)
       visit new_user_registration_path
-      fill_in 'Email', with: email
-      fill_in 'Password', with: password
-      click_button 'Sign up'
+      fill_in "Email", with: email
+      fill_in "Password", with: password
+      click_button "Sign up"
     end
 
     def sign_in
       user = FactoryBot.create(:user)
       user.save
       visit new_user_session_path
-      fill_in 'user_email', with: user.email
-      fill_in 'user_password', with: user.password
-      click_button 'Log in'
-      expect(page).to have_content 'Signed in successfully.'
+      fill_in "user_email", with: user.email
+      fill_in "user_password", with: user.password
+      click_button "Log in"
+      expect(page).to have_content "Signed in successfully."
     end
   end
 end

data/spec/support/features.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require File.expand_path('../features/session_helpers.rb', __FILE__)
+
+require File.expand_path("../features/session_helpers.rb", __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature

data/spec/support/fixtures.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 def read_fixture(fname)
   File.read(File.join(fixture_dir, fname))
 end
 
 def fixture_dir
-  @fixture_dir ||= File.join(File.dirname(__FILE__), '../fixtures')
+  @fixture_dir ||= File.join(File.dirname(__FILE__), "../fixtures")
 end

data/spec/tasks/geoblacklight_spec.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
-require 'spec_helper'
-require 'rake'
-require 'fileutils'
 
-describe 'geoblacklight.rake' do
-  describe 'geoblacklight:downloads:mkdir' do
+require "spec_helper"
+require "rake"
+require "fileutils"
+
+describe "geoblacklight.rake" do
+  describe "geoblacklight:downloads:mkdir" do
     before do
       Rails.application.load_tasks
-      FileUtils.rm_rf Rails.root.join('tmp', 'cache', 'downloads')
+      FileUtils.rm_rf Rails.root.join("tmp", "cache", "downloads")
     end
 
-    it 'creates the tmp/cache/downloads directory' do
-      Rake::Task['geoblacklight:downloads:mkdir'].invoke
-      expect(File.directory?(Rails.root.join('tmp', 'cache', 'downloads')))
+    it "creates the tmp/cache/downloads directory" do
+      Rake::Task["geoblacklight:downloads:mkdir"].invoke
+      expect(File.directory?(Rails.root.join("tmp", "cache", "downloads")))
         .to be true
     end
   end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,43 +1,44 @@
 # frozen_string_literal: true
-require 'rails/generators'
+
+require "rails/generators"
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path('../../../../spec/test_app_templates', __FILE__)
+  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   def fix_sqlite3_version_requirement
-    return unless Gem.loaded_specs['rails'].version.to_s <= '5.2.2'
+    return unless Gem.loaded_specs["rails"].version.to_s <= "5.2.2"
 
     # Hack for https://github.com/rails/rails/issues/35153
     # Adapted from https://github.com/projectblacklight/blacklight/pull/2065
-    gsub_file('Gemfile', /^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
+    gsub_file("Gemfile", /^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
   end
 
   def add_gems
-    gem 'blacklight'
-    gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
+    gem "blacklight"
+    gem "webpacker" unless Rails.version.to_s.start_with? "6.1."
     Bundler.with_clean_env do
-      run 'bundle install'
+      run "bundle install"
     end
   end
 
   def install_webpacker
-    run 'bundle exec rails webpacker:install'
+    run "bundle exec rails webpacker:install"
   end
 
   def run_blacklight_generator
-    say_status('warning', 'GENERATING BL', :yellow)
+    say_status("warning", "GENERATING BL", :yellow)
 
-    generate 'blacklight:install', '--devise'
+    generate "blacklight:install", "--devise"
   end
 
   def install_engine
-    generate 'geoblacklight:install', '-f'
+    generate "geoblacklight:install", "-f"
   end
 
   def fixtures
-    FileUtils.mkdir_p 'spec/fixtures/solr_documents'
-    directory 'solr_documents', 'spec/fixtures/solr_documents'
-    FileUtils.mkdir_p 'spec/fixtures/metadata'
-    directory 'metadata', 'spec/fixtures/metadata'
+    FileUtils.mkdir_p "spec/fixtures/solr_documents"
+    directory "solr_documents", "spec/fixtures/solr_documents"
+    FileUtils.mkdir_p "spec/fixtures/metadata"
+    directory "metadata", "spec/fixtures/metadata"
   end
 end

data/spec/views/catalog/_document_split.html.erb_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb', type: :view do
+require "spec_helper"
+
+describe "catalog/_document_split.html.erb", type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_index_split.html.erb_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb', type: :view do
+require "spec_helper"
+
+describe "catalog/_document_split.html.erb", type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_results_pagination.html.erb_spec.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'catalog/_results_pagination', type: :view do
-  it 'will have a #pagination wrapping div' do
+require "spec_helper"
+
+describe "catalog/_results_pagination", type: :view do
+  it "will have a #pagination wrapping div" do
     allow(view).to receive_messages(show_pagination?: false)
     render
-    expect(rendered).to have_css '#pagination'
+    expect(rendered).to have_css "#pagination"
   end
 end

data/spec/views/catalog/_show_downloads.html.erb_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'catalog/_show_downloads', type: :view do
-  context 'document is downloadable' do
+require "spec_helper"
+
+describe "catalog/_show_downloads", type: :view do
+  context "document is downloadable" do
     let(:document) { instance_double(SolrDocument) }
     before do
       assign :document, document
@@ -14,28 +15,28 @@ describe 'catalog/_show_downloads', type: :view do
       allow(document).to receive(:download_types).and_return(shapefile: {})
     end
 
-    it 'renders the downloads collapse partial' do
+    it "renders the downloads collapse partial" do
       expect(view).to receive(:document_downloadable?).and_return(true)
 
-      stub_template 'catalog/_downloads_collapse.html.erb' => 'stubbed_downloads_collapse'
+      stub_template "catalog/_downloads_collapse.html.erb" => "stubbed_downloads_collapse"
 
       render
 
-      expect(rendered).to have_content 'stubbed_downloads_collapse'
+      expect(rendered).to have_content "stubbed_downloads_collapse"
     end
   end
 
-  context 'document is not downloadable' do
+  context "document is not downloadable" do
     let(:document) { instance_double(SolrDocument, restricted?: true, same_institution?: true) }
     before do
       expect(view).to receive(:document_downloadable?).and_return(false)
     end
 
-    context 'when restricted & same institution' do
-      it 'renders login link' do
+    context "when restricted & same institution" do
+      it "renders login link" do
         assign :document, document
         render
-        expect(rendered).to have_css '.card-header a'
+        expect(rendered).to have_css ".card-header a"
       end
     end
   end

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'catalog/_show_tools.html.erb', type: :view do
-  let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
+require "spec_helper"
+
+describe "catalog/_show_tools.html.erb", type: :view do
+  let(:document) { SolrDocument.new id: "xyz", format: "a" }
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:context) { Blacklight::Configuration::Context.new(controller) }
 
@@ -12,23 +13,23 @@ describe 'catalog/_show_tools.html.erb', type: :view do
     allow(view).to receive(:blacklight_configuration_context).and_return context
   end
 
-  describe 'document actions' do
+  describe "document actions" do
     let(:document_actions) { blacklight_config.show.document_actions }
 
-    it 'renders a document action' do
-      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
-      render partial: 'catalog/show_tools'
-      expect(rendered).to have_link 'Some action', href: 'x'
+    it "renders a document action" do
+      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: "document_action"
+      render partial: "catalog/show_tools"
+      expect(rendered).to have_link "Some action", href: "x"
     end
 
-    context 'without any document actions defined' do
+    context "without any document actions defined" do
       before do
         document_actions.clear
       end
 
-      it 'does not display the tools' do
-        render partial: 'catalog/show_tools'
+      it "does not display the tools" do
+        render partial: "catalog/show_tools"
 
         expect(rendered).to be_blank
       end

data/template.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
-gem 'blacklight', '~> 7.0'
-gem 'geoblacklight', '~> 4.0.0.pre.rc3'
-gem 'sprockets', '< 4.0' # Use sprockets less than 4.0, let webpacker users set this up themselves
+
+gem "blacklight", "~> 7.0"
+gem "geoblacklight", "~> 4.0"
+gem "sprockets", "< 4.0" # Use sprockets less than 4.0, let webpacker users set this up themselves
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065
-gemfile = File.expand_path('Gemfile')
+gemfile = File.expand_path("Gemfile")
 File.write(gemfile, File.open(gemfile) do |f|
   text = f.read
   text.gsub(/^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
 end)
 
-run 'bundle install'
+run "bundle install"
 
-generate 'blacklight:install', '--devise'
-generate 'geoblacklight:install', '-f'
+generate "blacklight:install", "--devise"
+generate "geoblacklight:install", "-f"
 
-rake 'db:migrate'
+rake "db:migrate"