blacklight_range_limit 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d06f2026c9872ba165877b0d2e5a533e4522ebe0bc273b46586ce916708db5
-  data.tar.gz: 7d7cae7865815f99228acb3264b59499d9a313f219f69e8bd47090fbc98e767c
+  metadata.gz: 454aced55fe12cf920d7f33fc5338f40707ae450e78f3863f2d99a7721c9dc40
+  data.tar.gz: 19b80f76873f3a1a3e59ffaa7291c1f8d2f7af680a7979a8e3f3655adf716296
 SHA512:
-  metadata.gz: 4cd3f8e9c6d1f32a9a1ff1b8b2ff66b7619d4b45f88a85f4d15c80b38501f681d250ead319b823ef19b3d10249bfc16291d430f4a44c023985cdeb46ae112370
-  data.tar.gz: 3f5a12bedc924cea811b1ad562ae1df9cbb6499b1015143206c64c36b86994eb5441ab968290524324e9a62a7c462a083d3f606c3831faf5e7e57c6b68ed7997
+  metadata.gz: d8e45fed92431f1f46db61c9c76986f4552a7c01aba77aa1f85890cae4a8fc0dee42812ef4c4de0a11473653fceb1dc1e8a4f07588ae67761ecae6fa52410bab
+  data.tar.gz: 2bf5fccb09e9f21de9c7a783e4f0e426d1eb5299010a0cea108619c30182d11d20e1df0ba58110d0f7ac036828fcdbd16e6dd243f50d8a1078a783f05317a049

data/Rakefile

@@ -6,8 +6,6 @@ require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 require 'solr_wrapper'
 
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
-
 task :default => :ci
 
 desc "Run specs"

data/VERSION

@@ -1 +1 @@
-6.4.0
+6.5.0

data/blacklight_range_limit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails', '>= 4.2', '< 6'
   s.add_dependency 'jquery-rails' # our JS needs jquery_rails
-  s.add_dependency 'blacklight', '>= 6.10.0', '< 7.0.0'
+  s.add_dependency 'blacklight', '~> 6.10'
 
   s.add_development_dependency 'chromedriver-helper'
   s.add_development_dependency 'rspec', '~> 3.0'
@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'solr_wrapper', '~> 2.2'
-  s.add_development_dependency 'engine_cart', '~> 1.0'
+  s.add_development_dependency 'engine_cart', '~> 2.0'
   s.add_development_dependency 'webdrivers'
 end

data/lib/blacklight_range_limit/controller_override.rb

@@ -9,6 +9,7 @@ module BlacklightRangeLimit
     included do
       helper BlacklightRangeLimit::ViewHelperOverride
       helper RangeLimitHelper
+      helper_method :has_range_limit_parameters?
     end
 
     # Action method of our own!
@@ -28,5 +29,18 @@ module BlacklightRangeLimit
 
       render('blacklight_range_limit/range_segments', :locals => {:solr_field => params[:range_field]}, :layout => !request.xhr?)
     end
+
+    # over-ride, call super, but make sure our range limits count too
+    def has_search_parameters?
+      super || has_range_limit_parameters?
+    end
+
+    def has_range_limit_parameters?(my_params = params)
+      my_params[:range] &&
+        my_params[:range].to_unsafe_h.any? do |key, v|
+          v.present? && v.respond_to?(:'[]') &&
+          (v["begin"].present? || v["end"].present? || v["missing"].present?)
+        end
+    end
   end
 end

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -11,19 +11,6 @@
       super
     end
 
-    def has_range_limit_parameters?(my_params = params)
-      my_params[:range] &&
-        my_params[:range].to_unsafe_h.any? do |key, v|
-          v.present? && v.respond_to?(:'[]') &&
-          (v["begin"].present? || v["end"].present? || v["missing"].present?)
-        end
-    end
-
-    # over-ride, call super, but make sure our range limits count too
-    def has_search_parameters?
-      super || has_range_limit_parameters?
-    end
-
     def query_has_constraints?(my_params = params)
       super || has_range_limit_parameters?(my_params)
     end
@@ -100,14 +87,14 @@
     private
 
     def range_params(my_params = params)
-      return {} unless my_params[:range].is_a?(ActionController::Parameters)
+      return {} unless my_params[:range].is_a?(ActionController::Parameters) || my_params[:range].is_a?(Hash)
 
       my_params[:range].select do |_solr_field, range_options|
         next unless range_options
 
-        [range_options['missing'],
-         range_options['begin'],
-         range_options['end']].any?
+        [range_options['missing'].presence,
+         range_options['begin'].presence,
+         range_options['end'].presence].any?
       end
     end
   end

data/lib/generators/blacklight_range_limit/install_generator.rb

@@ -9,7 +9,7 @@ module BlacklightRangeLimit
     end
 
     def install_catalog_controller_mixin
-      inject_into_class 'app/controllers/catalog_controller.rb', CatalogController do
+      inject_into_file 'app/controllers/catalog_controller.rb', after: /include Blacklight::Catalog.*$/ do
         "\n  include BlacklightRangeLimit::ControllerOverride\n"
       end
     end

data/spec/features/blacklight_range_limit_spec.rb

@@ -24,7 +24,15 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    expect(page).to have_content "2000 to 2008 [remove] 12"
+    within '.blacklight-pub_date_sort' do
+      expect(page).to have_content "2000 to 2008 [remove] 12"
+    end
+
+    within '#appliedParams'  do
+      expect(page).to have_content '2000 to 2008'
+    end
+
+    expect(page).to have_content '1 - 10 of 12'
   end
 
   it "should not include page parameter" do
@@ -61,9 +69,9 @@ describe "Blacklight Range Limit with configured input labels" do
         maxlength: 6
       }
       config.default_solr_params[:'facet.field'] = config.facet_fields.keys
-    end  
-  end    
-  
+    end
+  end
+
   it "should show the range limit facet with configured labels and maxlength" do
     visit '/catalog'
     expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'from publication date'

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -82,6 +82,13 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
           ActionController::Parameters.new(range: { field_name: { 'wrong' => 'data' } })
         )
       ).to eq({})
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'begin' => '', 'end' => '' } })
+        )
+      ).to eq({})
     end
 
     it 'returns the range parameters that are present' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,22 +49,16 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.10.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '6.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.10.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '6.10'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +177,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin