Merge branch 'develop'

ninjudd · May 13, 2013 · 1186c74 · 1186c74
2 parents 2cb07f0 + 7bda760
commit 1186c74
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,12 @@
-.cake
 pom.xml
+pom.xml.asc
 *.jar
 *.war
+*~
 lib
 classes
 build
 ./wakeful
 docs
 target
-.lein-failures
+.lein*
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/wakeful "0.5.1"
+(defproject org.flatland/wakeful "0.5.2-SNAPSHOT"
   :url "https://github.com/flatland/wakeful"
   :license {:name "Eclipse Public License - v 1.0"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

diff --git a/test/sample2/foo.clj b/test/sample2/foo.clj
@@ -0,0 +1,14 @@
+(ns sample2.foo
+  "This namespace contains a read and write function that expect config as the first arg.")
+
+(defn bar
+  "This is the bar read method"
+  [config request]
+  {:body
+   [:bar (:uri request) (:route-params request) config]})
+
+(defn bar!
+  "This is the bar write method"
+  [config request]
+  {:body
+   [:bar! (:uri request) (:body request) (:route-params request) config]})