blacklight 5.18.0 → 5.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0b1d1a62262bce3d881921729256a4171e29b8
-  data.tar.gz: b245309f402218cf2a31ecc8140b2ded3415b6f8
+  metadata.gz: 1d95698b0c62bbcfda4b25ab964d44e561038f2a
+  data.tar.gz: bf198778fca1e08d985d5f25bcdb81d618d265d4
 SHA512:
-  metadata.gz: 982f053854b9ace7a94da7f6f5590ab79a5d516855b556ea8f48aa79e71dda90adbe7caf80cd17ddc7d486de4c7b4f1077f32de4e65daea5362614b2c3ea8953
-  data.tar.gz: f96310c7a544d0179e42253dba5255f8cdfceb1c231ad13ed156e68b043ee8dff64f836bd8f85c8349b3093478dbef378eb3075759794a3d0cc266ef5ebda817
+  metadata.gz: 920425d9d9c2a45bde71b8fb12dc53071bfcca0e4e26579052ca8e8e7b40d9d9a0e01dae1c4a1665d7525a7302dca3cb612217fc23b6da272db702d6bff08a7b
+  data.tar.gz: 646bb31cea472f1211ea0d3bca51e422eec059a473b4c56cc0a2b43489039071e4c212992d30b3daf93122ec784590931f08ba15c7f03823077b9d3372e1be73

data/.gitignore

@@ -13,3 +13,4 @@ lib/solrmarc.log.*
 tmp/*
 pkg/*
 .internal_test_app
+/spec/examples.txt

data/.rubocop_hound.yml

@@ -648,10 +648,6 @@ Style/Blocks:
     ugly). Prefer {...} over do...end for single-line blocks.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks
   Enabled: true
-Style/CaseEquality:
-  Description: Avoid explicit use of the case equality operator(===).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality
-  Enabled: false
 Style/CharacterLiteral:
   Description: Checks for uses of character literals.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-character-literals

data/.travis.yml

@@ -5,26 +5,24 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.3
+  - 2.3.1
 
 matrix:
   include:
-    - rvm: 2.2.3
+    - rvm: 2.2.5
       env: "RAILS_VERSION=4.0.13"
-    - rvm: 2.2.3
+    - rvm: 2.2.5
       env: "RAILS_VERSION=4.1.13"
-    - rvm: 2.1.7
-      env: "RAILS_VERSION=4.2.4"
-    - rvm: jruby
-      env: "RAILS_VERSION=4.2.4 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
-    - rvm: 1.9.3
-      env: "RAILS_VERSION=4.2.4"
+    - rvm: 2.1.5
+      env: "RAILS_VERSION=4.2.7.1"
+    - rvm: jruby-9.0.5.0
+      env: "RAILS_VERSION=4.2.7.1 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=4.2.4"
+ - "RAILS_VERSION=4.2.7.1"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/VERSION

@@ -1 +1 @@
-5.18.0
+5.19.0

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

@@ -9,17 +9,31 @@ Blacklight = function() {
       for(var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
+    },
+
+    listeners: function () {
+      var listeners = [];
+      if (Turbolinks && Turbolinks.supported) {
+        // Turbolinks 5
+        if (Turbolinks.BrowserAdapter) {
+          listeners.push('turbolinks:load');
+        } else {
+          // Turbolinks < 5
+          listeners.push('page:load', 'ready');
+        }
+      } else {
+        listeners.push('ready');
+      }
+
+      return listeners.join(' ');
     }
-  }
+  };
 }();
 
 // turbolinks triggers page:load events on page transition
 // If app isn't using turbolinks, this event will never be triggered, no prob. 
-$(document).on('page:load', function() {
+$(document).on(Blacklight.listeners(), function() {
   Blacklight.activate();  
 });
 
-$(document).ready(function() {
-  Blacklight.activate();  
-});
 

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -187,7 +187,7 @@ module Blacklight::CatalogHelperBehavior
     end
 
     if value
-      if url_options === false || url_options[:suppress_link]
+      if url_options == false || url_options[:suppress_link]
         value
       else
         link_to_document document, value, url_options

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -196,7 +196,7 @@ module Blacklight::ConfigurationHelperBehavior
   # @param displayable_config [#if,#unless] an object that responds to if/unless
   # @return [Boolean]
   def evaluate_if_unless_configuration displayable_config, *args
-    return displayable_config if displayable_config === true or displayable_config === false
+    return displayable_config if displayable_config == true or displayable_config == false
     
     if_value = !displayable_config.respond_to?(:if) ||
                     displayable_config.if.nil? ||

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -218,7 +218,7 @@ module Blacklight::FacetsHelperBehavior
       facet_config.query[value][:label]
     when facet_config.date
       localization_options = {}
-      localization_options = facet_config.date unless facet_config.date === true
+      localization_options = facet_config.date unless facet_config.date == true
       l(value.to_datetime, localization_options)
     else
       value

data/app/presenters/blacklight/document_presenter.rb

@@ -167,7 +167,7 @@ module Blacklight
           @document.highlight_field(field_config.field).map(&:html_safe) if @document.has_highlight_field? field_config.field
         when (field_config and field_config.accessor)
           # implicit method call
-          if field_config.accessor === true
+          if field_config.accessor == true
             @document.send(field)
           # arity-1 method call (include the field name in the call)
           elsif !field_config.accessor.is_a?(Array) && @document.method(field_config.accessor).arity != 0
@@ -194,7 +194,7 @@ module Blacklight
         when (field_config and field_config.helper_method)
           @controller.send(field_config.helper_method, options.merge(document: @document, field: field, config: field_config, value: value))
         when (field_config and field_config.link_to_search)
-          link_field = if field_config.link_to_search === true
+          link_field = if field_config.link_to_search == true
             field_config.key
           else
             field_config.link_to_search

data/lib/blacklight/configuration/fields.rb

@@ -125,7 +125,7 @@ module Blacklight
 
       protected
       def luke_fields
-        if @table[:luke_fields] === false
+        if @table[:luke_fields] == false
           return nil
         end
 

data/lib/blacklight/search_builder.rb

@@ -15,7 +15,7 @@ module Blacklight
     # @param [List<Symbol>,TrueClass] processor_chain a list of filter methods to run or true, to use the default methods
     # @param [Object] scope the scope where the filter methods reside in.
     def initialize(processor_chain, scope)
-      @processor_chain = if processor_chain === true
+      @processor_chain = if processor_chain == true
         default_processor_chain.dup
       else
         processor_chain

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

@@ -57,7 +57,7 @@ module Blacklight::Solr::Response::Spelling
                 #   origFreq =>
                 #   suggestion =>  [{ frequency =>, word => }] # for extended results
                 #   suggestion => ['word'] # for non-extended results
-                if suggestions.index("correctlySpelled")
+                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'] > term_info['origFreq']
                   end

data/spec/features/search_formats_spec.rb

@@ -6,10 +6,15 @@ describe "Search Formats" do
   before do
     # Get all the fields from Solr, so the #index documents have the MARC field (to trigger appropriate
     # export formats)
+    @current = CatalogController.blacklight_config.default_solr_params.dup
     CatalogController.blacklight_config.default_solr_params[:fl] = '*'
   end
 
-  it "should have an RSS XML response" do
+  after do
+    CatalogController.blacklight_config.default_solr_params = @current
+  end
+
+  it "has an RSS XML response" do
     visit "/catalog.rss?q="
     expect(page).to have_content "Blacklight Search Results"
     doc = Nokogiri::XML(page.body)

data/spec/helpers/hash_as_hidden_fields_spec.rb

@@ -10,13 +10,13 @@ describe HashAsHiddenFieldsHelper 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
 

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

@@ -139,6 +139,13 @@ describe Blacklight::Solr::Response do
     expect(r.spelling.words).to include("dell")
     expect(r.spelling.words).to include("ultrasharp")
   end
+  
+  it 'provides spelling suggestions for solr 5 spellcheck results' do
+    raw_response = eval(mock_response_with_solr5_spellcheck)
+    r = Blacklight::Solr::Response.new(raw_response,  {})
+    expect(r.spelling.words).to include("political", "politics", "policy")
+  end
+
 
   it 'should provide spelling suggestions for extended spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck_extended)
@@ -232,4 +239,8 @@ describe Blacklight::Solr::Response do
   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
+  
+  def mock_response_with_solr5_spellcheck
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>1,'params'=>{'q'=>'politica','wt'=>'ruby'}},'response'=>{'numFound'=>0,'start'=>0,'maxScore'=>0.0,'docs'=>[]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'format'=>[],'lc_1letter_facet'=>[],'lc_alpha_facet'=>[],'lc_b4cutter_facet'=>[],'language_facet'=>[],'pub_date'=>[],'subject_era_facet'=>[],'subject_geo_facet'=>[],'subject_topic_facet'=>[]},'facet_ranges'=>{},'facet_intervals'=>{},'facet_heatmaps'=>{}},'spellcheck'=>{'suggestions'=>['politica',{'numFound'=>3,'startOffset'=>0,'endOffset'=>8,'origFreq'=>0,'suggestion'=>[{'word'=>'political','freq'=>3},{'word'=>'politics','freq'=>3},{'word'=>'policy','freq'=>2}]}],'correctlySpelled'=>false}}|
+  end
 end

data/spec/spec_helper.rb

@@ -56,4 +56,47 @@ RSpec.configure do |config|
 
   config.include Devise::TestHelpers, type: :controller
   config.infer_spec_type_from_file_location!
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.18.0
+  version: 5.19.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -609,7 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)