Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

removes old Noir dependencies, replaces defpage with compojure route #16

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject fetch "0.1.0-alpha2"
(defproject fetch "0.1.0-alpha3"
:description "A ClojureScript and Noir library to make client-server interaction painless."
:dependencies [[clojure "1.3.0"]
:dependencies [[org.clojure/clojure "1.5.1"]
[noir "1.2.2"]])
15 changes: 8 additions & 7 deletions src/noir/fetch/remotes.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
(ns noir.fetch.remotes
(:use [noir.core :only [defpage]]))
(:require [clojure.edn :as edn]
[compojure.core :refer :all]))

(def remotes (atom {}))

Expand All @@ -10,8 +11,7 @@
(swap! remotes assoc remote func))

(defn safe-read [s]
(binding [*read-eval* false]
(read-string s)))
(edn/read-string s))

(defmacro defremote [remote params & body]
`(do
Expand All @@ -30,7 +30,8 @@
(println "*** fetch/wrap-remotes is no longer needed. Please remove it ***")
handler)

(defpage [:any "/_fetch"] {:keys [remote params]}
(let [params (safe-read params)
remote (keyword remote)]
(call-remote remote params)))
(defroutes fetch-routes
(ANY "/_fetch" [remote params]
(let [params (safe-read params)
remote (keyword remote)]
(call-remote remote params))))