Permalink
Browse files

Changed r.m.params to use new Clojure 1.2 libraries

  • Loading branch information...
1 parent 173cb2d commit 007302affcaeac6380aa7fd0ebf279c2a8c6271f @weavejester weavejester committed Jul 23, 2010
Showing with 5 additions and 4 deletions.
  1. +5 −4 ring-core/src/ring/middleware/params.clj
View
9 ring-core/src/ring/middleware/params.clj
@@ -1,7 +1,8 @@
(ns ring.middleware.params
"Parse form and query params."
- (:require (clojure.contrib [str-utils :as str] [duck-streams :as duck])
- (ring.util [codec :as codec])))
+ (:require [ring.util.codec :as codec]
+ [clojure.string :as string]
+ [clojure.contrib.io :as io]))
(defn assoc-param
"Associate a key with a value. If the key already exists in the map,
@@ -25,7 +26,7 @@
(codec/url-decode (or val "") encoding))
param-map))
{}
- (str/re-split #"&" param-string)))
+ (string/split param-string #"&")))
(defn- assoc-query-params
"Parse and assoc parameters from the query string with the request."
@@ -47,7 +48,7 @@
[request encoding]
(merge-with merge request
(if-let [body (and (urlencoded-form? request) (:body request))]
- (let [params (parse-params (duck/slurp* body) encoding)]
+ (let [params (parse-params (io/slurp* body) encoding)]
{:form-params params, :params params})
{:form-params {}, :params {}})))

0 comments on commit 007302a

Please sign in to comment.