rack-mount 0.6.1 → 0.6.2

data/lib/rack/mount/recognition/route.rb

@@ -1,62 +0,0 @@
-require 'rack/mount/utils'
-
-module Rack::Mount
-  module Recognition
-    module Route #:nodoc:
-      attr_reader :named_captures
-
-      def initialize(*args)
-        super
-
-        @named_captures = {}
-        @conditions.map { |method, condition|
-          next unless condition.respond_to?(:named_captures)
-          @named_captures[method] = condition.named_captures.inject({}) { |named_captures, (k, v)|
-            named_captures[k.to_sym] = v.last - 1
-            named_captures
-          }.freeze
-        }
-        @named_captures.freeze
-
-        if @conditions.has_key?(:path_info) &&
-            !Utils.regexp_anchored?(@conditions[:path_info])
-          @prefix = true
-          @app = Prefix.new(@app)
-        else
-          @prefix = false
-        end
-      end
-
-      def prefix?
-        @prefix
-      end
-
-      def recognize(obj)
-        matches = {}
-        params  = @defaults.dup
-
-        if @conditions.all? { |method, condition|
-          value = obj.send(method)
-          if condition.is_a?(Regexp) && (m = value.match(condition))
-            matches[method] = m
-            captures = m.captures
-            @named_captures[method].each { |k, i|
-              if v = captures[i]
-                params[k] = v
-              end
-            }
-            true
-          elsif value == condition
-            true
-          else
-            false
-          end
-        }
-          return matches, params
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/rack/mount/recognition/route_set.rb

@@ -1,121 +0,0 @@
-require 'rack/mount/utils'
-
-module Rack::Mount
-  module Recognition
-    module RouteSet
-      attr_reader :parameters_key
-
-      # Adds recognition related concerns to RouteSet.new.
-      def initialize(options = {})
-        @parameters_key = options.delete(:parameters_key) || 'rack.routing_args'
-        @parameters_key.freeze
-        @recognition_key_analyzer = Analysis::Frequency.new_with_module(Analysis::Splitting)
-
-        super
-      end
-
-      # Adds recognition aspects to RouteSet#add_route.
-      def add_route(*args)
-        route = super
-        @recognition_key_analyzer << route.conditions
-        route
-      end
-
-      def recognize(obj)
-        raise 'route set not finalized' unless @recognition_graph
-
-        cache = {}
-        keys = @recognition_keys.map { |key|
-          if key.respond_to?(:call_source)
-            key.call(cache, obj)
-          else
-            obj.send(key)
-          end
-        }
-        @recognition_graph[*keys].each do |route|
-          matches, params = route.recognize(obj)
-          if matches && params
-            if block_given?
-              yield route, matches, params
-            else
-              return route, matches, params
-            end
-          end
-        end
-
-        nil
-      end
-
-      X_CASCADE = 'X-Cascade'.freeze
-      PASS      = 'pass'.freeze
-      PATH_INFO = 'PATH_INFO'.freeze
-
-      # Rack compatible recognition and dispatching method. Routes are
-      # tried until one returns a non-catch status code. If no routes
-      # match, the catch status code is returned.
-      #
-      # This method can only be invoked after the RouteSet has been
-      # finalized.
-      def call(env)
-        raise 'route set not finalized' unless @recognition_graph
-
-        env[PATH_INFO] = Utils.normalize_path(env[PATH_INFO])
-
-        request = nil
-        req = @request_class.new(env)
-        recognize(req) do |route, matches, params|
-          # TODO: We only want to unescape params from uri related methods
-          params.each { |k, v| params[k] = Utils.unescape_uri(v) if v.is_a?(String) }
-
-          if route.prefix?
-            env[Prefix::KEY] = matches[:path_info].to_s
-          end
-
-          env[@parameters_key] = params
-          result = route.app.call(env)
-          return result unless result[1][X_CASCADE] == PASS
-        end
-
-        request || [404, {'Content-Type' => 'text/html', 'X-Cascade' => 'pass'}, ['Not Found']]
-      end
-
-      def rehash #:nodoc:
-        @recognition_keys  = build_recognition_keys
-        @recognition_graph = build_recognition_graph
-
-        super
-      end
-
-      protected
-        def recognition_stats
-          { :keys => @recognition_keys,
-            :keys_size => @recognition_keys.size,
-            :graph_size => @recognition_graph.size,
-            :graph_height => @recognition_graph.height,
-            :graph_average_height => @recognition_graph.average_height }
-        end
-
-      private
-        def expire!
-          @recognition_keys = @recognition_graph = nil
-          @recognition_key_analyzer.expire!
-          super
-        end
-
-        def flush!
-          @recognition_key_analyzer = nil
-          super
-        end
-
-        def build_recognition_graph
-          build_nested_route_set(@recognition_keys) { |k, i|
-            @recognition_key_analyzer.possible_keys[i][k]
-          }
-        end
-
-        def build_recognition_keys
-          @recognition_key_analyzer.report
-        end
-    end
-  end
-end