roda 3.108.0 → 3.109.0

data/lib/roda/plugins/sinatra_helpers.rb

@@ -256,6 +256,11 @@ class Roda
         end
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :absolute_redirects, name: :absolute_redirects?)
+        RodaPlugins.opt_attr_reader(self, :prefixed_redirects, name: :prefixed_redirects?)
+      end
+
       module RequestMethods
         # Alias for referrer
         def back
@@ -285,9 +290,8 @@ class Roda
         # If the absolute_redirects or :prefixed_redirects roda class options has been set, respect those
         # and update the path.
         def redirect(path=(no_add_script_name = true; default_redirect_path), status=default_redirect_status)
-          opts = roda_class.opts
-          absolute_redirects = opts[:absolute_redirects]
-          prefixed_redirects = no_add_script_name ? false : opts[:prefixed_redirects]
+          absolute_redirects = roda_class.absolute_redirects?
+          prefixed_redirects = no_add_script_name ? false : roda_class.prefixed_redirects?
           path = uri(path, absolute_redirects, prefixed_redirects) if absolute_redirects || prefixed_redirects
           super(path, status)
         end

data/lib/roda/plugins/status_handler.rb

@@ -37,6 +37,8 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :status_handler, name: :status_handlers)
+
         # Install the given block as a status handler for the given HTTP response code.
         def status_handler(code, opts=OPTS, &block)
           # For backwards compatibility, pass request argument if block accepts argument
@@ -54,7 +56,7 @@ class Roda
           end
 
           meth = define_roda_method(:"_roda_status_handler__#{code}", arity, &block)
-          self.opts[:status_handler][code] = define_roda_method(:"_roda_status_handler_#{code}", 1) do |result|
+          status_handlers[code] = define_roda_method(:"_roda_status_handler_#{code}", 1) do |result|
             res = @_response
             res.status = result[0]
             handle_headers.call(res.headers)
@@ -64,7 +66,7 @@ class Roda
 
         # Freeze the hash of status handlers so that there can be no thread safety issues at runtime.
         def freeze
-          opts[:status_handler].freeze
+          status_handlers.freeze
           super
         end
       end
@@ -74,7 +76,7 @@ class Roda
 
         # If routing returns a response we have a handler for, call that handler.
         def _roda_after_20__status_handler(result)
-          if result && (meth = opts[:status_handler][result[0]]) && (v = result[2]).is_a?(Array) && v.empty?
+          if result && (meth = self.class.status_handlers[result[0]]) && (v = result[2]).is_a?(Array) && v.empty?
             send(meth, result)
           end
         end

data/lib/roda/plugins/strip_path_prefix.rb

@@ -21,9 +21,11 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :strip_path_prefix, name: :strip_path_prefix_regexp)
+
         # Strip the path prefix from the gien path if it starts with the prefix.
-        def expand_path(path, root=opts[:root])
-          super.sub(opts[:strip_path_prefix], '')
+        def expand_path(path, root=app_root)
+          super.sub(strip_path_prefix_regexp, '')
         end
       end
     end

data/lib/roda/plugins/symbol_matchers.rb

@@ -121,6 +121,8 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :symbol_matchers)
+
         # Set the matcher and block to use for the given class.
         # The matcher can be a regexp, registered symbol matcher, or registered class
         # matcher (if using the class_matchers plugin).
@@ -141,7 +143,7 @@ class Roda
 
         # Freeze the class_matchers hash when freezing the app.
         def freeze
-          opts[:symbol_matchers].freeze
+          symbol_matchers.freeze
           super
         end
       end

data/lib/roda/plugins/symbol_views.rb

@@ -28,7 +28,7 @@ class Roda
       end
 
       def self.configure(app)
-        app.opts[:custom_block_results][Symbol] = :view
+        app.custom_block_results[Symbol] = :view
       end
     end
 

data/lib/roda/plugins/timestamp_public.rb

@@ -46,7 +46,11 @@ class Roda
       #
       # The options given are also passed to the public plugin.
       def self.configure(app, opts=OPTS)
-        app.opts[:timestamp_public_prefix] = (opts[:prefix] || app.opts[:timestamp_public_prefix] || "static").dup.freeze
+        app.opts[:timestamp_public_prefix] = (opts[:prefix] || app.timestamp_public_prefix || "static").dup.freeze
+      end
+
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :timestamp_public_prefix)
       end
 
       module InstanceMethods
@@ -54,8 +58,8 @@ class Roda
         # This does not check the file is inside the directory for performance reasons,
         # so this should not be called with untrusted input.
         def timestamp_path(file)
-          mtime = File.mtime(File.join(opts[:public_root], file))
-          "/#{opts[:timestamp_public_prefix]}/#{sprintf("%i%06i", mtime.to_i, mtime.usec)}/#{file}"
+          mtime = File.mtime(File.join(self.class.public_root, file))
+          "/#{self.class.timestamp_public_prefix}/#{sprintf("%i%06i", mtime.to_i, mtime.usec)}/#{file}"
         end
       end
 
@@ -65,7 +69,7 @@ class Roda
         # a integer segment for the timestamp, and this is a GET request.
         def timestamp_public
           if is_get?
-            on roda_class.opts[:timestamp_public_prefix], Integer do |_|
+            on roda_class.timestamp_public_prefix, Integer do |_|
               public
             end
           end

data/lib/roda/plugins/type_routing.rb

@@ -110,7 +110,7 @@ class Roda
       }.freeze
 
       def self.configure(app, opts = {})
-        config = (app.opts[:type_routing] || CONFIGURATION).dup
+        config = (app.type_routing_opts || CONFIGURATION).dup
         [:use_extension, :use_header, :default_type].each do |key|
           config[key] = opts[key] if opts.has_key?(key)
         end
@@ -149,12 +149,16 @@ class Roda
         app.opts[:type_routing] = config.freeze
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :type_routing, name: :type_routing_opts)
+      end
+
       module RequestMethods
         # Yields if the given +type+ matches the requested data type and halts
         # the request afterwards, returning the result of the block.
         def on_type(type, &block)
           return unless type == requested_type
-          response[RodaResponseHeaders::CONTENT_TYPE] ||= @scope.opts[:type_routing][:types][type]
+          response[RodaResponseHeaders::CONTENT_TYPE] ||= roda_class.type_routing_opts[:types][type]
           always(&block)
         end
 
@@ -162,7 +166,7 @@ class Roda
         def requested_type
           return @requested_type if @requested_type
 
-          opts = @scope.opts[:type_routing]
+          opts = roda_class.type_routing_opts
           @requested_type = accept_response_type if opts[:use_header]
           @requested_type ||= opts[:default_type]
         end
@@ -182,7 +186,7 @@ class Roda
         # Removes a trailing file extension from the path, and sets
         # the requested type if so.
         def _remaining_path(env)
-          opts = scope.opts[:type_routing]
+          opts = roda_class.type_routing_opts
           path = super
 
           if opts[:use_extension]
@@ -197,7 +201,7 @@ class Roda
 
         # The response type indicated by the Accept request header.
         def accept_response_type
-          mimes = @scope.opts[:type_routing][:mimes]
+          mimes = roda_class.type_routing_opts[:mimes]
           response[RodaResponseHeaders::VARY] = (vary = response[RodaResponseHeaders::VARY]) ? "#{vary}, Accept" : 'Accept'
 
           @env['HTTP_ACCEPT'].to_s.split(/\s*,\s*/).map do |part|

data/lib/roda/plugins/typecast_params.rb

@@ -1122,7 +1122,7 @@ class Roda
       # before processing them.
       def self.configure(app, opts=OPTS, &block)
         app.const_set(:TypecastParams, Class.new(RodaPlugins::TypecastParams::Params)) unless app.const_defined?(:TypecastParams)
-        app::TypecastParams.class_eval(&block) if block
+        app::TypecastParams.class_eval(&block) if block # RODA4: use class_exec
         if opts[:strip] == :all
           app::TypecastParams.send(:include, StringStripper)
         end
@@ -1133,7 +1133,7 @@ class Roda
           app::TypecastParams.send(:include, SkipBytesizeChecking)
         end
         if opts[:date_parse_input_handler]
-          app::TypecastParams.class_eval do
+          app::TypecastParams.class_exec do
             include DateParseInputHandler
             define_method(:handle_date_parse_input, &opts[:date_parse_input_handler])
             private :handle_date_parse_input

data/lib/roda/plugins/typecast_params_sized_integers.rb

@@ -90,7 +90,7 @@ class Roda
         end
 
         if default = opts[:default_size]
-          app::TypecastParams.class_eval do
+          app::TypecastParams.class_exec do
             meths = ['', 'convert_', '_convert_array_', '_max_input_bytesize_for_', '_invalid_value_message_for_']
             %w[int uint pos_int pos_uint Integer Integeru].each do |type|
               meths.each do |prefix|

data/lib/roda/plugins/url_escape.rb

@@ -16,20 +16,8 @@ class Roda
     #   end
     module UrlEscape
       module InstanceMethods
-        if RUBY_VERSION >= '2'
-          define_method(:url_escape, Rack::Utils.instance_method(:escape))
-          define_method(:url_unescape, Rack::Utils.instance_method(:unescape))
-        # simplecov:disable
-        else
-          def url_escape(v)
-            Rack::Utils.escape(v)
-          end
-
-          def url_unescape(v)
-            Rack::Utils.unescape(v)
-          end
-        end
-        # simplecov:enable
+        define_method(:url_escape, Rack::Utils.instance_method(:escape))
+        define_method(:url_unescape, Rack::Utils.instance_method(:unescape))
       end
     end
 

data/lib/roda/plugins.rb

@@ -32,6 +32,16 @@ class Roda
       plugin
     end
 
+    # Define an attr_reader method for name that uses the instance variable
+    # <tt>@opt_*</tt>. Designed to be used with instance variables set via RodaOpts#[]=.
+    def self.opt_attr_reader(mod, key, name: key)
+      opt_name = :"opt_#{key}"
+      mod.send(:attr_reader, opt_name)
+      mod.send(:alias_method, name, opt_name)
+      mod.send(:remove_method, opt_name)
+      nil
+    end
+
     # Register the given plugin with Roda, so that it can be loaded using #plugin
     # with a symbol.  Should be used by plugin files. Example:
     #

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 = 108
+  RodaMinorVersion = 109
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/lib/roda.rb

@@ -5,6 +5,7 @@ require_relative "roda/request"
 require_relative "roda/response"
 require_relative "roda/plugins"
 require_relative "roda/cache"
+require_relative "roda/opts"
 require_relative "roda/version"
 
 # The main class for Roda.  Roda is built completely out of plugins, with the
@@ -18,7 +19,8 @@ class Roda
   @inherit_middleware = true
   @middleware = []
   @plugins = []
-  @opts = {}
+  @opts = RodaOpts.new
+  @opts.roda_class = self
   @raw_route_block = nil
   @route_block = nil
   @rack_app_route_block = nil
@@ -30,6 +32,8 @@ class Roda
     module Base
       # Class methods for the Roda class.
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :root, name: :app_root)
+
         # The rack application that this class uses.
         def app
           @app || build_rack_app
@@ -140,7 +144,7 @@ class Roda
                   # Fallback to instance_exec in this case.
                   b = block
                   block = if RUBY_VERSION >= '2.7'
-                    eval('lambda{|*a, **kw| instance_exec(*a, **kw, &b)}', nil, __FILE__, __LINE__) # Keyword arguments fallback
+                    lambda{|*a, **kw| instance_exec(*a, **kw, &b)} # Keyword arguments fallback
                   else
                     # simplecov:disable
                     lambda{|*a| instance_exec(*a, &b)} # Keyword arguments fallback
@@ -189,7 +193,7 @@ class Roda
         end
 
         # Expand the given path, using the root argument as the base directory.
-        def expand_path(path, root=opts[:root])
+        def expand_path(path, root=app_root)
           ::File.expand_path(path, root)
         end
 
@@ -207,9 +211,9 @@ class Roda
             # If the _roda_run_main_route instance method has not been overridden,
             # make it an alias to _roda_main_route for performance
             if instance_method(:_roda_run_main_route).owner == InstanceMethods
-              class_eval("alias _roda_run_main_route _roda_main_route")
+              alias_method :_roda_run_main_route, :_roda_main_route
             end
-            self::RodaResponse.class_eval do
+            self::RodaResponse.class_exec do
               if instance_method(:set_default_headers).owner == ResponseMethods &&
                  instance_method(:default_headers).owner == ResponseMethods
 
@@ -253,21 +257,28 @@ class Roda
         def inherited(subclass)
           raise RodaError, "Cannot subclass a frozen Roda class" if frozen?
 
-          # Mark current class as having been subclassed, as some optimizations
-          # depend on the class not being subclassed
-          opts[:subclassed] = true
-
           super
           subclass.instance_variable_set(:@inherit_middleware, @inherit_middleware)
           subclass.instance_variable_set(:@middleware, @inherit_middleware ? @middleware.dup : [])
           subclass.instance_variable_set(:@plugins, @plugins.dup)
-          subclass.instance_variable_set(:@opts, opts.dup)
-          subclass.opts.delete(:subclassed)
-          subclass.opts.to_a.each do |k,v|
-            if (v.is_a?(Array) || v.is_a?(Hash)) && !v.frozen?
-              subclass.opts[k] = v.dup
+
+          opts = RodaOpts.new
+          opts.roda_class = subclass
+          @opts.each do |k,v|
+            opts[k] = if k == :subclassed
+              false
+            elsif (v.is_a?(Array) || v.is_a?(Hash)) && !v.frozen?
+              v.dup
+            else
+              v
             end
           end
+          subclass.instance_variable_set(:@opts, opts)
+
+          # Mark current class as having been subclassed, as some optimizations
+          # depend on the class not being subclassed
+          @opts[:subclassed] = true
+
           if block = @raw_route_block
             subclass.route(&block)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.108.0
+  version: 3.109.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -159,11 +159,14 @@ files:
 - MIT-LICENSE
 - lib/roda.rb
 - lib/roda/cache.rb
+- lib/roda/opts.rb
 - lib/roda/plugins.rb
 - lib/roda/plugins/Integer_matcher_max.rb
+- lib/roda/plugins/_add_script_name.rb
 - lib/roda/plugins/_after_hook.rb
 - lib/roda/plugins/_base64.rb
 - lib/roda/plugins/_before_hook.rb
+- lib/roda/plugins/_json.rb
 - lib/roda/plugins/_optimized_matching.rb
 - lib/roda/plugins/_symbol_class_matchers.rb
 - lib/roda/plugins/_symbol_regexp_matchers.rb
@@ -334,14 +337,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Routing tree web toolkit
 test_files: []