bridgetown-routes 2.0.0.beta3 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182f550df75c1d2f198a658350022f3023c414064b438a63788f96d1ccc1f9c9
-  data.tar.gz: 929495d80bd84106a7fdd5e03f26fe5e282724543c8bc4bc3b9d7caf37305ea7
+  metadata.gz: ead7362de53f74f9fc0d9cb78a809f52e88472d06255ad1aae6c199dd706f180
+  data.tar.gz: f0bd1482dc914fb895d46feab6c62181ff5e7cd7cb48b67510538a2a7fcf7d05
 SHA512:
-  metadata.gz: 815ebca3c626e89b7fda9dc4acef77ec76f571abbaaa6c469c795046166206f876b81b30551144d05731516402619f0646810179980e848ee7e7fc3e074ac9ac
-  data.tar.gz: 7177468892e7d078a8e180e6ca757b1673b0855fc44ec93e6bac03ebf10f1f06b48d93f819414d737d21e972db83c1414e65fb0ab9285f4ddbe7ea9ef61a067c
+  metadata.gz: abac48a5f49b5d0ffd6ab6a9bdedd5ca5030f0bcb389d22a759db7f001ed6086d760660c3aecb663577bae87186816c90b49d6bca769dd8de426056a4e638820
+  data.tar.gz: 52fac80a368798162d5c3c189cf8c3932a73bca858e44ad5d04e1c8ba52c740b87875ffc19e0d970c400ce471e767d5bfb95f035abfd2b5d609ccd548818a7b7

data/lib/bridgetown-routes/view_helpers.rb

@@ -1,14 +1,26 @@
 # frozen_string_literal: true
 
-require_relative "flash_additions"
-
 module Bridgetown
   module Routes
     module ViewHelpers
       # This flash is only used as a stub for views in case there's no Roda flash
       # available in the rendering context
       class Flash < Hash
-        include Bridgetown::Routes::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
 
         def now
           self

data/lib/roda/plugins/bridgetown_routes.rb

@@ -1,27 +1,11 @@
 # frozen_string_literal: true
 
-require "roda/plugins/flash"
-require_relative "../../bridgetown-routes/flash_additions"
-
-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
       def self.load_dependencies(app)
         app.plugin :slash_path_empty # now /hello and /hello/ are both matched
         app.plugin :placeholder_string_matchers
-        app.plugin :flash
-        app.plugin :route_csrf
       end
 
       def self.configure(app, _opts = {})
@@ -130,10 +114,14 @@ class Roda
       module RequestMethods
         # This runs through all of the routes in the manifest, setting up Roda blocks for execution
         def file_routes
+          base_path = Bridgetown::Current.preloaded_configuration.base_path.delete_prefix("/")
+
           scope.routes_manifest.routes.each do |route|
             file, localized_file_slugs, segment_keys = route
 
             localized_file_slugs.each do |slug|
+              on("") { scope.run_file_route(file, slug:) } if slug == "index" && !base_path.empty?
+
               # This sets up an initial Roda route block at the slug, and handles segments as params
               #
               # _routes/nested/[slug].erb -> "nested/:slug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta3
+        version: 2.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta3
+        version: 2.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,6 @@ files:
 - bridgetown-routes.gemspec
 - lib/bridgetown-routes.rb
 - lib/bridgetown-routes/code_blocks.rb
-- lib/bridgetown-routes/flash_additions.rb
 - lib/bridgetown-routes/manifest.rb
 - lib/bridgetown-routes/manifest_router.rb
 - lib/bridgetown-routes/view_helpers.rb

data/lib/bridgetown-routes/flash_additions.rb

@@ -1,39 +0,0 @@
-# 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