blacklight 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10118d3a200e5152de30c6f1738a5ce717e41802
-  data.tar.gz: 36743744db251f2c367347d538f9a4414422e33e
+  metadata.gz: 56c35c6ca23b02b1ca6e11d7ba4eca20e6e98765
+  data.tar.gz: e84c2c02337bd0ff644922c8007b8aa700b1a0bc
 SHA512:
-  metadata.gz: 42344240b708f4b0a48c8d8837b4a2aef285fb2a5cbdbb5b73d7585db3cea3a6f43d11f87ce2fda62ecd543fba5f08540759d489188ab3ffc85e6c23da9afadd
-  data.tar.gz: cd6920cc46fc9823f9953debe129d8fa9a21dadcb1dd3e19a8c9b0c281c274bc084a2902e1ed54a85fa9186970c9294fcba153e584c56992b7b596828db7eede
+  metadata.gz: 9e78806fd48f0861fba67936341782d9411b45719688c9fc1fe08cd4e3cc1a8e5675ab3496c185ae16ad2b0a8019a9d2b0b535d36f6284e5a2d2c21623424064
+  data.tar.gz: 2e72ce5c749e044c9c60383341ef872ba427feeb4da4172adbf3bd257e41ea5cd7eb6d653d0a6fc0ee57cdee2fb70d5e0e2d55df2ae85b3045584a27eea819f1

data/.travis.yml

@@ -1,34 +1,31 @@
 language: ruby
 sudo: false
-cache:
-  directories:
-  - /tmp/solr-5.3.0
 
 notifications:
   email: false
 
 rvm:
-  - 2.3.0
+  - 2.3.1
 
 matrix:
   include:
-    - rvm: 2.1.6
-      env: "RAILS_VERSION=4.2.5"
-    - rvm: 2.2.4
-      env: "RAILS_VERSION=4.2.5"
-    - rvm: 2.3.0
-      env: "RAILS_VERSION=5.0.0.beta3"
-    - rvm: jruby-9.0.4.0
-      env: "RAILS_VERSION=4.2.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.9
+      env: "RAILS_VERSION=4.2.6"
+    - rvm: 2.2.5
+      env: "RAILS_VERSION=4.2.6"
+    - rvm: 2.3.1
+      env: "RAILS_VERSION=5.0.0.rc1"
+    - rvm: jruby-9.0.5.0
+      env: "RAILS_VERSION=4.2.6 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.0.5.0
   fast_finish: true
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=4.2.5"
+ - "RAILS_VERSION=4.2.6"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -37,3 +34,5 @@ notifications:
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -45,3 +45,5 @@ else
   end
 end
 # END ENGINE_CART BLOCK
+
+eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))

data/VERSION

@@ -1 +1 @@
-6.1.0
+6.2.0

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

@@ -134,7 +134,7 @@ module Blacklight::SearchHelper
   end
 
   def repository
-    @repository ||= repository_class.new(blacklight_config)
+    repository_class.new(blacklight_config)
   end
 
   private

data/blacklight.gemspec

@@ -35,10 +35,10 @@ Gem::Specification.new do |s|
   s.add_dependency "twitter-typeahead-rails", '~> 0.11'
 
   s.add_development_dependency "solr_wrapper"
-  s.add_development_dependency "rspec-rails", "~> 3.0"
+  s.add_development_dependency "rspec-rails", ">= 3.4", "< 4"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
-  s.add_development_dependency "capybara"
+  s.add_development_dependency "capybara", '~> 2.6.0'
   s.add_development_dependency "poltergeist"
   s.add_development_dependency 'engine_cart', '~> 0.8.0'
   s.add_development_dependency "equivalent-xml"

data/db/migrate/20140202020201_create_searches.rb

@@ -3,13 +3,11 @@ class CreateSearches < ActiveRecord::Migration
   def self.up
     create_table :searches do |t|
       t.text  :query_params
-      t.integer :user_id
+      t.integer :user_id, index: true
       t.string :user_type
 
       t.timestamps null: false
     end
-
-    add_index :searches, :user_id
   end
 
   def self.down

data/db/migrate/20140202020202_create_bookmarks.rb

@@ -2,9 +2,10 @@
 class CreateBookmarks < ActiveRecord::Migration
   def self.up
     create_table :bookmarks do |t|
-      t.integer :user_id, :null=>false
+      t.integer :user_id, index: true, null: false
       t.string :user_type
-      t.string :document_id
+      t.string :document_id, index: true
+      t.string :document_type
       t.string :title
       t.timestamps null: false
     end

data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration
   def change
-    add_column(:bookmarks, :document_type, :string)
+    add_column(:bookmarks, :document_type, :string) unless Bookmark.connection.column_exists? :bookmarks, :document_type
     
-    add_index :bookmarks, :user_id
+    add_index :bookmarks, :user_id unless Bookmark.connection.index_exists? :bookmarks, :user_id
   end
 end

data/lib/blacklight.rb

@@ -10,6 +10,7 @@ module Blacklight
   autoload :Exceptions,  'blacklight/exceptions'
   autoload :Parameters,  'blacklight/parameters'
   autoload :Routes,      'blacklight/routes'
+  autoload :RuntimeRegistry, 'blacklight/runtime_registry'
   autoload :SearchBuilder, 'blacklight/search_builder'
   autoload :SearchState, 'blacklight/search_state'
   autoload :Solr, 'blacklight/solr'
@@ -26,7 +27,11 @@ module Blacklight
   ##
   # The default index connection for the search index
   def self.default_index
-    @default_index ||= repository_class.new(default_configuration)
+    Blacklight::RuntimeRegistry.connection ||= repository_class.new(default_configuration)
+  end
+
+  def self.default_index=(repository)
+    Blacklight::RuntimeRegistry.connection = repository
   end
 
   ##
@@ -52,10 +57,14 @@ module Blacklight
   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]
-        blacklight_yml[::Rails.env].symbolize_keys
-      end
+    Blacklight::RuntimeRegistry.connection_config ||= begin
+      raise "The #{::Rails.env} environment settings were not found in the blacklight.yml config" unless blacklight_yml[::Rails.env]
+      blacklight_yml[::Rails.env].symbolize_keys
+    end
+  end
+
+  def self.connection_config=(value)
+    Blacklight::RuntimeRegistry.connection_config = value
   end
 
   def self.blacklight_yml

data/lib/blacklight/runtime_registry.rb

@@ -0,0 +1,9 @@
+require 'active_support/per_thread_registry'
+
+module Blacklight
+  class RuntimeRegistry
+    extend ActiveSupport::PerThreadRegistry
+
+    attr_accessor :connection, :connection_config
+  end
+end

data/lib/generators/blacklight/install_generator.rb

@@ -100,7 +100,7 @@ EOF
     def generate_blacklight_marc_demo
       if options[:marc]
         blacklight_marc = String.new('blacklight-marc')
-        gem blacklight_marc, '~> 6.0'
+        gem blacklight_marc, '~> 6.1'
 
         Bundler.with_clean_env do
           run "bundle install"

data/solr/conf/schema.xml

@@ -459,6 +459,7 @@
 
    <!-- NOTE: this is not a full list of fields in the index; dynamic fields are also used -->
    <field name="id" type="string" indexed="true" stored="true" required="true" />
+   <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
    <!-- default, catch all search field -->
    <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>

data/spec/models/blacklight/document/active_model_shim_spec.rb

@@ -22,7 +22,7 @@ describe 'Blacklight::Document::ActiveModelShim' do
   end
 
   before do
-    allow(MockDocument.repository).to receive(:find).and_return(MockResponse.new([{id: 1}], {}))
+    allow(MockDocument).to receive(:repository).and_return(double(find: MockResponse.new([{id: 1}], {})))
   end
  
   describe "#find" do

data/spec/models/blacklight/document_spec.rb

@@ -81,7 +81,7 @@ describe Blacklight::Document do
     end
 
     before do
-      allow(MockDocument.repository).to receive(:find).and_return(MockResponse.new([{id: 1}], {}))
+      allow(MockDocument).to receive(:repository).and_return(double(find: MockResponse.new([{id: 1}], {})))
     end
 
     it "should have a globalid" do

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

@@ -10,6 +10,7 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
     assign(:pagination, pagination)
     assign(:facet, facet)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    controller.request.path_parameters[:action] = 'index'
   end
 
   it 'renders the facet index navigation range' do

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

@@ -3,6 +3,10 @@ require 'spec_helper'
 
 describe "catalog/_paginate_compact.html.erb" do
   let(:user) { User.new.tap { |u| u.save(validate: false) } }
+  
+  before do
+    controller.request.path_parameters[:action] = 'index'
+  end
 
   describe "with a real solr response", :integration => true do  
     def blacklight_config

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

@@ -13,6 +13,8 @@ describe "catalog/_view_type_group" do
     end
 
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
+
+    controller.request.path_parameters[:action] = 'index'
   end
 
   it "should not display the group when there's only one option" do

data/template.demo.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-gem "blacklight", ">= 5.3.0"
+gem "blacklight", ">= 6.1"
 gem "jettywrapper", ">= 2.0"
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,16 +161,22 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -203,16 +209,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +497,7 @@ files:
 - lib/blacklight/routes.rb
 - lib/blacklight/routes/exportable.rb
 - lib/blacklight/routes/searchable.rb
+- lib/blacklight/runtime_registry.rb
 - lib/blacklight/search_builder.rb
 - lib/blacklight/search_state.rb
 - lib/blacklight/solr.rb
@@ -671,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)