blacklight 6.8.0 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7659ba5e00f78c03a1a4f10c0b3aa010290f3101
-  data.tar.gz: eff65628374ba2a260ce76c62a8e6fbcc7eea314
+  metadata.gz: 2061ccbc1e4df9ec4a7c1b1f780ea5420a379483
+  data.tar.gz: f08c9eac999b9954471352a6d5c1d83f9885a932
 SHA512:
-  metadata.gz: e6fc2330aa0cd95b868358e8d4761a88a0eca3bbcc7bf3513b843983ff894f87539f289d453c55fa95122f4a0943860d8c8522969f85ea0ccd50cbeda82513cf
-  data.tar.gz: c176bbe0a6cbaf3c5eea74a13d644a113e7daf87750be9782303ab36081d15da334d23dff1ca6dc2a8e3885c58efd0dac1ddc419f73db63d3b7fbbec6a443ce2
+  metadata.gz: 8708c94876e422d943c9fdada3c5faefa71342a7112e6e2a8ce32b7a82b56be6b18ed74f041773e75594928e69fd30067c74ba65bfd7df1be5190f484113a643
+  data.tar.gz: 7ae034c2608744da8b713df542509e87e27380794c2400ef3b90bb829e262fc21895fdb7650b133c89d87b8270987b6afd9804408753be1ad4695c886800703f

data/.jshintrc

@@ -1,66 +1,19 @@
 {
-  /*
-   * ENVIRONMENTS
-   * =================
-   */
-
-  // Define globals exposed by modern browsers.
   "browser": true,
-
-  // Define globals exposed by jQuery.
   "jquery": true,
-
-  // Define globals exposed by Node.js.
   "node": true,
-
-  // Allow ES6.
   "esnext": true,
-
-  /*
-   * ENFORCING OPTIONS
-   * =================
-   */
-
-  // Force all variable names to use either camelCase style or UPPER_CASE
-  // with underscores.
   "camelcase": true,
-
-  // Prohibit use of == and != in favor of === and !==.
   "eqeqeq": true,
-
-  // Enforce tab width of 2 spaces.
   "indent": 2,
-
-  // Prohibit use of a variable before it is defined.
   "latedef": true,
-
-  // Enforce line length to 80 characters
   "maxlen": 80,
-
-  // Require capitalized names for constructor functions.
   "newcap": true,
-
-  // Enforce use of single quotation marks for strings.
   "quotmark": "single",
-
-  // Enforce placing 'use strict' at the top function scope
   "strict": true,
-
-  // Prohibit use of explicitly undeclared variables.
   "undef": true,
-
-  // Warn when variables are defined but never used.
   "unused": true,
-
-  /*
-   * RELAXING OPTIONS
-   * =================
-   */
-
-  // Suppress warnings about == null comparisons.
   "eqnull": true,
-
-  // Custom predefined javascript objects that should be defined
   "predef": [
     "Blacklight"
   ]

data/VERSION

@@ -1 +1 @@
-6.8.0
+6.9.0

data/app/assets/javascripts/blacklight/autocomplete.js

@@ -5,6 +5,9 @@ Blacklight.onLoad(function() {
 
   $('[data-autocomplete-enabled="true"]').each(function() {
     var $el = $(this);
+    if($el.hasClass('tt-hint')) {
+      return;
+    }
     var suggestUrl = $el.data().autocompletePath;
     
     var terms = new Bloodhound({

data/app/controllers/concerns/blacklight/controller.rb

@@ -67,7 +67,15 @@ module Blacklight::Controller
 
     # @return [Blacklight::SearchState] a memoized instance of the parameter state.
     def search_state
-      @search_state ||= search_state_class.new(params, blacklight_config)
+      @search_state ||= begin
+        if search_state_class.instance_method(:initialize).arity == -3
+          search_state_class.new(params, blacklight_config, self)
+        else
+          Deprecation.warn(search_state_class, "The constructor for #{search_state_class} now requires a third argument. " \
+            "Invoking it will 2 arguments is deprecated and will be removed in Blacklight 7.")
+          search_state_class.new(params, blacklight_config)
+        end
+      end
     end
 
     # Default route to the search action (used e.g. in global partials). Override this method
@@ -131,7 +139,7 @@ module Blacklight::Controller
     #
     def has_user_authentication_provider?
       respond_to? :current_user
-    end           
+    end
 
     def require_user_authentication_provider
       raise ActionController::RoutingError, 'Not Found' unless has_user_authentication_provider?
@@ -159,7 +167,7 @@ module Blacklight::Controller
     end
 
     ##
-    # To handle failed authorization attempts, redirect the user to the 
+    # To handle failed authorization attempts, redirect the user to the
     # login form and persist the current request uri as a parameter
     def access_denied
       # send the user home if the access was previously denied by the same
@@ -171,5 +179,4 @@ module Blacklight::Controller
 
       redirect_to new_user_session_url(:referer => request.fullpath)
     end
-  
 end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -12,6 +12,12 @@ module Blacklight::CatalogHelperBehavior
     auto_discovery_link_tag(:atom, feed_link_url('atom', options), title: t('blacklight.search.atom_feed'))
   end
 
+  # @param [Hash] options
+  # @option options :route_set the route scope to use when constructing the link
+  def json_api_link_tag(options = {})
+    auto_discovery_link_tag(:json, feed_link_url('json', options), type: 'application/json')
+  end
+
   ##
   # Override the Kaminari page_entries_info helper with our own, blacklight-aware
   # implementation.

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -64,14 +64,14 @@ module Blacklight::RenderConstraintsHelperBehavior
   # @param [Hash] localized_params query parameters
   # @return [String]
   def render_constraints_filters(localized_params = params)
-     return "".html_safe unless localized_params[:f]
-     path = controller.search_state_class.new(localized_params, blacklight_config)
-     content = []
-     localized_params[:f].each_pair do |facet,values|
-       content << render_filter_element(facet, values, path)
-     end
+    return "".html_safe unless localized_params[:f]
+    path = controller.search_state_class.new(localized_params, blacklight_config, controller)
+    content = []
+    localized_params[:f].each_pair do |facet,values|
+      content << render_filter_element(facet, values, path)
+    end
 
-     safe_join(content.flatten, "\n")
+    safe_join(content.flatten, "\n")
   end
 
   ##

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

@@ -6,6 +6,7 @@
   <%= render_opensearch_response_metadata %>
   <%= rss_feed_link_tag %>
   <%= atom_feed_link_tag %>
+  <%= json_api_link_tag %>
 <% end %>
 
 <%= render 'search_header' %>

data/app/views/catalog/opensearch.xml.builder

@@ -4,7 +4,7 @@ xml.OpenSearchDescription(:xmlns=>'http://a9.com/-/spec/opensearch/1.1/') {
   xml.Description "#{application_name} Search"
   xml.Image "#{asset_url('favicon.ico')}", :height=>16, :width=>16, :type=>'image/x-icon'
   xml.Contact
-  xml.Url :type=>'text/html', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}?q={searchTerms}"
-  xml.Url :type=>'application/rss+xml', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}.rss?q={searchTerms}"
+  xml.Url :type=>'text/html', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}?q={searchTerms}&page={startPage?}"
+  xml.Url :type=>'application/rss+xml', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}.rss?q={searchTerms}&page={startPage?}"
   xml.Url :type=>'application/x-suggestions+json', :method=>'get', :template=>"#{url_for :controller=>'catalog',:action => 'opensearch', :format=> 'json', :only_path => false}?q={searchTerms}"
 }

data/blacklight.gemspec

@@ -38,12 +38,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.5"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
-  s.add_development_dependency "capybara", '~> 2.6.0'
+  s.add_development_dependency "capybara", '~> 2.6'
   s.add_development_dependency "poltergeist"
   s.add_development_dependency 'engine_cart', '~> 1.0'
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop", '~> 0.47.0' # pending release of 0.48.1
   s.add_development_dependency "rubocop-rspec", '~> 1.8.0'
 end

data/config/locales/blacklight.sq.yml

@@ -0,0 +1,234 @@
+sq:
+  views:
+    pagination:
+      first: '« E para'
+      last: 'E fundit »'
+      previous: '« Mbrapa'
+      next: 'Tjetra »'
+      truncate: '…'
+
+    pagination_compact:
+      previous: '« Mbrapa'
+      next: 'Tjetra »'
+
+  blacklight:
+    application_name: 'Blacklight'
+
+    header_links:
+      login: 'Hyr'
+      logout: 'Dil'
+      bookmarks: 'Memorizimet'
+      saved_searches: 'Kërkimet e ruajtura'
+      search_history: 'Historia'
+
+    welcome: 'Mirësevini!'
+    and: 'dhe'
+    or: 'ose'
+
+    modal:
+      close: "Mbylle"
+
+    bookmarks:
+      title: 'Memorizimet'
+      page_title: 'Memorizimet - %{application_name}'
+      no_bookmarks: 'Nuk keni memorizime të ruajtura'
+      add:
+        button: 'Memorizo'
+        success:
+          one: 'Memorizimi u shtua me sukses.'
+          other: 'Memorizimet u shtuan me sukses.'
+        failure:  'Na vjen keq, ka pasur një problem gjatë ruajtes së memorizimeve.'
+      remove:
+        button: 'Fshij memorizimin'
+        success: 'Fshrija e memorizimit u krye me sukses'
+        failure: 'Na vjen keq, ka pasur një problem gjatë fshirjes së memorizimeve.'
+        action_confirm: 'Dëshiron ta fshishë memorizimin?'
+      clear:
+        action_title: 'Fshij memorizimet'
+        action_confirm: "Dëshiron t'i fshishë memorizimet?"
+        success: 'Memorizimet u fshinë.'
+        failure: 'Na vjen keq, ka pasur një problem gjatë fshirjes së memorizimeve.'
+      need_login: 'Ju lutemi kyçuni për të menaxhuar dhe për të parë memorizimet tuaja.'
+      list_title: 'Memorizimet e juaja'
+      delete: 'Fshije'
+
+    saved_searches:
+      add:
+        success: 'Kërkimi u ruajt me sukses.'
+        failure: 'Ka pasur një problem gjatë ruajt së kërkimit.'
+      remove:
+        success: 'Kërkimi i ruajtur u fshi me sukses.'
+        failure: 'Ka pasur një problem gjatë fshirjes së kërkimit.'
+      clear:
+        action_title: 'Fshij Kërkimet E Ruajtura'
+        action_confirm: "Dëshiron t'i fshishë kërkimet e ruajtua?"
+        success: 'Kërkimet e ruajtua u fshinë'
+        failure: 'Ka pasur një problem gjatë fshirjes së kërkimeve.'
+      title: 'Kërkimet e ruajtura'
+      page_title: 'Kërkimet E Ruajtura - %{application_name}'
+      need_login: 'Ju lutemi kyçuni për të menaxhuar dhe për të parë kërkimet e ruajtura.'
+      no_searches: 'Nuk keni kerkime të ruajtura'
+      list_title: 'Kërkimet e ruajtura'
+      delete: 'fshije'
+
+    search_history:
+      clear:
+        action_title: 'Fshij Historinë E Kërkimit'
+        action_confirm: 'Dëshiron ta fshishë historinë e kërkimit?'
+        success: 'Historia e kërkimit u fshi'
+        failure: 'Ka pasur një problem gjatë fshirjes së historisë së kërkimit.'
+      title: 'Historia e kërkimit'
+      page_title: 'Historia e kërkimit - %{application_name}'
+      no_history: 'Nuk keni histori të kërkimit'
+      recent: 'Kërkimet e fundit'
+      forget: 'fshije'
+      save: 'ruaje'
+
+    tools:
+      title: 'Veglat'
+      citation: 'Citati'
+      email: 'Email'
+      sms: 'Dërgo SMS'
+      clear: 'Fshij'
+
+    citation:
+      mla: 'MLA'
+      apa: 'APA'
+      chicago: 'Chicago'
+
+    email:
+      form:
+        title: 'Dërgo Email'
+        to: 'Email:'
+        message: 'Mesazhi:'
+        submit: 'Dërgo'
+      text:
+        default_title: 'N/A'
+        title: 'Titulli: %{value}'
+        author: 'Autori: %{value}'
+        format: 'Formati: %{value}'
+        language: 'Gjuha: %{value}'
+        subject:
+          one: 'Item Record: %{title}'
+          other: 'Item records'
+        url: 'URL: %{url}'
+        message: 'Mesazhi: %{message}'
+
+      success: "Emaili u dëgua"
+
+      errors:
+        to:
+          invalid: 'Duhet të shkruash një email adresë valide'
+          blank: 'Duhet të shkruash një pranues për të dëguar mesazh'
+    sms:
+      form:
+        title: 'SMS'
+        to: 'Numri i telefonit:'
+        carrier: 'Operatori'
+        carrier_prompt: 'Ju lutemi zgjedheni operatorin'
+        submit: 'Dërgo'
+      text:
+        title: '%{value}'
+        author: ' nga %{value}'
+        url: 'Link: %{url}'
+      success: "SMS-i u dëgua"
+      errors:
+        to:
+          invalid: 'Duhet të shkruash një number telefoni me 10 shifra'
+          blank: "Duhet të shkruash një numer telefoni për të dëguar SMS"
+        carrier:
+          blank: 'Duhet të zgjedheni operatorin'
+          invalid: "Duhet të zgjedheni operatorë valid"
+
+    back_to_search: 'Kthehu te kërkimi'
+    back_to_bookmarks: 'Kthehu te memorizimet'
+
+    search:
+      # i18n key 'title' is deprecated and will be removed in Blacklight 6.0
+      title: '%{application_name} Rezultatet e kërkimit'
+      page_title:
+        title: '%{constraints} - %{application_name} Rezultatet e kërkimit'
+        constraint: '%{label}: %{value}'
+        many_constraint_values: '%{values} zgjedhura'
+      search_results_header: 'Kufizimet e kërkimit'
+      search_results: 'Rezultatet e kërkimit'
+      errors:
+        request_error: "Na vjen keq, unë nuk e kuptoj kërkimin tuaj."
+        invalid_solr_id: "Na vjen keq, ju keni kërkuar një të dhënë që nuk ekziston."
+      per_page:
+        label: '%{count}<span class="sr-only"> për faqe</span>'
+        button_label: '%{count} për faqe'
+        title: 'Numri i rezultateve që do të shfaqen për faqe'
+        submit: 'Përditëso'
+      sort:
+        label: 'Klasifikoj sipas %{field}'
+        submit: 'klasifiko rezultatet'
+      form:
+        search_field:
+          label: 'Kërko'
+          title: 'Targeted search options'
+          post_label: 'për'
+        search:
+          label: 'kërko për'
+          placeholder: 'Kërko...'
+        submit: 'Kërko'
+      pagination:
+        title: 'Navigimi i rezultateteve'
+      pagination_info:
+        no_items_found: '%{entry_name} nuk u gjet'
+        single_item_found: '<strong>1</strong> %{entry_name} u gjet'
+        pages:
+          one: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> prej <strong>%{total_num}</strong>'
+          other: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> prej <strong>%{total_num}</strong>'
+      entry_pagination_info:
+        one: '<strong>1 prej 1</strong>'
+        other: '<strong>%{current}</strong> prej <strong>%{total}</strong>'
+      documents:
+        counter: '%{counter}. '
+      facets:
+        title: 'Kufizo këkimin'
+        clear: 'Fshij filterin'
+        sort:
+          count: 'Renditja numerike'
+          index: 'A-Z Renditja'
+        count: '%{number}'
+        more_html: 'Më shumë <span class="sr-only">%{field_name}</span> »'
+        selected:
+          remove: '[fshije]'
+        missing: "[Mungon]"
+      group:
+        more: 'më shumë »'
+      filters:
+        title: 'Ju keni kërkuar për:'
+        label: '%{label}:'
+        remove:
+          value: 'Fshij kufizimin %{value}'
+          label_value: 'Fshij kufizimin %{label}: %{value}'
+      start_over: 'Fillo nga e para'
+      index:
+        label: '%{label}:'
+      show:
+        title: '%{document_title} - %{application_name}'
+        label: '%{label}:'
+      rss_feed: 'RSS për rezultatet'
+      atom_feed: 'Atom për rezultatet'
+      fields:
+        default: 'Fjala'
+      bookmarks:
+        present: "Në memorizime"
+        absent: "Memorizo"
+        inprogress: "Duke u ruajtur..."
+      zero_results:
+        title: "Nuk u gjet asnjë rezultat"
+        modify_search: "Provo të ndryshosh kërkimin"
+        use_fewer_keywords: "Përdorni më pak fjalë kyçe, pastaj filtroni kërkimin tuaj me opcionet në të majtë"
+        search_fields: "u kërkuat për %{search_fields}"
+        search_everything: "provo të kërkosh çdo gjë"
+      view_title: "Shiko rezultatin si: "
+      view:
+        list: "List"
+
+    entry_name:
+      default: 'entry'
+
+    did_you_mean: 'A keni menduar: %{options}?'

data/lib/blacklight/search_state.rb

@@ -6,11 +6,16 @@ module Blacklight
     attr_reader :blacklight_config # Must be called blacklight_config, because Blacklight::Facet calls blacklight_config.
     attr_reader :params
 
+    # This method is never accessed in this class, but may be used by subclasses that need
+    # to access the url_helpers
+    attr_reader :controller
+
     delegate :facet_configuration_for_field, to: :blacklight_config
 
     # @param [ActionController::Parameters] params
     # @param [Blacklight::Config] blacklight_config
-    def initialize(params, blacklight_config)
+    # @param [ApplicationController] controller used for the routing helpers
+    def initialize(params, blacklight_config, controller = nil)
       if params.respond_to?(:to_unsafe_h)
         # This is the typical (not-ActionView::TestCase) code path.
         @params = params.to_unsafe_h
@@ -24,6 +29,7 @@ module Blacklight
       end
 
       @blacklight_config = blacklight_config
+      @controller = controller
     end
 
     def to_hash
@@ -32,7 +38,7 @@ module Blacklight
     alias to_h to_hash
 
     def reset
-      self.class.new(ActionController::Parameters.new, blacklight_config)
+      self.class.new(ActionController::Parameters.new, blacklight_config, controller)
     end
 
     ##
@@ -120,7 +126,7 @@ module Blacklight
     # @yield [params] The merged parameters hash before being sanitized
     def params_for_search(params_to_merge={}, &block)
       # params hash we'll return
-      my_params = params.dup.merge(self.class.new(params_to_merge, blacklight_config))
+      my_params = params.dup.merge(self.class.new(params_to_merge, blacklight_config, controller))
 
       if block_given?
         yield my_params

data/lib/blacklight/solr/response/spelling.rb

@@ -28,44 +28,39 @@ module Blacklight::Solr::Response::Spelling
         if spellcheck && spellcheck[:suggestions]
           suggestions = spellcheck[:suggestions]
           unless suggestions.nil?
-            # suggestions is an array:
-            #    (query term)
-            #    (hash of term info and term suggestion)
-            #    ...
-            #    (query term)
-            #    (hash of term info and term suggestion)
-            #    'correctlySpelled'
-            #    true/false
-            #    collation
-            #    (suggestion for collation)
-            if suggestions.index("correctlySpelled") #if extended results
-              i_stop = suggestions.index("correctlySpelled")
-            elsif suggestions.index("collation")
-              i_stop = suggestions.index("collation")
-            else
-              i_stop = suggestions.length
+            if suggestions.is_a?(Array)
+              # Before solr 6.5 suggestions is an array with the following format:
+              #    (query term)
+              #    (hash of term info and term suggestion)
+              #    ...
+              #    (query term)
+              #    (hash of term info and term suggestion)
+              #    'correctlySpelled'
+              #    true/false
+              #    collation
+              #    (suggestion for collation)
+              # We turn it into a hash here so that it is the same format as in solr 6.5 and later
+              suggestions = Hash[*suggestions].except('correctlySpelled', 'collation')
             end
-              # step through array in 2s to get info for each term
-              0.step(i_stop-1, 2) do |i|
-                term = suggestions[i]
-                term_info = suggestions[i+1]
-                # term_info is a hash:
-                #   numFound =>
-                #   startOffset =>
-                #   endOffset =>
-                #   origFreq =>
-                #   suggestion =>  [{ frequency =>, word => }] # for extended results
-                #   suggestion => ['word'] # for non-extended results
-                orig_freq = term_info['origFreq']
-                if term_info['suggestion'].first.is_a?(Hash) or suggestions.index("correctlySpelled")
-                  word_suggestions << term_info['suggestion'].map do |suggestion|
-                    suggestion['word'] if suggestion['freq'] > orig_freq
-                  end
-                else
-                  # only extended suggestions have frequency so we just return all suggestions
-                  word_suggestions << term_info['suggestion']
+
+            suggestions.each do |_, term_info|
+              # term_info is a hash:
+              #   numFound =>
+              #   startOffset =>
+              #   endOffset =>
+              #   origFreq =>
+              #   suggestion =>  [{ frequency =>, word => }] # for extended results
+              #   suggestion => ['word'] # for non-extended results
+              orig_freq = term_info['origFreq']
+              if term_info['suggestion'].first.is_a?(Hash)
+                word_suggestions << term_info['suggestion'].map do |suggestion|
+                  suggestion['word'] if suggestion['freq'] > orig_freq
                 end
+              else
+                # only extended suggestions have frequency so we just return all suggestions
+                word_suggestions << term_info['suggestion']
               end
+            end
           end
         end
         word_suggestions.flatten.compact.uniq

data/lib/generators/blacklight/solr4_generator.rb

@@ -25,7 +25,7 @@ module Blacklight
     end
 
     def add_rsolr_gem
-      gem "rsolr".dup, "~> 1.0"
+      gem "rsolr".dup, '>= 1.0', '< 3'
     end
   end
 end

data/lib/generators/blacklight/solr5_generator.rb

@@ -31,7 +31,7 @@ module Blacklight
     end
 
     def add_rsolr_gem
-      gem 'rsolr', '~> 1.0'
+      gem 'rsolr', '>= 1.0', '< 3'
     end
   end
 end

data/spec/features/search_spec.rb

@@ -30,6 +30,7 @@ describe "Search Page" do
     Capybara.ignore_hidden_elements = false
     expect(page).to have_selector("link[rel=alternate][type='application/rss+xml']")
     expect(page).to have_selector("link[rel=alternate][type='application/atom+xml']")
+    expect(page).to have_selector("link[rel=alternate][type='application/json']")
 
     # opensearch
     expect(page).to have_selector("meta[name=totalResults]")

data/spec/helpers/catalog_helper_spec.rb

@@ -134,7 +134,7 @@ describe CatalogHelper do
       let(:my_engine) { double("Engine") }
       let(:query_params) { { controller: 'catalog', action: 'index' } }
       let(:config) { Blacklight::Configuration.new }
-      let(:search_state) { Blacklight::SearchState.new(query_params, config) }
+      let(:search_state) { Blacklight::SearchState.new(query_params, config, controller) }
 
       it "calls url_for on the engine scope" do
         allow(helper).to receive(:search_state).and_return search_state
@@ -152,7 +152,7 @@ describe CatalogHelper do
       let(:my_engine) { double("Engine") }
       let(:query_params) { { controller: 'catalog', action: 'index' } }
       let(:config) { Blacklight::Configuration.new }
-      let(:search_state) { Blacklight::SearchState.new(query_params, config) }
+      let(:search_state) { Blacklight::SearchState.new(query_params, config, controller) }
 
       it "calls url_for on the engine scope" do
         allow(helper).to receive(:search_state).and_return search_state

data/spec/helpers/hash_as_hidden_fields_spec.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-describe HashAsHiddenFieldsHelper do
-  include HashAsHiddenFieldsHelper
-  before(:each) do
-    @hash = {:q => "query", :search_field => "search_field", :per_page=>10, :page=>5, :extra_arbitrary_key=>"arbitrary_value", :f=> {:field1 => ["a", "b"], :field2=> ["z"]}}
+describe Blacklight::HashAsHiddenFieldsHelperBehavior do
+  let(:params) do
+    { q: "query",
+      search_field: "search_field",
+      per_page: 10,
+      page: 5,
+      extra_arbitrary_key: "arbitrary_value",
+      f: { field1: %w(a b), field2: ["z"] } }
   end
+  let(:generated) { helper.render_hash_as_hidden_fields(params) }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
-
-    generated = render_hash_as_hidden_fields(@hash)
-
-    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']")
-    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']")
-    expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']")
-    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']")
-    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']")
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']")
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']")
-    
+    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: false)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: false)
   end
-
 end

data/spec/helpers/render_constraints_helper_spec.rb

@@ -50,7 +50,7 @@ describe RenderConstraintsHelper do
     subject { helper.render_filter_element('type', ['journal'], path) }
 
     let(:params) { ActionController::Parameters.new q: 'biz' }
-    let(:path) { Blacklight::SearchState.new(params, config) }
+    let(:path) { Blacklight::SearchState.new(params, config, controller) }
 
     it "has a link relative to the current url" do
       expect(subject).to have_link "Remove constraint Item Type: journal", href: "/catalog?q=biz"

data/spec/lib/blacklight/search_state_spec.rb

@@ -9,7 +9,8 @@ describe Blacklight::SearchState do
   end
 
   let(:parameter_class) { ActionController::Parameters }
-  let(:search_state) { described_class.new(params, blacklight_config) }
+  let(:controller) { double }
+  let(:search_state) { described_class.new(params, blacklight_config, controller) }
   let(:params) { parameter_class.new }
 
   describe '#to_h' do

data/spec/models/blacklight/solr/response_spec.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-describe Blacklight::Solr::Response do
+RSpec.describe Blacklight::Solr::Response do
+  let(:raw_response) { eval(mock_query_response) }
 
-  def create_response
-    raw_response = eval(mock_query_response)
-    Blacklight::Solr::Response.new(raw_response, raw_response['params'])
+  let(:r) do
+    Blacklight::Solr::Response.new(raw_response,
+                                   raw_response['params'])
   end
 
-  let(:r) { create_response }
-
   it 'should create a valid response' do
     expect(r).to respond_to(:header)
   end
@@ -106,7 +105,6 @@ describe Blacklight::Solr::Response do
   end
 
   it 'should return the correct value when calling facet_by_field_name' do
-    r = create_response
     facet = r.aggregations['cat']
     expect(facet.name).to eq 'cat'
   end
@@ -183,6 +181,15 @@ describe Blacklight::Solr::Response do
     end
   end
 
+  context 'solr 6.5 spellcheck collation syntax' do
+    it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation_solr65)
+      r = Blacklight::Solr::Response.new(raw_response, {})
+      expect(r.spelling.words).to include("dell")
+      expect(r.spelling.words).to include("ultrasharp")
+    end
+  end
+
   it "should provide MoreLikeThis suggestions" do
     raw_response = eval(mock_response_with_more_like_this)
     r = Blacklight::Solr::Response.new(raw_response, {})
@@ -228,7 +235,11 @@ describe Blacklight::Solr::Response do
   def mock_response_with_spellcheck_collation_solr5
     %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']}],'collations'=>['collation','dell ultrasharp']}}|
   end
-  
+
+  def mock_response_with_spellcheck_collation_solr65
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>{'hell'=>{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar'=>{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']}},'collations'=>['collation','dell ultrasharp']}}|
+  end
+
   def mock_response_with_more_like_this
     %({'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'facet'=>'false','mlt.mindf'=>'1','mlt.fl'=>'subject_t','fl'=>'id','mlt.count'=>'3','mlt.mintf'=>'0','mlt'=>'true','q.alt'=>'*:*','qt'=>'search','wt'=>'ruby'}},'response'=>{'numFound'=>30,'start'=>0,'docs'=>[{'id'=>'00282214'},{'id'=>'00282371'},{'id'=>'00313831'},{'id'=>'00314247'},{'id'=>'43037890'},{'id'=>'53029833'},{'id'=>'77826928'},{'id'=>'78908283'},{'id'=>'79930185'},{'id'=>'85910001'}]},'moreLikeThis'=>{'00282214'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00282371'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00313831'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'96933325'}]},'00314247'=>{'numFound'=>3,'start'=>0,'docs'=>[{'id'=>'2008543486'},{'id'=>'96933325'},{'id'=>'2009373513'}]},'43037890'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'53029833'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'77826928'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'94120425'}]},'78908283'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'79930185'=>{'numFound'=>2,'start'=>0,'docs'=>[{'id'=>'94120425'},{'id'=>'2007020969'}]},'85910001'=>{'numFound'=>0,'start'=>0,'docs'=>[]}}})
   end

data/spec/models/solr_document_spec.rb

@@ -1,31 +1,27 @@
 # frozen_string_literal: true
 
-describe SolrDocument do
-  
-  before(:each) do
-    
-    @solrdoc = SolrDocument.new :id => '00282214', :format => ['Book'], :title_display => 'some-title'
-
-  end
-  
-  describe "new" do
-    it "takes a Hash as the argument" do
-      expect { SolrDocument.new(:id => 1) }.not_to raise_error
-    end
-  end
-  
+RSpec.describe SolrDocument do
   describe "access methods" do
-
-    it "has the right value for title_display" do
-      expect(@solrdoc[:title_display]).not_to be_nil
+    let(:solrdoc) do
+      SolrDocument.new(id: '00282214', format: ['Book'], title_display: 'some-title')
     end
-    
-    it "has the right value for format" do
-      expect(@solrdoc[:format][0]).to eq 'Book'
+
+    describe "#[]" do
+      subject { solrdoc[field] }
+
+      context "with title_display" do
+        let(:field) { :title_display }
+        it { is_expected.to eq 'some-title' }
+      end
+      context "with format" do
+        let(:field) { :format }
+        it { is_expected.to eq ['Book'] }
+      end
     end
     
-    it "provides the item's solr id" do
-      expect(@solrdoc.id).to eq '00282214'
+    describe "#id" do
+      subject { solrdoc.id }
+      it { is_expected.to eq '00282214' }
     end
   end
-end
+end

data/spec/presenters/blacklight/link_alternate_presenter_spec.rb

@@ -8,7 +8,8 @@ RSpec.describe Blacklight::LinkAlternatePresenter do
   let(:config) { Blacklight::Configuration.new }
   let(:parameter_class) { ActionController::Parameters }
   let(:params) { parameter_class.new }
-  let(:search_state) { Blacklight::SearchState.new(params, config) }
+  let(:controller) { double }
+  let(:search_state) { Blacklight::SearchState.new(params, config, controller) }
 
   let(:presenter) { described_class.new(view_context, document, options) }
   before do

data/spec/presenters/index_presenter_spec.rb

@@ -9,7 +9,8 @@ describe Blacklight::IndexPresenter do
   let(:presenter) { described_class.new(document, request_context, config) }
   let(:parameter_class) { ActionController::Parameters }
   let(:params) { parameter_class.new }
-  let(:search_state) { Blacklight::SearchState.new(params, config) }
+  let(:controller) { double }
+  let(:search_state) { Blacklight::SearchState.new(params, config, controller) }
 
   let(:document) do
     SolrDocument.new(id: 1,

data/spec/presenters/show_presenter_spec.rb

@@ -9,7 +9,8 @@ describe Blacklight::ShowPresenter do
   let(:presenter) { described_class.new(document, request_context, config) }
   let(:parameter_class) { ActionController::Parameters }
   let(:params) { parameter_class.new }
-  let(:search_state) { Blacklight::SearchState.new(params, config) }
+  let(:controller) { double }
+  let(:search_state) { Blacklight::SearchState.new(params, config, controller) }
 
   let(:document) do
     SolrDocument.new(id: 1,

data/spec/support/controller_level_helpers.rb

@@ -4,7 +4,7 @@ module ControllerLevelHelpers
     include Blacklight::Facet
 
     def search_state
-      @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+      @search_state ||= Blacklight::SearchState.new(params, blacklight_config, controller)
     end
 
     def blacklight_configuration_context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.9.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -287,16 +287,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.47.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.47.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -505,7 +505,6 @@ files:
 - app/views/catalog/index.html.erb
 - app/views/catalog/index.json.jbuilder
 - app/views/catalog/index.rss.builder
-- app/views/catalog/opensearch.json.erb
 - app/views/catalog/opensearch.xml.builder
 - app/views/catalog/send_email_record.erb
 - app/views/catalog/show.html.erb
@@ -538,6 +537,7 @@ files:
 - config/locales/blacklight.fr.yml
 - config/locales/blacklight.it.yml
 - config/locales/blacklight.pt-BR.yml
+- config/locales/blacklight.sq.yml
 - config/routes.rb
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
@@ -748,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)