From acb2e3edabf80be899fb87dae65221cb8f532e68 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Tue, 25 Apr 2017 12:39:40 -0500
Subject: [PATCH] Add Rails 5.2 support

---
 .../javascripts/blacklight/blacklight.js      |  1 +
 lib/generators/blacklight/assets_generator.rb | 21 ++++++++++++++-----
 .../templates/alternate_controller.rb         |  2 +-
 lib/generators/blacklight/user_generator.rb   |  2 +-
 spec/views/catalog/_facets.html.erb_spec.rb   |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/blacklight/blacklight.js b/app/assets/javascripts/blacklight/blacklight.js
index 02475dbb6e..86db03cde4 100644
--- a/app/assets/javascripts/blacklight/blacklight.js
+++ b/app/assets/javascripts/blacklight/blacklight.js
@@ -4,6 +4,7 @@
 //   which over-rides things in this JS file, as described below.
 //
 // These javascript files are compiled in via the Rails asset pipeline:
+//= require jquery
 //= require blacklight/core
 //= require blacklight/autofocus
 //= require blacklight/bookmark_toggle
diff --git a/lib/generators/blacklight/assets_generator.rb b/lib/generators/blacklight/assets_generator.rb
index 1733003b14..29fa469423 100644
--- a/lib/generators/blacklight/assets_generator.rb
+++ b/lib/generators/blacklight/assets_generator.rb
@@ -8,23 +8,34 @@ def assets
 
       return if has_blacklight_assets?
 
+      contents = "\n//\n// Required by Blacklight\n"
+      contents += "//= require jquery\n" if rails_5_1?
+      contents += "//= require blacklight/blacklight\n"
+
       marker = if turbolinks?
                  '//= require turbolinks'
+               elsif rails_5_1?
+                 '//= require rails-ujs'
                else
                  '//= require jquery_ujs'
                end
 
       insert_into_file "app/assets/javascripts/application.js", :after => marker do
-        <<-EOF
-//
-// Required by Blacklight
-//= require blacklight/blacklight
-EOF
+        contents
       end
     end
 
+    # This is not a default in Rails 5.1
+    def add_jquery
+      gem 'jquery-rails' if rails_5_1?
+    end
+
     private
 
+    def rails_5_1?
+      Rails.version =~ /5\.1/
+    end
+
     def turbolinks?
       @turbolinks ||= IO.read("app/assets/javascripts/application.js").include?('turbolinks')
     end
diff --git a/lib/generators/blacklight/templates/alternate_controller.rb b/lib/generators/blacklight/templates/alternate_controller.rb
index b2819d6334..91891b6dd5 100644
--- a/lib/generators/blacklight/templates/alternate_controller.rb
+++ b/lib/generators/blacklight/templates/alternate_controller.rb
@@ -5,7 +5,7 @@ class AlternateController < CatalogController
   end
 
   def xyz *args
-    view_context.image_tag "asdfg"
+    view_context.tag "img"
   end
   
   helper_method :xyz
diff --git a/lib/generators/blacklight/user_generator.rb b/lib/generators/blacklight/user_generator.rb
index b77288d33c..faa41feeee 100644
--- a/lib/generators/blacklight/user_generator.rb
+++ b/lib/generators/blacklight/user_generator.rb
@@ -20,7 +20,7 @@ def generate_devise_assets
       return unless options[:devise]
 
       gem "devise"
-      gem "devise-guests", "~> 0.5"
+      gem "devise-guests", "~> 0.6"
 
       Bundler.with_clean_env do
         run "bundle install"
diff --git a/spec/views/catalog/_facets.html.erb_spec.rb b/spec/views/catalog/_facets.html.erb_spec.rb
index d1c65a8c3c..2472ff25bc 100644
--- a/spec/views/catalog/_facets.html.erb_spec.rb
+++ b/spec/views/catalog/_facets.html.erb_spec.rb
@@ -6,7 +6,7 @@
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
     allow(view).to receive(:search_action_path) do |*args|
-      search_catalog_url *args
+      '/catalog'
     end
   end