Skip to content

Commit

Permalink
Renamed routes.param to routes.params.
Browse files Browse the repository at this point in the history
  • Loading branch information
r0man committed Aug 10, 2012
1 parent 0f1621c commit f0e22dc
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions project.clj
Expand Up @@ -10,7 +10,7 @@
:plugins [[lein-cljsbuild "0.2.4"]] :plugins [[lein-cljsbuild "0.2.4"]]
:hooks [leiningen.cljsbuild] :hooks [leiningen.cljsbuild]
:cljsbuild {:builds [{:compiler {:output-to "target/routes-test.js" :cljsbuild {:builds [{:compiler {:output-to "target/routes-test.js"
:optimizations :advanced :optimizations :whitespace
:pretty-print true} :pretty-print true}
:source-path "test/cljs"} :source-path "test/cljs"}
{:compiler {:output-to "target/routes-debug.js" {:compiler {:output-to "target/routes-debug.js"
Expand All @@ -24,7 +24,9 @@
:jar true}] :jar true}]
:crossover-jar true :crossover-jar true
:crossover-path ".crossover-cljs" :crossover-path ".crossover-cljs"
:crossovers [routes.helper routes.server] :crossovers [routes.helper
routes.params
routes.server]
:repl-listen-port 9000 :repl-listen-port 9000
:repl-launch-commands :repl-launch-commands
{"chromium" ["chromium" "http://localhost:9000/"] {"chromium" ["chromium" "http://localhost:9000/"]
Expand Down
2 changes: 1 addition & 1 deletion src/clj/routes/core.clj
Expand Up @@ -32,7 +32,7 @@
(defmacro defparam [name doc & [format-fn parse-fn]] (defmacro defparam [name doc & [format-fn parse-fn]]
(let [name# name] (let [name# name]
`(def ~name# `(def ~name#
(routes.param/->Parameter (routes.params/->Parameter
~(str name#) ~(str name#)
~doc ~doc
(or ~format-fn str) (or ~format-fn str)
Expand Down
2 changes: 1 addition & 1 deletion src/clj/routes/param.clj → src/clj/routes/params.clj
@@ -1,4 +1,4 @@
(ns routes.param (ns routes.params
(:refer-clojure :exclude [format]) (:refer-clojure :exclude [format])
(:require;*CLJSBUILD-REMOVE*;-macros (:require;*CLJSBUILD-REMOVE*;-macros
[routes.core :refer [defparam]]) [routes.core :refer [defparam]])
Expand Down
2 changes: 1 addition & 1 deletion test/clj/routes/test/core.clj
@@ -1,5 +1,5 @@
(ns routes.test.core (ns routes.test.core
(:require [routes.param :as params]) (:require [routes.params :as params])
(:use clojure.test (:use clojure.test
routes.core routes.core
routes.helper routes.helper
Expand Down
2 changes: 1 addition & 1 deletion test/clj/routes/test/fixtures.clj
@@ -1,6 +1,6 @@
(ns routes.test.fixtures (ns routes.test.fixtures
(:require [routes.core :refer [defroute]] (:require [routes.core :refer [defroute]]
[routes.param :as params] [routes.params :as params]
[routes.server :refer [example]])) [routes.server :refer [example]]))


(def europe {:id 1 :name "Europe"}) (def europe {:id 1 :name "Europe"})
Expand Down
@@ -1,6 +1,6 @@
(ns routes.test.param (ns routes.test.param
(:require [clojure.test :refer :all] (:require [clojure.test :refer :all]
[routes.param :refer :all])) [routes.params :refer :all]))


(deftest test-format-integer (deftest test-format-integer
(is (= "1" (-format integer 1)))) (is (= "1" (-format integer 1))))
Expand Down

0 comments on commit f0e22dc

Please sign in to comment.