blacklight 7.0.0 → 7.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 85a532b997b308e09d4a8a2e9d32dad2875f6a5a9b47f3b02fcdff79bd237b2e
4
- data.tar.gz: d103e0ede5a6c2bfb658ff7ec3dfe049d63aa261d3f8ba2e6f41273702c465cf
3
+ metadata.gz: 1b48d282f24a3086daabbb88b766b5a1d76ff4230a6e6abff9d419b23b01289e
4
+ data.tar.gz: 31da35fbd6535f17a16803af0058b3734e5eb37c44352cc0fbacad8a7bf45142
5
5
  SHA512:
6
- metadata.gz: dfe1f7f5c84c9643861c8bf0e471190a0f364439c88ed19bc94ec66b52f18bc70092415016759d0118eb8372470fd85d56c775529732c46dbfbf52f0c7d83dbb
7
- data.tar.gz: 212410aeded08255f08403d19fea41311426441d442d18dd9f54d451641eae9c93d03f016ca2dbda56aff5a70333ff08ae162bf4b5ca6980bf068666ffc8e636
6
+ metadata.gz: c27bcde35299dcc9468f3684459664fe048d2e4c284701d30128e9f842fb18575905b934c806fb55290ac9eaaf434461b680b1ea3f2f7a626e627c05787391a5
7
+ data.tar.gz: 8478b902a2878b30091fc944dd3be890322a530eca1559f78c9867c03838f575bf46fd4cff2f7b88b00d035deaa0cc51274bc8b253c97626c9af059be7572fda
@@ -8,6 +8,8 @@ notifications:
8
8
 
9
9
  matrix:
10
10
  include:
11
+ - rvm: 2.6.0
12
+ env: "RAILS_VERSION=5.2.2"
11
13
  - rvm: 2.5.3
12
14
  env: "RAILS_VERSION=5.1.6"
13
15
  - rvm: 2.4.5
data/VERSION CHANGED
@@ -1 +1 @@
1
- 7.0.0
1
+ 7.0.1
@@ -32,7 +32,7 @@
32
32
  }
33
33
 
34
34
  .filter-name:after {
35
- color: $gray-100;
35
+ color: $gray-500;
36
36
  content: "❯";
37
37
  font-size: 90%;
38
38
  padding-left: $caret-width;
@@ -163,7 +163,6 @@ module Blacklight::ConfigurationHelperBehavior
163
163
  field = fields.first if document.nil?
164
164
  field ||= fields.find { |f| document.has? f }
165
165
  field &&= field.try(:to_sym)
166
- field ||= document.id
167
166
 
168
167
  field
169
168
  end
@@ -1,21 +1,26 @@
1
+ <div class="modal-header">
2
+ <h1><%= t('blacklight.tools.citation') %></h1>
3
+ <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
4
+ <span aria-hidden="true">&times;</span>
5
+ </button>
6
+ </div>
7
+ <div class="modal-body">
8
+ <% @documents.each do |document| %>
9
+ <h1 class="modal-title"><%= document_heading(document) %></h1>
1
10
 
2
- <% @documents.each do |document| %>
11
+ <% if document.respond_to?(:export_as_mla_citation_txt) %>
12
+ <h2><%= t('blacklight.citation.mla') %></h2>
13
+ <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
14
+ <% end %>
3
15
 
4
- <h1 class="modal-title"><%= document_heading(document) %></h1>
16
+ <% if document.respond_to?(:export_as_apa_citation_txt) %>
17
+ <h2><%= t('blacklight.citation.apa') %></h2>
18
+ <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
19
+ <% end %>
5
20
 
6
- <% if document.respond_to?(:export_as_mla_citation_txt) %>
7
- <h2><%= t('blacklight.citation.mla') %></h2>
8
- <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
9
- <% end %>
10
-
11
- <% if document.respond_to?(:export_as_apa_citation_txt) %>
12
- <h2><%= t('blacklight.citation.apa') %></h2>
13
- <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
14
- <% end %>
15
-
16
- <%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
17
- <h2><%= t('blacklight.citation.chicago') %></h2>
18
- <%= document.send(:export_as_chicago_citation_txt).html_safe %>
19
- <%- end -%>
20
-
21
- <% end %>
21
+ <% if document.respond_to?(:export_as_chicago_citation_txt) %>
22
+ <h2><%= t('blacklight.citation.chicago') %></h2>
23
+ <%= document.send(:export_as_chicago_citation_txt).html_safe %>
24
+ <% end %>
25
+ <% end %>
26
+ </div>
@@ -1 +1 @@
1
- <%= render :partial => 'citation' -%>
1
+ <%= render partial: 'citation' %>
@@ -1,9 +1 @@
1
- <div class="modal-header">
2
- <h1><%= t('blacklight.tools.citation') %></h1>
3
- <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
4
- <span aria-hidden="true">&times;</span>
5
- </button>
6
- </div>
7
- <div class="modal-body">
8
- <%= render :partial => 'citation' -%>
9
- </div>
1
+ <%= render partial: 'citation' %>
@@ -40,10 +40,10 @@ Gem::Specification.new do |s|
40
40
  s.add_development_dependency "capybara", '~> 3'
41
41
  s.add_development_dependency 'chromedriver-helper', '< 2.0.0' # 2.1.0 is causing "Unable to find chromedriver" on Travis
42
42
  s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
43
- s.add_development_dependency 'engine_cart', '~> 1.2'
43
+ s.add_development_dependency 'engine_cart', '~> 2.1'
44
44
  s.add_development_dependency "equivalent-xml"
45
45
  s.add_development_dependency "simplecov"
46
- s.add_development_dependency "rubocop", '~> 0.60.0'
46
+ s.add_development_dependency "rubocop", '~> 0.61.1'
47
47
  s.add_development_dependency "rubocop-rspec", '~> 1.8'
48
48
  s.add_development_dependency "i18n-tasks"
49
49
  end
@@ -7,7 +7,6 @@ module Blacklight
7
7
  argument :controller_name, type: :string, default: "catalog"
8
8
  argument :document_name, type: :string, default: "solr_document"
9
9
  argument :search_builder_name, type: :string, default: "search_builder"
10
- argument :solr_version, type: :string, default: "latest"
11
10
 
12
11
  class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
13
12
  class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
@@ -88,7 +87,7 @@ EOF
88
87
  return unless options[:marc]
89
88
 
90
89
  blacklight_marc = String.new('blacklight-marc')
91
- gem blacklight_marc, '< 8'
90
+ gem blacklight_marc, '>= 7.0.0.rc1', '< 8'
92
91
 
93
92
  Bundler.with_clean_env do
94
93
  run "bundle install"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "blacklight-frontend",
3
- "version": "7.0.0-alpha.1",
3
+ "version": "7.0.1",
4
4
  "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)",
5
5
  "main": "app/assets/javascripts/blacklight",
6
6
  "scripts": {
@@ -64,7 +64,7 @@ RSpec.describe CatalogController, api: true do
64
64
  end
65
65
 
66
66
  it "returns results (possibly 0) when the user asks for a valid value to a custom facet query", integration: true do
67
- get :index, params: { f: { example_query_facet_field: 'years_10' } } # valid custom facet value with some results
67
+ get :index, params: { f: { example_query_facet_field: 'years_25' } } # valid custom facet value with some results
68
68
  expect(assigns(:response).docs).not_to be_empty
69
69
  end
70
70
 
@@ -172,8 +172,8 @@ RSpec.describe CatalogController, api: true do
172
172
  let(:query_facet_items) { query_facet['attributes']['items'].map { |x| x['attributes'] } }
173
173
 
174
174
  it "has items with labels and values" do
175
- expect(query_facet_items.first['label']).to eq 'within 10 Years'
176
- expect(query_facet_items.first['value']).to eq 'years_10'
175
+ expect(query_facet_items.first['label']).to eq 'within 25 Years'
176
+ expect(query_facet_items.first['value']).to eq 'years_25'
177
177
  end
178
178
  end
179
179
  end
@@ -114,12 +114,6 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
114
114
  f = helper.document_show_link_field document
115
115
  expect(f).to eq :b
116
116
  end
117
-
118
- it "fallbacks on the id" do
119
- blacklight_config.index.title_field = [:zzz, :yyy]
120
- f = helper.document_show_link_field document
121
- expect(f).to eq 123
122
- end
123
117
  end
124
118
 
125
119
  describe "#view_label" do
@@ -11,8 +11,6 @@ end
11
11
  require 'rubocop/rake_task'
12
12
  RuboCop::RakeTask.new(:rubocop)
13
13
 
14
- EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
15
-
16
14
  desc "Run test suite"
17
15
  task ci: ['blacklight:generate'] do
18
16
  SolrWrapper.wrap do |solr|
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- gem "blacklight", ">= 6.1"
3
+ gem 'blacklight', '>= 7.0'
4
4
 
5
5
  run "bundle install"
6
6
 
7
7
  # run the blacklight install generator
8
- options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc --solr_version=latest')
8
+ options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc')
9
9
 
10
10
  generate 'blacklight:install', options
11
11
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.0
4
+ version: 7.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: exe
19
19
  cert_chain: []
20
- date: 2018-12-19 00:00:00.000000000 Z
20
+ date: 2019-01-13 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rails
@@ -227,14 +227,14 @@ dependencies:
227
227
  requirements:
228
228
  - - "~>"
229
229
  - !ruby/object:Gem::Version
230
- version: '1.2'
230
+ version: '2.1'
231
231
  type: :development
232
232
  prerelease: false
233
233
  version_requirements: !ruby/object:Gem::Requirement
234
234
  requirements:
235
235
  - - "~>"
236
236
  - !ruby/object:Gem::Version
237
- version: '1.2'
237
+ version: '2.1'
238
238
  - !ruby/object:Gem::Dependency
239
239
  name: equivalent-xml
240
240
  requirement: !ruby/object:Gem::Requirement
@@ -269,14 +269,14 @@ dependencies:
269
269
  requirements:
270
270
  - - "~>"
271
271
  - !ruby/object:Gem::Version
272
- version: 0.60.0
272
+ version: 0.61.1
273
273
  type: :development
274
274
  prerelease: false
275
275
  version_requirements: !ruby/object:Gem::Requirement
276
276
  requirements:
277
277
  - - "~>"
278
278
  - !ruby/object:Gem::Version
279
- version: 0.60.0
279
+ version: 0.61.1
280
280
  - !ruby/object:Gem::Dependency
281
281
  name: rubocop-rspec
282
282
  requirement: !ruby/object:Gem::Requirement