bp3-action_dispatch 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40a3514837d758199e64ffcca4e182a1d92857417d4080726e5a022a3a25c74
-  data.tar.gz: 518255920737b9e273bfb050d592823b9f5be04703e5ae352849bbdde48c9471
+  metadata.gz: a83f6c1e661ae30a16db2f0e917cdb20f6b05e01c31df9382b5f6fccbc37507b
+  data.tar.gz: 4caf8ea58b59eef52f4a095815bcb8f29636e7f14513599e50c45092fa2865b1
 SHA512:
-  metadata.gz: 68488d8c4cd841e895a49934dfdb9e0deca496441f75f7108963f741faff2877ccf2599d91836f74ed2a69cc6843ac60c9f2a4fe6c2acdc70af6d6a1ac6f371c
-  data.tar.gz: f8462b77b3da8adbba1d36e751fe081e6ab53c3b7f8314e4fc9d654c581509bf57e0b02850b0114cdf591f5cd08febe8da67ee562350bbb9bc945eec95ef07ae
+  metadata.gz: bde24835bc1109b7ee9411c7a61c72f20c2afe45ff7ad31b24d098a08b7f23d06cf73688f2d53ec99456eff769aae1c0409eca7a9acb8fa33e47d8eeb86b2042
+  data.tar.gz: dff7c0b3c30f34e5ef8126e691092815aca057144039e88bb2780ffe0408fc2a6eda5c14fe2ea33533461fe96bf97abffc5422c33c808cb67b4f3761c55e459d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.1.4] - 2025-01-27
+
+- Increase robustness of path parsing
+  - handle cases with '//' in the path (blank path segments)
+  - return default locale as fallback
+
 ## [0.1.3] - 2024-11-18
 
 - Use ruby 3.3.5 and relax gem constraints

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bp3-action_dispatch (0.1.3)
+    bp3-action_dispatch (0.1.4)
       actionpack (>= 7.1.2)
       activesupport (>= 7.1.2)
       i18n (>= 1.8.11)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (8.0.0)
-      actionview (= 8.0.0)
-      activesupport (= 8.0.0)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -19,13 +19,13 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (8.0.0)
-      activesupport (= 8.0.0)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.0)
+    activesupport (8.0.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -41,46 +41,47 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     byebug (11.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    erubi (1.13.0)
-    i18n (1.14.6)
+    erubi (1.13.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.8.2)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.1)
-    loofah (2.23.1)
+    json (2.9.1)
+    language_server-protocol (3.17.0.4)
+    logger (1.6.5)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.25.1)
-    nokogiri (1.16.7-x86_64-darwin)
+    minitest (5.25.4)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     racc (1.8.1)
     rack (3.1.8)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -93,34 +94,37 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.68.0)
+    rspec-support (3.13.2)
+    rubocop (1.71.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.2.0)
+    rubocop-rspec (3.4.0)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.2)
+    securerandom (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.2)
-    useragent (0.16.10)
+    useragent (0.16.11)
 
 PLATFORMS
   x86_64-darwin-21
   x86_64-darwin-22
+  x86_64-darwin-23
 
 DEPENDENCIES
   bp3-action_dispatch!

data/lib/bp3/action_dispatch/request_locale.rb

@@ -3,6 +3,8 @@
 module Bp3
   module ActionDispatch
     module RequestLocale
+      attr_reader :locale_from
+
       def request_locale
         @request_locale ||= extract_locale
       end
@@ -14,18 +16,19 @@ module Bp3
           extract_locale_from_params ||
           extract_locale_from_host ||
           extract_locale_from_header ||
-          extract_locale_from_setting
+          extract_locale_from_setting ||
+          default_locale
       end
 
       def extract_locale_from_path
-        locale = original_fullpath.split('/')[original_fullpath.starts_with?('/') ? 1 : 0]
+        locale = original_fullpath.split('/').reject { |e| e.nil? || e == '' }.first
         locale = locale_if_exists(locale)
         @locale_from = 'path' if locale
         locale
       end
 
       def extract_locale_from_params
-        return nil if params[:locale].blank?
+        return nil if params[:locale].nil? || params[:locale] == ''
 
         locale = params[:locale]
         locale = locale_if_exists(locale)
@@ -41,7 +44,7 @@ module Bp3
 
       def extract_locale_from_header
         header = env['HTTP_ACCEPT_LANGUAGE']
-        return if header.blank?
+        return if header.nil? || header == ''
 
         languages = parse_header(header)
         sorted = languages.sort_by { |_l, q| q }.reverse
@@ -61,12 +64,18 @@ module Bp3
         locale
       end
 
+      def default_locale
+        locale = I18n.default_locale
+        @locale_from = 'default' if locale
+        locale
+      end
+
       # example format: 'en;q=0.1,nl'
       def parse_header(header)
         languages = header.split(',').map(&:strip)
         languages.map do |language|
           locale, quality = language.split(/\s*;\s*q\s*=\s*/i)
-          quality = quality.blank? ? 1.0 : quality.to_f
+          quality = quality.nil? || quality == '' ? 1.0 : quality.to_f
           [locale, quality]
         end
       end

data/lib/bp3/action_dispatch/version.rb

@@ -2,6 +2,6 @@
 
 module Bp3
   module ActionDispatch
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bp3-action_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wim den Braven
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: bp3-action_dispatch adapts ActionDispatch::Request for BP3 (persuavis/black_phoebe_3).