routing-filter-codeur 0.7.1.1 → 0.7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82978a3445a6164bddffdf0d98fe25cc425ecdf523cfe8ee4b47a3e64bbdb39
-  data.tar.gz: 150ad70a72b7bccd9258ca8db48155da90b9b6f6b2fb034c49a64543bc40b12e
+  metadata.gz: 0d471f2df5df783d7ff49326fddeb891cd698f580e48044945e969fc9d65e105
+  data.tar.gz: 938019b4ade919fd8d8291c89bb9b309dd9f3afa0870ca9b3a225739911347fe
 SHA512:
-  metadata.gz: afdec861ddbc9ee114a3fea0a742d75e078a2b65885e518025af865037a5adec24f2109facf53dafaa550ed83de7c799a61525a8d969a3c96d8c928fc866e153
-  data.tar.gz: 6503ef8d3b9983e9d62ad4f633bf3122949fa47b12e4a5f415f702dbe993184aa40571192ad8bf68111b1d4b41c343bc3e4d4245ce62f33df2627160d367aa64
+  metadata.gz: 3524f4dca5e3a1a90aff4a04cb6b68581bad7b17c454d7e214ce86f9d8fb1501a495c6d37ba40d57b357d07232acdb2119de18c208389ea8572c95088df8db35
+  data.tar.gz: c35b8a1711a4904cae16562fb9df5181d66baff0a020a43805f7835474235ec222e8f50187dca2e26401512250f1b9859eb92de581fb7b5a1e15afbe57328a29

data/lib/routing_filter/adapters/routers/journey.rb

@@ -1,25 +1,43 @@
+# frozen_string_literal: true
+
+# Prepend the method lookup to intercept find_routes in rails.
+#
+# This enables us to intercept the incoming route paths before they are
+# recognized by the rails router and transformed to a route set and dispatched
+# to a controller.
 module ActionDispatchJourneyRouterWithFiltering
   def find_routes(env)
-    path = env.is_a?(Hash) ? env['PATH_INFO'] : env.path_info
+    path = if env.is_a?(Hash)
+             env['PATH_INFO']
+           else
+             env.path_info
+           end
+
     filter_parameters = {}
     original_path = path.dup
 
+    # Apply the custom user around_recognize filter callbacks
     @routes.filters.run(:around_recognize, path, env) do
+      # Yield the filter paramters for adjustment by the user
       filter_parameters
     end
 
-    super(env).map do | route|
-      env.parameters.merge(filter_parameters)
-      [ route ]
-    end.tap do |route|
-      # restore the original path
+    # Recognize the routes
+    super(env) do |match, parameters, route|
+      # Merge in custom parameters that will be visible to the controller
+      params = (parameters || {}).merge(filter_parameters)
+
+      # Reset the path before yielding to the controller (prevents breakages in CSRF validation)
       if env.is_a?(Hash)
         env['PATH_INFO'] = original_path
       else
         env.path_info = original_path
       end
+
+      # Yield results are dispatched to the controller
+      yield [match, params, route]
     end
   end
 end
 
-ActionDispatch::Journey::Router.send(:prepend, ActionDispatchJourneyRouterWithFiltering)
+ActionDispatch::Journey::Router.prepend(ActionDispatchJourneyRouterWithFiltering)

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.7.1.1'
+  VERSION = '0.7.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: routing-filter-codeur
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.1.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack