blacklight 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a532b997b308e09d4a8a2e9d32dad2875f6a5a9b47f3b02fcdff79bd237b2e
-  data.tar.gz: d103e0ede5a6c2bfb658ff7ec3dfe049d63aa261d3f8ba2e6f41273702c465cf
+  metadata.gz: 1b48d282f24a3086daabbb88b766b5a1d76ff4230a6e6abff9d419b23b01289e
+  data.tar.gz: 31da35fbd6535f17a16803af0058b3734e5eb37c44352cc0fbacad8a7bf45142
 SHA512:
-  metadata.gz: dfe1f7f5c84c9643861c8bf0e471190a0f364439c88ed19bc94ec66b52f18bc70092415016759d0118eb8372470fd85d56c775529732c46dbfbf52f0c7d83dbb
-  data.tar.gz: 212410aeded08255f08403d19fea41311426441d442d18dd9f54d451641eae9c93d03f016ca2dbda56aff5a70333ff08ae162bf4b5ca6980bf068666ffc8e636
+  metadata.gz: c27bcde35299dcc9468f3684459664fe048d2e4c284701d30128e9f842fb18575905b934c806fb55290ac9eaaf434461b680b1ea3f2f7a626e627c05787391a5
+  data.tar.gz: 8478b902a2878b30091fc944dd3be890322a530eca1559f78c9867c03838f575bf46fd4cff2f7b88b00d035deaa0cc51274bc8b253c97626c9af059be7572fda

data/.travis.yml

@@ -8,6 +8,8 @@ notifications:
 
 matrix:
   include:
+    - rvm: 2.6.0
+      env: "RAILS_VERSION=5.2.2"
     - rvm: 2.5.3
       env: "RAILS_VERSION=5.1.6"
     - rvm: 2.4.5

data/VERSION

@@ -1 +1 @@
-7.0.0
+7.0.1

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -32,7 +32,7 @@
   }
 
   .filter-name:after {
-    color: $gray-100;
+    color: $gray-500;
     content: "❯";
     font-size: 90%;
     padding-left: $caret-width;

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -163,7 +163,6 @@ module Blacklight::ConfigurationHelperBehavior
     field = fields.first if document.nil?
     field ||= fields.find { |f| document.has? f }
     field &&= field.try(:to_sym)
-    field ||= document.id
 
     field
   end

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 %>
 
-  <h1 class="modal-title"><%= document_heading(document) %></h1>
+    <% 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) %>
-  <h2><%= t('blacklight.citation.mla') %></h2>
-  <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<% 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_chicago_citation_txt) -%>
-  <h2><%= t('blacklight.citation.chicago') %></h2>
-  <%= 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,9 +1 @@
-<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">
-<%= render :partial => 'citation' -%>
-</div>
+<%= render partial: 'citation' %>

data/blacklight.gemspec

@@ -40,10 +40,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "capybara", '~> 3'
   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 "simplecov"
-  s.add_development_dependency "rubocop", '~> 0.60.0'
+  s.add_development_dependency "rubocop", '~> 0.61.1'
   s.add_development_dependency "rubocop-rspec", '~> 1.8'
   s.add_development_dependency "i18n-tasks"
 end

data/lib/generators/blacklight/install_generator.rb

@@ -7,7 +7,6 @@ module Blacklight
     argument     :controller_name, type: :string, default: "catalog"
     argument     :document_name, type: :string, default: "solr_document"
     argument     :search_builder_name, type: :string, default: "search_builder"
-    argument     :solr_version, type: :string, default: "latest"
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
@@ -88,7 +87,7 @@ EOF
       return unless options[:marc]
 
       blacklight_marc = String.new('blacklight-marc')
-      gem blacklight_marc, '< 8'
+      gem blacklight_marc, '>= 7.0.0.rc1', '< 8'
 
       Bundler.with_clean_env do
         run "bundle install"

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.1",
   "description": "[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {

data/spec/controllers/catalog_controller_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe CatalogController, api: true 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).not_to be_empty
       end
 
@@ -172,8 +172,8 @@ RSpec.describe CatalogController, api: true do
         let(:query_facet_items) { query_facet['attributes']['items'].map { |x| x['attributes'] } }
 
         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'
         end
       end
     end

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -114,12 +114,6 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
       f = helper.document_show_link_field document
       expect(f).to eq :b
     end
-
-    it "fallbacks on the id" do
-      blacklight_config.index.title_field = [:zzz, :yyy]
-      f = helper.document_show_link_field document
-      expect(f).to eq 123
-    end
   end
 
   describe "#view_label" do

data/tasks/blacklight.rake

@@ -11,8 +11,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|

data/template.demo.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-gem "blacklight", ">= 6.1"
+gem 'blacklight', '>= 7.0'
 
 run "bundle install"
 
 # run the blacklight install generator
-options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc --solr_version=latest')
+options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc')
 
 generate 'blacklight:install', options
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -227,14 +227,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
@@ -269,14 +269,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement