blacklight 6.10.0 → 6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60df91a78d3181795975d6b62bb92482e1b05151
-  data.tar.gz: 6c20566992ac377318609c742c12a5786db2f3db
+  metadata.gz: 13a1d0a576ef05724c0d14346328fd7650055bde
+  data.tar.gz: 5698a8f2653b6dca110bc5d7367000bc42c61e96
 SHA512:
-  metadata.gz: 6f8b43752993d04d66797cb247c542a3f1ec5b881a6f869ea6ad557cdf329c74039de7e9d7cd10a5664d12d2c88524df86c82a9e2cb324dce0973c6aea914fd2
-  data.tar.gz: 26aa1ebc30886fcda720c4df6b00b728d8cd7a186887c6eda806de0c3680f18956438c795d2a67b17d7868ce30e51f12394abe0e12f96cc0ff4cede008984b7a
+  metadata.gz: 9ab3959efcc3a80dc1058ca760252c99f831199aace9019136d34691f5d92d6af4f8d9199657713ef945f149b91341d8845a15716043b8ad2c0e272e3ae15f09
+  data.tar.gz: 155d327f094f45c424f98c56466606af7057db4b814fe62fb5f5b1ad7da0ce584447e6278d99f66b116f68e29c894559c3e10dafc4994a0a99561d3d19185c4a

data/.travis.yml

@@ -9,6 +9,8 @@ rvm:
 
 matrix:
   include:
+    - rvm: 2.4.1
+      env: "RAILS_VERSION=4.2.8"
     - rvm: 2.2.7
       env: "RAILS_VERSION=5.0.3"
     - rvm: 2.3.4
@@ -23,6 +25,9 @@ before_install:
   - gem update --system
   - gem install bundler
 
+before_script:
+  - if [[ "${RAILS_VERSION}" =~ ^4.2.* ]]; then perl -pi -e "s/ActiveRecord::Migration\[[\d\.]+\]/ActiveRecord::Migration/" db/migrate/*; fi
+
 env:
  - "RAILS_VERSION=5.1.1"
 

data/VERSION

@@ -1 +1 @@
-6.10.0
+6.10.1

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

@@ -96,7 +96,7 @@ module Blacklight::SearchContext
   def setup_next_and_previous_documents
     if search_session['counter'] and current_search_session
       index = search_session['counter'].to_i - 1
-      response, documents = get_previous_and_next_documents_for_search index, ActiveSupport::HashWithIndifferentAccess.new(current_search_session.query_params)
+      response, documents = get_previous_and_next_documents_for_search index, search_state.reset(current_search_session.query_params).to_hash
 
       search_session['total'] = response.total
       @search_context_response = response

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -114,7 +114,7 @@ module Blacklight::UrlHelperBehavior
   #   link_back_to_catalog(label: 'Back to Search', route_set: my_engine)
   def link_back_to_catalog(opts={:label=>nil})
     scope = opts.delete(:route_set) || self
-    query_params = current_search_session.try(:query_params) || ActionController::Parameters.new
+    query_params = search_state.reset(current_search_session.try(:query_params)).to_hash
 
     if search_session['counter']
       per_page = (search_session['per_page'] || default_per_page).to_i

data/app/views/search_history/index.html.erb

@@ -10,7 +10,7 @@
   <table class="table table-striped search_history">
     <%-  @searches.each_with_index do |search,index| -%>
     <%= content_tag :tr, :id => "document_#{index + 1}" do %>
-      <td class="query"><%= link_to_previous_search(search.query_params) %></td>
+      <td class="query"><%= link_to_previous_search(search_state.reset(search.query_params).to_hash) %></td>
       <%- if has_user_authentication_provider? -%>
         <td class="actions">
           <%- if current_or_guest_user && search.saved? -%>

data/lib/blacklight/search_state.rb

@@ -37,8 +37,8 @@ module Blacklight
     end
     alias to_h to_hash
 
-    def reset
-      self.class.new(ActionController::Parameters.new, blacklight_config, controller)
+    def reset(params = nil)
+      self.class.new(params || ActionController::Parameters.new, blacklight_config, controller)
     end
 
     ##

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

@@ -32,6 +32,13 @@ class Blacklight::Solr::Response::GroupResponse
     params[:start].to_s.to_i
   end
 
+  ##
+  # Relying on a fallback (method missing) to @response is problematic as it
+  # will not evaluate the correct `total` method.
+  def empty?
+    total.zero?
+  end
+
   def method_missing meth, *args, &block
     if response.respond_to? meth
       response.send(meth, *args, &block)

data/spec/lib/blacklight/search_state_spec.rb

@@ -8,9 +8,9 @@ describe Blacklight::SearchState do
     end
   end
 
+  subject(:search_state) { described_class.new(params, blacklight_config, controller) }
   let(:parameter_class) { ActionController::Parameters }
   let(:controller) { double }
-  let(:search_state) { described_class.new(params, blacklight_config, controller) }
   let(:params) { parameter_class.new }
 
   describe '#to_h' do
@@ -297,4 +297,12 @@ describe Blacklight::SearchState do
       expect(params).not_to have_key :f
     end
   end
+
+  describe '#reset' do
+    it 'returns a search state with the given parameters' do
+      new_state = search_state.reset('a' => 1)
+
+      expect(new_state.to_hash).to eq({ 'a' => 1 })
+    end
+  end
 end

data/spec/models/blacklight/solr/response/group_response_spec.rb

@@ -59,6 +59,12 @@ describe Blacklight::Solr::Response::GroupResponse do
       expect(group.group_limit).to eq 5
     end
   end
+  
+  describe "empty?" do
+    it "uses the total from this object" do
+      expect(group.empty?).to be false
+    end
+  end
 end
 
 def create_response(response, params = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.10.0
+  version: 6.10.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails