From f0e22dc8290f126a9dc6298c34193f8e64cfc311 Mon Sep 17 00:00:00 2001 From: Roman Scherer Date: Fri, 10 Aug 2012 10:41:33 +0200 Subject: [PATCH] Renamed routes.param to routes.params. --- project.clj | 6 ++++-- src/clj/routes/core.clj | 2 +- src/clj/routes/{param.clj => params.clj} | 2 +- test/clj/routes/test/core.clj | 2 +- test/clj/routes/test/fixtures.clj | 2 +- test/clj/routes/test/{param.clj => params.clj} | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) rename src/clj/routes/{param.clj => params.clj} (98%) rename test/clj/routes/test/{param.clj => params.clj} (96%) diff --git a/project.clj b/project.clj index 7cc314a..d456540 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ :plugins [[lein-cljsbuild "0.2.4"]] :hooks [leiningen.cljsbuild] :cljsbuild {:builds [{:compiler {:output-to "target/routes-test.js" - :optimizations :advanced + :optimizations :whitespace :pretty-print true} :source-path "test/cljs"} {:compiler {:output-to "target/routes-debug.js" @@ -24,7 +24,9 @@ :jar true}] :crossover-jar true :crossover-path ".crossover-cljs" - :crossovers [routes.helper routes.server] + :crossovers [routes.helper + routes.params + routes.server] :repl-listen-port 9000 :repl-launch-commands {"chromium" ["chromium" "http://localhost:9000/"] diff --git a/src/clj/routes/core.clj b/src/clj/routes/core.clj index 8684d8d..f152cea 100644 --- a/src/clj/routes/core.clj +++ b/src/clj/routes/core.clj @@ -32,7 +32,7 @@ (defmacro defparam [name doc & [format-fn parse-fn]] (let [name# name] `(def ~name# - (routes.param/->Parameter + (routes.params/->Parameter ~(str name#) ~doc (or ~format-fn str) diff --git a/src/clj/routes/param.clj b/src/clj/routes/params.clj similarity index 98% rename from src/clj/routes/param.clj rename to src/clj/routes/params.clj index d974e44..3330a7e 100644 --- a/src/clj/routes/param.clj +++ b/src/clj/routes/params.clj @@ -1,4 +1,4 @@ -(ns routes.param +(ns routes.params (:refer-clojure :exclude [format]) (:require;*CLJSBUILD-REMOVE*;-macros [routes.core :refer [defparam]]) diff --git a/test/clj/routes/test/core.clj b/test/clj/routes/test/core.clj index 553b8a9..92677e6 100644 --- a/test/clj/routes/test/core.clj +++ b/test/clj/routes/test/core.clj @@ -1,5 +1,5 @@ (ns routes.test.core - (:require [routes.param :as params]) + (:require [routes.params :as params]) (:use clojure.test routes.core routes.helper diff --git a/test/clj/routes/test/fixtures.clj b/test/clj/routes/test/fixtures.clj index 6dfdc45..ea3182e 100644 --- a/test/clj/routes/test/fixtures.clj +++ b/test/clj/routes/test/fixtures.clj @@ -1,6 +1,6 @@ (ns routes.test.fixtures (:require [routes.core :refer [defroute]] - [routes.param :as params] + [routes.params :as params] [routes.server :refer [example]])) (def europe {:id 1 :name "Europe"}) diff --git a/test/clj/routes/test/param.clj b/test/clj/routes/test/params.clj similarity index 96% rename from test/clj/routes/test/param.clj rename to test/clj/routes/test/params.clj index 1cf8bcd..7999f2d 100644 --- a/test/clj/routes/test/param.clj +++ b/test/clj/routes/test/params.clj @@ -1,6 +1,6 @@ (ns routes.test.param (:require [clojure.test :refer :all] - [routes.param :refer :all])) + [routes.params :refer :all])) (deftest test-format-integer (is (= "1" (-format integer 1))))