rack-mount 0.2.2 → 0.2.3

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

@@ -62,20 +62,20 @@ module Rack::Mount
             if part.is_a?(Reginald::Group)
               if index > 0
                 previous = parts[index-1]
-                if previous.literal?
+                if previous.is_a?(Reginald::Character) && previous.literal?
                   boundaries << previous.to_s
                 end
               end
 
               if inside = part[0][0]
-                if inside.literal?
+                if inside.is_a?(Reginald::Character) && inside.literal?
                   boundaries << inside.to_s
                 end
               end
 
               if index < parts.length
                 following = parts[index+1]
-                if following.literal?
+                if following.is_a?(Reginald::Character) && following.literal?
                   boundaries << following.to_s
                 end
               end

data/lib/rack/mount/multimap.rb

@@ -37,10 +37,10 @@ module Rack::Mount
       if key.is_a?(Regexp)
         @fuzz[value] = key
         if keys.empty?
-          hash_each_pair { |k, l| l << value if k =~ key }
+          @hash.each_pair { |k, l| l << value if k =~ key }
           self.default << value
         else
-          hash_each_pair { |k, _|
+          @hash.each_pair { |k, _|
             if k =~ key
               args[0] = k
               super(*args)

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

@@ -1,22 +1,13 @@
+require 'forwardable'
 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.
-class Multimap < Hash
-  #--
-  # Ignore protected aliases back to the original Hash methods
-  #++
-  module_eval %{
-    alias_method :hash_aref, :[]
-    protected :hash_aref
+class Multimap
+  extend Forwardable
 
-    alias_method :hash_aset, :[]=
-    protected :hash_aset
-
-    alias_method :hash_each_pair, :each_pair
-    protected :hash_each_pair
-  }
+  include Enumerable
 
   # call-seq:
   #   Multimap[ [key =>|, value]* ]   => multimap
@@ -53,7 +44,8 @@ class Multimap < Hash
       }
     end
 
-    map = super
+    map = new
+    map.instance_variable_set(:@hash, Hash[*args])
     map.default = default
     map
   end
@@ -70,20 +62,24 @@ class Multimap < Hash
   #   h["a"]           #=> [100].to_set
   #   h["c"]           #=> [].to_set
   def initialize(default = [])
-    super
+    @hash = Hash.new(default)
   end
 
   def initialize_copy(original) #:nodoc:
-    super
-    clear
-    original.each_pair { |key, container| self[key] = container }
-    self.default = original.default.dup
+    @hash = Hash.new(original.default.dup)
+    original._internal_hash.each_pair do |key, container|
+      @hash[key] = container.dup
+    end
   end
 
-  #--
-  # Setting a default proc is not supported
-  #++
-  undef :default_proc
+  def_delegators :@hash, :clear, :default, :default=, :empty?,
+                         :fetch, :has_key?, :key?
+
+  # Retrieves the <i>value</i> object corresponding to the
+  # <i>*keys</i> object.
+  def [](key)
+    @hash[key]
+  end
 
   # call-seq:
   #   map[key] = value        => value
@@ -118,9 +114,9 @@ class Multimap < Hash
   #   map.delete("a")      #=> [100]
   def delete(key, value = nil)
     if value
-      hash_aref(key).delete(value)
+      @hash[key].delete(value)
     else
-      super(key)
+      @hash.delete(key)
     end
   end
 
@@ -157,15 +153,9 @@ class Multimap < Hash
   #
   #   a is [100]
   #   b is [200, 300]
-  def each_association
-    # each_pair
+  def each_association(&block)
+    @hash.each_pair(&block)
   end
-  #--
-  # Ignore alias_method since the definition above serves
-  # as its documentation.
-  #++
-  remove_method :each_association
-  module_eval "alias_method :each_association, :each_pair"
 
   # call-seq:
   #   map.each_container { |container| block } => map
@@ -248,6 +238,24 @@ class Multimap < Hash
     end
   end
 
+  def ==(other) #:nodoc:
+    case other
+    when Multimap
+      @hash == other._internal_hash
+    else
+      @hash == other
+    end
+  end
+
+  def eql?(other) #:nodoc:
+    case other
+    when Multimap
+      @hash.eql?(other._internal_hash)
+    else
+      @hash.eql?(other)
+    end
+  end
+
   def freeze #:nodoc:
     each_container { |container| container.freeze }
     default.freeze
@@ -283,6 +291,21 @@ class Multimap < Hash
     invert[value]
   end
 
+  def delete_if(&block) #:nodoc:
+    @hash.delete_if(&block)
+    self
+  end
+
+  def reject(&block) #:nodoc:
+    dup.delete_if(&block)
+  end
+
+  def reject!(&block) #:nodoc:
+    old_size = size
+    delete_if(&block)
+    old_size == size ? nil : self
+  end
+
   # call-seq:
   #   map.replace(other_map) => map
   #
@@ -295,11 +318,11 @@ class Multimap < Hash
   def replace(other)
     case other
     when Array
-      super(self.class[self.default, *other])
+      @hash.replace(self.class[self.default, *other])
     when Hash
-      super(self.class[self.default, other])
+      @hash.replace(self.class[self.default, other])
     when self.class
-      super
+      @hash.replace(other)
     else
       raise ArgumentError
     end
@@ -333,6 +356,12 @@ class Multimap < Hash
     keys
   end
 
+  # Returns true if the given key is present in Multimap.
+  def include?(key)
+    keys.include?(key)
+  end
+  alias_method :member?, :include?
+
   # call-seq:
   #   map.length    =>  fixnum
   #   map.size      =>  fixnum
@@ -426,7 +455,7 @@ class Multimap < Hash
   #   map = Multimap["a" => 100, "b" => [200, 300]]
   #   map.to_hash   #=> { "a" => [100], "b" => [200, 300] }
   def to_hash
-    dup
+    @hash.dup
   end
 
   # call-seq:
@@ -457,11 +486,20 @@ class Multimap < Hash
     values
   end
 
+  # Return an array containing the values associated with the given keys.
+  def values_at(*keys)
+    @hash.values_at(*keys)
+  end
+
   protected
+    def _internal_hash #:nodoc:
+      @hash
+    end
+
     def update_container(key) #:nodoc:
-      container = hash_aref(key)
+      container = @hash[key]
       container = container.dup if container.equal?(default)
       container = yield(container)
-      hash_aset(key, container)
+      @hash[key] = container
     end
 end

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_pair { |_, container| container << value }
     self.default << value
     self
   end
@@ -59,7 +59,7 @@ class NestedMultimap < Multimap
   def [](*keys)
     i, l, r, k = 0, keys.length, self, self.class
     while r.is_a?(k)
-      r = i < l ? r.hash_aref(keys[i]) : r.default
+      r = i < l ? r._internal_hash[keys[i]] : r.default
       i += 1
     end
     r
@@ -83,7 +83,7 @@ class NestedMultimap < Multimap
   #   ["a", "b"] is [100, 101, 102]
   #   "c" is [200]
   def each_association
-    super do |key, container|
+    super() do |key, container|
       if container.respond_to?(:each_association)
         container.each_association do |nested_key, value|
           yield [key, nested_key].flatten, value
@@ -122,7 +122,7 @@ class NestedMultimap < Multimap
       end
     end
 
-    hash_each_pair { |_, container| each_container.call(container) }
+    @hash.each_pair { |_, container| each_container.call(container) }
     each_container.call(default)
 
     self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -06:00
+date: 2009-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency