rack-mount 0.3.2 → 0.3.3

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

@@ -101,6 +101,11 @@ module Rack::Mount
           super
         end
 
+        def flush!
+          @generation_key_analyzer = nil
+          super
+        end
+
         def build_generation_graph
           build_nested_route_set(@generation_keys) { |k, i|
             throw :skip unless @routes[i].significant_params?

data/lib/rack/mount/multimap.rb

@@ -7,22 +7,6 @@ end
 
 module Rack::Mount
   class Multimap < NestedMultimap #:nodoc:
-    def self.[](*args)
-      map = super
-      map.instance_variable_set('@fuzz', {})
-      map
-    end
-
-    def initialize(default = [])
-      @fuzz = {}
-      super
-    end
-
-    def initialize_copy(original)
-      @fuzz = original.instance_variable_get('@fuzz').dup
-      super
-    end
-
     def store(*args)
       keys  = args.dup
       value = keys.pop
@@ -35,7 +19,6 @@ module Rack::Mount
       end
 
       if key.is_a?(Regexp)
-        @fuzz[value] = key
         if keys.empty?
           @hash.each_pair { |k, l| l << value if k =~ key }
           self.default << value
@@ -56,12 +39,6 @@ module Rack::Mount
     end
     alias_method :[]=, :store
 
-    def freeze
-      @fuzz.clear
-      @fuzz = nil
-      super
-    end
-
     undef :index, :invert
 
     def height
@@ -72,23 +49,5 @@ module Rack::Mount
       lengths = containers_with_default.map { |e| e.length }
       lengths.inject(0) { |sum, len| sum += len }.to_f / lengths.size
     end
-
-    protected
-      def update_container(key) #:nodoc:
-        super do |container|
-          if container.is_a?(self.class)
-            container.each_container_with_default do |c|
-              c.delete_if do |value|
-                (requirement = @fuzz[value]) && key !~ requirement
-              end
-            end
-          else
-            container.delete_if do |value|
-              (requirement = @fuzz[value]) && key !~ requirement
-            end
-          end
-          yield container
-        end
-      end
   end
 end

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

@@ -98,6 +98,11 @@ module Rack::Mount
           super
         end
 
+        def flush!
+          @recognition_key_analyzer = @valid_conditions = nil
+          super
+        end
+
         def build_recognition_graph
           build_nested_route_set(@recognition_keys) { |k, i|
             @recognition_key_analyzer.possible_keys[i][k]

data/lib/rack/mount/route_set.rb

@@ -78,6 +78,7 @@ module Rack::Mount
     def freeze
       unless frozen?
         rehash
+        flush!
         @routes.each { |route| route.freeze }
         @routes.freeze
       end
@@ -89,6 +90,9 @@ module Rack::Mount
       def expire! #:nodoc:
       end
 
+      def flush! #:nodoc:
+      end
+
       # An internal helper method for constructing a nested set from
       # the linear route set.
       #

data/lib/rack/mount/vendor/multimap/multimap.rb

@@ -4,6 +4,17 @@ require 'multiset'
 # Multimap is a generalization of a map or associative array
 # abstract data type in which more than one value may be associated
 # with and returned for a given key.
+#
+# == Example
+#
+#   require 'multimap'
+#   map = Multimap.new
+#   map["a"] = 100
+#   map["b"] = 200
+#   map["a"] = 300
+#   map["a"]                              # -> [100, 300]
+#   map["b"]                              # -> [200]
+#   map.keys                              # -> #<Multiset: {a, a, b}>
 class Multimap
   extend Forwardable
 

data/lib/rack/mount/vendor/multimap/multiset.rb

@@ -1,7 +1,16 @@
 require 'set'
 
 # Multiset implements a collection of unordered values and
-# allows duplicate values.
+# allows duplicates.
+#
+# == Example
+#
+#   require 'multiset'
+#   s1 = Multiset.new [1, 2]              # -> #<Multiset: {1, 2}>
+#   s1.add(2)                             # -> #<Multiset: {1, 2, 2}>
+#   s1.merge([2, 6])                      # -> #<Multiset: {1, 2, 2, 2, 3}>
+#   s1.multiplicity(2)                    # -> 3
+#   s1.multiplicity(3)                    # -> 1
 class Multiset < Set
   def initialize(*args, &block) #:nodoc:
     @hash = Hash.new(0)

data/lib/rack/mount/vendor/multimap/nested_multimap.rb

@@ -45,7 +45,7 @@ class NestedMultimap < Multimap
   #   map["a"] #=> [100, 300]
   #   map["c"] #=> [300]
   def <<(value)
-    @hash.each_pair { |_, container| container << value }
+    @hash.each_value { |container| container << value }
     self.default << value
     self
   end
@@ -111,20 +111,11 @@ class NestedMultimap < Multimap
   #   [100, 101, 102]
   #   [100, 102]
   #   []
-  def each_container_with_default
-    each_container = Proc.new do |container|
-      if container.respond_to?(:each_container_with_default)
-        container.each_container_with_default do |value|
-          yield value
-        end
-      else
-        yield container
-      end
+  def each_container_with_default(&block)
+    @hash.each_value do |container|
+      iterate_over_container(container, &block)
     end
-
-    @hash.each_pair { |_, container| each_container.call(container) }
-    each_container.call(default)
-
+    iterate_over_container(default, &block)
     self
   end
 
@@ -148,6 +139,17 @@ class NestedMultimap < Multimap
   def inspect #:nodoc:
     super.gsub(/\}$/, ", default => #{default.inspect}}")
   end
+
+  private
+    def iterate_over_container(container)
+      if container.respond_to?(:each_container_with_default)
+        container.each_container_with_default do |value|
+          yield value
+        end
+      else
+        yield container
+      end
+    end
 end
 
 begin

data/lib/rack/mount/vendor/reginald/reginald.rb

@@ -13,19 +13,28 @@ module Reginald
     begin
       eval('foo = /(?<foo>.*)/').named_captures
 
+      # Returns true if the interpreter is using the Oniguruma Regexp lib
+      # and supports named captures.
+      #
+      #   /(?<foo>bar)/
       def regexp_supports_named_captures?
         true
       end
     rescue SyntaxError, NoMethodError
-      def regexp_supports_named_captures?
+      def regexp_supports_named_captures? #:nodoc:
         false
       end
     end
 
+    # Parses Regexp and returns a Expression data structure.
     def parse(regexp)
       Parser.parse_regexp(regexp)
     end
 
+    # Recompiles Regexp by parsing it and turning it back into a Regexp.
+    #
+    # (In the future Reginald will perform some Regexp optimizations
+    # such as removing unnecessary captures and options)
     def compile(source)
       regexp = Regexp.compile(source)
       expression = parse(regexp)

data/lib/rack/mount/vendor/reginald/reginald/alternation.rb

@@ -1,6 +1,6 @@
 module Reginald
   class Alternation < Collection
-    def self.reduce(alternation_or_expression, expression)
+    def self.reduce(alternation_or_expression, expression) #:nodoc:
       if alternation_or_expression.first.is_a?(Alternation)
         alternation_or_expression = alternation_or_expression.first
         alternation_or_expression << expression
@@ -18,6 +18,9 @@ module Reginald
       end
     end
 
+    # Returns true if expression could be treated as a literal string.
+    #
+    # Alternation groups are never literal.
     def literal?
       false
     end
@@ -30,7 +33,7 @@ module Reginald
       map { |e| e.to_s(parent) }.join('|')
     end
 
-    def inspect
+    def inspect #:nodoc:
       to_s.inspect
     end
   end

data/lib/rack/mount/vendor/reginald/reginald/atom.rb

@@ -7,6 +7,7 @@ module Reginald
       super
     end
 
+    # Returns true if expression could be treated as a literal string.
     def literal?
       false
     end
@@ -19,11 +20,11 @@ module Reginald
       "#{value}"
     end
 
-    def inspect
+    def inspect #:nodoc:
       "#<#{self.class.to_s.sub('Reginald::', '')} #{to_s.inspect}>"
     end
 
-    def ==(other)
+    def ==(other) #:nodoc:
       case other
       when String
         other == to_s
@@ -32,13 +33,13 @@ module Reginald
       end
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       other.instance_of?(self.class) &&
         self.value.eql?(other.value) &&
         (!!self.ignorecase).eql?(!!other.ignorecase)
     end
 
-    def freeze
+    def freeze #:nodoc:
       value.freeze
       super
     end

data/lib/rack/mount/vendor/reginald/reginald/character.rb

@@ -2,6 +2,9 @@ module Reginald
   class Character < Atom
     attr_accessor :quantifier
 
+    # Returns true if expression could be treated as a literal string.
+    #
+    # A Character is literal is there is no quantifier attached to it.
     def literal?
       quantifier.nil? && !ignorecase
     end
@@ -30,11 +33,11 @@ module Reginald
       end
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       super && quantifier.eql?(other.quantifier)
     end
 
-    def freeze
+    def freeze #:nodoc:
       quantifier.freeze
       super
     end

data/lib/rack/mount/vendor/reginald/reginald/character_class.rb

@@ -27,6 +27,9 @@ module Reginald
       negate ? true : false
     end
 
+    # Returns true if expression could be treated as a literal string.
+    #
+    # A CharacterClass is never literal.
     def literal?
       false
     end
@@ -52,11 +55,11 @@ module Reginald
       Regexp.compile("\\A#{re}\\Z").match(char)
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       super && negate == other.negate
     end
 
-    def freeze
+    def freeze #:nodoc:
       negate.freeze
       super
     end

data/lib/rack/mount/vendor/reginald/reginald/collection.rb

@@ -17,7 +17,7 @@ module Reginald
       any? { |e| e.include?(char) }
     end
 
-    def ==(other)
+    def ==(other) #:nodoc:
       case other
       when String
         other == to_s
@@ -28,11 +28,11 @@ module Reginald
       end
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       other.instance_of?(self.class) && super
     end
 
-    def freeze
+    def freeze #:nodoc:
       each { |e| e.freeze }
       super
     end

data/lib/rack/mount/vendor/reginald/reginald/expression.rb

@@ -3,7 +3,7 @@ module Reginald
     attr_reader :ignorecase
     attr_accessor :multiline, :extended
 
-    def self.reduce(expression_or_atom, atom = nil)
+    def self.reduce(expression_or_atom, atom = nil) #:nodoc:
       if expression_or_atom.is_a?(Expression)
         expression_or_atom << atom if atom
         new(*expression_or_atom)
@@ -34,6 +34,9 @@ module Reginald
       end
     end
 
+    # Returns true if expression could be treated as a literal string.
+    #
+    # A Expression is literal if all its elements are literal.
     def literal?
       !ignorecase && all? { |e| e.literal? }
     end
@@ -69,7 +72,7 @@ module Reginald
       end
     end
 
-    def inspect
+    def inspect #:nodoc:
       "#<Expression #{to_s.inspect}>"
     end
 
@@ -77,7 +80,7 @@ module Reginald
       ignorecase
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       super &&
         !!self.multiline == !!other.multiline &&
         !!self.ignorecase == !!other.ignorecase &&

data/lib/rack/mount/vendor/reginald/reginald/group.rb

@@ -11,6 +11,9 @@ module Reginald
       expression.ignorecase = ignorecase
     end
 
+    # Returns true if expression could be treated as a literal string.
+    #
+    # A Group is literal if its expression is literal and it has no quantifier.
     def literal?
       quantifier.nil? && expression.literal?
     end
@@ -29,7 +32,7 @@ module Reginald
       Regexp.compile("\\A#{to_s}\\Z")
     end
 
-    def inspect
+    def inspect #:nodoc:
       to_s.inspect
     end
 
@@ -45,7 +48,7 @@ module Reginald
       capture
     end
 
-    def ==(other)
+    def ==(other) #:nodoc:
       case other
       when String
         other == to_s
@@ -54,7 +57,7 @@ module Reginald
       end
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       other.is_a?(self.class) &&
         self.expression == other.expression &&
         self.quantifier == other.quantifier &&
@@ -63,7 +66,7 @@ module Reginald
         self.name == other.name
     end
 
-    def freeze
+    def freeze #:nodoc:
       expression.freeze
       super
     end

data/lib/rack/mount/vendor/reginald/reginald/parser.rb

@@ -6,7 +6,7 @@
 
 require 'racc/parser.rb'
 module Reginald
-  class Parser < Racc::Parser
+  class Parser < Racc::Parser #:nodoc: all
 
 def self.parse_regexp(regexp)
   parser = new

metadata

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