blacklight 6.19.1 → 6.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a58afc62bfdc6dfd3b7796e75ecdfef49a7d831fbd66cb2b4a34a483ff79bd
-  data.tar.gz: 696d0e82c3adc9e0728c98452b7588d7235f5cc649ac0a259ae122001b5b78dd
+  metadata.gz: 29725d7ac098fe4dfcdadceabf7b03066f14c680a9af21afa54191d643e87e7a
+  data.tar.gz: e36bfb2a98c4eccdd1368f8a06a7a377e5fa5f1d3282a48384e31470148b3c50
 SHA512:
-  metadata.gz: 4830158f0d709f43a5d2d4388e29843f3ab02404cacd7abf0ba0965b58873a0f01c75e0bfbf2d32f7f467fbd4a98cdf121d2205b9e0de07e7ed28a40047e997f
-  data.tar.gz: af430dcbe8775706d3c9436b197bcd2fb9b8212ab46cac4ea33b14fd07e3c012293683b94993e4d431214d8a929828e12c8f5154bcd3f841904b68479a461c61
+  metadata.gz: f00f3c5c21af357d7c695888835a92a7ca63ca361fdb670fee07254f69a444fca4bc6d7d0ccd396bb871346eabc6ef6015c82d4dbadd81c1a3e7ccb584f56545
+  data.tar.gz: 4f06db656530cb3b32364815ae24fff6c4ddcd8fe12373e08d6088b263025b9acb292c616ac45377ba43f96dbb6230875e98553fe4c7bd87b5f18f5819557a92

data/.travis.yml

@@ -24,6 +24,10 @@ matrix:
       env: "RAILS_VERSION=5.2.0 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
     - rvm: jruby-9.1.17.0
+    - rvm: 2.4.4
+      env: "RAILS_VERSION=4.2.10"
+    - rvm: 2.2.10
+      env: "RAILS_VESION=5.0.7"
   fast_finish: true
 
 before_install:

data/VERSION

@@ -1 +1 @@
-6.19.1
+6.19.2

data/app/views/catalog/_citation.html.erb

@@ -1,21 +1,26 @@
+<div class="modal-header">
+  <h1><%= t('blacklight.tools.citation') %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <% @documents.each do |document| %>
+    <h1 class="modal-title"><%= document_heading(document) %></h1>
 
-<% @documents.each do |document| %>
+    <% if document.respond_to?(:export_as_mla_citation_txt) %>
+      <h2><%= t('blacklight.citation.mla') %></h2>
+      <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
+    <% end %>
 
-  <h3 class="modal-title"><%= document_heading(document) %></h3>
+    <% if document.respond_to?(:export_as_apa_citation_txt) %>
+      <h2><%= t('blacklight.citation.apa') %></h2>
+      <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
+    <% end %>
 
-<% if document.respond_to?(:export_as_mla_citation_txt) %>
-  <h4><%= t('blacklight.citation.mla') %></h4>
-  <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<% if document.respond_to?(:export_as_apa_citation_txt) %>
-  <h4><%= t('blacklight.citation.apa') %></h4>
-  <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
-  <h4><%= t('blacklight.citation.chicago') %></h4>
-  <%= document.send(:export_as_chicago_citation_txt).html_safe %>
-<%- end -%>
-
-<% end %>
+    <% if document.respond_to?(:export_as_chicago_citation_txt) %>
+      <h2><%= t('blacklight.citation.chicago') %></h2>
+      <%= document.send(:export_as_chicago_citation_txt).html_safe %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/catalog/citation.html.erb

@@ -1 +1 @@
-<%= render :partial => 'citation' -%>
+<%= render partial: 'citation' %>

data/app/views/catalog/citation.js.erb

@@ -1,7 +1 @@
-<div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3><%= t('blacklight.tools.citation') %></h3>
-</div>
-<div class="modal-body">
-<%= render :partial => 'citation' -%>
-</div>
+<%= render partial: 'citation' %>

data/blacklight.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "capybara", '>= 2', '< 4'
   s.add_development_dependency 'chromedriver-helper', '< 2.0.0' # 2.1.0 is causing "Unable to find chromedriver" on Travis
   s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
-  s.add_development_dependency 'engine_cart', '~> 1.2'
+  s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "simplecov"

data/spec/controllers/catalog_controller_spec.rb

@@ -62,7 +62,7 @@ describe CatalogController do
       end
 
       it "returns results (possibly 0) when the user asks for a valid value to a custom facet query", :integration => true do
-        get :index, params: { f: { example_query_facet_field: 'years_10' } } # valid custom facet value with some results
+        get :index, params: { f: { example_query_facet_field: 'years_25' } } # valid custom facet value with some results
         expect(assigns(:response).docs).to_not be_empty
         get :index, params: { f: {example_query_facet_field: 'years_5' } } # valid custom facet value with NO results
         expect(assigns(:response).docs).to be_empty
@@ -149,8 +149,8 @@ describe CatalogController do
         let(:query_facet_items) { facets.last['items'] }
         let(:regular_facet_items) { facets.first['items'] }
         it "has items with labels and values" do
-          expect(query_facet_items.first['label']).to eq 'within 10 Years'
-          expect(query_facet_items.first['value']).to eq 'years_10'
+          expect(query_facet_items.first['label']).to eq 'within 25 Years'
+          expect(query_facet_items.first['value']).to eq 'years_25'
           expect(regular_facet_items.first['label']).to eq "Book"
           expect(regular_facet_items.first['value']).to eq "Book"
         end

data/tasks/blacklight.rake

@@ -9,8 +9,6 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
-
 desc "Run test suite"
 task ci: ['blacklight:generate'] do
   SolrWrapper.wrap do |solr|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.19.1
+  version: 6.19.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,14 +267,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement