blacklight 5.16.3 → 5.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a874878adf1760be4d1354e774d8201f20ee9910
-  data.tar.gz: 2102617b793e2992f4f065374ca62b33f3fd39df
+  metadata.gz: e56b20bdd2b2230a8c427bd8a71188499ecadefd
+  data.tar.gz: f7b4394bde76c526e48d7305f1b0f40c094d2ea4
 SHA512:
-  metadata.gz: cbeb8e733a663339b5b4d98c5288d8c2355b10e1fb50694d20e3edc790d3c3facd623ae11fbba0990cb1885513d5bcdb164c6997dcd179f82048dec152a8c6be
-  data.tar.gz: 57b56668777afe6093bc5b0dec60a40f6c6da9aa7c7e0e9bdb6265ebd6d67084a96d1381a7c7fc2dba1b9b9b5d91463ed99da0d12c86b9816d9101a38fc6f513
+  metadata.gz: 1cee2f321d52e3b5733cbfcecf0c2fcf74f584e6a86e482ae5a67b0aad858b07e9d926b8b8778ca9aa5ce2147b0f98c6c5766fb5c3a6ea8e48a1d142653de09e
+  data.tar.gz: 9d6aeb7047e02b917ab07c08847b646a5e952c46c74e56cef99524a94ed4d444b474fda2b57914b7c588a46cb8a313381a885d0a97ef19da8b5d2b955b45abf7

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: File.expand_path('..', __FILE__)
 
 gem 'simplecov', '~> 0.10', require: false
-gem 'coveralls', require: false
+gem 'coveralls', '~> 0.8.6', require: false
 
 group :test do
   gem "blacklight-marc", "~> 5.0", github: "projectblacklight/blacklight_marc"

data/VERSION

@@ -1 +1 @@
-5.16.3
+5.16.4

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

@@ -54,7 +54,7 @@ module Blacklight::SearchHelper
   ##
   # Execute a solr query
   # @see [Blacklight::SolrRepository#send_and_receive]
-  # @return [Blacklight::SolrResponse] the solr response object
+  # @return [Blacklight::Solr::Response] the solr response object
   def find *args
     request_params = args.extract_options!
     path = args.first || blacklight_config.solr_path
@@ -121,7 +121,7 @@ module Blacklight::SearchHelper
   # a solr query method
   # @param [Hash,HashWithIndifferentAccess] user_params ({}) the user provided parameters (e.g. query, facets, sort, etc)
   # @param [Hash,HashWithIndifferentAccess] extra_controller_params ({}) extra parameters to add to the search
-  # @return [Blacklight::SolrResponse] the solr response object
+  # @return [Blacklight::Solr::Response] the solr response object
   def query_solr(user_params = params || {}, extra_controller_params = {})
     query = search_builder.with(user_params).merge(extra_controller_params)
     repository.search(query)
@@ -146,7 +146,7 @@ module Blacklight::SearchHelper
   deprecation_deprecate get_solr_response_for_doc_id: "use fetch(id) instead"
 
   # given a field name and array of values, get the matching SOLR documents
-  # @return [Blacklight::SolrResponse, Array<Blacklight::SolrDocument>] the solr response object and a list of solr documents
+  # @return [Blacklight::Solr::Response, Array<Blacklight::SolrDocument>] the solr response object and a list of solr documents
   def get_solr_response_for_field_values(field, values, extra_controller_params = {})
     query = Deprecation.silence(Blacklight::RequestBuilders) do
       search_builder.with(params).merge(extra_controller_params).merge(solr_documents_by_field_values_params(field, values))

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -181,7 +181,9 @@ module Blacklight::CatalogHelperBehavior
     value = if blacklight_config.view_config(document_index_view_type).thumbnail_method
       send(blacklight_config.view_config(document_index_view_type).thumbnail_method, document, image_options)
     elsif blacklight_config.view_config(document_index_view_type).thumbnail_field
-      image_tag thumbnail_url(document), image_options
+      url = thumbnail_url(document)
+
+      image_tag url, image_options if url.present?
     end
 
     if value

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -30,5 +30,13 @@ module Blacklight
     def sidebar_classes
       'col-md-3 col-sm-4'
     end
+
+    ##
+    # Class used for specifying main layout container classes. Can be
+    # overwritten to return 'container-fluid' for Bootstrap full-width layout
+    # @return [String] 
+    def container_classes
+      'container'
+    end
   end
 end

data/app/presenters/blacklight/document_presenter.rb

@@ -192,7 +192,7 @@ module Blacklight
       # rendering values
       case
         when (field_config and field_config.helper_method)
-          @controller.send(field_config.helper_method, options.merge(:document => @document, :field => field, :value => value))
+          @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
             field_config.key

data/app/views/layouts/blacklight.html.erb

@@ -35,7 +35,7 @@
 
   <%= render partial: 'shared/ajax_modal' %>
 
-  <div id="main-container" class="container">
+  <div id="main-container" class="<%= container_classes %>">
     <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
 
     <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>

data/app/views/shared/_header_navbar.html.erb

@@ -1,5 +1,5 @@
 <div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
-  <div class="container">
+  <div class="<%= container_classes %>">
     <div class="navbar-header">
     <button type="button" class="navbar-toggle btn collapsed" data-toggle="collapse" data-target="#user-util-collapse">
       <span class="sr-only">Toggle navigation</span>
@@ -17,7 +17,7 @@
 </div>
 
 <div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
-  <div class="container">
+  <div class="<%= container_classes %>">
     <%= render_search_bar  %>
   </div>
 </div>

data/lib/blacklight.rb

@@ -8,8 +8,6 @@ module Blacklight
   autoload :Routes, 'blacklight/routes'
   autoload :Solr, 'blacklight/solr'
 
-  SolrRepository = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Blacklight::SolrRepository', 'Blacklight::Solr::Repository')
-  SolrResponse = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Blacklight::SolrResponse', 'Blacklight::Solr::Response')
   autoload :SolrHelper, 'blacklight/solr_helper'
 
   autoload :AbstractRepository, 'blacklight/abstract_repository'
@@ -25,6 +23,22 @@ module Blacklight
     attr_accessor :solr, :solr_config
   end
 
+  class SolrRepository < Solr::Repository
+    extend Deprecation
+    def initialize blacklight_config
+      Deprecation.warn(self, 'Blacklight::SolrRepository is deprecated; use Blacklight::Solr::Repository instead')
+      super
+    end 
+  end
+
+  class SolrResponse < Solr::Response
+    extend Deprecation
+    def initialize(data, request_params, options = {})
+      Deprecation.warn(self, 'Blacklight::SolrResponse is deprecated; use Blacklight::Solr::Response instead')
+      super
+    end 
+  end
+
   # Secret key used to share session information with
   # other services (e.g. refworks callback urls)
   mattr_accessor :secret_key

data/spec/helpers/blacklight_helper_spec.rb

@@ -239,13 +239,13 @@ describe BlacklightHelper do
 
   describe "render_grouped_response?" do
     it "should check if the response ivar contains grouped data" do
-      assign(:response, double("SolrResponse", :grouped? => true))
+      assign(:response, double("Solr::Response", :grouped? => true))
       expect(helper.render_grouped_response?).to be true
     end
 
 
     it "should check if the response param contains grouped data" do
-      response = double("SolrResponse", :grouped? => true)
+      response = double("Solr::Response", :grouped? => true)
       expect(helper.render_grouped_response?(response)).to be true
     end
   end
@@ -417,7 +417,7 @@ describe BlacklightHelper do
 
     before do
       allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-      assign(:response, double("SolrResponse", grouped?: false, start: 0))
+      assign(:response, double("Solr::Response", grouped?: false, start: 0))
       allow(helper).to receive(:link_to_document).and_return('<a/>')
       allow(helper).to receive(:render_index_doc_actions).and_return('<div/>')
     end

data/spec/helpers/catalog_helper_spec.rb

@@ -226,6 +226,14 @@ describe CatalogHelper do
 
       expect(helper.render_thumbnail_tag document).to be_nil
     end
+
+    it "should return nil if no thumbnail is in the document" do
+      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
+
+      allow(document).to receive(:has?).with(:xyz).and_return(false)
+
+      expect(helper.render_thumbnail_tag document).to be_nil
+    end
   end
 
   describe "thumbnail_url" do

data/spec/helpers/layout_helper_spec.rb

@@ -28,4 +28,11 @@ describe LayoutHelper do
       expect(helper.sidebar_classes).to eq 'col-md-3 col-sm-4'
     end
   end
+
+  describe '#container_classes' do
+    it 'returns a string of classe(s)' do
+      expect(helper.container_classes).to be_an String
+      expect(helper.container_classes).to eq 'container'
+    end
+  end
 end

data/spec/presenters/document_presenter_spec.rb

@@ -334,4 +334,32 @@ describe Blacklight::DocumentPresenter do
       expect(subject.document_show_html_title).to eq "value"
     end
   end
+
+  describe '#get_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' }
+
+      before do
+        document['field_with_helper'] = 'value'
+      end
+
+      it "should check 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.get_field_values field_name, 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
 end

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

@@ -14,7 +14,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should render the pagination, sort, per page and view type controls" do
-    assign(:response, double("SolrResponse", limit_value: 1))
+    assign(:response, double("Solr::Response", limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
@@ -27,7 +27,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should not render the pagination controls with bad limit values" do
-    assign(:response, double("SolrResponse", limit_value: 0))
+    assign(:response, double("Solr::Response", limit_value: 0))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.16.3
+  version: 5.16.4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails