Merge pull request #2120 from projectblacklight/functional

Make render_document_sidebar_partial functional

Author: mejackreed

app/helpers/blacklight/catalog_helper_behavior.rb

@@ -153,8 +153,13 @@ def document_class_prefix
   #
   # @param [SolrDocument] document
   # @return [String]
-  def render_document_sidebar_partial(_document = @document)
-    render partial: 'show_sidebar'
+  def render_document_sidebar_partial(document = nil)
+    unless document
+      Deprecation.warn(self, 'render_document_sidebar_partial expects one argument ' /
+        '(@document) and you passed none. This behavior will be removed in version 8')
+      document = @document
+    end
+    render 'show_sidebar', document: document
   end
 
   ##

app/views/catalog/_show_sidebar.html.erb

@@ -1,10 +1,12 @@
-<%= render :partial => 'show_tools' %>
-  
-<% unless @document.more_like_this.empty? %>
+<%= render 'show_tools' %>
+
+<% unless document.more_like_this.empty? %>
   <div class="card">
     <div class="card-header">More Like This</div>
     <div class="card-body">
-      <%= render :collection => @document.more_like_this, :partial => 'show_more_like_this', :as => :document %>
+      <%= render collection: document.more_like_this,
+                 partial: 'show_more_like_this',
+                 as: :document %>
     </div>
   </div>
-<% end %>
+<% end %>

app/views/catalog/show.html.erb

@@ -8,5 +8,5 @@
 <%= render_document_main_content_partial %>
 
 <% content_for(:sidebar) do %>
-  <%= render_document_sidebar_partial %>
+  <%= render_document_sidebar_partial @document %>
 <% end %>

spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -17,9 +17,9 @@
   end
 
   it "shows more-like-this titles in the sidebar" do
-    @document = SolrDocument.new id: 1, title_s: 'abc', format: 'default'
-    allow(@document).to receive(:more_like_this).and_return([SolrDocument.new('id' => '2', 'title_tsim' => 'Title of MLT Document')])
-    render
+    document = SolrDocument.new id: 1, title_s: 'abc', format: 'default'
+    allow(document).to receive(:more_like_this).and_return([SolrDocument.new('id' => '2', 'title_tsim' => 'Title of MLT Document')])
+    render 'catalog/show_sidebar', document: document
     expect(rendered).to include("More Like This")
     expect(rendered).to include("Title of MLT Document")
   end