roda 3.46.0 → 3.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fd9ea4a9be8072ffc96e5bab91a845e99cc9a9d6641571167badd4146c93318
-  data.tar.gz: ed062be1d4b922ba39456f3868e599e3c6134fecfedaa3bfc780667bfec5c5f2
+  metadata.gz: 7cad702e3b962a1e1b64e631ef77ea1ccca4eb1c630f1ac2e73b5c169b505744
+  data.tar.gz: f6576f0bd8b1a921435121ce9043a04f04f5560eca7a2eb93f5f39500a62dc1b
 SHA512:
-  metadata.gz: 59e5677db771776107744f2438505b467363b410d6b2c8d19b1b11e802bfd15b22974997b20185e9ba3a1c9a7b8721bb5e3dbc1481a575f0812300c9c3241cac
-  data.tar.gz: 6233ec5251cfbeeaabdb44a7cba75d4831910215ae8239ec19873f58a62f14722bb6b57059f0814ae07e7ccc50977e3a2fbf74bb3b423a253b7dace5773c6887
+  metadata.gz: 7def8965cb5ce9b12c96d16f2edb4e4428b41367b91ebfb20132332b87b04fceba29fdb537ea91c25eda7cc72d07ba3d329d12c073746309b125275d8cc616ad
+  data.tar.gz: 7acab06b22c80a697e4e250b857544aa337fcdf9a1c2065adae61cac4d1d17171ea374300104855e192fc4700d39d5c8fb9ebe7e8ee2ebc5d00fd6776c7a9f64

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.47.0 (2021-08-13)
+
+* Automatically optimize remaining r.on calls with a single argument (jeremyevans)
+
 = 3.46.0 (2021-07-12)
 
 * Automatically optimize r.on/r.is/r.get/r.post methods with a single string, String, Integer, or regexp argument (jeremyevans)

data/doc/release_notes/3.47.0.txt

@@ -0,0 +1,13 @@
+= Improvements
+
+* The r.on optimization added in 3.46.0 has been extended to optimize
+  all single argument calls. This results in the following speedups
+  based on argument type:
+
+  * Hash matching: 10%
+  * Array/Symbol/Class matching: 15%
+  * Proc matching: 25%
+  * true matching: 45%
+  * false/nil matching: 65%
+
+* Other minor performance improvements have been made.

data/lib/roda.rb

@@ -213,7 +213,7 @@ class Roda
               plugin :direct_call
             end
 
-            if ([:on, :is, :_verb, :_match_class_String, :_match_class_Integer, :_match_string, :_match_regexp, :empty_path?]).all?{|m| self::RodaRequest.instance_method(m).owner == RequestMethods}
+            if ([:on, :is, :_verb, :_match_class_String, :_match_class_Integer, :_match_string, :_match_regexp, :empty_path?, :if_match, :match, :_match_class]).all?{|m| self::RodaRequest.instance_method(m).owner == RequestMethods}
               plugin :_optimized_matching
             end
           end

data/lib/roda/plugins/_optimized_matching.rb

@@ -52,20 +52,60 @@ class Roda
                   end
                 end
               elsif matcher == Integer
-                if matchdata = @remaining_path.match(/\A\/(\d+)(?=\/|\z)/)
+                if matchdata = /\A\/(\d+)(?=\/|\z)/.match(@remaining_path)
                   @remaining_path = matchdata.post_match
                   always{yield(matchdata[1].to_i)}
                 end
               else
-                if_match(args, &block)
+                path = @remaining_path
+                captures = @captures.clear
+                meth = :"_match_class_#{matcher}"
+                if respond_to?(meth, true)
+                  # Allow calling private methods, as match methods are generally private
+                  if send(meth, &block)
+                    block_result(yield(*captures))
+                    throw :halt, response.finish
+                  else
+                    @remaining_path = path
+                    false
+                  end
+                else
+                  unsupported_matcher(matcher)
+                end
               end
             when Regexp
-              if matchdata = @remaining_path.match(self.class.cached_matcher(matcher){matcher})
+              if matchdata = self.class.cached_matcher(matcher){matcher}.match(@remaining_path)
                 @remaining_path = matchdata.post_match
                 always{yield(*matchdata.captures)}
               end
+            when true
+              always(&block)
+            when false, nil
+              # nothing
             else
-              if_match(args, &block)
+              path = @remaining_path
+              captures = @captures.clear
+
+              matched = case matcher
+              when Array
+                _match_array(matcher)
+              when Hash
+                _match_hash(matcher)
+              when Symbol
+                _match_symbol(matcher)
+              when Proc
+                matcher.call
+              else
+                unsupported_matcher(matcher)
+              end
+
+              if matched
+                block_result(yield(*captures))
+                throw :halt, response.finish
+              else
+                @remaining_path = path
+                false
+              end
             end
           when 0
             always(&block)
@@ -111,7 +151,7 @@ class Roda
                 always{yield rp[1, len]}
               end
             elsif matcher == Integer
-              if matchdata = @remaining_path.match(/\A\/(\d+)\z/)
+              if matchdata = /\A\/(\d+)\z/.match(@remaining_path)
                 @remaining_path = ''
                 always{yield(matchdata[1].to_i)}
               end
@@ -119,7 +159,7 @@ class Roda
               if_match(args << TERM, &block)
             end
           when Regexp
-            if (matchdata = @remaining_path.match(self.class.cached_matcher(matcher){matcher})) && (post_match = matchdata.post_match).empty?
+            if (matchdata = self.class.cached_matcher(matcher){matcher}.match(@remaining_path)) && matchdata.post_match.empty?
               @remaining_path = ''
               always{yield(*matchdata.captures)}
             end

data/lib/roda/plugins/mail_processor.rb

@@ -566,7 +566,7 @@ class Roda
             end
             false
           when Regexp
-            if md = content.match(val)
+            if md = val.match(content)
               @captures.concat(md.captures)
             end
           else

data/lib/roda/plugins/type_routing.rb

@@ -184,7 +184,7 @@ class Roda
           path = super
 
           if opts[:use_extension]
-            if m = path.match(opts[:extension_regexp])
+            if m = opts[:extension_regexp].match(path)
               @type_routing_extension =  @requested_type = m[2].to_sym
               path = m[1]
             end

data/lib/roda/request.rb

@@ -517,7 +517,7 @@ class Roda
         # SCRIPT_NAME to include the matched path, removes the matched
         # path from PATH_INFO, and updates captures with any regex captures.
         def consume(pattern)
-          if matchdata = @remaining_path.match(pattern)
+          if matchdata = pattern.match(@remaining_path)
             @remaining_path = matchdata.post_match
             captures = matchdata.captures
             captures = yield(*captures) if block_given?

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.46.0
+  version: 3.47.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -217,6 +217,7 @@ extra_rdoc_files:
 - doc/release_notes/3.44.0.txt
 - doc/release_notes/3.45.0.txt
 - doc/release_notes/3.46.0.txt
+- doc/release_notes/3.47.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
@@ -270,6 +271,7 @@ files:
 - doc/release_notes/3.44.0.txt
 - doc/release_notes/3.45.0.txt
 - doc/release_notes/3.46.0.txt
+- doc/release_notes/3.47.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt