blacklight 5.19.2 → 6.0.0.pre1

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

@@ -1,229 +0,0 @@
-.ajax_form
-{
-  margin-bottom: 0;
-}
-
-#librarian_view
-{
-	left:-17%;
-	text-align:left;
-	top:10%;
-	width:700px;
-}
-
-#marc_view
-{
-	text-align:left;
-
-  .field
-  {
-    border-bottom: $marc_item_separator;
-    clear:both;
-  }
-
-  .ind1, .ind2
-  {
-    display:inline;
-    padding:0 $padding-xs-horizontal;
-  }
-
-  .subfields
-  {
-    padding-left:5em;
-  }
-
-  .tag_ind
-  {
-    float:left;
-  }
-}
-
-.constraints-container {
-  @extend .well;
-  line-height: 2.5;
-  padding: 16px 19px;
-}
-
-span.constraints-label {
-  @extend .h5;
-}
-
-.appliedFilter
-{
-  .constraint-value {
-    cursor: default;
-    text-overflow: ellipsis;
-    overflow: hidden;
-
-    @media (max-width: $screen-xs-max) {
-      max-width: $screen-xs-min / 2;
-    }
-
-    @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
-      max-width: $screen-sm-min / 2;
-    }
-
-    @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
-      max-width: $screen-md-min / 2;
-    }
-
-    @media (min-width: $screen-lg-min) {
-      max-width: $screen-lg-min / 2;
-    }
-
-    &:hover, &:active {
-      background-color: $btn-default-bg;
-      border-color: $btn-default-border;
-      box-shadow: none;
-    }
-  }
-
-  .filterName:after
-  {
-    @extend .text-muted;
-    font-family: 'Glyphicons Halflings';
-    /* glyphicon-chevron-right */
-    content: "\e080";
-    font-size: 70%;
-    padding-left: $caret-width-base;
-  }
-
-  .remove:hover, .remove:active {
-    @extend .btn-danger;
-
-  }
-}
-
-#documents {
-  .document {
-    margin-top: $padding-base-vertical;
-    padding-top: $padding-base-vertical;
-    border-bottom:1px dotted $table-border-color;
-    @extend .clearfix;
-  }
-}
-
-// Tools link on documetn show page
-.show-tools {
-  .bookmark_toggle {
-    padding: $nav-link-padding;
-  }
-}
-
-// bookmarks checkbox on index, give it some
-// lower margin when it collapses
-.index-document-functions {
-  margin-bottom: ($line-height-computed / 2);
-  @media (min-width: $screen-sm-min) {
-    margin-bottom: 0;
-  }
-}
-
-
-#sidebar form {
-  margin: 0;
-}
-
-.page_links
-{
-  display: inline-block;
-  border: 1px solid transparent;
-  padding: $padding-base-vertical $padding-base-horizontal;
-  padding-left: 0;
-}
-
-.pagination {
-  text-align: center ;
-}
-
-.dl-horizontal
-{
-  dd {
-    margin-bottom: $padding-base-vertical;
-
-    &:after {
-      clear: none;
-    }
-  }
-}
-
-.dl-invert {
-  dt {
-    font-weight: normal;
-    color: $field_name_color;
-  }
-}
-
-label.toggle_bookmark
-{
-	font-weight: inherit;
-	min-width: 8.5em;
-}
-
-#sidebar-mlt li {
-  padding-bottom: $padding-base-vertical;
-}
-
-#sortAndPerPage, .pagination-search-widgets {
-  border-bottom: 1px solid $pagination-border;
-  margin-bottom: 1em;
-  padding-bottom: 1em;
-}
-
-.pagination-search-widgets {
-  @extend .clearfix;
-  padding-top: 1px;
-  padding-bottom: $padding-base-vertical;
-}
-
-#sortAndPerPage .dropdown-toggle {
-  cursor: pointer;
-}
-
-.no-js #sortAndPerPage {
-  & {
-    @extend .clearfix;
-  }
-  .dropdown-menu {
-    background: none;
-    box-shadow: none;
-    border: none;
-    position: relative;
-    display: block;
-    float: none;
-  }
-
-}
-
-.document-thumbnail {
-  float: right;
-  padding-left: $line-height-computed;
-  margin-bottom: $line-height-computed;
-}
-
-.view-type {
-  display: inline-block;
-
-  .caption {
-    @extend .sr-only;
-  }
-}
-
-#sort-dropdown .dropdown-toggle, #per_page-dropdown .dropdown-toggle {
-  color: $link-color;
-
-  .caret {
-    color: $text-color;
-  }
-}
-
-
-.search-input-group {
-  width: 80%;
-}
-
-@media (max-width: $screen-sm-min) {
-  .search-input-group {
-    width: auto;
-  }
-}

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

@@ -1,31 +0,0 @@
-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/views/catalog/_refworks_form.html.erb

@@ -1,6 +0,0 @@
-<%# this partial is used by blacklight-marc 5.0 %>
-<%= form_tag refworks_export_url, :name => "refworks", :role => 'form', :target => "_blank", :id => "refworks-form" do %>
-
-<%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
-<%= submit_tag t('blacklight.tools.refworks'), :class => 'submit btn btn-default'%>
-<% end %>

data/lib/blacklight/configuration/view_config.rb

@@ -1,71 +0,0 @@
-require 'deprecation'
-
-class Blacklight::Configuration
-  class ViewConfig < Blacklight::OpenStructWithHashAccess
-    class Show < ViewConfig
-      extend Deprecation
-      self.deprecation_horizon = 'blacklight 6.0'
-
-      def html_title
-        Deprecation.warn(self.class, "config.show.html_title is deprecated; use config.show.title_field instead")
-        fetch(:html_title, title_field)
-      end
-
-      def heading
-        Deprecation.warn(self.class, "config.show.heading is deprecated; use config.show.title_field instead")
-        fetch(:heading, title_field)
-      end
-
-      def display_type
-        Deprecation.warn(self.class, "config.show.display_type is deprecated; use config.show.display_type_field instead")
-        fetch(:display_type, display_type_field)
-      end
-
-      def html_title= value
-        Deprecation.warn(self.class, "config.show.html_title is deprecated; use config.show.title_field instead")
-        super value
-        self.title_field = value
-      end
-
-      def heading= value
-        Deprecation.warn(self.class, "config.show.heading is deprecated; use config.show.title_field instead")
-        super value
-        self.title_field = value
-      end
-
-      def display_type= value
-        Deprecation.warn(self.class, "config.show.display_type is deprecated; use config.show.display_type_field instead")
-        super value
-        self.display_type_field = value
-      end
-    end
-
-    class Index < ViewConfig
-      extend Deprecation
-      self.deprecation_horizon = 'blacklight 6.0'
-
-      def record_display_type
-        Deprecation.warn(self.class, "config.index.record_display_type is deprecated; use config.index.display_type_field instead")
-        fetch(:record_display_type, display_type_field)
-      end
-
-      def record_display_type= value
-        Deprecation.warn(self.class, "config.index.record_display_type is deprecated; use config.index.display_type_field instead")
-        super value
-        self.display_type_field = value
-      end
-
-      def show_link
-        Deprecation.warn(self.class, "config.index.show_link is deprecated; use config.index.title_field instead")   
-        fetch(:show_link, title_field)
-      end
-
-      def show_link= value
-        Deprecation.warn(self.class, "config.index.show_link is deprecated; use config.index.title_field instead")
-        super value
-        self.title_field = value
-      end
-
-    end
-  end
-end

data/lib/blacklight/rails/routes.rb

@@ -1,29 +0,0 @@
-module ActionDispatch::Routing
-  class Mapper
-    # example
-    #   blacklight_for :catalog
-    #   blacklight_for :catalog, :dashboard
-    #   blacklight_for :catalog, except: [ :saved_searches ]
-    #   blacklight_for :catalog, only: [ :saved_searches, :solr_document ]
-    #   blacklight_for :catalog, constraints: {id: /[0-9]+/ }
-    def blacklight_for(*resources)
-      raise_no_blacklight_secret_key unless Blacklight.secret_key
-      options = resources.extract_options!
-      resources.map!(&:to_sym)
-
-      Blacklight::Routes.new(self, options.merge(resources: resources)).draw
-    
-    end
-    
-    private
-    def raise_no_blacklight_secret_key #:nodoc:
-      raise <<-ERROR
-Blacklight.secret_key was not set. If you are using Rails 4.1+, set your app's secret key base (config/secrets.yml) OR add the following to an initializer:
-
-Blacklight.secret_key = '#{SecureRandom.hex(64)}'
-
-Please ensure you restarted your application after installing Blacklight or setting the key.
-ERROR
-    end
-  end
-end

data/lib/blacklight/solr_helper.rb

@@ -1,9 +0,0 @@
-module Blacklight
-  module SolrHelper
-    extend ActiveSupport::Concern
-    included do
-      include Blacklight::SearchHelper
-      Deprecation.warn Blacklight::SolrHelper, "Blacklight::SolrHelper is deprecated; use Blacklight::SearchHelper instead"
-    end
-  end
-end

data/lib/generators/blacklight/templates/config/initializers/blacklight_initializer.rb

@@ -1,9 +0,0 @@
-# A secret token used to encrypt user_id's in the Bookmarks#export callback URL
-# functionality, for example in Refworks export of Bookmarks. In Rails 4, Blacklight
-# will use the application's secret key base instead.
-#
-<% if Rails::VERSION::MAJOR == 4 %>
-# Blacklight.secret_key = '<%= SecureRandom.hex(64) %>'
-<% else %>
-Blacklight.secret_key = '<%= SecureRandom.hex(64) %>'
-<% end %>

data/spec/helpers/component_helper_spec.rb

@@ -1,19 +0,0 @@
-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/routes_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper' 
-describe Blacklight::Routes do
-  subject { Blacklight::Routes.new(router, options) }
-  let(:router) { double }
-
-  describe "solr_document" do
-    describe "without constraints" do
-      let(:options) { Hash.new }
-      it "should define the resources" do
-        allow(router).to receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show]})
-        allow(router).to receive(:resources).with(:records, :only=>[:show])
-        subject.solr_document(:records)
-      end
-    end
-
-    describe "with constraints" do
-      let(:options) { { :constraints => {id: /[a-z]+/, format: false } } }
-      it "should define the resources" do
-        allow(router).to receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show], :constraints=>{:id=>/[a-z]+/, :format=>false} })
-        allow(router).to receive(:resources).with(:records, :only=>[:show], :constraints=>{:id=>/[a-z]+/, :format=>false})
-        subject.solr_document(:records)
-      end
-    end
-  end
-end

data/spec/lib/blacklight/solr_helper_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Blacklight::SolrHelper do
-  it "should raise a deprecation error" do
-    expect(Deprecation).to receive(:warn)
-    class TestClass
-      include Blacklight::SolrHelper
-    end
-  end
-
-  after { Object.send(:remove_const, :TestClass) }
-end