blacklight_range_limit 7.8.1 → 7.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 369f9fc8e935d61dcb33f4e4d1a04ceb0fc001bd31fde25a076a3173d87a28c3
-  data.tar.gz: eaa25cd87127ef727e678f36927ad1a46d7c983a6edaaf378f5cd3a717936fa9
+  metadata.gz: c9c6a258b341059e6b61badb2323850e57033bc29d6f03abadfd91e0a34afcf3
+  data.tar.gz: 8b3840c1990d7ff721c165104c0be7e585a708008dbebc093e46862a2cf8bf1a
 SHA512:
-  metadata.gz: 97e0c3edb2e3648b9c80f295493d2b0f7895d703cb4f9ba33b38d6b268d8d7e2ae4b5fd9418af7dbaca58ab620a9cfec2397c9e7458e4698ad351c11f1555b31
-  data.tar.gz: 42a9c26cc19444084c7920eea8a65110ca2d5aa1d5eed476c8b85214c718182af69cb404574545ee8fcd729495d10e807c6f1752e25275a849ba19543e0bb0d4
+  metadata.gz: 9a465799fe33e06c3ba6655dd55426cdc97b363f0ee7783ce71a9ea61a20767ae65b80020af0c84c39661b57546f682eb75fd7c79927bbfebd6eac78d3e409ce
+  data.tar.gz: 8fe559ef62f817a76d494f4839ccf22caf85478a5e55bcf7b9e3210842b26c900824d7bcbd952b4474abe4885ab0f6328f5a70741ef359bb7a08ef6dd72c5bc3

data/VERSION

@@ -1 +1 @@
-7.8.1
+7.8.2

data/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js

@@ -44,7 +44,6 @@ function min_max(range_element) {
       min = BlacklightRangeLimit.parseNum($(range_element).find(".min").first().text());
       max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
    }
-   console.log(min, max)
    return [min, max]
 }
 

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -35,7 +35,7 @@
           facet_field_label(solr_field),
           range_display(solr_field, my_params),
           escape_value: false,
-          remove: remove_range_param(solr_field, my_params)
+          remove: search_action_path(remove_range_param(solr_field, my_params))
         )
       end
     end
@@ -87,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_si' do
+      expect(page).to have_content "2000 to 2008 ✖ [remove] 12"
+    end
+
+    within '.constraints-container'  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

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -5,7 +5,12 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
     before do
       allow(helper).to receive_messages(
         facet_field_label: 'Date Range',
-        remove_range_param: '/remove'
+        remove_range_param: {},
+        search_action_path: '/catalog',
+        blacklight_config: CatalogController.blacklight_config
+      )
+      allow(controller).to receive_messages(
+        search_state_class: Blacklight::SearchState,
       )
     end
 
@@ -82,6 +87,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: 7.8.1
+  version: 7.8.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight