bridgetown-routes 1.2.0.beta3 → 1.2.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5949b1ebe4c5f24232ac0488c4f605218927c3da20c26bdce731552db4ede14
-  data.tar.gz: '0811c661436d875745219faccb16509c17109eda2ebb3616bb8e1d250bdd2845'
+  metadata.gz: a1851e1044647a20b32d1f926092099180a85094a725a64b448ac4a2fe5c8da2
+  data.tar.gz: fce918df055844cf76a60cef1724e430e93ee8a169049123ae12a892636c75dd
 SHA512:
-  metadata.gz: fd962ecf01401df33260d541bf8762589f0e0011f13dd91798f81cf8b081f72cc41b0926f5a4c475ad41287e83483bea6c5f1c9abf28df2151d051b4f7e68143
-  data.tar.gz: be0aa19c3a01bbc1549382c2a54a006733f55c9638d5bdb1dc4dbfb94d57b26aa8a43e9db3f681112c747b9bb100a16ac5dc82fc9d61411790f25358c3a3e412
+  metadata.gz: 6da6e86ae502760c25f2e7ff293ed48ba3b2519cf3ad8b6cd6625388de0df3c8bb73df99b4845ab4e8eac044078c03971a82db141c53de4a360861c438f7caa5
+  data.tar.gz: ad704062b6288e2428a2bb925d61987d46142900f802d898856297527bc9a2fac404270bca27901de0f440d576f962604a958632f6ed32606436fec47dc876e6

data/lib/bridgetown-routes/manifest.rb

@@ -32,11 +32,15 @@ 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)
           end
+
           @route_manifest ||= {}
           @route_manifest[site.label] = new_manifest
         end
@@ -44,9 +48,9 @@ module Bridgetown
         def sort_routes!(routes)
           routes.sort! do |route_a, route_b|
             # @type [String]
-            _, slug_a = route_a
+            slug_a = route_a[1][0]
             # @type [String]
-            _, slug_b = route_b
+            slug_b = route_b[1][0]
 
             # @type [Integer]
             weight1 = slug_a.count("/") <=> slug_b.count("/")
@@ -57,6 +61,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta3
+  version: 1.2.0.beta5
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-09 00:00:00.000000000 Z
+date: 2023-01-02 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.beta3
+        version: 1.2.0.beta5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta3
+        version: 1.2.0.beta5
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement