rack-mount 0.2.3 → 0.3.0

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

@@ -35,7 +35,7 @@ module Rack::Mount
       def url(*args)
         named_route, params, recall, options = extract_params!(*args)
 
-        options[:parameterize] ||= lambda { |name, value| Utils.escape_uri(value) }
+        options[:parameterize] ||= lambda { |name, param| Utils.escape_uri(param) }
 
         unless result = generate(:path_info, named_route, params, recall, options)
           return

data/lib/rack/mount/regexp_with_named_groups.rb

@@ -46,7 +46,7 @@ module Rack::Mount
           if scanner.scan(/\?:<([^>]+)>/)
             @names << scanner[1]
           elsif scanner.scan(/\?:/)
-            # ignore
+            # ignore noncapture
           else
             @names << nil
           end

data/lib/rack/mount/utils.rb

@@ -77,19 +77,13 @@ module Rack::Mount
         }.join("&")
       when Hash
         value.map { |k, v|
-          build_nested_query(v, prefix ? "#{prefix}[#{k}]" : k)
+          build_nested_query(v, prefix ? "#{prefix}[#{Rack::Utils.escape(k)}]" : Rack::Utils.escape(k))
         }.join("&")
       when String
         raise ArgumentError, "value must be a Hash" if prefix.nil?
-        "#{Rack::Utils.escape(prefix)}=#{Rack::Utils.escape(value)}"
-      when NilClass
-        Rack::Utils.escape(prefix)
+        "#{prefix}=#{Rack::Utils.escape(value)}"
       else
-        if value.respond_to?(:to_param)
-          build_nested_query(value.to_param.to_s, prefix)
-        else
-          Rack::Utils.escape(prefix)
-        end
+        prefix
       end
     end
     module_function :build_nested_query

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

@@ -291,16 +291,43 @@ class Multimap
     invert[value]
   end
 
-  def delete_if(&block) #:nodoc:
-    @hash.delete_if(&block)
+  # call-seq:
+  #   map.delete_if {| key, value | block }  -> map
+  #
+  # Deletes every key-value pair from <i>map</i> for which <i>block</i>
+  # evaluates to <code>true</code>.
+  #
+  #   map = Multimap["a" => 100, "b" => [200, 300]]
+  #   map.delete_if {|key, value| value >= 300 }
+  #     #=> Multimap["a" => 100, "b" => 200]
+  #
+  def delete_if
+    each_association do |key, container|
+      container.delete_if do |value|
+        yield [key, value]
+      end
+    end
     self
   end
 
-  def reject(&block) #:nodoc:
+  # call-seq:
+  #   map.reject {| key, value | block }  -> map
+  #
+  # Same as <code>Multimap#delete_if</code>, but works on (and returns) a
+  # copy of the <i>map</i>. Equivalent to
+  # <code><i>map</i>.dup.delete_if</code>.
+  #
+  def reject(&block)
     dup.delete_if(&block)
   end
 
-  def reject!(&block) #:nodoc:
+  # call-seq:
+  #   map.reject! {| key, value | block }  -> map or nil
+  #
+  # Equivalent to <code>Multimap#delete_if</code>, but returns
+  # <code>nil</code> if no changes were made.
+  #
+  def reject!(&block)
     old_size = size
     delete_if(&block)
     old_size == size ? nil : self

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

@@ -10,7 +10,7 @@ module Reginald
 
   class << self
     begin
-      eval('/(?<foo>.*)/').named_captures
+      eval('foo = /(?<foo>.*)/').named_captures
 
       def regexp_supports_named_captures?
         true

metadata

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