roda 3.93.0 → 3.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e04d3df576ad873687f27895cf5100f34a6142ee2204d4e74372d8da03ffe0
-  data.tar.gz: 6b4f577746d682fc763c765d6d9f787a251db3c392072d1fa123fe5bddab7e20
+  metadata.gz: 692e6feff78ea9a3c6562026fb6d5ea0e4b1f26cf76d9c283e3482296b4253f0
+  data.tar.gz: 330f62ed0603dea2ef640a424c0d1286a312b90b65ca4087cdd6772f1206c151
 SHA512:
-  metadata.gz: 845525a607910671a61b61645ecfa7243ab8565963169aff78e7908cd5a982c8cbd5f8420e9e53e6689488be5fa57bfba9fc7da714d5e892f79f205c0a895ccf
-  data.tar.gz: 37fe2d01f609363e382b0fffe45b2dc13c5c04d0467890db334417a44d42b8a906a3d95f0ec68e465b17b0c8c54667cd7ef93fe866e0ef48d0afdbf5916c5aaa
+  metadata.gz: b87645bffa98a056fed1fc31b032a58be23a99ef202d4f91bb9f9d10f1d62e73ebe4ae4a5008fbe978d7abdb1768b22010cf61ab1d37b677718db9477d891842
+  data.tar.gz: f2572f750dfcf59d1d563983c32d53246f5260d94124336332a8ae6c696f1ff4b18b269043e41105e10462ed4c5d4d1e66039291c60a80303b4a0a94fe602c0d

data/lib/roda/plugins/render_each.rb

@@ -70,6 +70,35 @@ class Roda
 
       ALLOWED_KEYS = [:locals, :local].freeze
 
+      if Render::COMPILED_METHOD_SUPPORT
+        module ClassMethods
+          # If using compiled methods and assuming fixed locals, optimize
+          # _cached_render_each_template_method.
+          def freeze
+            if render_opts[:assume_fixed_locals] && !render_opts[:check_template_mtime]
+              include AssumeFixedLocalsInstanceMethods
+            end
+
+            super
+          end
+        end
+
+        module AssumeFixedLocalsInstanceMethods
+          private
+
+          # Optimize method since this module is only loaded when using fixed locals
+          # and when caching templates.
+          def _cached_render_each_template_method(template)
+            case template
+            when String, Symbol
+              _cached_template_method_lookup(render_opts[:template_method_cache], template)
+            else
+              false
+            end
+          end
+        end
+      end
+
       module InstanceMethods
         # For each value in enum, render the given template using the
         # given opts.  The template and options hash are passed to +render+.
@@ -123,10 +152,31 @@ class Roda
         
         private
 
-        # The default local variable name to use for the template, if the :local option
-        # is not used when calling render_each.
-        def render_each_default_local(template)
-          File.basename(template.to_s).sub(/\..+\z/, '').to_sym
+        if File.basename("a/b") == "b" && File.basename("a\\b") == "a\\b" && RUBY_VERSION >= '3'
+          # The default local variable name to use for the template, if the :local option
+          # is not used when calling render_each.
+          def render_each_default_local(template)
+            # Optimize to avoid allocations when possible
+            template = case template
+            when Symbol
+              s = template.name
+              return template unless s.include?("/") || s.include?(".")
+              s
+            when String
+              return template.to_sym unless template.include?("/") || template.include?(".")
+              template
+            else
+              template.to_s
+            end
+
+            File.basename(template).sub(/\..+\z/, '').to_sym
+          end
+        # :nocov:
+        else
+          def render_each_default_local(template)
+            File.basename(template.to_s).sub(/\..+\z/, '').to_sym
+          end
+        # :nocov:
         end
 
         if Render::COMPILED_METHOD_SUPPORT

data/lib/roda/plugins/view_options.rb

@@ -182,12 +182,17 @@ class Roda
         # contain a slash.
         def template_name(opts)
           name = super
-          if (v = @_view_subdir) && !name.include?('/')
+          if (v = @_view_subdir) && use_view_subdir_for_template_name?(name)
             "#{v}/#{name}"
           else
             name
           end
         end
+
+        # Whether to use a view subdir for the template name.
+        def use_view_subdir_for_template_name?(name)
+          !name.include?('/')
+        end
       end
     end
 

data/lib/roda/plugins/view_subdir_leading_slash.rb

@@ -0,0 +1,49 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The view_subdir_leading_slash plugin builds on the view_options
+    # plugin, and changes the behavior so that if a view subdir is set,
+    # it is used for all templates, unless the template starts with a
+    # leading slash:
+    #
+    #   plugin :view_subdir_leading_slash
+    #
+    #   route do |r|
+    #     r.on "users" do
+    #       set_view_subdir 'users'
+    #       
+    #       r.get 'list' do
+    #         view 'lists/users' # uses ./views/users/lists/users.erb
+    #       end
+    #
+    #       r.get 'list' do
+    #         view '/lists/users' # uses ./views//lists/users.erb
+    #       end
+    #     end
+    #   end
+    #
+    # The default for the view_options plugin is to not use a
+    # view subdir if the template name contains a slash at all.
+    module ViewSubdirLeadingSlash
+      # Load the view_options plugin before this plugin, since this plugin
+      # works by overriding a method in the view_options plugin.
+      def self.load_dependencies(app)
+        app.plugin :view_options
+      end
+
+      module InstanceMethods
+        private
+
+        # Use a view subdir unless the template starts with a slash.
+        def use_view_subdir_for_template_name?(name)
+          !name.start_with?('/')
+        end
+      end
+    end
+
+    register_plugin(:view_subdir_leading_slash, ViewSubdirLeadingSlash)
+  end
+end
+

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 93
+  RodaMinorVersion = 94
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.93.0
+  version: 3.94.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -300,6 +300,7 @@ files:
 - lib/roda/plugins/typecast_params_sized_integers.rb
 - lib/roda/plugins/unescape_path.rb
 - lib/roda/plugins/view_options.rb
+- lib/roda/plugins/view_subdir_leading_slash.rb
 - lib/roda/request.rb
 - lib/roda/response.rb
 - lib/roda/session_middleware.rb