bridgetown-routes 1.0.0.alpha3 → 1.0.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824080d36bab52ac4f6ebf7a3e3d50ec2d7d289cd4727594125ba17475fbc445
-  data.tar.gz: 4c656040ae9fc9945c00240b019e7e2cd4be6d5df6b20b674e931cec2d3c1f3a
+  metadata.gz: dcd02f991a4e93157657cdcc8a8bb8fbb5dd31b8f7362115c35b93eb4e0f4440
+  data.tar.gz: 0ffd18f98b4a0b5d4e2fbd65cf539ad86c3d450351e5a9bc180501c4ca84877e
 SHA512:
-  metadata.gz: 538394a2ea353c743abcd06939a00bef9af7252e7a02a5184e1aefe989acdec3f885a1c55f233ef6e8119d333e8baa066da589ab9c261c7fed3775145d2bd289
-  data.tar.gz: '06932279655aa3e401ab61eac7b0f537d1bb5b52318f96f44c5a18b5d1072b52525467f5d9475ece1806147e8b5f22a4adb4a4912a638983670e1ec7606f2e86'
+  metadata.gz: 1a337e4d65fa2c54b449c6a2838214891d646061929dceb3285f10184826fd25e67de6c1960f7f82d7ba6af5957677c707034555ffa04581f99d2c48404fe3db
+  data.tar.gz: 39137b4297418ed2edec3ba8087449e4d0e8118787aa373ba7cf29bb04ae15be8f392ca718358388f3dc978a63c93cf0a9fc839938a963c52a011226714e9861

data/lib/bridgetown-routes/code_blocks.rb

@@ -21,6 +21,29 @@ module Bridgetown
         def route_block(name)
           blocks[name] if route_defined?(name)
         end
+
+        def eval_route_file(file, file_slug, app) # rubocop:disable Lint/UnusedMethodArgument
+          if Bridgetown.env.production? && Bridgetown::Routes::CodeBlocks.route_defined?(file_slug)
+            # we don't need to re-eval the file in production because it won't be changing underfoot
+            return
+          end
+
+          code = File.read(file)
+          code_postmatch = nil
+          ruby_content = code.match(Bridgetown::FrontMatterImporter::RUBY_BLOCK)
+          if ruby_content
+            code = ruby_content[1]
+            code_postmatch = ruby_content.post_match
+          end
+
+          code = <<~RUBY
+            r = app.request
+            add_route(#{file_slug.inspect}, #{code_postmatch.inspect}) do
+              #{code}
+            end
+          RUBY
+          instance_eval(code, file, -1)
+        end
       end
     end
   end

data/lib/bridgetown-routes/manifest.rb

@@ -4,6 +4,7 @@ module Bridgetown
   module Routes
     module Manifest
       class << self
+        # TODO: make this extensible
         def routable_extensions
           %w(rb md serb erb liquid)
         end
@@ -11,9 +12,11 @@ module Bridgetown
         def generate_manifest # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           return @route_manifest if @route_manifest && Bridgetown.env.production?
 
-          routes_dir = File.expand_path("src/_routes", Dir.pwd)
+          routes_dir = Bridgetown::Current.site.in_source_dir("_routes")
           # @type [Array]
-          routes = Dir.glob(routes_dir + "/**/*.{#{routable_extensions.join(",")}}").map do |file|
+          routes = Dir.glob(
+            routes_dir + "/**/*.{#{routable_extensions.join(",")}}"
+          ).filter_map do |file|
             if File.basename(file).start_with?("_", ".") ||
                 File.basename(file, ".*").end_with?(".test")
               next
@@ -30,7 +33,7 @@ module Bridgetown
             end
 
             [file, file_slug, segment_keys]
-          end.compact
+          end
 
           routes.sort! do |route_a, route_b|
             # @type [String]

data/lib/bridgetown-routes/roda_router.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   module Routes
     module RodaRouter
-      def self.start!(app) # rubocop:disable Metrics/MethodLength
+      def self.start!(app)
         r = app.request
         response = app.response
 
@@ -12,17 +12,15 @@ module Bridgetown
 
           r.on file_slug do |*segment_values|
             response["X-Bridgetown-SSR"] = "1"
-            unless Bridgetown.env.production? &&
-                Bridgetown::Routes::CodeBlocks.route_defined?(file_slug)
-              eval_route_file file, file_slug, app
-            end
+            # eval_route_file caches when Bridgetown.env.production?
+            Bridgetown::Routes::CodeBlocks.eval_route_file file, file_slug, 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)
-            app.instance_variable_set(
+            response.instance_variable_set(
               :@_route_file_code, route_block.instance_variable_get(:@_route_file_code)
             ) # could be nil
             app.instance_exec(&route_block)
@@ -31,24 +29,6 @@ module Bridgetown
 
         nil
       end
-
-      def self.eval_route_file(file, file_slug, app) # rubocop:disable Lint/UnusedMethodArgument
-        code = File.read(file)
-        code_postmatch = nil
-        ruby_content = code.match(Bridgetown::FrontMatterImporter::RUBY_BLOCK)
-        if ruby_content
-          code = ruby_content[1]
-          code_postmatch = ruby_content.post_match
-        end
-
-        code = <<~RUBY
-          r = app.request
-          Bridgetown::Routes::CodeBlocks.add_route(#{file_slug.inspect}, #{code_postmatch.inspect}) do
-            #{code}
-          end
-        RUBY
-        instance_eval(code, file, -1)
-      end
     end
   end
 end

data/lib/bridgetown-routes/view_helpers.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Routes
+    module FlashHashAdditions
+      def info
+        self["info"]
+      end
+
+      def info=(val)
+        self["info"] = val
+      end
+
+      def alert
+        self["alert"]
+      end
+
+      def alert=(val)
+        self["alert"] = val
+      end
+    end
+
+    module FlashHashIndifferent
+      def []=(key, val)
+        @next[key.to_s] = val
+      end
+    end
+
+    module FlashNowHashIndifferent
+      def []=(key, val)
+        super(key.to_s, val)
+      end
+
+      def [](key)
+        super(key.to_s)
+      end
+    end
+  end
+end
+
+module Bridgetown
+  module Routes
+    class BlankFlash < Hash
+      include Bridgetown::Routes::FlashHashAdditions
+
+      def now
+        self
+      end
+    end
+
+    module ViewHelpers
+      def request
+        view.resource&.roda_app&.request
+      end
+      alias_method :r, :request
+
+      def response
+        view.resource&.roda_app&.response
+      end
+
+      def flash
+        view.resource&.roda_app&.flash || _basic_flash
+      end
+
+      def _basic_flash
+        @_basic_flash ||= BlankFlash.new
+      end
+
+      # def csrf_tag(...)
+      #   request.scope.csrf_tag(...)
+      # end
+
+      # def csrf_token(...)
+      #   request.scope.csrf_token(...)
+      # end
+    end
+  end
+end
+
+Bridgetown::RubyTemplateView::Helpers.include Bridgetown::Routes::ViewHelpers

data/lib/bridgetown-routes.rb

@@ -3,9 +3,10 @@
 require "bridgetown-core"
 require "bridgetown-core/version"
 
-require_relative "roda/plugins/bridgetown_routes"
+require_relative "bridgetown-routes/view_helpers"
 
-require_relative "bridgetown-routes/helpers"
+# Roda isn't defined for Bridgetown build-only
+require_relative "roda/plugins/bridgetown_routes" if defined?(Roda)
 
 module Bridgetown
   module Routes
@@ -35,3 +36,21 @@ module Bridgetown
     # rubocop:enable Bridgetown/NoPutsAllowed
   end
 end
+
+module RodaResourceExtension
+  module RubyResource
+    def roda_app=(app)
+      unless app.is_a?(Bridgetown::Rack::Roda)
+        raise Bridgetown::Errors::FatalException,
+              "Resource's assigned Roda app must be of type `Bridgetown::Rack::Roda'"
+      end
+
+      @roda_app = app
+    end
+
+    def roda_app
+      @roda_app
+    end
+  end
+end
+Bridgetown::Resource.register_extension RodaResourceExtension

data/lib/roda/plugins/bridgetown_routes.rb

@@ -2,6 +2,17 @@
 
 require "roda/plugins/flash"
 
+Roda::RodaPlugins::Flash::FlashHash.include Bridgetown::Routes::FlashHashAdditions,
+                                            Bridgetown::Routes::FlashHashIndifferent
+Roda::RodaPlugins::Flash::FlashHash.class_eval do
+  def initialize(hash = {})
+    super(hash || {})
+    now.singleton_class.include Bridgetown::Routes::FlashHashAdditions,
+                                Bridgetown::Routes::FlashNowHashIndifferent
+    @next = {}
+  end
+end
+
 class Roda
   module RodaPlugins
     module BridgetownRoutes
@@ -20,53 +31,58 @@ class Roda
       end
 
       module InstanceMethods
-        def render_with(data: {}) # rubocop:todo Metrics/AbcSize
+        def render_with(data: {}) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
           path = Kernel.caller_locations(1, 1).first.absolute_path
-          source_path = Pathname.new(path).relative_path_from(Bridgetown::Current.site.source)
-          code = @_route_file_code
+          source_path = Pathname.new(path).relative_path_from(
+            Bridgetown::Current.site.in_source_dir("_routes")
+          )
+          code = response._route_file_code
 
           unless code.present?
             raise Bridgetown::Errors::FatalException,
                   "`render_with' method must be called from a template-based file in `src/_routes'"
           end
 
-          data = Bridgetown::Model::BuilderOrigin.new("builder://#{source_path}").read do
+          data = Bridgetown::Model::BuilderOrigin.new(
+            Bridgetown::Model::BuilderOrigin.id_for_builder_path(
+              self, Addressable::URI.encode(source_path.to_s)
+            )
+          ).read do
             data[:_collection_] = Bridgetown::Current.site.collections.pages
+            data[:_relative_path_] = source_path
             data[:_content_] = code
             data
           end
 
           Bridgetown::Model::Base.new(data).to_resource.tap do |resource|
-            resource.roda_data[:request] = request
-            resource.roda_data[:response] = response
-            resource.roda_data[:flash] = nil
-            #            resource.roda_data[:flash] = flash
+            resource.roda_app = self
           end.read!.transform!.output
         end
 
-        ruby2_keywords def render(*args, &block)
-          view.render(*args, &block)
+        def render(...)
+          view.render(...)
         end
 
         def view(view_class: Bridgetown::ERBView)
           response._fake_resource_view(
-            view_class: view_class, request: request, bridgetown_site: bridgetown_site
+            view_class: view_class, roda_app: self, bridgetown_site: bridgetown_site
           )
         end
       end
 
       module ResponseMethods
-        def _fake_resource_view(view_class:, request:, bridgetown_site:)
+        # template string provided, if available, by the saved code block
+        def _route_file_code
+          @_route_file_code
+        end
+
+        def _fake_resource_view(view_class:, roda_app:, bridgetown_site:)
           @_fake_resource_views ||= {}
           @_fake_resource_views[view_class] ||= view_class.new(
             # TODO: use a Stuct for better performance...?
             HashWithDotAccess::Hash.new({
               data: {},
-              roda_data: {
-                request: request,
-                response: self,
-                flash: nil, # flash,
-              },
+              roda_app: roda_app,
               site: bridgetown_site,
             })
           )
@@ -77,30 +93,3 @@ class Roda
     register_plugin :bridgetown_routes, BridgetownRoutes
   end
 end
-
-module RodaResourceExtension
-  module RubyResource
-    def roda_data
-      @roda_data ||= HashWithDotAccess::Hash.new
-    end
-  end
-end
-Bridgetown::Resource.register_extension RodaResourceExtension
-
-Roda::RodaPlugins::Flash::FlashHash.class_eval do
-  def info
-    self["info"]
-  end
-
-  def info=(val)
-    self["info"] = val
-  end
-
-  def alert
-    self["alert"]
-  end
-
-  def alert=(val)
-    self["alert"] = val
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
+  version: 1.0.0.alpha7
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-05 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.0.0.alpha3
+        version: 1.0.0.alpha7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha3
+        version: 1.0.0.alpha7
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement
@@ -49,9 +49,9 @@ files:
 - bridgetown-routes.gemspec
 - lib/bridgetown-routes.rb
 - lib/bridgetown-routes/code_blocks.rb
-- lib/bridgetown-routes/helpers.rb
 - lib/bridgetown-routes/manifest.rb
 - lib/bridgetown-routes/roda_router.rb
+- lib/bridgetown-routes/view_helpers.rb
 - lib/roda/plugins/bridgetown_routes.rb
 homepage: https://github.com/bridgetownrb/bridgetown/tree/main/bridgetown-routes
 licenses:

data/lib/bridgetown-routes/helpers.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module Routes
-    module ViewHelpers
-      def request
-        view.resource&.roda_data&.request
-      end
-      alias_method :r, :request
-
-      def response
-        view.resource&.roda_data&.response
-      end
-
-      def flash
-        view.resource&.roda_data&.flash
-      end
-
-      # def csrf_tag(...)
-      #   request.scope.csrf_tag(...)
-      # end
-
-      # def csrf_token(...)
-      #   request.scope.csrf_token(...)
-      # end
-    end
-  end
-end
-
-Bridgetown::RubyTemplateView::Helpers.include Bridgetown::Routes::ViewHelpers