blacklight_range_limit 9.0.0.beta2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe80b379721a4e19e01ecb97a0f1ca6335e2e85ae3914abec0f2ae9ee9546b6
-  data.tar.gz: cdc7468b2f1e7f649f72a9f4200948cbc543d9f1e6a86bcac03b467c65b18ba2
+  metadata.gz: 4e201cd7f8b701d21bf9e6b97410f4559b10a727ac170941acbafbf30ca42d2b
+  data.tar.gz: eacc2e3ec1f19a84436f36b0ae5379ad8af4a1c0895c7f4bf0aabe743301407c
 SHA512:
-  metadata.gz: df819d6ceb0f782c612d1eb83648a178ed2f555b599df666240cfa2cc7a75d0b3554ff29ff12ada5bdf3766bb74be88b76d054a95fd233d41309d2737bcb6cf2
-  data.tar.gz: 269df83223ddbed2fa371c9b0aa1ebc6d5afff775d5a313a6482ba8948412456b59bbe7b1b438e51143fe2941c3e643b3ba98f5a918287ce32b4867542871c69
+  metadata.gz: ebe7cd1f8b4aff796900985f5f5b2ef1d38191ef2682d331963a18f715191d266ca41de8f3b6882ebd0de5556ed6a4bf0c0486bd1229eb80890b06cf50898b2a
+  data.tar.gz: e678a32a7854cb0310e834ece0f4d82577829288a03eb7944665f1f799dfb4178bae51ddb36c90a8550064d0162edc19b25d9465641b6004d3ce1eb63853210a

data/Rakefile

@@ -32,10 +32,11 @@ task :guard_version_match do
 
   # 9.0.0.beta1 in gem becomes 9.0.0-beta1 in npm
   gem_version_parts = gem_version.split(".")
+
   npm_version_required = [
     gem_version_parts.slice(0, 3).join("."),
     gem_version_parts.slice(3, gem_version_parts.length).join(".")
-  ].join("-")
+  ].collect {|s| s if s && !s.empty? }.compact.join("-")
 
   if npm_version != npm_version_required
     raise <<~EOS

data/VERSION

@@ -1 +1 @@
-9.0.0.beta2
+9.0.0

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -48,6 +48,12 @@ module BlacklightRangeLimit
     # range_field, range_start, range_end
     def fetch_specific_range_limit(solr_params)
       field_key = blacklight_params[:range_field] # what field to fetch for
+
+      unless  blacklight_params[:range_start].present? && blacklight_params[:range_start].kind_of?(String) &&
+              blacklight_params[:range_end].present? && blacklight_params[:range_end].kind_of?(String)
+        raise BlacklightRangeLimit::InvalidRange
+      end
+
       start = blacklight_params[:range_start].to_i
       finish = blacklight_params[:range_end].to_i
 
@@ -61,6 +67,9 @@ module BlacklightRangeLimit
       solr_params[:rows] = 0
 
       return solr_params
+    rescue BlacklightRangeLimit::InvalidRange
+      # This will make Rails return a 400
+      raise ActionController::BadRequest, "invalid range_start (#{blacklight_params[:range_start]}) or range_end (#{blacklight_params[:range_end]})"
     end
 
     # hacky polyfill for new Blacklight behavior we need, if we don't have it yet

data/package.json

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

data/spec/controllers/range_limit_action_method_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+RSpec.describe CatalogController,  type: :controller do
+  # Note that ActionController::BadRequest is caught by rails and turned into a 400
+  # response, and ActionController::RoutingError is caught by raisl and turned into 404
+  describe "bad params" do
+    let (:facet_field) { "pub_date_si" }
+
+    it "without start param present raise BadRequest " do
+      expect {
+        get :range_limit, params: {
+          "range_field"=> facet_field,
+          "range_start"=>"1931"
+        }
+      }.to raise_error(ActionController::BadRequest)
+    end
+
+    it "without end param raise BadRequest " do
+      expect {
+        get :range_limit, params: {
+          "range_field"=> facet_field,
+          "range_start"=>"1931"
+        }
+      }.to raise_error(ActionController::BadRequest)
+    end
+
+    it "without either boundary raise BadRequest" do
+      expect {
+        get :range_limit, params: {
+          "range_field"=> facet_field,
+        }
+      }.to raise_error(ActionController::BadRequest)
+    end
+
+    it "without a range_field raise RoutingError" do
+      expect {
+        get :range_limit, params: {}
+      }.to raise_error(ActionController::RoutingError)
+    end
+
+    it "with params out of order raise BadRequest"  do
+      expect {
+        get :range_limit, params: {
+          "range_field"=> facet_field,
+          "range_start"=>"1940",
+          "range_end"=>"1930"
+        }
+      }.to raise_error(ActionController::BadRequest)
+    end
+
+    it "with one of the params is an array raise BadRequest" do
+      expect {
+        get :range_limit, params: {
+          "range_field"=> facet_field,
+          "range_start"=>"1931",
+          "range_end"=>["1940"]
+        }
+      }.to raise_error(ActionController::BadRequest)
+    end
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -13,9 +13,13 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def run_bl8_jsbundling_fixup
-    # while it's named confusingly, the BL8 assets:propshaft generator has what we need
-    # for jsbundling, I think.
-    if File.exist?("package.json") && Blacklight::VERSION.split(".").first == "8"
+    # BL 8.7.0 doesn't seem to need anything, but BL8 before that the automatic BL
+    # install process doesn't do everything we need.
+    #
+    # By manually triggering the BL8 assets:propshaft generator, we can get what we need
+    # for jsbundling, even though it's named confusingly for that, it works in these
+    # versions.
+    if File.exist?("package.json") && Gem::Requirement.create("~> 8.0", "< 8.7.0").satisfied_by?(Gem::Version.new(Blacklight::VERSION))
       generate "blacklight:assets:propshaft"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta2
+  version: 9.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -250,6 +250,7 @@ files:
 - spec/components/range_facet_component_spec.rb
 - spec/components/range_form_component_spec.rb
 - spec/components/range_segments_component_spec.rb
+- spec/controllers/range_limit_action_method_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/features/run_through_spec.rb
 - spec/fixtures/solr_documents/unknown_year.yml
@@ -290,6 +291,7 @@ test_files:
 - spec/components/range_facet_component_spec.rb
 - spec/components/range_form_component_spec.rb
 - spec/components/range_segments_component_spec.rb
+- spec/controllers/range_limit_action_method_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/features/run_through_spec.rb
 - spec/fixtures/solr_documents/unknown_year.yml