roda 3.93.0 → 3.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e04d3df576ad873687f27895cf5100f34a6142ee2204d4e74372d8da03ffe0
-  data.tar.gz: 6b4f577746d682fc763c765d6d9f787a251db3c392072d1fa123fe5bddab7e20
+  metadata.gz: f24c09b316cf269199b54b3de06e3d5f27529c46b8ab34f015a8bb1ce42799f0
+  data.tar.gz: e59f9b4e7e880f6313c5af6f33c59d9b87cd2a2b37cb247ea551a1a3556acaad
 SHA512:
-  metadata.gz: 845525a607910671a61b61645ecfa7243ab8565963169aff78e7908cd5a982c8cbd5f8420e9e53e6689488be5fa57bfba9fc7da714d5e892f79f205c0a895ccf
-  data.tar.gz: 37fe2d01f609363e382b0fffe45b2dc13c5c04d0467890db334417a44d42b8a906a3d95f0ec68e465b17b0c8c54667cd7ef93fe866e0ef48d0afdbf5916c5aaa
+  metadata.gz: 6a27c05cabeb588bbccd1e4d0341106575c1f702d970906ee800bc8747cbbad41d53d456cfe53c2725d86d9d6181c17cde734565a0a127bf71918c6a5b4d6e0b
+  data.tar.gz: fede1fe07b011d998c2962bc77c5c27cd28b3235d144f440dfb518f8c00184138fe6fcf355160ae98eb79ddce81e29f72c900543d128cc85d13c7f394501cd82

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/response_content_type.rb

@@ -0,0 +1,79 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The response_content_type extension adds response.content_type
+    # and response.content_type= methods for getting and setting the
+    # response content-type.
+    #
+    # When setting the content-type, you can pass either a string, which
+    # is used directly:
+    #
+    #   response.content_type = "text/html"
+    # 
+    # Or, if you have registered mime types when loading the plugin:
+    #
+    #   plugin :response_content_type, mime_types: {
+    #     plain: "text/plain",
+    #     html: "text/html",
+    #     pdf: "application/pdf"
+    #   }
+    #
+    # You can use a symbol:
+    #
+    #   response.content_type = :html
+    #
+    # If you would like to load all mime types supported by rack/mime,
+    # you can use the <tt>mime_types: :from_rack_mime</tt> option:
+    #
+    #   plugin :response_content_type, mime_types: :from_rack_mime
+    #
+    # Note that you are unlikely to be using all of these mime types,
+    # so doing this will likely result in unnecessary memory usage. It
+    # is recommended to use a hash with only the mime types your
+    # application actually uses.
+    #
+    # To prevent silent failures, if you attempt to set the response
+    # type with a symbol, and the symbol is not recognized, a KeyError
+    # is raised.
+    module ResponseContentType
+      def self.configure(app, opts=OPTS)
+        if mime_types = opts[:mime_types]
+          mime_types = if mime_types == :from_rack_mime
+            require "rack/mime"
+            h = {}
+            Rack::Mime::MIME_TYPES.each do |k, v|
+              h[k.slice(1,100).to_sym] = v
+            end
+            h
+          else
+            mime_types.dup
+          end
+          app.opts[:repsonse_content_types] = mime_types.freeze
+        else
+          app.opts[:repsonse_content_types] ||= {}
+        end
+      end
+
+      module ResponseMethods
+        # Return the content-type of the response. Will be nil if it has
+        # not yet been explicitly set.
+        def content_type
+          @headers[RodaResponseHeaders::CONTENT_TYPE]
+        end
+
+        # Set the content-type of the response. If given a string,
+        # it is used directly. If given a symbol, looks up the mime
+        # type with the given file extension. If the symbol is not
+        # a recognized mime type, raises KeyError.
+        def content_type=(mime_type)
+          mime_type = roda_class.opts[:repsonse_content_types].fetch(mime_type) if mime_type.is_a?(Symbol)
+          @headers[RodaResponseHeaders::CONTENT_TYPE] = mime_type
+        end
+      end
+    end
+
+    register_plugin(:response_content_type, ResponseContentType)
+  end
+end

data/lib/roda/plugins/sessions.rb

@@ -273,7 +273,29 @@ class Roda
             cookie = Hash[opts[:cookie_options]]
             cookie[:value] = cookie_value
             cookie[:secure] = true if !cookie.has_key?(:secure) && ssl?
+
+            before_size = if (set_cookie_before = headers[RodaResponseHeaders::SET_COOKIE]).is_a?(String)
+              set_cookie_before.bytesize
+            else
+              0
+            end
+
             Rack::Utils.set_cookie_header!(headers, opts[:key], cookie)
+
+            cookie_size = case set_cookie_after = headers[RodaResponseHeaders::SET_COOKIE]
+            when String
+              # Rack < 3 always takes this branch, combines cookies into string, subtract previous size
+              # Rack 3+ takes this branch if this is the first cookie set, in which case before size is 0
+              set_cookie_after.bytesize - before_size
+            else # when Array
+              # Rack 3+ takes branch if this is not the first cookie set, and last element of the array
+              # is most recently added cookie
+              set_cookie_after.last.bytesize
+            end
+
+            if cookie_size >= 4096
+              raise CookieTooLarge, "attempted to create cookie larger than 4096 bytes (bytes: #{cookie_size})"
+            end
           end
           
           if env[SESSION_DELETE_RACK_COOKIE]
@@ -500,7 +522,7 @@ class Roda
           data = Base64_.urlsafe_encode64(data)
 
           if data.bytesize >= 4096
-            raise CookieTooLarge, "attempted to create cookie larger than 4096 bytes"
+            raise CookieTooLarge, "attempted to create cookie larger than 4096 bytes (bytes: #{data.bytesize})"
           end
 
           data

data/lib/roda/plugins/typecast_params.rb

@@ -1155,11 +1155,26 @@ class Roda
       end
 
       module InstanceMethods
-        # Return and cache the instance of the Params class for the current request.
+        # Return and cache the instance of the TypecastParams class wrapping access
+        # to the request's params (merging query string params and body params).
         # Type conversion methods will be called on the result of this method.
         def typecast_params
           @_typecast_params ||= self.class::TypecastParams.new(@_request.params)
         end
+
+        # Return and cache the instance of the TypecastParams class wrapping
+        # access to parameters in the request's query string.
+        # Type conversion methods will be called on the result of this method.
+        def typecast_query_params
+          @_typecast_query_params ||= self.class::TypecastParams.new(@_request.GET)
+        end
+
+        # Return and cache the instance of the TypecastParams class wrapping
+        # access to parameters in the request's body.
+        # Type conversion methods will be called on the result of this method.
+        def typecast_body_params
+          @_typecast_body_params ||= self.class::TypecastParams.new(@_request.POST)
+        end
       end
     end
 

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 = 95
 
   # 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.95.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -275,6 +275,7 @@ files:
 - lib/roda/plugins/render_locals.rb
 - lib/roda/plugins/request_aref.rb
 - lib/roda/plugins/request_headers.rb
+- lib/roda/plugins/response_content_type.rb
 - lib/roda/plugins/response_request.rb
 - lib/roda/plugins/route_block_args.rb
 - lib/roda/plugins/route_csrf.rb
@@ -300,6 +301,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
@@ -327,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Routing tree web toolkit
 test_files: []