blacklight_range_limit 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb86d2b4a964fa439b38733a97efb61faa03e3db7a4a51a0ffa4daea379fe9d
-  data.tar.gz: 2444a4e758791ecb567d8f2f3aa0ee16a14a8cd20e3b4652a4b1b565a9511f0f
+  metadata.gz: cb2770ee329bb6bc941864e6e371eab6f676a5aba369c9ece4aebb244703089d
+  data.tar.gz: ed51729efb72aa983fbe046995ab9b633cd31923a083f05579912b496a192942
 SHA512:
-  metadata.gz: 423928f6a8c0b71b04a8ac60a4bff7b2581aacb0a398bb4d7c933ba6c87e4b92540871e9709870e8342f7471830995552ba465e2c19357d0fa4b5637b80c5d10
-  data.tar.gz: 9799b189b778c9a34ca56fcb794143f328cbac9cb9ce7df829c18c23146842b6f8c961ac866c7692cc9eef31923dc0d0a012171afe658fe5778e91a5cdd18651
+  metadata.gz: f40f9917b407aa32b7cb5b0040fd69dde006f911cea0470ddf56c885985e84232ac70488db753a8b3d07efae7e48e3915474f98e9832ad1518c279e5de0347e8
+  data.tar.gz: faa8fe7325e92e8cc8694b67c89229c9f346471f06415069b0c5736efa797a1dba040e4b5033559639c36ac52ea21a05b5699b3ab081530aca23d2712bc342a5

data/.github/workflows/ruby.yml

@@ -34,42 +34,68 @@ jobs:
         # that'd be too much. Plus BL can't *generate* every one even though it
         # can be made to work with every one. We test with some good significant
         # representative samples.
+        #
+        # If 'blacklight_version' includes `://`, will be understood as github url,
+        # used for testing off blacklight main.
 
         include:
-          # BLACKLIGHT EDGE, can test with Rails 8 beta, importmap and esbuild
+          # BLACKLIGHT EDGE, can test with latest rails, importmap and esbuild
           #
 
-          - rails_version: "~> 8.0.0"
-            blacklight_version: '{ "git": "https://github.com/projectblacklight/blacklight.git" }'
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: 'https://github.com/projectblacklight/blacklight.git'
             ruby: "3.3"
             additional_name: "/ importmap-rails"
             additional_engine_cart_rails_options: "--css=bootstrap"
 
-          - rails_version: "~> 8.0.0"
-            blacklight_version: '{ "git": "https://github.com/projectblacklight/blacklight.git" }'
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: 'https://github.com/projectblacklight/blacklight.git'
             ruby: "3.3"
             additional_name: "/ esbuild"
             additional_engine_cart_rails_options: "--css=bootstrap --javascript=esbuild"
 
-          # BLACKLIGHT 9, with beta cause that's all that's out as we write this
-          # and with Rails 8.0 only for simplicity
+          # BLACKLIGHT 9 and with Rails 8 and 8.1
           #
 
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: '~> 9.0'
+            ruby: "3.4"
+            additional_name: "/ importmap-rails"
+            additional_engine_cart_rails_options: "--css=bootstrap"
+
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: '~> 9.0'
+            ruby: "3.4"
+            additional_name: "/ esbuild"
+            additional_engine_cart_rails_options: "--css=bootstrap --javascript=esbuild"
+
           - rails_version: "~> 8.0.0"
-            blacklight_version: '~> 9.0.0.beta'
+            blacklight_version: '~> 9.0'
             ruby: "3.4"
             additional_name: "/ importmap-rails"
             additional_engine_cart_rails_options: "--css=bootstrap"
 
           - rails_version: "~> 8.0.0"
-            blacklight_version: '~> 9.0.0.beta'
+            blacklight_version: '~> 9.0'
             ruby: "3.4"
             additional_name: "/ esbuild"
             additional_engine_cart_rails_options: "--css=bootstrap --javascript=esbuild"
 
 
-          # BLACKLIGHT 8, can test with use importmaps and esbuild
-          #
+          # BLACKLIGHT 8, can test with use importmaps and esbuild, also rails 8 and 8.1
+          # and a bit of 7.2
+
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: "~> 8.0"
+            ruby: "3.3"
+            additional_name: "/ importmap-rails, propshaft"
+            additional_engine_cart_rails_options: "-a propshaft --css=bootstrap"
+
+          - rails_version: "~> 8.1.0.rc1"
+            blacklight_version: "~> 8.0"
+            ruby: "3.3"
+            additional_engine_cart_rails_options: "-a propshaft --javascript=esbuild --css=bootstrap"
+            additional_name: "/ esbuild, propshaft"
 
           - rails_version: "~> 8.0.0"
             blacklight_version: "~> 8.0"

data/Gemfile

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'json'
 
 source 'https://rubygems.org'
 
@@ -10,14 +9,9 @@ group :test do
   gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 end
 
-# While gemspec allows BL8 and some people are using BL8... the build
-# has never actually passed on BL8 yet. We may choose to run tests on
-# a blacklight version other than the latest allowed by gemspec, to get
-# tests to pass, or to test on older BL still supported here.
 if ENV['BLACKLIGHT_VERSION']
-  # allow direct git and other with serialized json kw args
-  if ENV['BLACKLIGHT_VERSION'].start_with?("{")
-    gem "blacklight", **JSON.parse(ENV['BLACKLIGHT_VERSION'])
+  if ENV['BLACKLIGHT_VERSION'].include?("://")
+    gem "blacklight", git: ENV['BLACKLIGHT_VERSION']
   else
     gem "blacklight", ENV['BLACKLIGHT_VERSION']
   end
@@ -45,16 +39,6 @@ else
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
-
-    case ENV['RAILS_VERSION']
-    when /^6.0/
-      gem 'sass-rails', '>= 6'
-      gem 'webpacker', '~> 4.0'
-    when /^5.[12]/
-      gem 'sass-rails', '~> 5.0'
-      gem 'sprockets', '~> 3.7'
-      gem 'thor', '~> 0.20'
-    end
   end
 end
 # END ENGINE_CART BLOCK

data/VERSION

@@ -1 +1 @@
-9.1.0
+9.2.0

data/app/components/blacklight_range_limit/range_form_component.html.erb

@@ -3,25 +3,21 @@
 
   <div class="range-limit-input-group">
     <div class="d-flex justify-content-between align-items-end">
-      <div class="d-flex flex-column mr-1 me-1">
-        <%= label_tag(begin_input_name, t("blacklight.range_limit.range_begin_short"), class: 'text-muted small mb-1') %>
-        <%= number_field_tag(begin_input_name,
-                              begin_value_default,
-                              min: range_config[:min_value],
-                              max: range_config[:max_value],
-                              class: "form-control form-control-sm range_begin")
-        %>
-      </div>
+      <%= render BlacklightRangeLimit::RangeInputComponent.new(
+        input_name: begin_input_name,
+        input_value: begin_value_default,
+        label_text: t("blacklight.range_limit.range_begin_short"),
+        min_value: range_config[:min_value],
+        max_value: range_config[:max_value],
+        css_class: "range_begin") %>
 
-      <div class="d-flex flex-column ml-1 ms-1">
-        <%= label_tag(end_input_name, t("blacklight.range_limit.range_end_short"), class: 'text-muted small mb-1') %>
-        <%= number_field_tag(end_input_name,
-                              end_value_default,
-                              min: range_config[:min_value],
-                              max: range_config[:max_value],
-                              class: "form-control form-control-sm range_end")
-        %>
-      </div>
+      <%= render BlacklightRangeLimit::RangeInputComponent.new(
+        input_name: end_input_name,
+        input_value: end_value_default,
+        label_text: t("blacklight.range_limit.range_end_short"),
+        min_value: range_config[:min_value],
+        max_value: range_config[:max_value],
+        css_class: "range_end") %>
     </div>
     <div class="d-flex justify-content-end mt-2">
       <%= submit_tag t('blacklight.range_limit.submit_limit'), class: @classes[:submit], name: nil %>

data/app/components/blacklight_range_limit/range_input_component.html.erb

@@ -0,0 +1,9 @@
+<div class="d-flex flex-column mr-1 me-1">
+  <%= label_tag @input_name, @label_text, class: 'text-muted small mb-1' %>
+  <%= number_field_tag @input_name,
+    @input_value,
+    min: @min_value,
+    max: @max_value,
+    class: "form-control form-control-sm #{@css_class}" %>
+</div>
+

data/app/components/blacklight_range_limit/range_input_component.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module BlacklightRangeLimit
+  class RangeInputComponent < Blacklight::Component
+      def initialize(input_name:, input_value:, label_text:, min_value:, max_value:, css_class:)
+        @input_name = input_name
+        @input_value = input_value
+        @label_text = label_text
+        @min_value = min_value
+        @max_value = max_value
+        @css_class = css_class
+      end
+  end
+end

data/blacklight_range_limit.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'blacklight', '>= 7.25.2', '< 9'
+  s.add_dependency 'blacklight', '>= 7.25.2', '< 10'
   s.add_dependency 'view_component', ">= 2.54", "< 5"
 
   s.add_development_dependency 'rspec', '~> 3.0'

data/lib/blacklight_range_limit/controller_override.rb

@@ -8,18 +8,17 @@ module BlacklightRangeLimit
 
     RANGE_LIMIT_FIELDS = [:range_end, :range_field, :range_start].freeze
 
+    included do
+      # have to do this in before_action so it's done before any application level
+      # before_actions, that might do something that needs it
+      before_action :_range_limit_add_search_state_fields, only: :range_limit
+    end
+
     # Action method of our own!
     # Delivers a _partial_ that's a display of a single fields range facets.
     # Used when we need a second Solr query to get range facets, after the
     # first found min/max from result set.
     def range_limit
-      # The builder in this action will need our special range_limit fields, so we
-      # must allow them.
-      if blacklight_config.search_state_fields
-        missing_keys = RANGE_LIMIT_FIELDS - blacklight_config.search_state_fields
-        blacklight_config.search_state_fields.concat(missing_keys)
-      end
-
       @facet = blacklight_config.facet_fields[params[:range_field]]
       raise ActionController::RoutingError, 'Not Found' unless @facet&.range
 
@@ -40,6 +39,14 @@ module BlacklightRangeLimit
       render BlacklightRangeLimit::RangeSegmentsComponent.new(facet_field: @presenter), layout: !request.xhr?
     end
 
+    def _range_limit_add_search_state_fields
+      # The builder in this action will need our special range_limit fields, so we
+      # must allow them.
+      blacklight_config.search_state_fields ||= []
+      missing_keys = RANGE_LIMIT_FIELDS - blacklight_config.search_state_fields
+      blacklight_config.search_state_fields.concat(missing_keys)
+    end
+
     class_methods do
       def default_range_config
         BlacklightRangeLimit.default_range_config

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-range-limit",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "A range facet UI component plugin for blacklight",
   "type": "module",
 

data/spec/test_app_templates/Gemfile.extra

@@ -1,10 +1,8 @@
 gem 'rails-controller-testing'
 
 if ENV['BLACKLIGHT_VERSION']
-  # allow direct git and other with serialized json kw args
-  require 'json'
-  if ENV['BLACKLIGHT_VERSION'].start_with?("{")
-    gem "blacklight", **JSON.parse(ENV['BLACKLIGHT_VERSION'])
+  if ENV['BLACKLIGHT_VERSION'].include?("://")
+    gem "blacklight", git: ENV['BLACKLIGHT_VERSION']
   else
     gem "blacklight", ENV['BLACKLIGHT_VERSION']
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -19,7 +19,7 @@ dependencies:
         version: 7.25.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 7.25.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,8 @@ files:
 - app/components/blacklight_range_limit/range_facet_component.rb
 - app/components/blacklight_range_limit/range_form_component.html.erb
 - app/components/blacklight_range_limit/range_form_component.rb
+- app/components/blacklight_range_limit/range_input_component.html.erb
+- app/components/blacklight_range_limit/range_input_component.rb
 - app/components/blacklight_range_limit/range_segments_component.html.erb
 - app/components/blacklight_range_limit/range_segments_component.rb
 - app/presenters/blacklight_range_limit/facet_field_presenter.rb
@@ -280,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files: