blacklight 6.9.0 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2061ccbc1e4df9ec4a7c1b1f780ea5420a379483
-  data.tar.gz: f08c9eac999b9954471352a6d5c1d83f9885a932
+  metadata.gz: 60df91a78d3181795975d6b62bb92482e1b05151
+  data.tar.gz: 6c20566992ac377318609c742c12a5786db2f3db
 SHA512:
-  metadata.gz: 8708c94876e422d943c9fdada3c5faefa71342a7112e6e2a8ce32b7a82b56be6b18ed74f041773e75594928e69fd30067c74ba65bfd7df1be5190f484113a643
-  data.tar.gz: 7ae034c2608744da8b713df542509e87e27380794c2400ef3b90bb829e262fc21895fdb7650b133c89d87b8270987b6afd9804408753be1ad4695c886800703f
+  metadata.gz: 6f8b43752993d04d66797cb247c542a3f1ec5b881a6f869ea6ad557cdf329c74039de7e9d7cd10a5664d12d2c88524df86c82a9e2cb324dce0973c6aea914fd2
+  data.tar.gz: 26aa1ebc30886fcda720c4df6b00b728d8cd7a186887c6eda806de0c3680f18956438c795d2a67b17d7868ce30e51f12394abe0e12f96cc0ff4cede008984b7a

data/.rubocop_todo.yml

@@ -90,6 +90,8 @@ Metrics/BlockNesting:
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 186
+  Exclude:
+    - 'lib/blacklight/configuration.rb'
 
 # Offense count: 20
 Metrics/CyclomaticComplexity:
@@ -99,11 +101,15 @@ Metrics/CyclomaticComplexity:
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 52
+  Exclude:
+    - 'lib/blacklight/configuration.rb'
 
 # Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 208
+  Exclude:
+    - 'lib/blacklight/solr/search_builder_behavior.rb'
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.

data/.travis.yml

@@ -5,16 +5,16 @@ notifications:
   email: false
 
 rvm:
-  - 2.3.1
+  - 2.4.1
 
 matrix:
   include:
-    - rvm: 2.3.3
-      env: "RAILS_VERSION=4.2.8"
-    - rvm: 2.2.6
-      env: "RAILS_VERSION=5.0.2"
+    - rvm: 2.2.7
+      env: "RAILS_VERSION=5.0.3"
+    - rvm: 2.3.4
+      env: "RAILS_VERSION=5.1.1"
     - rvm: jruby-9.1.7.0
-      env: "RAILS_VERSION=5.0.2 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+      env: "RAILS_VERSION=5.0.3 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
     - rvm: jruby-9.1.7.0
   fast_finish: true
@@ -24,7 +24,7 @@ before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=5.0.2"
+ - "RAILS_VERSION=5.1.1"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/VERSION

@@ -1 +1 @@
-6.9.0
+6.10.0

data/db/migrate/20140202020201_create_searches.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateSearches < ActiveRecord::Migration
+class CreateSearches < ActiveRecord::Migration[4.2]
   def self.up
     create_table :searches do |t|
       t.binary  :query_params

data/db/migrate/20140202020202_create_bookmarks.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateBookmarks < ActiveRecord::Migration
+class CreateBookmarks < ActiveRecord::Migration[4.2]
   def self.up
     create_table :bookmarks do |t|
       t.integer :user_id, index: true, null: false

data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration
+class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration[4.2]
   def change
     add_column(:bookmarks, :document_type, :string) unless Bookmark.connection.column_exists? :bookmarks, :document_type
     

data/lib/blacklight/configuration.rb

@@ -136,7 +136,8 @@ module Blacklight
           default_per_page: nil,
           # how many searches to save in session history
           search_history_window: 100,
-          default_facet_limit: 10
+          default_facet_limit: 10,
+          default_more_limit: 20
           }
         end
       end

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -185,11 +185,13 @@ module Blacklight::Solr
       solr_params[:"facet.field"] = with_ex_local_param(facet_ex, facet_config.field)
 
       limit = if scope.respond_to?(:facet_list_limit)
+                Deprecation.warn(self, "The use of facet_list_limit is deprecated and will be removed in 7.0. " \
+                  "Consider using the 'more_limit' option in the field configuration or 'default_more_limit' instead.")
                 scope.facet_list_limit.to_s.to_i
               elsif solr_params["facet.limit"]
                 solr_params["facet.limit"].to_i
               else
-                facet_config.fetch(:more_limit, 20)
+                facet_config.fetch(:more_limit, blacklight_config.default_more_limit)
               end
 
       page = blacklight_params.fetch(request_keys[:page], 1).to_i

data/lib/generators/blacklight/assets_generator.rb

@@ -8,23 +8,34 @@ module Blacklight
 
       return if has_blacklight_assets?
 
+      contents = "\n//\n// Required by Blacklight\n"
+      contents += "//= require jquery\n" if rails_5_1?
+      contents += "//= require blacklight/blacklight\n"
+
       marker = if turbolinks?
                  '//= require turbolinks'
+               elsif rails_5_1?
+                 '//= require rails-ujs'
                else
                  '//= require jquery_ujs'
                end
 
       insert_into_file "app/assets/javascripts/application.js", :after => marker do
-<<-EOF
-//
-// Required by Blacklight
-//= require blacklight/blacklight
-EOF
+        contents
       end
     end
 
+    # This is not a default in Rails 5.1
+    def add_jquery
+      gem 'jquery-rails' if rails_5_1?
+    end
+
     private
 
+    def rails_5_1?
+      Rails.version =~ /5\.1/
+    end
+
     def turbolinks?
       @turbolinks ||= IO.read("app/assets/javascripts/application.js").include?('turbolinks')
     end

data/lib/generators/blacklight/templates/alternate_controller.rb

@@ -5,7 +5,7 @@ class AlternateController < CatalogController
   end
 
   def xyz *args
-    view_context.image_tag "asdfg"
+    view_context.tag "img"
   end
   
   helper_method :xyz

data/lib/generators/blacklight/user_generator.rb

@@ -20,7 +20,7 @@ module Blacklight
       return unless options[:devise]
 
       gem "devise"
-      gem "devise-guests", "~> 0.5"
+      gem "devise-guests", "~> 0.6"
 
       Bundler.with_clean_env do
         run "bundle install"

data/spec/helpers/catalog_helper_spec.rb

@@ -131,15 +131,19 @@ describe CatalogHelper do
 
   describe "rss_feed_link_tag" do
     context "when an alternate scope is passed in" do
+      subject(:tag) { helper.rss_feed_link_tag(route_set: my_engine) }
+
       let(:my_engine) { double("Engine") }
       let(:query_params) { { controller: 'catalog', action: 'index' } }
       let(:config) { Blacklight::Configuration.new }
       let(:search_state) { Blacklight::SearchState.new(query_params, config, controller) }
 
-      it "calls url_for on the engine scope" do
+      before do
         allow(helper).to receive(:search_state).and_return search_state
-        expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
-        tag = helper.rss_feed_link_tag(route_set: my_engine)
+      end
+
+      it "calls url_for on the engine scope" do
+        expect(my_engine).to receive(:url_for).and_return('/rss-path')
         expect(tag).to match /title="RSS for results"/
         expect(tag).to match /rel="alternate"/
         expect(tag).to match %r{type="application/rss\+xml"}
@@ -149,15 +153,19 @@ describe CatalogHelper do
 
   describe "atom_feed_link_tag" do
     context "when an alternate scope is passed in" do
+      subject(:tag) { helper.atom_feed_link_tag(route_set: my_engine) }
+
       let(:my_engine) { double("Engine") }
       let(:query_params) { { controller: 'catalog', action: 'index' } }
       let(:config) { Blacklight::Configuration.new }
       let(:search_state) { Blacklight::SearchState.new(query_params, config, controller) }
 
-      it "calls url_for on the engine scope" do
+      before do
         allow(helper).to receive(:search_state).and_return search_state
-        expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
-        tag = helper.atom_feed_link_tag(route_set: my_engine)
+      end
+
+      it "calls url_for on the engine scope" do
+        expect(my_engine).to receive(:url_for).and_return('/atom-path')
         expect(tag).to match /title="Atom for results"/
         expect(tag).to match /rel="alternate"/
         expect(tag).to match %r{type="application/atom\+xml"}

data/spec/helpers/url_helper_spec.rb

@@ -127,14 +127,18 @@ describe BlacklightUrlHelper do
 
     context "when an alternate scope is passed in" do
       let(:my_engine) { double("Engine") }
+      subject(:tag) { helper.link_back_to_catalog(route_set: my_engine) }
 
-      it "calls url_for on the engine scope" do
+      before do
         allow(helper).to receive(:current_search_session).and_return double(:query_params => query_params)
-        expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
-        tag = helper.link_back_to_catalog(route_set: my_engine)
+      end
+
+      it "calls url_for on the engine scope" do
+        expect(my_engine).to receive(:url_for)
+          .with(q:"query", f: "facets", controller: "catalog")
+          .and_return('link-url')
         expect(tag).to match /Back to Search/
-        expect(tag).to match /q=query/
-        expect(tag).to match /f=facets/
+        expect(tag).to match /link-url/
       end
     end
   end

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

@@ -367,7 +367,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
     end
   end
 
-  
+
   describe "#facet_value_to_fq_string" do
     it "should use the configured field name" do
       blacklight_config.add_facet_field :facet_key, field: "facet_name"
@@ -480,7 +480,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
 
     let(:solr_parameters) do
       solr_parameters = Blacklight::Solr::Request.new
-      
+
       subject.add_facetting_to_solr(solr_parameters)
 
       solr_parameters
@@ -512,7 +512,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       it "should respect the include_in_request parameter" do
         blacklight_config.add_facet_field 'yes_facet', include_in_request: true
         blacklight_config.add_facet_field 'no_facet', include_in_request: false
-        
+
         expect(solr_parameters[:'facet.field']).to include('yes_facet')
         expect(solr_parameters[:'facet.field']).not_to include('no_facet')
       end
@@ -640,6 +640,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
 
     context 'when facet_list_limit is defined in scope' do
       before do
+        allow(Deprecation).to receive(:warn)
         allow(context).to receive_messages facet_list_limit: 1000
       end
       it 'uses scope method for limit' do

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,4 @@
-if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
+if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\./ || ENV['RAILS_VERSION'] == 'edge'
   gem 'rails-controller-testing'
   gem 'deprecation'
 end

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

@@ -6,7 +6,7 @@ describe "catalog/_facets" do
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
     allow(view).to receive(:search_action_path) do |*args|
-      search_catalog_url *args
+      '/catalog'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.10.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails