blacklight 7.0.0.rc1 → 7.0.0.rc2

data/spec/views/catalog/show.json.jbuilder_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/show.json" do
+  let(:document) do
+    SolrDocument.new(id: '123', title_tsim: 'Book1', author_tsim: 'Julie', format: 'Book')
+  end
+  let(:config) do
+    Blacklight::Configuration.new do |config|
+      config.add_show_field 'title', label: 'Title', field: 'title_tsim'
+    end
+  end
+
+  let(:hash) do
+    render template: "catalog/show.json", format: :json
+    JSON.parse(rendered).with_indifferent_access
+  end
+
+  before do
+    allow(view).to receive(:blacklight_config).and_return(config)
+    assign :document, document
+  end
+
+  it "includes document attributes" do
+    expect(hash).to include(data:
+      {
+        id: '123',
+        type: 'Book',
+        attributes: {
+          'title' => {
+            id: 'http://test.host/catalog/123#title',
+            type: 'document_value',
+            attributes: {
+              value: 'Book1',
+              label: 'Title'
+            }
+          }
+        }
+      })
+  end
+end

data/spec/views/catalog/sms_success.html.erb_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.describe "catalog/sms_success.html.erb" do
-
   it "includes the data-blacklight-modal properties" do
     render
     expect(rendered).to have_selector "div[data-blacklight-modal=container]"

data/spec/views/shared/_user_util_links.html.erb_spec.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe "shared/_user_util_links" do
-
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
       config.navbar.partials = { bookmark: Blacklight::Configuration::ToolConfig.new(partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?) }
     end
-
   end
 
   it "renders the correct bookmark count" do
@@ -16,7 +14,6 @@ RSpec.describe "shared/_user_util_links" do
     allow(view).to receive(:has_user_authentication_provider?).and_return false
     allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
     render "shared/user_util_links"
-    expect(rendered).to have_selector('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: "#{count}")
+    expect(rendered).to have_selector('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: count.to_s)
   end
-
 end

data/tasks/blacklight.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'solr_wrapper'
 require 'engine_cart/rake_task'
 
@@ -13,8 +15,8 @@ EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"
 task ci: ['blacklight:generate'] do
-  SolrWrapper.wrap(version: '7.1.0') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), '.internal_test_app', 'solr', 'conf')) do
+  SolrWrapper.wrap do |solr|
+    solr.with_collection do
       within_test_app do
         system "RAILS_ENV=test rake blacklight:index:seed"
       end
@@ -52,8 +54,8 @@ namespace :blacklight do
       Rake::Task['engine_cart:generate'].invoke
     end
 
-    SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
+    SolrWrapper.wrap do |solr|
+      solr.with_collection do
         Rake::Task['blacklight:internal:seed'].invoke
 
         within_test_app do

data/template.demo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 gem "blacklight", ">= 6.1"
 
 run "bundle install"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc1
+  version: 7.0.0.rc2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,14 +25,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -51,16 +51,16 @@ dependencies:
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -185,42 +185,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -283,14 +283,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +305,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -351,6 +365,7 @@ files:
 - app/assets/stylesheets/blacklight/_mixins.scss
 - app/assets/stylesheets/blacklight/_modal.scss
 - app/assets/stylesheets/blacklight/_pagination.scss
+- app/assets/stylesheets/blacklight/_search_form.scss
 - app/assets/stylesheets/blacklight/_search_history.scss
 - app/assets/stylesheets/blacklight/_search_results.scss
 - app/assets/stylesheets/blacklight/_twitter_typeahead.scss
@@ -386,7 +401,6 @@ files:
 - app/helpers/blacklight_helper.rb
 - app/helpers/catalog_helper.rb
 - app/javascript/blacklight/autocomplete.js
-- app/javascript/blacklight/autofocus.js
 - app/javascript/blacklight/bookmark_toggle.js
 - app/javascript/blacklight/checkbox_submit.js
 - app/javascript/blacklight/collapsable.js
@@ -416,6 +430,7 @@ files:
 - app/models/record_mailer.rb
 - app/models/search.rb
 - app/models/solr_document.rb
+- app/presenters/blacklight/document_presenter.rb
 - app/presenters/blacklight/field_presenter.rb
 - app/presenters/blacklight/index_presenter.rb
 - app/presenters/blacklight/json_presenter.rb
@@ -456,6 +471,7 @@ files:
 - app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_facet_pivot.html.erb
 - app/views/catalog/_facets.html.erb
+- app/views/catalog/_field.json.jbuilder
 - app/views/catalog/_group.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
@@ -495,6 +511,7 @@ files:
 - app/views/catalog/opensearch.xml.builder
 - app/views/catalog/send_email_record.erb
 - app/views/catalog/show.html.erb
+- app/views/catalog/show.json.jbuilder
 - app/views/catalog/sms.html.erb
 - app/views/catalog/sms_success.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
@@ -521,6 +538,7 @@ files:
 - app/views/shared/_sitelinks_search_box.html.erb
 - app/views/shared/_user_util_links.html.erb
 - blacklight.gemspec
+- config/i18n-tasks.yml
 - config/locales/blacklight.de.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.es.yml
@@ -648,6 +666,7 @@ files:
 - spec/helpers/blacklight/url_helper_behavior_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
+- spec/i18n_spec.rb
 - spec/integration/generators/blacklight/solr_generator_spec.rb
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
@@ -685,11 +704,13 @@ files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/document_presenter_spec.rb
+- spec/presenters/blacklight/index_presenter_spec.rb
+- spec/presenters/blacklight/json_presenter_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
 - spec/presenters/blacklight/search_bar_presenter_spec.rb
-- spec/presenters/index_presenter_spec.rb
+- spec/presenters/blacklight/show_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb
-- spec/presenters/show_presenter_spec.rb
 - spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/services/blacklight/search_service_spec.rb
@@ -725,6 +746,7 @@ files:
 - spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
+- spec/views/catalog/show.json.jbuilder_spec.rb
 - spec/views/catalog/sms_success.html.erb_spec.rb
 - spec/views/shared/_user_util_links.html.erb_spec.rb
 - tasks/blacklight.rake
@@ -749,7 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -793,6 +815,7 @@ test_files:
 - spec/helpers/blacklight/url_helper_behavior_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
+- spec/i18n_spec.rb
 - spec/integration/generators/blacklight/solr_generator_spec.rb
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
@@ -830,11 +853,13 @@ test_files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/document_presenter_spec.rb
+- spec/presenters/blacklight/index_presenter_spec.rb
+- spec/presenters/blacklight/json_presenter_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
 - spec/presenters/blacklight/search_bar_presenter_spec.rb
-- spec/presenters/index_presenter_spec.rb
+- spec/presenters/blacklight/show_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb
-- spec/presenters/show_presenter_spec.rb
 - spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/services/blacklight/search_service_spec.rb
@@ -870,5 +895,6 @@ test_files:
 - spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
+- spec/views/catalog/show.json.jbuilder_spec.rb
 - spec/views/catalog/sms_success.html.erb_spec.rb
 - spec/views/shared/_user_util_links.html.erb_spec.rb

data/app/javascript/blacklight/autofocus.js

@@ -1,20 +0,0 @@
-//= require blacklight/core
-(function($) {
-  Blacklight.doSearchAutofocusFallback = function() {
-    if (typeof Blacklight.do_search_autofocus_fallback == 'function') {
-      console.warn("do_search_autofocus_fallback is deprecated. Use doSearchAutofocusFallback instead.");
-      return Blacklight.do_search_autofocus_fallback();
-    }
-    if (typeof Modernizer != 'undefined') {
-      if (Modernizr.autofocus) {
-        return;
-      }
-    }
-
-    $('input[autofocus]').focus();
-  }
-
-  Blacklight.onLoad(function() {
-    Blacklight.doSearchAutofocusFallback();
-  });
-})(jQuery);

data/spec/presenters/index_presenter_spec.rb

@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Blacklight::IndexPresenter do
-  include Capybara::RSpecMatchers
-  let(:request_context) { double(document_index_view_type: 'list') }
-  let(:config) { Blacklight::Configuration.new }
-
-  subject { presenter }
-  let(:presenter) { described_class.new(document, request_context, config) }
-  let(:parameter_class) { ActionController::Parameters }
-  let(:params) { parameter_class.new }
-  let(:controller) { double }
-  let(:search_state) { Blacklight::SearchState.new(params, config, controller) }
-
-  let(:document) do
-    SolrDocument.new(id: 1,
-                     'link_to_facet_true' => 'x',
-                     'link_to_facet_named' => 'x',
-                     'qwer' => 'document qwer value',
-                     'mnbv' => 'document mnbv value')
-  end
-
-  before do
-    allow(request_context).to receive(:search_state).and_return(search_state)
-  end
-
-  describe "field_value" do
-    let(:config) do
-      Blacklight::Configuration.new.configure do |config|
-        config.add_index_field 'qwer'
-        config.add_index_field 'asdf', :helper_method => :render_asdf_index_field
-        config.add_index_field 'link_to_facet_true', :link_to_facet => true
-        config.add_index_field 'link_to_facet_named', :link_to_facet => :some_field
-        config.add_index_field 'highlight', :highlight => true
-        config.add_index_field 'solr_doc_accessor', :accessor => true
-        config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
-        config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
-        config.add_index_field 'alias', field: 'qwer'
-        config.add_index_field 'with_default', default: 'value'
-      end
-    end
-    it "checks for an explicit value" do
-      value = subject.field_value 'asdf', :value => 'asdf'
-      expect(value).to eq 'asdf'
-    end
-
-    it "checks for a helper method to call" do
-      allow(request_context).to receive(:render_asdf_index_field).and_return('custom asdf value')
-      value = subject.field_value 'asdf'
-      expect(value).to eq 'custom asdf value'
-    end
-
-    it "checks for a link_to_facet" do
-      allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_facet_true' => ['x'] }).and_return('/foo')
-      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      value = subject.field_value 'link_to_facet_true'
-      expect(value).to eq 'bar'
-    end
-
-    it "checks for a link_to_facet with a field name" do
-      allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
-      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      value = subject.field_value 'link_to_facet_named'
-      expect(value).to eq 'bar'
-    end
-
-    it "gracefully handles when no highlight field is available" do
-      allow(document).to receive(:has_highlight_field?).and_return(false)
-      value = subject.field_value 'highlight'
-      expect(value).to be_blank
-    end
-
-    it "checks for a highlighted field" do
-      allow(document).to receive(:has_highlight_field?).and_return(true)
-      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
-      value = subject.field_value 'highlight'
-      expect(value).to eq '<em>highlight</em>'
-    end
-
-    it "checks the document field value" do
-      value = subject.field_value 'qwer'
-      expect(value).to eq 'document qwer value'
-    end
-
-    it "works with index fields that aren't explicitly defined" do
-      value = subject.field_value 'mnbv'
-      expect(value).to eq 'document mnbv value'
-    end
-
-    it "calls an accessor on the solr document" do
-      allow(document).to receive_messages(solr_doc_accessor: "123")
-      value = subject.field_value 'solr_doc_accessor'
-      expect(value).to eq "123"
-    end
-
-    it "calls an explicit accessor on the solr document" do
-      allow(document).to receive_messages(solr_doc_accessor: "123")
-      value = subject.field_value 'explicit_accessor'
-      expect(value).to eq "123"
-    end
-
-    it "calls an accessor on the solr document with the field as an argument" do
-      allow(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
-      value = subject.field_value 'explicit_accessor_with_arg'
-      expect(value).to eq "123"
-    end
-
-    it "supports solr field configuration" do
-      value = subject.field_value 'alias'
-      expect(value).to eq "document qwer value"
-    end
-
-    it "supports default values in the field configuration" do
-      value = subject.field_value 'with_default'
-      expect(value).to eq "value"
-    end
-  end
-
-  describe '#field_values' do
-    context 'for a field with the helper_method option' do
-      let(:field_name) { 'field_with_helper' }
-      let(:field_config) { config.add_facet_field 'field_with_helper', helper_method: 'render_field_with_helper' }
-      let(:document) do
-        SolrDocument.new(id: 1, 'field_with_helper' => 'value')
-      end
-
-      it "checks call the helper method with arguments" do
-        allow(request_context).to receive(:render_field_with_helper) do |*args|
-          args.first
-        end
-
-        render_options = { a: 1 }
-
-        options = subject.send(:field_values, field_config, a: 1)
-
-        expect(options).to include :document, :field, :value, :config, :a
-        expect(options[:document]).to eq document
-        expect(options[:field]).to eq 'field_with_helper'
-        expect(options[:value]).to eq ['value']
-        expect(options[:config]).to eq field_config
-        expect(options[:a]).to eq 1
-      end
-    end
-  end
-
-  describe "#thumbnail" do
-    subject { presenter.thumbnail }
-    it { is_expected.to be_instance_of Blacklight::ThumbnailPresenter }
-  end
-end