blacklight_range_limit 7.8.2 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c6a258b341059e6b61badb2323850e57033bc29d6f03abadfd91e0a34afcf3
-  data.tar.gz: 8b3840c1990d7ff721c165104c0be7e585a708008dbebc093e46862a2cf8bf1a
+  metadata.gz: 7bdd7d570174f761a17a7744d8b79796ebf4122e1ce4ef2bf1c366b31a7a82b3
+  data.tar.gz: e662b7bb3ab1272c4b110fae8ef3e3a8bd5aae0afe32a659a2b769941d8d8969
 SHA512:
-  metadata.gz: 9a465799fe33e06c3ba6655dd55426cdc97b363f0ee7783ce71a9ea61a20767ae65b80020af0c84c39661b57546f682eb75fd7c79927bbfebd6eac78d3e409ce
-  data.tar.gz: 8fe559ef62f817a76d494f4839ccf22caf85478a5e55bcf7b9e3210842b26c900824d7bcbd952b4474abe4885ab0f6328f5a70741ef359bb7a08ef6dd72c5bc3
+  metadata.gz: beb6a84a7ecb8cab0b9eaefc8ea1dea12224755676415bcda3f4d6252430e13d9d475254b914e2bfc638a7d9f03eb719aebefdc66380f7b378a69a2b4ebce7e2
+  data.tar.gz: b12a205a837bd3602eacd560b4d4370cabf4e47a960a62cbf57698fcb0f9ef567522fd1fe0b89d64aeb4a78f52de41bb0638a63e47123b881716c5da84f2ae3c

data/.travis.yml

@@ -14,6 +14,8 @@ matrix:
       env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
     - rvm: 2.6.5
       env: "RAILS_VERSION=5.2.3"
+    - rvm: 2.6.5
+      env: "RAILS_VERSION=5.2.3 BLACKLIGHT_VERSION=7.6.0"
     - rvm: 2.5.7
       env: "RAILS_VERSION=5.1.7"
 

data/VERSION

@@ -1 +1 @@
-7.8.2
+7.9.0

data/app/helpers/range_limit_helper.rb

@@ -63,9 +63,14 @@ module RangeLimitHelper
 
   ##
   # A method that is meant to be overridden downstream to format how a range
-  # label might be displayed to a user. By default it just returns the value.
-  def format_range_display_value(value, _solr_field)
-    value
+  # label might be displayed to a user. By default it just returns the value
+  # as rendered by the presenter
+  def format_range_display_value(value, solr_field)
+    if respond_to?(:facet_item_presenter)
+      facet_item_presenter(facet_configuration_for_field(solr_field), value, solr_field).label
+    else
+      facet_display_value(solr_field, value)
+    end
   end
 
   # Show the limit area if:

data/app/views/blacklight_range_limit/_range_segments.html.erb

@@ -7,10 +7,11 @@
         <span class="facet-label">
             <%= link_to(
                   t('blacklight.range_limit.range_html',
-                  begin: format_range_display_value(facet_display_value(solr_field, hash[:from]), solr_field),
-                  begin_value: facet_display_value(solr_field, hash[:from]),
-                  end: format_range_display_value(facet_display_value(solr_field, hash[:to]), solr_field),
-                  end_value: facet_display_value(solr_field, hash[:to])),
+                    begin: format_range_display_value(hash[:from], solr_field),
+                    begin_value: hash[:from],
+                    end: format_range_display_value(hash[:to], solr_field),
+                    end_value: hash[:to]
+                  ),
                   search_action_url(add_range(solr_field, hash[:from], hash[:to]).except(:controller, :action)),
                   class: 'facet_select'
               ) %>

data/blacklight_range_limit.gemspec

@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
 
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'blacklight', '>= 7.0'
+  s.add_dependency 'blacklight', '~> 7.0'
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara', '~> 3'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'solr_wrapper', '~> 0.14'
+  s.add_development_dependency 'solr_wrapper', '~> 2.0'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
   s.add_development_dependency 'webdrivers', '~>3.0'

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -7,7 +7,8 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
         facet_field_label: 'Date Range',
         remove_range_param: {},
         search_action_path: '/catalog',
-        blacklight_config: CatalogController.blacklight_config
+        blacklight_config: CatalogController.blacklight_config,
+        search_state: {},
       )
       allow(controller).to receive_messages(
         search_state_class: Blacklight::SearchState,
@@ -37,7 +38,11 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
 
   describe 'render_search_to_s_filters' do
     before do
-      allow(helper).to receive_messages(facet_field_label: 'Date Range')
+      allow(helper).to receive_messages(
+        facet_field_label: 'Date Range',
+        blacklight_config: CatalogController.blacklight_config,
+        search_state: {},
+      )
     end
 
     it 'does not return any content when the range parameter invalid' do

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1,3 @@
 gem 'rails-controller-testing'
 gem 'thor', '~> 0.20'
+gem 'blacklight', ENV['BLACKLIGHT_VERSION'] if ENV['BLACKLIGHT_VERSION']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.8.2
+  version: 7.9.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement