bridgetown-routes 1.2.0.beta2 → 1.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f78f788255fc7a1a3921bacceaadb5b2ada3509c880d4bf4af8490d2d75036e
-  data.tar.gz: 375b123451dd08feda3b2d39ac197d7c1da8d9dfb00d4084f779826c59940507
+  metadata.gz: d25f883860757364304b62c272eda2e32a75f89b0822d0dcacb1cffbd9b520bc
+  data.tar.gz: aa1c4341ecfaa9d337d233d2e7cff360aa45784d39e67152c400d84c94c63c7f
 SHA512:
-  metadata.gz: e4d4ad7ab41ec2f11171e449df4f1a3b5f37387e05a1d4c567ef248d987b35efbb427a1d600676b455240b6f0902842619cc18c42e8187c11a0209a48498ff41
-  data.tar.gz: 11ee941c8a4a6a4c63bdcf1660b3ba309c80578fdf8816da91d248934854faa1019fa935ee4e600bbfe9aacbcd732437fb19b719f4e797fbbc35b078f833e27e
+  metadata.gz: 54f32ecbd983c9beec9b010ba27208c6c68811d837bb9a44b7e2057ffc6b9d0acb7414d6e967fe3e5d22a2442d4fb02ecd83acf6cea1cce505b0053b595c71d0
+  data.tar.gz: fc1e5cafcbcbe048ca6e49bea10c0f026efa42ca2c7d678c539db22e921448b963cd1f25069c7a22f814c691ef80088a9c27d060c52d590514d52cebc20aa98e

data/lib/bridgetown-routes/manifest.rb

@@ -32,7 +32,10 @@ module Bridgetown
                 ":#{Regexp.last_match(1)}"
               end
 
-              [file, file_slug, segment_keys]
+              # generate localized file slugs
+              localized_file_slugs = generate_localized_file_slugs(site, file_slug)
+
+              [file, localized_file_slugs, segment_keys]
             end
 
             new_manifest += sort_routes!(routes)
@@ -57,6 +60,28 @@ module Bridgetown
             end
           end.reverse!
         end
+
+        def locale_for(slug, site)
+          possible_locale_segment = slug.split("/").first.to_sym
+
+          if site.config.available_locales.include? possible_locale_segment
+            possible_locale_segment
+          else
+            site.config.default_locale
+          end
+        end
+
+        private
+
+        def generate_localized_file_slugs(site, file_slug)
+          site.config.available_locales.map do |locale|
+            if locale == site.config.default_locale && !site.config.prefix_default_locale
+              file_slug
+            else
+              "#{locale}/#{file_slug}"
+            end
+          end
+        end
       end
     end
   end

data/lib/bridgetown-routes/manifest_router.rb

@@ -16,27 +16,40 @@ module Bridgetown
         end
 
         Bridgetown::Routes::Manifest.generate_manifest(bridgetown_site).each do |route|
-          file, file_slug, segment_keys = route
-
-          r.on file_slug do |*segment_values|
-            response["X-Bridgetown-SSR"] = "1"
-            # eval_route_file caches when Bridgetown.env.production?
-            Bridgetown::Routes::CodeBlocks.eval_route_file file, file_slug, @_roda_app
-
-            segment_values.each_with_index do |value, index|
-              r.params[segment_keys[index]] ||= value
-            end
-
-            route_block = Bridgetown::Routes::CodeBlocks.route_block(file_slug)
-            response.instance_variable_set(
-              :@_route_file_code, route_block.instance_variable_get(:@_route_file_code)
-            ) # could be nil
-            @_roda_app.instance_exec(r, &route_block)
+          file, localized_file_slugs, segment_keys = route
+
+          localized_file_slugs.each do |file_slug|
+            add_route(r, file, file_slug, segment_keys)
           end
         end
 
         nil
       end
+
+      private
+
+      def add_route(route, file, file_slug, segment_keys)
+        route.on file_slug do |*segment_values|
+          response["X-Bridgetown-SSR"] = "1"
+          # eval_route_file caches when Bridgetown.env.production?
+          Bridgetown::Routes::CodeBlocks.eval_route_file file, file_slug, @_roda_app
+
+          segment_values.each_with_index do |value, index|
+            route.params[segment_keys[index]] ||= value
+          end
+
+          # set route locale
+          locale = Bridgetown::Routes::Manifest.locale_for(file_slug, bridgetown_site)
+          I18n.locale           = locale
+          route.params[:locale] = locale
+
+          route_block = Bridgetown::Routes::CodeBlocks.route_block(file_slug)
+          response.instance_variable_set(
+            :@_route_file_code, route_block.instance_variable_get(:@_route_file_code)
+          ) # could be nil
+          @_roda_app.instance_exec(route, &route_block)
+        end
+      end
     end
   end
 end

data/lib/roda/plugins/bridgetown_routes.rb

@@ -21,7 +21,7 @@ class Roda
         app.plugin :slash_path_empty # now /hello and /hello/ are both matched
         app.plugin :placeholder_string_matchers
         app.plugin :flash
-        app.plugin :route_csrf, check_header: true
+        app.plugin :route_csrf
       end
 
       def self.configure(app, _opts = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta2
+  version: 1.2.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta2
+        version: 1.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta2
+        version: 1.2.0.beta4
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement