blacklight 5.17.2 → 5.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb02cacbad8a1eae5549c29ea63d69d742755284
-  data.tar.gz: 5ce395c3e3dc278d89fdec2dfbc56845377db6ac
+  metadata.gz: 3a0b1d1a62262bce3d881921729256a4171e29b8
+  data.tar.gz: b245309f402218cf2a31ecc8140b2ded3415b6f8
 SHA512:
-  metadata.gz: 09f6375583aa2751d3420688eb39dec519f92fb7cbd99b993ff8616e59246c9716c7d33d00c139bb7e7b890550c04f36a584e33d8ad091bd3fd2bc22236c03d5
-  data.tar.gz: 3dbf5104d494af8f835fb76b7e1bdbe1093dd40705d3fcc4ee6545b475c66f71b8dc6378c7c6265b9ca3ca662bdf765689207369327ef8d8c5bb84d953ba7e9d
+  metadata.gz: 982f053854b9ace7a94da7f6f5590ab79a5d516855b556ea8f48aa79e71dda90adbe7caf80cd17ddc7d486de4c7b4f1077f32de4e65daea5362614b2c3ea8953
+  data.tar.gz: f96310c7a544d0179e42253dba5255f8cdfceb1c231ad13ed156e68b043ee8dff64f836bd8f85c8349b3093478dbef378eb3075759794a3d0cc266ef5ebda817

data/Gemfile

@@ -8,7 +8,7 @@ gem 'coveralls', '~> 0.8.6', require: false
 gem 'autoprefixer-rails', '~> 6.0.0' if RUBY_VERSION < '2.0'
 
 group :test do
-  gem "blacklight-marc", "~> 5.0", github: "projectblacklight/blacklight_marc"
+  gem "blacklight-marc", '~> 5.0'
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 end
 

data/VERSION

@@ -1 +1 @@
-5.17.2
+5.18.0

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -64,18 +64,9 @@
   }
 
   @mixin hyphens-auto {
-    // breaks long words apart so they don't cause the containing div to
-    // be too big
-    // from http://kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/
-    -ms-word-break: break-all;
-    word-break: break-all;
-
-    // Non standard for webkit
-    word-break: break-word;
-
+    overflow-wrap: break-word;
     -webkit-hyphens: auto;
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
+    -o-hyphens: auto;
     hyphens: auto;
   }
 

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

@@ -0,0 +1,31 @@
+module Blacklight
+  module SearchHistory
+    extend ActiveSupport::Concern
+    include Blacklight::Configurable
+
+    included do
+      copy_blacklight_config_from(CatalogController)
+    end
+
+    def index
+      @searches = searches_from_history
+    end
+
+    # TODO: we may want to remove unsaved (those without user_id) items from
+    # the database when removed from history
+    def clear
+      if session[:history].clear
+        flash[:notice] = I18n.t('blacklight.search_history.clear.success')
+      else
+        flash[:error] = I18n.t('blacklight.search_history.clear.failure')
+      end
+
+      if respond_to? :redirect_back
+        redirect_back fallback_location: blacklight.search_history_path
+      else
+        # Deprecated in Rails 5.0
+        redirect_to :back
+      end
+    end
+  end
+end

data/app/controllers/search_history_controller.rb

@@ -1,21 +1,4 @@
 # -*- encoding : utf-8 -*-
 class SearchHistoryController < ApplicationController
-  include Blacklight::Configurable
-
-  copy_blacklight_config_from(CatalogController)
-
-  def index
-    @searches = searches_from_history
-  end
-  
-  
-  #TODO we may want to remove unsaved (those without user_id) items from the database when removed from history
-  def clear
-    if session[:history].clear
-      flash[:notice] = I18n.t('blacklight.search_history.clear.success')
-    else
-      flash[:error] = I18n.t('blacklight.search_history.clear.failure') 
-    end
-    redirect_to :back
-  end
+  include Blacklight::SearchHistory
 end

data/lib/blacklight.rb

@@ -62,8 +62,10 @@ module Blacklight
     default_index.connection
   end
 
+  ##
+  # The default index connection for the search index
   def self.default_index
-    @default_index ||= Blacklight::Solr::Repository.new(Blacklight::Configuration.new)
+    @default_index ||= repository_class.new(default_configuration)
   end
 
   def self.solr_config
@@ -71,6 +73,31 @@ module Blacklight
     connection_config
   end
 
+  ##
+  # The configured repository class. By convention, this is
+  # the class Blacklight::{name of the adapter}::Repository, e.g.
+  #   elastic_search => Blacklight::ElasticSearch::Repository
+  def self.repository_class
+    case connection_config[:adapter]
+    when 'solr'
+      Blacklight::Solr::Repository
+    when /::/
+      connection_config[:adapter].constantize
+    when nil, ''
+      Rails.logger.warn "The value for :adapter was not found in the blacklight.yml config, and will be required in Blacklight 6.0.0"
+
+      Blacklight::Solr::Repository
+    else
+      "Blacklight/#{connection_config.fetch(:adapter)}/Repository".classify.constantize
+    end
+  end
+
+  ##
+  # The default Blacklight configuration.
+  def self.default_configuration
+    Blacklight::Configuration.new
+  end
+
   def self.connection_config
     @connection_config ||= begin
         raise "The #{::Rails.env} environment settings were not found in the blacklight.yml config" unless blacklight_yml[::Rails.env]

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -139,10 +139,8 @@ module Blacklight::Solr
           end
         end
 
-        # Support facet paging and 'more'
-        # links, by sending a facet.limit one more than what we
-        # want to page at, according to configured facet limits.
-        solr_parameters[:"f.#{facet.field}.facet.limit"] = (facet_limit_for(field_name) + 1) if facet_limit_for(field_name)
+        limit = facet_limit_with_pagination(field_name)
+        solr_parameters[:"f.#{facet.field}.facet.limit"] = limit if limit
       end
     end
 
@@ -250,6 +248,22 @@ module Blacklight::Solr
       end
     end
 
+    # Support facet paging and 'more'
+    # links, by sending a facet.limit one more than what we
+    # want to page at, according to configured facet limits.
+    def facet_limit_with_pagination(field_name)
+      limit = facet_limit_for(field_name)
+
+      return if limit.nil?
+
+      if limit > 0
+        limit + 1
+      else
+        limit
+      end
+    end
+
+
     ##
     # A helper method used for generating solr LocalParams, put quotes
     # around the term unless it's a bare-word. Escape internal quotes

data/spec/helpers/url_helper_spec.rb

@@ -129,6 +129,13 @@ describe BlacklightUrlHelper do
     end
   end
 
+  describe "link_to_previous_document" do
+    context "when the argument is nil" do
+      subject { helper.link_to_previous_document(nil) }
+      it { is_expected.to eq '<span class="previous">&laquo; Previous</span>' }
+    end
+  end
+
   describe "link_to_query" do
     it "should build a link tag to catalog using query string (no other params)" do
       query = "brilliant"

data/spec/lib/blacklight_spec.rb

@@ -1,14 +1,63 @@
 require 'spec_helper'
 
 describe Blacklight do
-  
   context 'root' do
-
     let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
 
     it 'should return the full path to the BL plugin' do
       expect(Blacklight.root).to eq blroot
     end
+  end
+
+  describe '.default_index' do
+    context 'for a solr index' do
+      before do
+        allow(Blacklight).to receive(:connection_config).and_return(adapter: 'solr')
+      end
+
+      it 'is an instance of Blacklight::SolrRepository' do
+        expect(Blacklight.default_index).to be_a Blacklight::Solr::Repository
+      end
+    end
+  end
+
+  describe '.repository_class' do
+    context 'for a solr index' do
+      before do
+        allow(Blacklight).to receive(:connection_config).and_return(adapter: 'solr')
+      end
+
+      it 'resolves to the SolrRepository implementation' do
+        expect(Blacklight.repository_class).to eq Blacklight::Solr::Repository
+      end
+    end
 
+    context 'for an elastic_search index' do
+      before do
+        stub_const("Blacklight::ElasticSearch::Repository", double)
+        allow(Blacklight).to receive(:connection_config).and_return(adapter: 'elastic_search')
+      end
+
+      it 'resolves to the ElasticSearch::Repository implementation' do
+        expect(Blacklight.repository_class).to eq Blacklight::ElasticSearch::Repository
+      end
+    end
+
+    context 'for an explicitly provided class' do
+      before do
+        stub_const("CustomSearch::Repository", double)
+        allow(Blacklight).to receive(:connection_config).and_return(adapter: 'CustomSearch::Repository')
+      end
+
+      it 'resolves to the custom implementation' do
+        expect(Blacklight.repository_class).to eq CustomSearch::Repository
+      end
+    end
+  end
+
+  describe '.default_configuration' do
+    it 'is a Blacklight configuration' do
+      expect(Blacklight.default_configuration).to be_a Blacklight::Configuration
+    end
   end
 end

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

@@ -102,6 +102,26 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 21
     end
 
+    context 'with a negative facet limit' do
+      before do
+        blacklight_config.facet_fields['subject_topic_facet'].limit = -1
+      end
+
+      it 'is negative' do
+        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq -1
+      end
+    end
+
+    context 'with a facet limit set to 0' do
+      before do
+        blacklight_config.facet_fields['subject_topic_facet'].limit = 0
+      end
+
+      it 'is negative' do
+        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 0
+      end
+    end
+
     it "should handle no facet_limits in config" do
       blacklight_config.facet_fields = {}
       expect(subject).not_to have_key(:"f.subject_topic_facet.facet.limit")

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -17,7 +17,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
-    gem 'blacklight-marc', "~> 5.0", :github => 'projectblacklight/blacklight_marc'
+    gem 'blacklight-marc', "~> 5.0"
 
     Bundler.with_clean_env do
       run "bundle install"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.17.2
+  version: 5.18.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,6 +290,7 @@ files:
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_fields.rb
 - app/controllers/concerns/blacklight/search_helper.rb
+- app/controllers/concerns/blacklight/search_history.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb