blacklight 5.16.0 → 5.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f04052db0293c8e93daad2cd0292fb6f6dd221d
-  data.tar.gz: 915bc9c1fc3a1685ac79c0ee68ff19d5a8ab5a62
+  metadata.gz: 151e13c103de8da06aff554974e4d6fb08f1ec6c
+  data.tar.gz: 5c610d9673326a95e419dcf0b8ae34487faa9808
 SHA512:
-  metadata.gz: 79f8af63d92a6fcc81a8f2381477d7e09ea30e42ed3dd1f1bd34b8fe4d9e1c4baae9831d1169233f4bf4cce41ffd01b5dc5c272f8943f4da63c941bd1e3d0cfb
-  data.tar.gz: a0388a293e6791114f1310ec5a83d219746bfd151bc29fc024afa7933ef0c7755ed4d8179c60421c80eab4a43eaf38a0b4489356659d2050b9171d527c28fc4a
+  metadata.gz: 6dee016cf1931ba320fefff5f6cddf5180f482ea5a4d8a26d1c561bf6cff5614d2a6e057ad8b1958d7062a64262528df285004c923897824cc81ffa3dcf10fe2
+  data.tar.gz: 95261b33157f9c4544db07cb552f356377eb739ceccfe2605f773cf0200b6323fb645407e3a5b6f554d71db975ba0cedca9477dc580dfa67d6bc3b7baef1187f

data/VERSION

@@ -1 +1 @@
-5.16.0
+5.16.1

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

@@ -3,8 +3,23 @@ module Blacklight::Catalog
   extend ActiveSupport::Concern
   extend Deprecation
 
-  SearchContext = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Blacklight::Catalog::SearchContext', 'Blacklight::SearchContext')
-  ComponentConfiguration = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Blacklight::Catalog::ComponentConfiguration', 'Blacklight::DefaultComponentConfiguration')
+  module SearchContext
+    extend ActiveSupport::Concern
+    extend Deprecation
+    included do
+      Deprecation.warn(SearchContext, 'Blacklight::Catalog::SearchContext is deprecated; use Blacklight::SearchContext instead')
+      include Blacklight::SearchContext
+    end
+  end
+
+  module ComponentConfiguration
+    extend ActiveSupport::Concern
+    extend Deprecation
+    included do
+      Deprecation.warn(SearchContext, 'Blacklight::Catalog::ComponentConfiguration is deprecated; use Blacklight::DefaultComponentConfiguration instead')
+      include Blacklight::DefaultComponentConfiguration
+    end
+  end
 
   include Blacklight::Base
   include Blacklight::DefaultComponentConfiguration

data/lib/blacklight.rb

@@ -12,6 +12,10 @@ module Blacklight
   SolrResponse = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Blacklight::SolrResponse', 'Blacklight::Solr::Response')
   autoload :SolrHelper, 'blacklight/solr_helper'
 
+  autoload :AbstractRepository, 'blacklight/abstract_repository'
+  autoload :Configuration, 'blacklight/configuration'
+  autoload :SearchBuilder, 'blacklight/search_builder'
+
   extend Deprecation
 
   require 'blacklight/version'

data/{app/models → lib}/blacklight/configuration.rb

@@ -6,6 +6,7 @@ module Blacklight
 
     require 'blacklight/configuration/view_config'
     require 'blacklight/configuration/tool_config'
+
     # XXX this isn't very pretty, but it works.
     require 'blacklight/configuration/fields'
     require 'blacklight/configuration/field'
@@ -225,14 +226,6 @@ module Blacklight
 
     def locate_search_builder_class
       ::SearchBuilder
-    rescue NameError => e
-      # If the NameError is a result of the SearchBuilder having a
-      # NameError (e.g. NoMethodError) within it then raise the error.
-      raise e if Object.const_defined? "::SearchBuilder"
-
-      # Otherwise the NameError was a result of not being able to find SearchBuilder
-      Deprecation.warn(Configuration, "Your application is missing the SearchBuilder. Have you run `rails generate blacklight:search_builder`? Falling back to Blacklight::Solr::SearchBuilder")
-      Blacklight::Solr::SearchBuilder
     end
 
     def facet_paginator_class

data/lib/blacklight/solr.rb

@@ -2,5 +2,10 @@ module Blacklight
   module Solr
     require File.join(Blacklight::Engine.config.root, 'app', 'models', 'concerns', 'blacklight', 'document')
     require File.join(Blacklight::Engine.config.root, 'app', 'models', 'concerns', 'blacklight', 'solr', 'document')
+
+    autoload :Repository, 'blacklight/solr/repository'
+    autoload :Request, 'blacklight/solr/request'
+    autoload :Response, 'blacklight/solr/response'
+    autoload :SearchBuilderBehavior, 'blacklight/solr/search_builder_behavior'
   end
 end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Blacklight::Solr::SearchBuilder do
+describe Blacklight::Solr::SearchBuilderBehavior do
   let(:single_facet) { { format: 'Book' } }
   let(:multi_facets) { { format: 'Book', language_facet: 'Tibetan' } }
   let(:mult_word_query) { 'tibetan history' }
@@ -13,14 +13,19 @@ describe Blacklight::Solr::SearchBuilder do
 
   before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
 
-  let(:search_builder) { described_class.new(method_chain, context) }
+  let(:search_builder_class) do
+    Class.new(Blacklight::SearchBuilder) do
+      include Blacklight::Solr::SearchBuilderBehavior
+    end
+  end
+  let(:search_builder) { search_builder_class.new(method_chain, context) }
 
   subject { search_builder.with(user_params) }
 
   context "with default processor chain" do
-    subject { described_class.new true, context }
+    subject { search_builder_class.new true, context }
     it "should use the class-level default_processor_chain" do
-      expect(subject.processor_chain).to eq described_class.default_processor_chain
+      expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
   end
 

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -4,7 +4,7 @@ require 'rexml/document'
 describe "catalog/index" do  
 
   before(:all) do
-    @response = Blacklight::SolrResponse.new({ response: { numFound: 30 }}, { start: 10, rows: 10})
+    @response = Blacklight::Solr::Response.new({ response: { numFound: 30 }}, { start: 10, rows: 10})
     
     @config = CatalogController.blacklight_config
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.16.0
+  version: 5.16.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -313,30 +313,8 @@ files:
 - app/helpers/layout_helper.rb
 - app/helpers/render_constraints_helper.rb
 - app/helpers/search_history_constraints_helper.rb
-- app/models/blacklight/abstract_repository.rb
-- app/models/blacklight/configuration.rb
-- app/models/blacklight/configuration/facet_field.rb
-- app/models/blacklight/configuration/field.rb
-- app/models/blacklight/configuration/fields.rb
-- app/models/blacklight/configuration/search_field.rb
-- app/models/blacklight/configuration/solr_field.rb
-- app/models/blacklight/configuration/sort_field.rb
-- app/models/blacklight/configuration/tool_config.rb
-- app/models/blacklight/configuration/view_config.rb
 - app/models/blacklight/facet_paginator.rb
-- app/models/blacklight/search_builder.rb
 - app/models/blacklight/solr/facet_paginator.rb
-- app/models/blacklight/solr/repository.rb
-- app/models/blacklight/solr/request.rb
-- app/models/blacklight/solr/response.rb
-- app/models/blacklight/solr/response/facets.rb
-- app/models/blacklight/solr/response/group.rb
-- app/models/blacklight/solr/response/group_response.rb
-- app/models/blacklight/solr/response/more_like_this.rb
-- app/models/blacklight/solr/response/pagination_methods.rb
-- app/models/blacklight/solr/response/response.rb
-- app/models/blacklight/solr/response/spelling.rb
-- app/models/blacklight/solr/search_builder.rb
 - app/models/bookmark.rb
 - app/models/concerns/blacklight/configurable.rb
 - app/models/concerns/blacklight/document.rb
@@ -357,7 +335,6 @@ files:
 - app/models/concerns/blacklight/solr/document/more_like_this.rb
 - app/models/concerns/blacklight/solr/document/schema_org.rb
 - app/models/concerns/blacklight/solr/document/sms.rb
-- app/models/concerns/blacklight/solr/search_builder_behavior.rb
 - app/models/concerns/blacklight/token_based_user.rb
 - app/models/concerns/blacklight/user.rb
 - app/models/record_mailer.rb
@@ -464,11 +441,33 @@ files:
 - db/migrate/20140202020202_create_bookmarks.rb
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
 - lib/blacklight.rb
+- lib/blacklight/abstract_repository.rb
+- lib/blacklight/configuration.rb
+- lib/blacklight/configuration/facet_field.rb
+- lib/blacklight/configuration/field.rb
+- lib/blacklight/configuration/fields.rb
+- lib/blacklight/configuration/search_field.rb
+- lib/blacklight/configuration/solr_field.rb
+- lib/blacklight/configuration/sort_field.rb
+- lib/blacklight/configuration/tool_config.rb
+- lib/blacklight/configuration/view_config.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
 - lib/blacklight/rails/routes.rb
 - lib/blacklight/routes.rb
+- lib/blacklight/search_builder.rb
 - lib/blacklight/solr.rb
+- lib/blacklight/solr/repository.rb
+- lib/blacklight/solr/request.rb
+- lib/blacklight/solr/response.rb
+- lib/blacklight/solr/response/facets.rb
+- lib/blacklight/solr/response/group.rb
+- lib/blacklight/solr/response/group_response.rb
+- lib/blacklight/solr/response/more_like_this.rb
+- lib/blacklight/solr/response/pagination_methods.rb
+- lib/blacklight/solr/response/response.rb
+- lib/blacklight/solr/response/spelling.rb
+- lib/blacklight/solr/search_builder_behavior.rb
 - lib/blacklight/solr_helper.rb
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb

data/app/models/blacklight/solr/search_builder.rb

@@ -1,7 +0,0 @@
-module Blacklight::Solr
-  # @deprecated In 6.0 you should have this class generated into your application and Blacklight will
-  #             no longer need to provide it.
-  class SearchBuilder < Blacklight::SearchBuilder
-    include Blacklight::Solr::SearchBuilderBehavior
-  end
-end