Give `require` the same features as `import` (#1142)
Give `require` the same features as `import`
You can now do (require foo), (require [foo [a b c]]), (require [foo [*]]), and (require [foo :as bar]). The first and last forms get you macros named foo.a, foo.b, etc. or bar.a, bar.b, etc., respectively. The second form only gets the macros in the list.
Implements #1118 and perhaps partly addresses #277.
N.B. The new meaning of (require foo) will cause all existing code that uses macros to break. Simply replace these forms with (require [foo [*]]) to get your code working again.
There's a bit of a hack involved in the forms (require foo) or (require [foo :as bar]). When you call (foo.a ...) or (bar.a ...), Hy doesn't actually look inside modules. Instead, these (require ...) forms give the macros names that have periods in them, which happens to work fine with the way Hy finds and interprets macro calls.
* Make `require` syntax stricter and add tests
* Update documentation for `require`
* Documentation wording improvements
* Allow :as in `require` name lists
2016-11-03 08:35:58 +01:00
|
|
|
(require [hy.contrib.meth [route post-route put-route delete-route]])
|
2013-12-20 20:29:48 +01:00
|
|
|
|
|
|
|
(defclass FakeMeth []
|
|
|
|
"Mocking decorator class"
|
2015-08-04 16:43:07 +02:00
|
|
|
[rules {}]
|
|
|
|
(defn route [self rule &kwargs options]
|
|
|
|
(fn [f]
|
|
|
|
(assoc self.rules rule (, f options))
|
|
|
|
f)))
|
2013-12-20 20:29:48 +01:00
|
|
|
|
|
|
|
(defn test_route []
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [app (FakeMeth)]
|
2013-12-20 20:29:48 +01:00
|
|
|
(route get-index "/" [] (str "Hy world!"))
|
|
|
|
(setv app-rules (getattr app "rules"))
|
|
|
|
(assert (in "/" app-rules))
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [(, rule-fun rule-opt) (get app-rules "/")]
|
2013-12-20 20:29:48 +01:00
|
|
|
(assert (not (empty? rule-opt)))
|
|
|
|
(assert (in "GET" (get rule-opt "methods")))
|
|
|
|
(assert (= (getattr rule-fun "__name__") "get_index"))
|
|
|
|
(assert (= "Hy world!" (rule-fun))))))
|
|
|
|
|
|
|
|
(defn test_post_route []
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [app (FakeMeth)]
|
2013-12-20 20:29:48 +01:00
|
|
|
(post-route get-index "/" [] (str "Hy world!"))
|
|
|
|
(setv app-rules (getattr app "rules"))
|
|
|
|
(assert (in "/" app-rules))
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [(, rule-fun rule-opt) (get app-rules "/")]
|
2013-12-20 20:29:48 +01:00
|
|
|
(assert (not (empty? rule-opt)))
|
|
|
|
(assert (in "POST" (get rule-opt "methods")))
|
|
|
|
(assert (= (getattr rule-fun "__name__") "get_index"))
|
|
|
|
(assert (= "Hy world!" (rule-fun))))))
|
|
|
|
|
|
|
|
(defn test_put_route []
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [app (FakeMeth)]
|
2013-12-20 20:29:48 +01:00
|
|
|
(put-route get-index "/" [] (str "Hy world!"))
|
|
|
|
(setv app-rules (getattr app "rules"))
|
|
|
|
(assert (in "/" app-rules))
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [(, rule-fun rule-opt) (get app-rules "/")]
|
2013-12-20 20:29:48 +01:00
|
|
|
(assert (not (empty? rule-opt)))
|
|
|
|
(assert (in "PUT" (get rule-opt "methods")))
|
|
|
|
(assert (= (getattr rule-fun "__name__") "get_index"))
|
|
|
|
(assert (= "Hy world!" (rule-fun))))))
|
|
|
|
|
|
|
|
(defn test_delete_route []
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [app (FakeMeth)]
|
2013-12-20 20:29:48 +01:00
|
|
|
(delete-route get-index "/" [] (str "Hy world!"))
|
|
|
|
(setv app-rules (getattr app "rules"))
|
|
|
|
(assert (in "/" app-rules))
|
2015-08-17 09:07:32 +02:00
|
|
|
(let [(, rule-fun rule-opt) (get app-rules "/")]
|
2013-12-20 20:29:48 +01:00
|
|
|
(assert (not (empty? rule-opt)))
|
|
|
|
(assert (in "DELETE" (get rule-opt "methods")))
|
|
|
|
(assert (= (getattr rule-fun "__name__") "get_index"))
|
|
|
|
(assert (= "Hy world!" (rule-fun))))))
|