blacklight 5.8.0 → 5.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6abf19233b0973dff8cfaff353836ee5af69e6
-  data.tar.gz: ae4e3d469b37f1ae8f469470fb6e87e2976cb788
+  metadata.gz: 9f9651eef53cd449f3bb428731943e8759b52af1
+  data.tar.gz: 4db418373c1ea6262414f5442c816bd9c0a46d36
 SHA512:
-  metadata.gz: 7244ed7c511e061c63bf949889671cbcfcfac42bafc87d98b95093dcd2d1596629be83fbec0fffe02715ebb23fbd9ac626fcd35d3fd59b06e1b488eb412cc206
-  data.tar.gz: a3f3d9b2ccb72941967790c380735dabceff82c4bf5eb22a885771ceeda226d60cc7ac86a81e90136decdcce537ffbdd48adc43b095b7cd956c13a559f3ebc2f
+  metadata.gz: 2505780053f2cc34f8285d3589e82b18ca5bef37a8f0242fea877c14d2f858260e4fe8029b97b1fd4bfcb70042b049f12bc08247b94527dc1812be2c8e184ca4
+  data.tar.gz: 91578686f80295bc9e9a93e543b00ccf9cba18434ab18f5066ec79cdd911d8872220b275391bc9b67d441d12fd53c49e064803581f2a8bd2bbbaf46c2b2a2721

data/.travis.yml

@@ -7,22 +7,22 @@ rvm:
 matrix:
   include:
     - rvm: 2.1.4
-      env: "RAILS_VERSION=4.0.11"
+      env: "RAILS_VERSION=4.0.12"
     - rvm: 2.0.0
-      env: "RAILS_VERSION=4.1.7"
+      env: "RAILS_VERSION=4.1.8"
     - rvm: 1.9.3
-      env: "RAILS_VERSION=4.1.7"
+      env: "RAILS_VERSION=4.1.8"
     - rvm: jruby
-      env: "RAILS_VERSION=4.1.7 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+      env: "RAILS_VERSION=4.1.8 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
     - rvm: 2.1.4
-      env: "RAILS_VERSION=4.2.0.rc1"
+      env: "RAILS_VERSION=4.2.0.rc3"
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=3.2.20"
- - "RAILS_VERSION=4.1.7"
+ - "RAILS_VERSION=3.2.21"
+ - "RAILS_VERSION=4.1.8"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/Gemfile

@@ -24,6 +24,8 @@ else
 
   if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
     gem 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
+  else
+    gem 'sass-rails', "< 5.0"
   end
-  gem 'sass-rails'
 end

data/VERSION

@@ -1 +1 @@
-5.8.0
+5.8.1

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -304,7 +304,8 @@ module Blacklight::UrlHelperBehavior
     end
   end
 
-  def endnote_catalog_path opts = {}
+  # For exporting a single endnote document. (endnote_catalog_path is defined by blacklight-marc and it is used for multiple document export)
+  def single_endnote_catalog_path opts = {}
     catalog_path(opts.merge(format: 'endnote'))
   end
 

data/lib/blacklight/catalog/component_configuration.rb

@@ -10,8 +10,8 @@ module Blacklight
       add_results_collection_tool(:view_type_group)
 
       add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
-      add_show_tools_partial(:refworks, if: :render_refworks_action?)
-      add_show_tools_partial(:endnote, if: :render_endnote_action? )
+      add_show_tools_partial(:refworks, if: :render_refworks_action?, modal: false)
+      add_show_tools_partial(:endnote, if: :render_endnote_action?, modal: false, path: :single_endnote_catalog_path )
       add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
       add_show_tools_partial(:sms, callback: :sms_action, validator: :validate_sms_params)
       add_show_tools_partial(:citation)

data/lib/blacklight/solr_helper.rb

@@ -236,6 +236,11 @@ module Blacklight::SolrHelper
     @solr_repository ||= Blacklight::SolrRepository.new(blacklight_config)
   end
 
+  def blacklight_solr
+    solr_repository.blacklight_solr
+  end
+  deprecation_deprecate :blacklight_solr
+
   private
 
   ##

data/lib/blacklight/solr_repository.rb

@@ -16,7 +16,11 @@ module Blacklight
     # @param [String] document's unique key value
     # @param [Hash] additional solr query parameters
     def find id, params = {}
-      solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, {qt: blacklight_config.document_solr_request_handler}.merge(blacklight_config.default_document_solr_params.merge(params).merge(blacklight_config.document_unique_id_param => id))
+      doc_params = params.reverse_merge(qt: blacklight_config.document_solr_request_handler)
+                         .reverse_merge(blacklight_config.default_document_solr_params)
+                         .merge(blacklight_config.document_unique_id_param => id)
+      
+      solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params
       raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.documents.empty?
       solr_response
     end
@@ -25,7 +29,7 @@ module Blacklight
     # Execute a search query against solr
     # @param [Hash] solr query parameters
     def search params = {}
-      send_and_receive blacklight_config.solr_path, { qt: blacklight_config.qt }.merge(params)
+      send_and_receive blacklight_config.solr_path, params.reverse_merge(qt: blacklight_config.qt)
     end
 
     ##

data/spec/helpers/component_helper_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe '#document_action_path' do
+  before do
+    allow(helper).to receive_messages(controller_name: 'catalog')
+  end
+
+  let(:document_action_config) { Blacklight::Configuration::ToolConfig.new(tool_config) }
+  let(:document) { SolrDocument.new(id: '123') }
+
+  subject { helper.document_action_path(document_action_config, id: document) }
+
+  context "for endnote" do
+    let(:tool_config) { { if: :render_refworks_action?, partial: "document_action",
+      name: :endnote, key: :endnote, path: :single_endnote_catalog_path } }
+
+    it { is_expected.to eq '/catalog/123.endnote' }
+  end
+end

data/spec/lib/blacklight/solr_repository_spec.rb

@@ -42,6 +42,14 @@ describe Blacklight::SolrRepository do
       allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
       expect(subject.find("123", {qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
     end
+
+    it "should preserve the class of the incoming params" do
+      doc_params = HashWithIndifferentAccess.new
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      response = subject.find("123", doc_params)
+      expect(response).to be_a_kind_of Blacklight::SolrResponse
+      expect(response.params).to be_a_kind_of HashWithIndifferentAccess
+    end
   end
 
   describe "#search" do
@@ -67,6 +75,16 @@ describe Blacklight::SolrRepository do
       allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc'})).and_return(mock_response)
       expect(subject.search({qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
     end
+    
+    it "should preserve the class of the incoming params" do
+      search_params = HashWithIndifferentAccess.new
+      search_params[:q] = "query"
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      
+      response = subject.search(search_params)
+      expect(response).to be_a_kind_of Blacklight::SolrResponse
+      expect(response.params).to be_a_kind_of HashWithIndifferentAccess
+    end
   end
 
   describe "#send_and_receive" do

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

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'catalog/_document_action' do
+  let(:document_action_config) { Blacklight::Configuration::ToolConfig.new(tool_config) }
+  let(:document) { SolrDocument.new(id: '123') }
+
+  before do
+    allow(view).to receive_messages(controller_name: 'catalog')
+    render 'catalog/document_action', document_action_config: document_action_config, document: document
+  end
+
+  context "for refworks" do
+    let(:tool_config) { { if: :render_refworks_action?, partial: "document_action",
+      name: :refworks, key: :refworks, modal: false } }
+
+    it "should not be modal" do
+      expect(rendered).to have_link('Export to Refworks')
+      expect(rendered).not_to have_selector('a[data-ajax-modal]')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.8.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -487,6 +487,7 @@ files:
 - spec/features/search_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
+- spec/helpers/component_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
@@ -532,6 +533,7 @@ files:
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
+- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
@@ -600,6 +602,7 @@ test_files:
 - spec/features/search_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
+- spec/helpers/component_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
@@ -645,6 +648,7 @@ test_files:
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
+- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb