Make Blacklight 6 start to work

Author: xhero

Gemfile

@@ -131,4 +131,9 @@ gem 'osullivan'
 ## Add translations for activerecord and co
 gem 'rails-i18n'#, github: 'svenfuchs/rails-i18n', branch: 'rails-4-x' # For 4.x
 
-gem 'gruff'
+gem 'gruff'
+group :development, :test do
+  gem 'solr_wrapper', '>= 0.3'
+end
+
+gem 'rsolr', '>= 1.0'

Gemfile.lock

@@ -168,6 +168,8 @@ GEM
     formtastic_i18n (0.6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    gruff (0.7.0)
+      rmagick (~> 2.13, >= 2.13.4)
     has_scope (0.7.1)
       actionpack (>= 4.1, < 5.2)
       activesupport (>= 4.1, < 5.2)
@@ -296,6 +298,8 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
+    retriable (3.1.1)
+    rmagick (2.16.0)
     rolify (5.2.0)
     rsolr (2.1.0)
       builder (>= 2.1.2)
@@ -314,6 +318,8 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     ruby-prof (0.17.0)
+    ruby-progressbar (1.9.0)
+    rubyzip (1.2.1)
     sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -327,6 +333,11 @@ GEM
       tilt (>= 1.1, < 3)
     sdoc (1.0.0)
       rdoc (>= 5.0)
+    solr_wrapper (1.2.0)
+      faraday
+      retriable
+      ruby-progressbar
+      rubyzip
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -385,6 +396,7 @@ DEPENDENCIES
   devise
   devise-i18n
   exception_notification
+  gruff
   htmlentities
   i18n-js (>= 3.0.0.rc11)
   jbuilder
@@ -405,10 +417,12 @@ DEPENDENCIES
   rails-i18n
   rails3-jquery-autocomplete!
   rolify
+  rsolr (>= 1.0)
   rspec
   ruby-prof
   sass-rails
   sdoc
+  solr_wrapper (>= 0.3)
   sunspot_rails (~> 2.2)
   sunspot_solr (~> 2.2)
   turbolinks

Rakefile

@@ -4,3 +4,5 @@
 require File.expand_path('../config/application', __FILE__)
 
 Muscat::Application.load_tasks
+
+require 'solr_wrapper/rake_task' unless Rails.env.production?

app/assets/stylesheets/blacklight.scss

@@ -1,6 +1,12 @@
+@import 'bootstrap-sprockets';
 
+@import 'bootstrap';
+
+@import 'blacklight/blacklight';
+
+// From muscat
 @import 'variables';
 @import 'rism_theme';
 @import 'bootstrap';
-@import 'blacklight/blacklight';
-@import 'ekko-lightbox';
+//@import 'blacklight/blacklight';
+@import 'ekko-lightbox';

app/controllers/application_controller.rb

@@ -1,4 +1,8 @@
 class ApplicationController < ActionController::Base
+  # Adds a few additional behaviors into the application controller
+  include Blacklight::Controller
+  layout 'blacklight'
+
   # Adds a few additional behaviors into the application controller 
    include Blacklight::Controller
   # Please be sure to impelement current_user and user_session. Blacklight depends on 

app/models/search_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class SearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
 end

app/models/user.rb

@@ -1,5 +1,11 @@
 class User < ApplicationRecord
 
+  if Blacklight::Utils.needs_attr_accessible?
+    attr_accessible :email, :password, :password_confirmation
+  end
+  # Connects this user object to Blacklights Bookmarks.
+  include Blacklight::User
+
   has_and_belongs_to_many :workgroups
   attr_accessible :email, :password, :preference_wf_stage, :password_confirmation if Rails::VERSION::MAJOR < 4
   has_many :sources, foreign_key: 'wf_owner'

app/views/catalog/_search_form.html.erb

@@ -69,7 +69,7 @@
 								//var storytellingWidget = new StorytellingWidget(storytelling,storytellingDiv);
 								*/
 
-								var data1 = GeoTemConfig.getJson("/catalog/geosearch/852a_facet_sm.json?<%=params.to_query.html_safe%>");
+								var data1 = GeoTemConfig.getJson("/catalog/geosearch/852a_facet_sm.json?<%=params.permit!.to_query.html_safe%>");
 								// This is for source-based navigation
 								//var data1 = GeoTemConfig.getJson("/catalog.json?utf8=✓&search_field=any_field&per_page=2000000&q=<%=params[:q]%>");
 

app/views/map/_show.html.erb

@@ -0,0 +1,3 @@
+en:
+  blacklight:
+    application_name: 'Blacklight'

config/locales/blacklight.en.yml

@@ -1,4 +1,4 @@
-class DropDnbTable < ActiveRecord::Migration
+class DropDnbTable < ActiveRecord::Migration[4.2]
   def change
     drop_table :DNB if ActiveRecord::Base.connection.table_exists? 'DNB' do |t|
       t.integer "id",     limit: 4,     default: 0, null: false