rufus-verbs 0.10 → 1.0.0

data/lib/rufus-verbs.rb

@@ -0,0 +1,3 @@
+
+require 'rufus/verbs'
+

data/lib/rufus/verbs.rb

@@ -1,6 +1,5 @@
-#
 #--
-# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +19,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-# (MIT license)
+# Made in Japan.
 #++
-#
 
-#
-# John Mettraux
-#
-# Made in Japan
-#
-# 2008/01/11
-#
 
 require 'rufus/verbs/endpoint'
 require 'rufus/verbs/conditional'
@@ -39,94 +30,94 @@ require 'rufus/verbs/conditional'
 module Rufus::Verbs
 
 
-    #
-    # GET
-    #
-    def get (*args)
-
-        EndPoint.request :get, args
-    end
+  #
+  # GET
+  #
+  def get (*args)
 
-    #
-    # POST
-    #
-    def post (*args, &block)
+    EndPoint.request :get, args
+  end
 
-        EndPoint.request :post, args, &block
-    end
+  #
+  # POST
+  #
+  def post (*args, &block)
 
-    #
-    # PUT
-    #
-    def put (*args, &block)
+    EndPoint.request :post, args, &block
+  end
 
-        EndPoint.request :put, args, &block
-    end
+  #
+  # PUT
+  #
+  def put (*args, &block)
 
-    #
-    # DELETE
-    #
-    def delete (*args)
+    EndPoint.request :put, args, &block
+  end
 
-        EndPoint.request :delete, args
-    end
+  #
+  # DELETE
+  #
+  def delete (*args)
 
-    #
-    # HEAD
-    #
-    def head (*args)
+    EndPoint.request :delete, args
+  end
 
-        EndPoint.request :head, args
-    end
+  #
+  # HEAD
+  #
+  def head (*args)
 
-    #
-    # OPTIONS
-    #
-    def options (*args)
+    EndPoint.request :head, args
+  end
 
-        EndPoint.request :options, args
-    end
+  #
+  # OPTIONS
+  #
+  def options (*args)
 
-    #
-    # Opens a file or a URI (GETs it and return the reply). Will tolerate
-    # a HTTP[S] URI or a file path.
-    #
-    # It is not named open() in order not to collide with File.open and
-    # open-uri's open.
-    #
-    def fopen (uri, *args, &block)
+    EndPoint.request :options, args
+  end
 
-        # should I really care about blocks here ? ...
+  #
+  # Opens a file or a URI (GETs it and return the reply). Will tolerate
+  # a HTTP[S] URI or a file path.
+  #
+  # It is not named open() in order not to collide with File.open and
+  # open-uri's open.
+  #
+  def fopen (uri, *args, &block)
 
-        u = URI.parse uri.to_s
+    # should I really care about blocks here ? ...
 
-        return File.open(uri.to_s, &block) \
-            if u.scheme == nil
+    u = URI.parse uri.to_s
 
-        return File.open(uri.to_s[5..-1], &block) \
-            if u.scheme == 'file'
+    return File.open(uri.to_s, &block) \
+      if u.scheme == nil
 
-        if u.scheme == 'http' or u.scheme == 'https'
+    return File.open(uri.to_s[5..-1], &block) \
+      if u.scheme == 'file'
 
-            r = EndPoint.request(:get, [ uri ] + args) \
+    if u.scheme == 'http' or u.scheme == 'https'
 
-            if block
-                block.call r
-                return
-            end
+      r = EndPoint.request(:get, [ uri ] + args) \
 
-            class << r
-                def read
-                    self.body
-                end
-            end unless r.respond_to?(:read)
+      if block
+        block.call r
+        return
+      end
 
-            return r
+      class << r
+        def read
+          self.body
         end
+      end unless r.respond_to?(:read)
 
-        raise "can't handle scheme '#{u.scheme}' for #{u.to_s}"
+      return r
     end
 
-    extend self
+    raise "can't handle scheme '#{u.scheme}' for #{u.to_s}"
+  end
+
+  extend self
 end
 

data/lib/rufus/verbs/conditional.rb

@@ -1,6 +1,5 @@
-#
 #--
-# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -8,10 +7,10 @@
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,120 +19,111 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-# (MIT license)
+# Made in Japan.
 #++
-#
 
-#
-# John Mettraux
-#
-# Made in Japan
-#
-# 2008/01/16
-#
 
-#require 'rubygems'
 require 'rufus/lru'
 
 
 module Rufus::Verbs
 
+  #
+  # An EndPoint with a cache for conditional GETs.
+  #
+  #   ep = ConditionalEndPoint.new(
+  #     :host => "restful.server",
+  #     :port => 7080,
+  #     :resource => "inventory/tools")
+  #
+  #   res = ep.get :id => 1
+  #     # first call will retrieve the representation completely
+  #
+  #   res = ep.get :id => 1
+  #     # the server (provided that it supports conditional GET) only
+  #     # returned a 304 answer, the response is returned from the
+  #     # ConditionalEndPoint cache
+  #
+  # The :cache_size option allows to set the size of the conditional GET
+  # cache. The default size is currently 147.
+  #
+  class ConditionalEndPoint < EndPoint
+
+    def initialize (opts)
+
+      super
+
+      cs = opts[:cache_size] || 147
+
+      @cache = LruHash.new cs
+    end
+
     #
-    # An EndPoint with a cache for conditional GETs.
-    #
-    #     ep = ConditionalEndPoint.new(
-    #         :host => "restful.server", 
-    #         :port => 7080, 
-    #         :resource => "inventory/tools")
-    #
-    #     res = ep.get :id => 1
-    #         # first call will retrieve the representation completely
-    #
-    #     res = ep.get :id => 1
-    #         # the server (provided that it supports conditional GET) only 
-    #         # returned a 304 answer, the response is returned from the
-    #         # ConditionalEndPoint cache
-    #
-    # The :cache_size option allows to set the size of the conditional GET
-    # cache. The default size is currently 147.
+    # Returns the count of representation 'cached' here for the
+    # purpose of conditional GET requests.
     #
-    class ConditionalEndPoint < EndPoint
-
-        def initialize (opts)
-
-            super
+    def cache_current_size
 
-            cs = opts[:cache_size] || 147
-
-            @cache = LruHash.new cs
-        end
-
-        #
-        # Returns the count of representation 'cached' here for the
-        # purpose of conditional GET requests.
-        #
-        def cache_current_size
-
-            @cache.size
-        end
+      @cache.size
+    end
 
-        #
-        # Returns the max size of the conditional GET cache.
-        #
-        def cache_size
+    #
+    # Returns the max size of the conditional GET cache.
+    #
+    def cache_size
 
-            @cache.maxsize
-        end
+      @cache.maxsize
+    end
 
-        private
+    private
 
-            #
-            # If the representation has already been gotten, send
-            # potential If-Modified-Since and/or If-None-Match.
-            #
-            def add_conditional_headers (req, opts)
+    #
+    # If the representation has already been gotten, send
+    # potential If-Modified-Since and/or If-None-Match.
+    #
+    def add_conditional_headers (req, opts)
 
-                # if path is cached send since and/or match
+      # if path is cached send since and/or match
 
-                e = @cache[opts[:c_uri]]
+      e = @cache[opts[:c_uri]]
 
-                return unless e # not cached
+      return unless e # not cached
 
-                req['If-Modified-Since'] = e.lastmod if e.lastmod
-                req['If-None-Match'] = e.etag if e.etag
+      req['If-Modified-Since'] = e.lastmod if e.lastmod
+      req['If-None-Match'] = e.etag if e.etag
 
-                opts[:c_cached] = e
-            end
+      opts[:c_cached] = e
+    end
 
-            def handle_response (method, res, opts)
+    def handle_response (method, res, opts)
 
-                # if method is get and reply is 200, cache (if et and/or lm)
-                # if method is get and reply is 304, return from cache
+      # if method is get and reply is 200, cache (if et and/or lm)
+      # if method is get and reply is 304, return from cache
 
-                super
+      super
 
-                code = res.code.to_i
+      code = res.code.to_i
 
-                return opts[:c_cached] if code == 304
+      return opts[:c_cached] if code == 304
 
-                cache(res, opts) if code == 200
+      cache(res, opts) if code == 200
 
-                res
-            end
+      res
+    end
 
-            def cache (res, opts)
+    def cache (res, opts)
 
-                class << res
-                    def lastmod
-                        self['Last-Modified']
-                    end
-                    def etag
-                        self['Etag']
-                    end
-                end
+      class << res
+        def lastmod
+          self['Last-Modified']
+        end
+        def etag
+          self['Etag']
+        end
+      end
 
-                @cache[opts[:c_uri]] = res
-            end
+      @cache[opts[:c_uri]] = res
     end
+  end
 end
 

data/lib/rufus/verbs/cookies.rb

@@ -1,6 +1,5 @@
-#
 #--
-# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -8,10 +7,10 @@
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,308 +19,299 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-# (MIT license)
+# Made in Japan.
 #++
-#
 
-#
-# John Mettraux
-#
-# Made in Japan
-#
-# 2008/01/19
-#
 
 require 'webrick/cookie'
 
-#require 'rubygems'
 require 'rufus/lru'
 
 
 module Rufus
 module Verbs
 
+  #
+  # Cookies related methods
+  #
+  # http://www.ietf.org/rfc/rfc2109.txt
+  #
+  module CookieMixin
+
     #
-    # Cookies related methods
-    #
-    # http://www.ietf.org/rfc/rfc2109.txt
+    # making the cookie jar available
     #
-    module CookieMixin
-
-        #
-        # making the cookie jar available
-        #
-        attr_reader :cookies
+    attr_reader :cookies
 
-        protected
+    protected
 
-            #
-            # Prepares the instance variable @cookies for storing
-            # cooking for this endpoint.
-            #
-            # Reads the :cookies endpoint option for determining the
-            # size of the cookie jar (77 by default).
-            #
-            def prepare_cookie_jar
+    #
+    # Prepares the instance variable @cookies for storing
+    # cooking for this endpoint.
+    #
+    # Reads the :cookies endpoint option for determining the
+    # size of the cookie jar (77 by default).
+    #
+    def prepare_cookie_jar
 
-                o = @opts[:cookies]
+      o = @opts[:cookies]
 
-                return unless o and o != false
+      return unless o and o != false
 
-                s = o.to_s.to_i
-                s = 77 if s < 1
+      s = o.to_s.to_i
+      s = 77 if s < 1
 
-                @cookies = CookieJar.new s
-            end
+      @cookies = CookieJar.new s
+    end
 
-            #
-            # Parses the HTTP response for a potential 'Set-Cookie' header,
-            # parses and returns it as a hash.
-            #
-            def parse_cookies (response)
+    #
+    # Parses the HTTP response for a potential 'Set-Cookie' header,
+    # parses and returns it as a hash.
+    #
+    def parse_cookies (response)
 
-                c = response['Set-Cookie']
-                return nil unless c
-                Cookie.parse_set_cookies c
-            end
+      c = response['Set-Cookie']
+      return nil unless c
+      Cookie.parse_set_cookies c
+    end
 
-            #
-            # (This method will have no effect if the EndPoint is not
-            # tracking cookies)
-            #
-            # Registers a potential cookie set by the server.
-            #
-            def register_cookies (response, opts)
+    #
+    # (This method will have no effect if the EndPoint is not
+    # tracking cookies)
+    #
+    # Registers a potential cookie set by the server.
+    #
+    def register_cookies (response, opts)
 
-                return unless @cookies
+      return unless @cookies
 
-                cs = parse_cookies response
+      cs = parse_cookies response
 
-                return unless cs
+      return unless cs
 
-                # "The origin server effectively ends a session by
-                #  sending the client a Set-Cookie header with Max-Age=0"
+      # "The origin server effectively ends a session by
+      #  sending the client a Set-Cookie header with Max-Age=0"
 
-                cs.each do |c|
+      cs.each do |c|
 
-                    host = opts[:host]
-                    path = opts[:path]
-                    cpath = c.path || "/"
+        host = opts[:host]
+        path = opts[:path]
+        cpath = c.path || "/"
 
-                    next unless cookie_acceptable?(opts, response, c)
+        next unless cookie_acceptable?(opts, response, c)
 
-                    domain = c.domain || host
+        domain = c.domain || host
 
-                    if c.max_age == 0
-                        @cookies.remove_cookie domain, path, c
-                    else
-                        @cookies.add_cookie domain, path, c
-                    end
-                end
-            end
+        if c.max_age == 0
+          @cookies.remove_cookie domain, path, c
+        else
+          @cookies.add_cookie domain, path, c
+        end
+      end
+    end
 
-            #
-            # Checks if the cookie is acceptable in the context of 
-            # the request that sent it.
-            #
-            def cookie_acceptable? (opts, response, cookie)
+    #
+    # Checks if the cookie is acceptable in the context of
+    # the request that sent it.
+    #
+    def cookie_acceptable? (opts, response, cookie)
 
-                # reject if :
-                #
-                # * The value for the Path attribute is not a prefix of the 
-                #   request-URI.
-                # * The value for the Domain attribute contains no embedded dots
-                #   or does not start with a dot.
-                # * The value for the request-host does not domain-match the 
-                #   Domain attribute.
-                # * The request-host is a FQDN (not IP address) and has the form
-                #   HD, where D is the value of the Domain attribute, and H is a
-                #   string that contains one or more dots.
+      # reject if :
+      #
+      # * The value for the Path attribute is not a prefix of the
+      #   request-URI.
+      # * The value for the Domain attribute contains no embedded dots
+      #   or does not start with a dot.
+      # * The value for the request-host does not domain-match the
+      #   Domain attribute.
+      # * The request-host is a FQDN (not IP address) and has the form
+      #   HD, where D is the value of the Domain attribute, and H is a
+      #   string that contains one or more dots.
 
-                cdomain = cookie.domain
+      cdomain = cookie.domain
 
-                if cdomain
+      if cdomain
 
-                    return false unless cdomain.index '.'
-                    return false if cdomain[0, 1] != '.'
+        return false unless cdomain.index '.'
+        return false if cdomain[0, 1] != '.'
 
-                    h, d = split_host(opts[:host])
-                    return false if d != cdomain
-                end
+        h, d = split_host(opts[:host])
+        return false if d != cdomain
+      end
 
-                #path = opts[:path]
-                path = response.request.path
+      #path = opts[:path]
+      path = response.request.path
 
-                cpath = cookie.path || "/"
+      cpath = cookie.path || "/"
 
-                return false if path[0..cpath.length-1] != cpath
+      return false if path[0..cpath.length-1] != cpath
 
-                true
-            end
+      true
+    end
 
-            # 
-            # Places the 'Cookie' header in the request if appropriate.
-            #
-            # (This method will have no effect if the EndPoint is not
-            # tracking cookies)
-            #
-            def mention_cookies (request, opts)
+    #
+    # Places the 'Cookie' header in the request if appropriate.
+    #
+    # (This method will have no effect if the EndPoint is not
+    # tracking cookies)
+    #
+    def mention_cookies (request, opts)
 
-                return unless @cookies
+      return unless @cookies
 
-                cs = @cookies.fetch_cookies opts[:host], opts[:path]
+      cs = @cookies.fetch_cookies opts[:host], opts[:path]
 
-                request['Cookie'] = cs.collect { |c| c.to_header_s }.join(",")
-            end
+      request['Cookie'] = cs.collect { |c| c.to_header_s }.join(",")
+    end
+  end
+
+  #
+  # An extension of the cookie implementation found in WEBrick.
+  #
+  # Unmodified for now.
+  #
+  class Cookie < WEBrick::Cookie
+
+    def to_header_s
+
+      ret = ''
+      ret << @name << '=' << @value
+      ret << '; ' << '$Version=' << @version.to_s if @version > 0
+      ret << '; ' << '$Domain=' << @domain if @domain
+      ret << '; ' << '$Port=' << @port if @port
+      ret << '; ' << '$Path=' << @path if @path
+      ret
     end
+  end
 
-    #
-    # An extension of the cookie implementation found in WEBrick.
-    #
-    # Unmodified for now.
-    #
-    class Cookie < WEBrick::Cookie
+  #
+  # Cookies are stored by domain, they via this CookieKey which gathers
+  # path and name of the cookie.
+  #
+  class CookieKey
 
-        def to_header_s
+    attr_reader :name, :path
 
-            ret = ""
-            ret << @name << "=" << @value
-            ret << "; " << "$Version=" << @version.to_s if @version > 0
-            ret << "; " << "$Domain="  << @domain  if @domain
-            ret << "; " << "$Port="    << @port if @port
-            ret << "; " << "$Path="    << @path if @path
-            ret
-        end
+    def initialize (path, cookie)
+
+      @name = cookie.name
+      @path = path || cookie.path
     end
 
     #
-    # Cookies are stored by domain, they via this CookieKey which gathers
-    # path and name of the cookie.
+    # longer paths first
     #
-    class CookieKey
-
-        attr_reader :name, :path
+    def <=> (other)
 
-        def initialize (path, cookie)
+      -1 * (@path <=> other.path)
+    end
 
-            @name = cookie.name
-            @path = path || cookie.path
-        end
+    def hash
+      "#{@name}|#{@path}".hash
+    end
 
-        #
-        # longer paths first
-        #
-        def <=> (other)
+    def == (other)
+      (@path == other.path and @name == other.name)
+    end
 
-            -1 * (@path <=> other.path)
-        end
+    alias eql? ==
+  end
 
-        def hash
-            "#{@name}|#{@path}".hash
-        end
+  #
+  # A few methods about hostnames.
+  #
+  # (in a mixin... could be helpful somewhere else later)
+  #
+  module HostMixin
 
-        def == (other)
-            (@path == other.path and @name == other.name)
-        end
-
-        alias eql? ==
-    end
+    #
+    # Matching a classical IP address (not a v6 though).
+    # Should be sufficient for now.
+    #
+    IP_REGEX = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
 
     #
-    # A few methods about hostnames.
+    # Returns a pair host/domain, note that the domain starts with a dot.
     #
-    # (in a mixin... could be helpful somewhere else later)
+    #   split_host('localhost') --> [ 'localhost', nil ]
+    #   split_host('benz.car.co.nz') --> [ 'benz', '.car.co.nz' ]
+    #   split_host('127.0.0.1') --> [ '127.0.0.1', nil ]
+    #   split_host('::1') --> [ '::1', nil ]
     #
-    module HostMixin
-
-        #
-        # Matching a classical IP address (not a v6 though).
-        # Should be sufficient for now.
-        #
-        IP_REGEX = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
-
-        #
-        # Returns a pair host/domain, note that the domain starts with a dot.
-        #
-        #     split_host('localhost') --> [ 'localhost', nil ]
-        #     split_host('benz.car.co.nz') --> [ 'benz', '.car.co.nz' ]
-        #     split_host('127.0.0.1') --> [ '127.0.0.1', nil ]
-        #     split_host('::1') --> [ '::1', nil ] 
-        #
-        def split_host (host)
-
-            return [ host, nil ] if IP_REGEX.match host
-            i = host.index('.')
-            return [ host, nil ] unless i
-            [ host[0..i-1], host[i..-1] ]
-        end
+    def split_host (host)
+
+      return [ host, nil ] if IP_REGEX.match host
+      i = host.index('.')
+      return [ host, nil ] unless i
+      [ host[0..i-1], host[i..-1] ]
     end
+  end
 
-    #
-    # The container for cookies. Features methods for storing and retrieving
-    # cookies easily.
-    #
-    class CookieJar
-        include HostMixin
+  #
+  # The container for cookies. Features methods for storing and retrieving
+  # cookies easily.
+  #
+  class CookieJar
+    include HostMixin
 
-        def initialize (jar_size)
+    def initialize (jar_size)
 
-            @per_domain = LruHash.new jar_size
-        end
+      @per_domain = LruHash.new jar_size
+    end
 
-        #
-        # Returns the count of cookies currently stored in this jar.
-        #
-        def size
+    #
+    # Returns the count of cookies currently stored in this jar.
+    #
+    def size
 
-            @per_domain.keys.inject(0) { |i, d| i + @per_domain[d].size }
-        end
+      @per_domain.keys.inject(0) { |i, d| i + @per_domain[d].size }
+    end
 
-        def add_cookie (domain, path, cookie)
+    def add_cookie (domain, path, cookie)
 
-            (@per_domain[domain] ||= {})[CookieKey.new(path, cookie)] = cookie
-        end
+      (@per_domain[domain] ||= {})[CookieKey.new(path, cookie)] = cookie
+    end
 
-        def remove_cookie (domain, path, cookie)
+    def remove_cookie (domain, path, cookie)
 
-            (d = @per_domain[domain])
-            return unless d
-            d.delete CookieKey.new(path, cookie)
-        end
+      (d = @per_domain[domain])
+      return unless d
+      d.delete CookieKey.new(path, cookie)
+    end
 
-        #
-        # Retrieves the cookies that matches the combination host/path.
-        # If the retrieved cookie is expired, will remove it from the jar
-        # and return nil.
-        #
-        def fetch_cookies (host, path)
+    #
+    # Retrieves the cookies that matches the combination host/path.
+    # If the retrieved cookie is expired, will remove it from the jar
+    # and return nil.
+    #
+    def fetch_cookies (host, path)
 
-            c = do_fetch(@per_domain[host], path)
+      c = do_fetch(@per_domain[host], path)
 
-            h, d = split_host host
-            c += do_fetch(@per_domain[d], path) if d
+      h, d = split_host host
+      c += do_fetch(@per_domain[d], path) if d
 
-            c
-        end
+      c
+    end
 
-        private
+    private
 
-            #
-            # Returns all the cookies that match a domain (host) and a path.
-            #
-            def do_fetch (dh, path)
+    #
+    # Returns all the cookies that match a domain (host) and a path.
+    #
+    def do_fetch (dh, path)
 
-                return [] unless dh
+      return [] unless dh
 
-                keys = dh.keys.sort.find_all do |k|
-                    path[0..k.path.length-1] == k.path
-                end
-                keys.inject([]) do |r, k|
-                    r << dh[k]
-                    r
-                end
-            end
+      keys = dh.keys.sort.find_all do |k|
+        path[0..k.path.length-1] == k.path
+      end
+      keys.inject([]) do |r, k|
+        r << dh[k]
+        r
+      end
     end
+  end
 end
 end