roda-cj 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b2172bd61961f3176d6c3b058c2f01b67366c3
-  data.tar.gz: 0892c32cefa17382cea92d15ac5520f5a0342939
+  metadata.gz: 2f2740123aa0c6fafe4c1665f9c83e408cef9105
+  data.tar.gz: 74ec8c03a23405c2ac18eb23ceea5ccb3f4813c1
 SHA512:
-  metadata.gz: ac35c86664a528718846cfde26d78cdd33c41238b53b06cf73775fd7e86afd257a1ca36b7b6c57efa0460f53f95e0d2da49d5a0a7e5b457a5e696b6c15313ca5
-  data.tar.gz: 1546b8958db7fb24ec76483259686d90b65908a29a321795a7717c16dccc371f172bd9c8ac9b5dc8ad88fb97758fedc0d14e95d99bc451d2679b2b3b553b95af
+  metadata.gz: 876514335f729d2beeea7b218bc14d7cac1772f5b568a4a985457b01321c16ef33116bb3dd605e218d3512185d34dffaca426b9e803d0e860c56619eb2838359
+  data.tar.gz: d046733fe6737ccabc612523c7812b1be778cea3675223a1a5bc3c202a91fad2da26e2fac842789542368fcb95e0b8d201cff9235de3410c3e1e5e414314f1f0

data/CHANGELOG

@@ -1,5 +1,7 @@
 = HEAD
 
+* Optimize matching by caching consume regexp for strings, regexp, symbol, and :extension matchers (jeremyevans)
+
 * Add r.root for matching root (path "/"), for easier to read version of r.is "" (jeremyevans)
 
 * Optimize r.is terminal matcher, remove :term hash matcher (jeremyevans)

data/lib/roda/plugins/halt.rb

@@ -22,19 +22,19 @@ class Roda
     # Or set the response body and return:
     #
     #   route do |r|
-    #     r.halt("body')
+    #     r.halt('body')
     #   end
     #
     # Or set both:
     #
     #   route do |r|
-    #     r.halt(403, "body')
+    #     r.halt(403, 'body')
     #   end
     #
     # Or set response status, headers, and body:
     #
     #   route do |r|
-    #     r.halt(403, {'Content-Type'=>'text/csv'}, "body')
+    #     r.halt(403, {'Content-Type'=>'text/csv'}, 'body')
     #   end
     #
     # Note that there is a difference between provide status, headers, and body as separate

data/lib/roda/version.rb

@@ -1,3 +1,3 @@
 class Roda
-  RodaVersion = '0.9.1'.freeze
+  RodaVersion = '0.9.2'.freeze
 end

data/lib/roda.rb

@@ -14,6 +14,43 @@ class Roda
   # only contains the class methods.
   class RodaRequest < ::Rack::Request;
     @roda_class = ::Roda
+    @match_pattern_cache = {}
+
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby'
+      # :nocov:
+      @match_pattern_mutex = Mutex.new
+
+      def self.cached_matcher(obj)
+        unless pattern = @match_pattern_mutex.synchronize{@match_pattern_cache[obj]}
+          pattern = consume_pattern(yield)
+          @match_pattern_mutex.synchronize{@match_pattern_cache[obj] = pattern}
+        end
+        pattern
+      end
+
+      def self.inherited(subclass)
+        super
+        subclass.instance_variable_set(:@match_pattern_cache, {})
+        subclass.instance_variable_set(:@match_pattern_mutex, Mutex.new)
+      end
+      # :nocov:
+    else
+      # Return the cached pattern for the given object.  If the object is
+      # not already cached, yield to get the basic pattern, and convert the
+      # basic pattern to a pattern that does not partial segments.
+      def self.cached_matcher(obj)
+        unless pattern = @match_pattern_cache[obj]
+          pattern = @match_pattern_cache[obj] = consume_pattern(yield)
+        end
+        pattern
+      end
+
+      # Initialize the match_pattern cache in the subclass.
+      def self.inherited(subclass)
+        super
+        subclass.instance_variable_set(:@match_pattern_cache, {})
+      end
+    end
 
     class << self
       # Reference to the Roda class related to this request class.
@@ -25,6 +62,15 @@ class Roda
       def inspect
         "#{roda_class.inspect}::RodaRequest"
       end
+
+      private
+
+      # The pattern to use for consuming, based on the given argument.  The returned
+      # pattern requires the path starts with a string and does not match partial
+      # segments.
+      def consume_pattern(pattern)
+        /\A(\/(?:#{pattern}))(\/|\z)/
+      end
     end
   end
 
@@ -390,12 +436,49 @@ class Roda
           throw :halt, response
         end
 
+        # Match any of the elements in the given array.  Return at the
+        # first match without evaluating future matches.  Returns false
+        # if no elements in the array match.
+        def _match_array(matcher)
+          matcher.any? do |m|
+            if matched = match(m)
+              if m.is_a?(String)
+                captures.push(m)
+              end
+            end
+
+            matched
+          end
+        end
+
+        # Match the given regexp exactly if it matches a full segment.
+        def _match_regexp(re)
+          consume(self.class.cached_matcher(re){re})
+        end
+
+        # Match the given hash if all hash matchers match.
+        def _match_hash(hash)
+          hash.all?{|k,v| send("match_#{k}", v)}
+        end
+
+        # Match the given string to the request path.  Regexp escapes the
+        # string so that regexp metacharacters are not matched, and recognizes
+        # colon tokens for placeholders.
+        def _match_string(str)
+          consume(self.class.cached_matcher(str){Regexp.escape(str).gsub(/:\w+/, SEGMENT)})
+        end
+
+        # Match the given symbol if any segment matches.
+        def _match_symbol(sym)
+          consume(self.class.cached_matcher(sym){SEGMENT})
+        end
+
         # Attempts to match the pattern to the current path.  If there is no
         # match, returns false without changes.  Otherwise, modifies
         # SCRIPT_NAME to include the matched path, removes the matched
         # path from PATH_INFO, and updates captures with any regex captures.
         def consume(pattern)
-          matchdata = env[PATH_INFO].match(/\A(\/(?:#{pattern}))(\/|\z)/)
+          matchdata = env[PATH_INFO].match(pattern)
 
           return false unless matchdata
 
@@ -423,17 +506,17 @@ class Roda
         def match(matcher)
           case matcher
           when String
-            match_string(matcher)
+            _match_string(matcher)
           when Regexp
-            consume(matcher)
+            _match_regexp(matcher)
           when Symbol
-            consume(SEGMENT)
+            _match_symbol(matcher)
           when TERM
             env[PATH_INFO] == EMPTY_STRING
           when Hash
-            matcher.all?{|k,v| send("match_#{k}", v)}
+            _match_hash(matcher)
           when Array
-            match_array(matcher)
+            _match_array(matcher)
           when Proc
             matcher.call
           else
@@ -441,25 +524,10 @@ class Roda
           end
         end
 
-        # Match any of the elements in the given array.  Return at the
-        # first match without evaluating future matches.  Returns false
-        # if no elements in the array match.
-        def match_array(matcher)
-          matcher.any? do |m|
-            if matched = match(m)
-              if m.is_a?(String)
-                captures.push(m)
-              end
-            end
-
-            matched
-          end
-        end
-
         # Match files with the given extension.  Requires that the
         # request path end with the extension.
         def match_extension(ext)
-          consume("([^\\/]+?)\.#{ext}\\z")
+          consume(self.class.cached_matcher(ext){"([^\\/]+?)\.#{ext}\\z"})
         end
 
         # Match by request method.  This can be an array if you want
@@ -488,15 +556,6 @@ class Roda
           end
         end
 
-        # Match the given string to the request path.  Regexp escapes the
-        # string so that regexp metacharacters are not matched, and recognizes
-        # colon tokens for placeholders.
-        def match_string(str)
-          str = Regexp.escape(str)
-          str.gsub!(/:\w+/, SEGMENT)
-          consume(str)
-        end
-
         # Yield to the given block, clearing any captures before
         # yielding and restoring the SCRIPT_NAME and PATH_INFO on exit.
         def try

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-cj
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack