Merge pull request #96 from projectblacklight/bl8

Support Blacklight 8

Author: jcoyne

app/assets/stylesheets/blacklight_marc.scss

@@ -1,25 +1,14 @@
 /* border between items on marc view */
 $marc_item_separator: 1px solid $text-muted !default;
 
-#librarian_view
-{
-	left:-17%;
-	text-align:left;
-	top:10%;
-	width:700px;
-}
-
-#marc_view
-{
-	text-align:left;
-	/* https://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
-	font-family: "Courier New", monospace, serif;
-	font-size: 1em;
+.marc_view {
+	font-family: $font-family-monospace;
 
-  .field
-  {
+  .field {
+		align-items: flex-start;
     border-bottom: $marc_item_separator;
-    clear:both;
+		display: flex;
+		gap: 2em;
   }
 
   .ind1, .ind2
@@ -28,13 +17,7 @@ $marc_item_separator: 1px solid $text-muted !default;
     padding: 0 ($spacer / 2);
   }
 
-  .subfields
-  {
-    padding-left:5em;
-  }
-
-  .tag_ind
-  {
-    float:left;
-  }
+	.tag_ind {
+		flex-shrink: 0;
+	}
 }

lib/blacklight/marc/catalog.rb app/controllers/concerns/blacklight/marc/catalog.rb

@@ -9,13 +9,20 @@ module Catalog
     end
 
     def librarian_view
-      @response, deprecated_document = search_service.fetch params[:id]
-      @document = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_document, "The @document instance variable is deprecated and will be removed in Blacklight-marc 8.0")
+      if Blacklight::VERSION >= '8'
+        @document = search_service.fetch(params[:id])
+        @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(@document.response, "The @response instance variable is deprecated and will be removed in Blacklight-marc 8.0")
+
+      else
+        deprecated_response, @document = search_service.fetch(params[:id])
+        @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_response, "The @response instance variable is deprecated and will be removed in Blacklight-marc 8.0")
+      end
+
       respond_to do |format|
         format.html do
           return render layout: false if request.xhr?
           # Otherwise draw the full page
-        end 
+        end
       end
     end
 

app/helpers/blacklight_marc_helper.rb

@@ -39,4 +39,12 @@ def render_endnote_texts(documents)
     end
     val
   end
+
+  # A URL to refworks export, with an embedded callback URL to this app.
+  # the callback URL is to bookmarks#export, which delivers a list of
+  # user's bookmarks in 'refworks marc txt' format -- we tell refworks
+  # to expect that format.
+  def bookmarks_export_url(format, params = {})
+    bookmarks_url(params.merge(format: format, encrypted_user_id: encrypt_user_id(current_or_guest_user.id)))
+  end
 end

app/views/catalog/_marc_view.html.erb

@@ -1,32 +1,30 @@
-<div id="marc_view" class="modal-body">
-  <% fields = document.to_marc.find_all{|f| ('000'..'999') === f.tag }  %>
+<div id="marc_view" class="marc_view">
   <div class="field"><%= t('blacklight.search.librarian_view.leader', :leader => document.to_marc.leader) %></div>
-  <%- fields.each do |field| -%>
-  <%- unless field.tag.to_s == "940" -%>
+  <%- document.to_marc.each do |field| -%>
     <div class="field">
-      <div class="tag_ind">
-        <span class="tag">
-          <%= h(field.tag) %>
-        </span>
       <%- if field.is_a?(MARC::ControlField) -%>
-        <span class="control_field_values">
-          <%= h(field.value) %>
-        </span>
+      <div class="tag_ind">
+        <span class="tag"><%= field.tag %></span>
+      </div>
+      <span class="control_field_values">
+        <%= h(field.value) %>
+      </span>
       <%- else -%>
+      <div class="tag_ind">
+        <span class="tag"><%= field.tag %></span>
         <div class="ind1">
-          <%= !field.indicator1.blank? ? field.indicator1 : "&nbsp;".html_safe -%>
+          <%= field.try(:indicator1).present? ? field.indicator1 : "&nbsp;".html_safe -%>
         </div>
         <div class="ind2">
-          <%= !field.indicator2.blank? ? field.indicator2 : "&nbsp;".html_safe -%>
+          <%= field.try(:indicator2).present? ? field.indicator2 : "&nbsp;".html_safe -%>
         </div>
       </div>
       <div class="subfields">
         <%- field.each do |sub| -%>
-        <span class="sub_code"><%= h(sub.code) %>|</span> <%= h(sub.value) %>
-      <%- end -%>
-      <%- end -%>
+        <span class="sub_code"><%= sub.code %>|</span> <%= sub.value %>
+        <%- end -%>
       </div>
+      <%- end -%>
     </div>
-  <%- end-%>
   <%- end -%>
 </div>

app/views/catalog/librarian_view.html.erb

@@ -1,13 +1,8 @@
-
-<div class="modal-header">
-  <h1 class="modal-title"><%= t('blacklight.search.librarian_view.title') %></h1>
-  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">
-    <span aria-hidden="true">×</span>
-  </button>
-</div>
-<%- if @response.documents.first.respond_to?(:to_marc) -%>
-  <%= render "marc_view", document: @response.documents.first %>
-<%- else %>
-  <%= t('blacklight.search.librarian_view.empty') %>
-<%- end -%>
-
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <% component.title { t('blacklight.search.librarian_view.title') } %>
+  <%- if @document.respond_to?(:to_marc) -%>
+    <%= render "marc_view", document: @document %>
+  <%- else %>
+    <%= t('blacklight.search.librarian_view.empty') %>
+  <%- end -%>
+<% end %>

blacklight-marc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'blacklight', '~> 7.0'
+  spec.add_dependency 'blacklight', '>= 7.11', '< 9'
   spec.add_dependency "library_stdnums"
   spec.add_dependency "rails"
   spec.add_dependency "marc",      ">= 0.4.3", "< 2.0"  # Marc record parser.

spec/helpers/blacklight_marc_helper_spec.rb

@@ -43,4 +43,11 @@
     end
   end
 
+  describe "#bookmarks_export_url" do
+    it "is the bookmark url with an encrypted user token" do
+      allow(helper).to receive_messages(encrypt_user_id: 'xyz', current_or_guest_user: double(id: 123))
+      url = helper.bookmarks_export_url(:html)
+      expect(url).to eq helper.bookmarks_url(format: :html, encrypted_user_id: 'xyz')
+    end
+  end
 end