bridgetown-routes 1.3.3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea6241b17998767dc43b82eadecbca5a74e771478794f6b17660d345c704aea
-  data.tar.gz: 347cd90e29c446aed8184d7745a06947d56d8dbbc2b4cf8d63cff1129d2d41f9
+  metadata.gz: 304b389006048955c739fc4162c3f678f0425388f126d13f1507a71c0f207333
+  data.tar.gz: ce03add76d718c225da566b472ceab910d0193743549713fb5664e44a9f7e581
 SHA512:
-  metadata.gz: ac0d859a83052a51d2f78f20ed29c199ab8d3d2fac1125532714d4f532f641335a9f12cab2c695ade7b9392f7538d7d726143ec4bb72a85c8d8a046a639ed698
-  data.tar.gz: f33b28795aa4e1c3ef0a7efbda3767d3475a3de915eb10ca08d3b85007b466029a10efaf2a0c5fe5b7aa1bcb4e88535743e54b38c61c59667276e2bfb974c985
+  metadata.gz: 0ec8b61de86e46cf4aebf44171ec1421403bd5522a46ff1f0fc93c3cb1fc36d6b277751eecff130cf25f5daeec344528b5b712bd90f978649e97e56d3269d794
+  data.tar.gz: fd97a1dbaad47125d3cf69b38d1bc58695ec666f6ff4fcee6009366a74ce401188eef92d8ff740d01a1389bc995b903ccf74abd56770084063e5b073892b053b

data/.rubocop.yml

@@ -4,3 +4,4 @@ inherit_from: ../.rubocop.yml
 AllCops:
   Exclude:
     - "*.gemspec"
+    - "test/ssr/src/**/*.rb"

data/lib/bridgetown-routes/code_blocks.rb

@@ -6,8 +6,11 @@ module Bridgetown
       class << self
         attr_accessor :blocks
 
-        def add_route(name, file_code = nil, &block)
+        def add_route(name, file_code = nil, front_matter_line_count = nil, &block)
           block.instance_variable_set(:@_route_file_code, file_code) if file_code
+          if front_matter_line_count
+            block.instance_variable_set(:@_front_matter_line_count, front_matter_line_count)
+          end
 
           @blocks ||= {}
           @blocks[name] = block
@@ -30,18 +33,23 @@ module Bridgetown
 
           code = File.read(file)
           code_postmatch = nil
-          ruby_content = code.match(Bridgetown::FrontMatterImporter::RUBY_BLOCK)
+          ruby_content = code.match(Bridgetown::FrontMatter::Loaders::Ruby::BLOCK)
+          front_matter_line_count = nil
           if ruby_content
             code = ruby_content[1]
-            code_postmatch = ruby_content.post_match
+            code_postmatch = ruby_content.post_match.lstrip
+            front_matter_line_count = code.lines.count - 1
+            if code.match?(%r!^\s*render_with(\s|\()!).! && code.match?(%r!r\.[a-z]+\s+do!).!
+              code.concat("\nrender_with {}")
+            end
           end
 
-          code = <<~RUBY
-            add_route(#{file_slug.inspect}, #{code_postmatch.inspect}) do |r|
-              #{code}
-            end
-          RUBY
-          instance_eval(code, file, ruby_content ? 1 : 0)
+          # rubocop:disable Style/DocumentDynamicEvalDefinition, Style/EvalWithLocation
+          code_proc = Kernel.eval(
+            "proc {|r| #{code} }", TOPLEVEL_BINDING, file, ruby_content ? 2 : 1
+          )
+          add_route(file_slug, code_postmatch, front_matter_line_count, &code_proc)
+          # rubocop:enable Style/DocumentDynamicEvalDefinition, Style/EvalWithLocation
         end
       end
     end

data/lib/bridgetown-routes/manifest.rb

@@ -2,97 +2,111 @@
 
 module Bridgetown
   module Routes
-    module Manifest
-      class << self
-        def generate_manifest(site) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity
-          return @route_manifest[site.label] if @route_manifest && Bridgetown.env.production?
+    class Manifest
+      attr_reader :site, :config, :manifest
+
+      def initialize(site, cache_routes: Bridgetown.env.production?)
+        @site = site
+        @manifest = []
+        @config = site.config.routes
+        @cache_routes = cache_routes
+        @islands_dir = File.expand_path(site.config.islands_dir, site.config.source)
+      end
 
-          new_manifest = []
-          routable_extensions = site.config.routes.extensions.join(",")
+      def routable_extensions = config.extensions.join(",")
 
-          site.config.routes.source_paths.each do |routes_dir|
-            routes_dir = File.expand_path(routes_dir, site.config.source)
+      def routes
+        return @manifest if !@manifest.empty? && @cache_routes
 
-            # @type [Array]
-            routes = Dir.glob(
-              routes_dir + "/**/*.{#{routable_extensions}}"
-            ).filter_map do |file|
-              if File.basename(file).start_with?("_", ".") ||
-                  File.basename(file, ".*").end_with?(".test")
-                next
-              end
+        @manifest = []
 
-              file_slug, segment_keys = file_slug_and_segments(site, routes_dir, file)
+        # Loop through all the directories (`src/_routes`, etc) looking for route files, then
+        # sort them and add them to the manifest:
+        expand_source_paths_with_islands.each do |routes_dir|
+          @manifest += glob_routes(routes_dir).map do |file|
+            file_slug, segment_keys = file_slug_and_segments(routes_dir, file)
 
-              # generate localized file slugs
-              localized_file_slugs = generate_localized_file_slugs(site, file_slug)
+            # generate localized file slugs
+            localized_file_slugs = generate_localized_file_slugs(file_slug)
 
-              [file, localized_file_slugs, segment_keys]
-            end
+            [file, localized_file_slugs, segment_keys]
+          end.then { sort_routes! _1 }
+        end
 
-            new_manifest += sort_routes!(routes)
-          end
+        @manifest
+      end
+
+      def expand_source_paths_with_islands
+        # clear out any past islands folders
+        config.source_paths.reject! { _1.start_with?(@islands_dir) }
 
-          @route_manifest ||= {}
-          @route_manifest[site.label] = new_manifest
+        Dir.glob("#{@islands_dir}/**/routes").each do |route_folder|
+          config.source_paths << route_folder
         end
 
-        def sort_routes!(routes)
-          routes.sort! do |route_a, route_b|
-            # @type [String]
-            slug_a = route_a[1][0]
-            # @type [String]
-            slug_b = route_b[1][0]
-
-            # @type [Integer]
-            weight1 = slug_a.count("/") <=> slug_b.count("/")
-            if weight1.zero?
-              slug_b.count("/:") <=> slug_a.count("/:")
-            else
-              weight1
-            end
-          end.reverse!
+        config.source_paths.map { File.expand_path _1, site.config.source }
+      end
+
+      def glob_routes(dir, pattern = "**/*")
+        files = Dir.glob("#{dir}/#{pattern}.{#{routable_extensions}}")
+        files.reject! do |file|
+          File.basename(file, ".*").then { _1.start_with?("_", ".") || _1.end_with?(".test") }
+        end
+        files
+      end
+
+      def file_slug_and_segments(routes_dir, file)
+        # @type [String]
+        file_slug = file.delete_prefix("#{routes_dir}/").then do |f|
+          if routes_dir.start_with?(@islands_dir)
+            # convert _islands/foldername/routes/someroute.rb to foldername/someroute.rb
+            f = routes_dir.delete_prefix("#{@islands_dir}/").sub(%r!/routes$!, "/") + f
+          end
+          [File.dirname(f), File.basename(f, ".*")].join("/").delete_prefix("./")
+        end.delete_suffix("/index")
+        segment_keys = []
+        file_slug.gsub!(%r{\[([^/]+)\]}) do |_segment|
+          segment_keys << Regexp.last_match(1)
+          ":#{Regexp.last_match(1)}"
         end
 
-        def locale_for(slug, site)
-          possible_locale_segment = slug.split("/").first.to_sym
+        [file_slug, segment_keys]
+      end
 
-          if site.config.available_locales.include? possible_locale_segment
-            possible_locale_segment
+      def generate_localized_file_slugs(file_slug)
+        site.config.available_locales.map do |locale|
+          if locale == site.config.default_locale && !site.config.prefix_default_locale
+            file_slug
           else
-            site.config.default_locale
+            "#{locale}/#{file_slug}"
           end
         end
+      end
 
-        private
-
-        def file_slug_and_segments(site, routes_dir, file)
+      def sort_routes!(routes)
+        routes.sort! do |route_a, route_b|
+          # @type [String]
+          slug_a = route_a[1][0]
           # @type [String]
-          file_slug = file.delete_prefix("#{routes_dir}/").then do |f|
-            if routes_dir.start_with?(
-              File.expand_path(site.config[:islands_dir], site.config.source)
-            )
-              f = "#{site.config[:islands_dir].delete_prefix("_")}/#{f}"
-            end
-            [File.dirname(f), File.basename(f, ".*")].join("/").delete_prefix("./")
-          end.delete_suffix("/index")
-          segment_keys = []
-          file_slug.gsub!(%r{\[([^/]+)\]}) do |_segment|
-            segment_keys << Regexp.last_match(1)
-            ":#{Regexp.last_match(1)}"
+          slug_b = route_b[1][0]
+
+          # @type [Integer]
+          weight1 = slug_a.count("/") <=> slug_b.count("/")
+          if weight1.zero?
+            slug_b.count("/:") <=> slug_a.count("/:")
+          else
+            weight1
           end
+        end.reverse!
+      end
 
-          [file_slug, segment_keys]
-        end
+      def locale_for(slug)
+        possible_locale_segment = slug.split("/").first.to_sym
 
-        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
+        if site.config.available_locales.include? possible_locale_segment
+          possible_locale_segment
+        else
+          site.config.default_locale
         end
       end
     end

data/lib/bridgetown-routes/manifest_router.rb

@@ -1,55 +1,11 @@
 # frozen_string_literal: true
 
-require "bridgetown-core/rack/routes"
-
 module Bridgetown
   module Routes
     class ManifestRouter < Bridgetown::Rack::Routes
       priority :lowest
 
-      route do |r|
-        unless bridgetown_site
-          Bridgetown.logger.warn(
-            "The `bridgetown_routes` plugin hasn't been configured in the Roda app."
-          )
-          return
-        end
-
-        Bridgetown::Routes::Manifest.generate_manifest(bridgetown_site).each do |route|
-          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
+      route(&:file_routes)
     end
   end
 end

data/lib/bridgetown-routes.rb

@@ -11,13 +11,20 @@ module Bridgetown
 end
 
 # @param config [Bridgetown::Configuration::ConfigurationDSL]
-Bridgetown.initializer :"bridgetown-routes" do |config|
+Bridgetown.initializer :"bridgetown-routes" do |
+  config,
+  additional_source_paths: [],
+  additional_extensions: []
+|
   config.init :ssr # ensure we already have touchdown!
 
   config.routes ||= {}
-  config.routes.source_paths ||= ["_routes", "#{config.islands_dir}/routes"]
+  config.routes.source_paths ||= ["_routes"]
   config.routes.extensions ||= %w(rb md serb erb liquid)
 
+  config.routes.source_paths += Array(additional_source_paths)
+  config.routes.extensions += Array(additional_extensions)
+
   config.only :server do
     require_relative "bridgetown-routes/manifest_router"
   end

data/lib/roda/plugins/bridgetown_routes.rb

@@ -25,14 +25,67 @@ class Roda
       end
 
       def self.configure(app, _opts = {})
-        return unless app.opts[:bridgetown_site].nil?
+        app.root_hook do
+          routes_dir = File.expand_path(
+            bridgetown_site.config.routes.source_paths.first,
+            bridgetown_site.config.source
+          )
+          file = routes_manifest.glob_routes(routes_dir, "index").first
+          next unless file
+
+          run_file_route(file, slug: "index")
+        end
+
+        if app.opts[:bridgetown_site]
+          app.opts[:routes_manifest] ||=
+            Bridgetown::Routes::Manifest.new(app.opts[:bridgetown_site])
+          return
+        end
 
         raise "Roda app failure: the bridgetown_ssr plugin must be registered before " \
               "bridgetown_routes"
       end
 
       module InstanceMethods
-        def render_with(data: {}) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+        def routes_manifest
+          self.class.opts[:routes_manifest]
+        end
+
+        def run_file_route(file, slug:)
+          response["X-Bridgetown-Routes"] = "1"
+          # eval_route_file caches when Bridgetown.env.production?
+          Bridgetown::Routes::CodeBlocks.eval_route_file file, slug, self
+
+          # set route locale
+          locale = routes_manifest.locale_for(slug)
+          I18n.locale = request.params[:locale] = locale
+
+          # get the route block extracted from the file at slug
+          route_block = Bridgetown::Routes::CodeBlocks.route_block(slug)
+          response.instance_variable_set(
+            :@_route_file_code, route_block.instance_variable_get(:@_route_file_code)
+          ) # could be nil
+          response.instance_variable_set(
+            :@_front_matter_line_count,
+            route_block.instance_variable_get(:@_front_matter_line_count)
+          ) # could be nil
+          instance_exec(request, &route_block)
+        end
+
+        def front_matter(&block)
+          b = block.binding
+          denylisted = %i(r argv)
+          data = b.local_variables.filter_map do |key|
+            next if denylisted.any? key
+
+            [key, b.local_variable_get(key)]
+          end.to_h
+
+          Bridgetown::FrontMatter::RubyFrontMatter.new(data:).tap { _1.instance_exec(&block) }.to_h
+        end
+
+        def render_with(data: {}, &) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+          data = front_matter(&) if data.empty? && block_given?
           path = Kernel.caller_locations(1, 1).first.path
           source_path = Pathname.new(path).relative_path_from(
             bridgetown_site.in_source_dir("_routes")
@@ -50,14 +103,16 @@ class Roda
             )
           ).read do
             data[:_collection_] = bridgetown_site.collections.pages
+            data[:_original_path_] = path
             data[:_relative_path_] = source_path
+            data[:_front_matter_line_count_] = response._front_matter_line_count
             data[:_content_] = code
             data
           end
 
           Bridgetown::Model::Base.new(data).to_resource.tap do |resource|
             resource.roda_app = self
-          end.read!.transform!.output
+          end.read!
         end
 
         def render(...)
@@ -65,17 +120,45 @@ class Roda
         end
 
         def view(view_class: Bridgetown::ERBView)
+          # TODO: support user choosing templates by extension rather than class
           response._fake_resource_view(
-            view_class: view_class, roda_app: self, bridgetown_site: bridgetown_site
+            view_class:, roda_app: self, bridgetown_site:
           )
         end
       end
 
+      module RequestMethods
+        # This runs through all of the routes in the manifest, setting up Roda blocks for execution
+        def file_routes
+          scope.routes_manifest.routes.each do |route|
+            file, localized_file_slugs, segment_keys = route
+
+            localized_file_slugs.each do |slug|
+              # This sets up an initial Roda route block at the slug, and handles segments as params
+              #
+              # _routes/nested/[slug].erb -> "nested/:slug"
+              # "nested/123" -> r.params[:slug] == 123
+              on slug do |*segment_values|
+                segment_values.each_with_index do |value, index|
+                  params[segment_keys[index]] ||= value
+                end
+
+                # This is provided as an instance method by our Roda plugin:
+                scope.run_file_route(file, slug:)
+              end
+            end
+          end
+
+          nil # be sure not to return the above array loop
+        end
+      end
+
       module ResponseMethods
         # template string provided, if available, by the saved code block
-        def _route_file_code
-          @_route_file_code
-        end
+        def _route_file_code = @_route_file_code
+
+        # we need to know where the real template starts for good error reporting
+        def _front_matter_line_count = @_front_matter_line_count
 
         def _fake_resource_view(view_class:, roda_app:, bridgetown_site:)
           @_fake_resource_views ||= {}
@@ -83,7 +166,7 @@ class Roda
             # TODO: use a Stuct for better performance...?
             HashWithDotAccess::Hash.new({
               data: {},
-              roda_app: roda_app,
+              roda_app:,
               site: bridgetown_site,
             })
           )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-08-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.3.3
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement
@@ -73,11 +73,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A Bridgetown plugin to add support for file-based Roda backend routes within