rack-mount 0.4.0 → 0.4.1

data/lib/rack/mount/analysis/frequency.rb

@@ -35,7 +35,7 @@ module Rack::Mount
 
       def process_key(requirements, method, requirement)
         if requirement.is_a?(Regexp)
-          expression = parse_regexp(requirement)
+          expression = Utils.parse_regexp(requirement)
           expression = expression.reject { |e| e.is_a?(Reginald::Anchor) }
 
           if expression.is_a?(Reginald::Expression) && expression.literal?
@@ -50,19 +50,13 @@ module Rack::Mount
         @report ||= begin
           possible_keys.each { |keys| keys.each_pair { |key, _| @key_frequency << key } }
           return [] if @key_frequency.count <= 1
-          @key_frequency.select_upper
+          @key_frequency.keys_above_mean
         end
       end
 
       def expire!
         @possible_keys = @report = nil
       end
-
-      private
-        def parse_regexp(regexp)
-          @parse_regexp_cache ||= {}
-          @parse_regexp_cache[regexp] ||= Utils.parse_regexp(regexp).freeze
-        end
     end
   end
 end

data/lib/rack/mount/analysis/histogram.rb

@@ -6,20 +6,56 @@ module Rack::Mount
       def initialize
         @count = 0
         super(0)
+        expire_caches!
       end
 
       def <<(value)
         @count += 1
         self[value] += 1 if value
+        expire_caches!
+        self
       end
 
-      def select_upper
-        values = sort_by { |_, value| value }
-        values.reverse!
-        values = values.select { |_, value| value >= count / size }
-        values.map! { |key, _| key }
-        values
+      def sorted_by_frequency
+        sort_by { |_, value| value }.reverse!
       end
+
+      def max
+        @max ||= values.max || 0
+      end
+
+      def min
+        @min ||= values.min || 0
+      end
+
+      def mid_range
+        @mid_range ||= calculate_mid_range
+      end
+
+      def mean
+        @mean ||= calculate_mean
+      end
+
+      def keys_above_mean
+        @keys_above_mean ||= compute_keys_above_mean
+      end
+
+      private
+        def calculate_mid_range
+          (max + min) / 2
+        end
+
+        def calculate_mean
+          count / size
+        end
+
+        def compute_keys_above_mean
+          sorted_by_frequency.select { |_, value| value >= mean }.map! { |key, _| key }
+        end
+
+        def expire_caches!
+          @max = @min = @mid_range = @mean = @keys_above_mean = nil
+        end
     end
   end
 end

data/lib/rack/mount/analysis/splitting.rb

@@ -39,7 +39,7 @@ module Rack::Mount
       end
 
       def separators(key)
-        @boundaries[key].select_upper
+        @boundaries[key].keys_above_mean
       end
 
       def process_key(requirements, method, requirement)
@@ -57,7 +57,7 @@ module Rack::Mount
         def analyze_capture_boundaries(regexp, boundaries) #:nodoc:
           return boundaries unless regexp.is_a?(Regexp)
 
-          parts = parse_regexp(regexp)
+          parts = Utils.parse_regexp(regexp)
           parts.each_with_index do |part, index|
             if part.is_a?(Reginald::Group)
               if index > 0
@@ -88,7 +88,7 @@ module Rack::Mount
         def generate_split_keys(regexp, separators) #:nodoc:
           segments = []
           buf = nil
-          parts = parse_regexp(regexp)
+          parts = Utils.parse_regexp(regexp)
           parts.each_with_index do |part, index|
             case part
             when Reginald::Anchor

data/lib/rack/mount/utils.rb

@@ -99,6 +99,12 @@ module Rack::Mount
     module_function :normalize_extended_expression
 
     def parse_regexp(regexp)
+      cache = Thread.current[:rack_mount_utils_parse_regexp_cache] ||= {}
+
+      if expression = cache[regexp]
+        return expression
+      end
+
       unless regexp.is_a?(RegexpWithNamedGroups)
         regexp = RegexpWithNamedGroups.new(regexp)
       end
@@ -119,6 +125,7 @@ module Rack::Mount
         tag_captures.call(expression)
       end
 
+      cache[regexp] = expression.freeze
       expression
     rescue Racc::ParseError, Reginald::Parser::ScanError
       []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -06:00
+date: 2010-01-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency