Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Moved from Maven to Leiningen

  • Loading branch information...
commit ddea4391aaf2eaf7703c76747aebe27ce9a87c0c 1 parent 3870574
@Flamefork authored
Showing with 24 additions and 90 deletions.
  1. +3 −1 .gitignore
  2. +0 −78 pom.xml
  3. +10 −0 project.clj
  4. 0  src/{main/clojure → }/fleet.clj
  5. 0  src/{main/clojure → }/fleet/builder.clj
  6. 0  src/{main/clojure → }/fleet/loader.clj
  7. 0  src/{main/clojure → }/fleet/parser.clj
  8. 0  src/{main/clojure → }/fleet/runtime.clj
  9. 0  src/{main/clojure → }/fleet/util.clj
  10. 0  src/{main/java → }/fleet/util/CljString.java
  11. +4 −4 {src/test/clojure → test}/fleet/parser_builder_test.clj
  12. 0  {src/test/clojure → test}/fleet/runtime_test.clj
  13. 0  {src/test/clojure → test}/fleet/util_test.clj
  14. +5 −5 {src/test/clojure → test}/fleet_api_test.clj
  15. +2 −2 {src/test/clojure → test}/fleet_lang_test.clj
  16. 0  {src/test/fleet → test/resources}/first/test_tpl.fleet
  17. 0  {src/test/fleet → test/resources}/first/test_tpl.html
  18. 0  {src/test/fleet → test/resources}/ns/layout.html.fleet
  19. 0  {src/test/fleet → test/resources}/ns/posts/exceptional.fleet
  20. 0  {src/test/fleet → test/resources}/ns/posts/post.html.fleet
  21. 0  {src/test/fleet → test/resources}/ns/posts/posts.html
  22. 0  {src/test/fleet → test/resources}/ns/posts/posts.html.fleet
  23. 0  {src/test/fleet → test/resources}/ns/posts/posts_with_layout.html
  24. 0  {src/test/fleet → test/resources}/ns/posts/update.js
  25. 0  {src/test/fleet → test/resources}/ns/posts/update.js.fleet
  26. 0  {src/test/fleet → test/resources}/second/esc_posts_tpl.html
  27. 0  {src/test/fleet → test/resources}/second/post_tpl.ast.clj
  28. 0  {src/test/fleet → test/resources}/second/post_tpl.clj
  29. 0  {src/test/fleet → test/resources}/second/post_tpl.fleet
  30. 0  {src/test/fleet → test/resources}/second/posts_tpl.fleet
  31. 0  {src/test/fleet → test/resources}/second/posts_tpl.html
  32. 0  {src/test/fleet → test/resources}/third/anon_posts_tpl.fleet
  33. 0  {src/test/fleet → test/resources}/third/anon_posts_tpl.html
View
4 .gitignore
@@ -1,5 +1,7 @@
README.html
-target
+pom.xml
+classes
+lib
*.iml
View
78 pom.xml
@@ -1,78 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>fleet</groupId>
- <artifactId>fleet</artifactId>
- <packaging>jar</packaging>
- <version>0.9.2-SNAPSHOT</version>
- <name>fleet</name>
- <url>http://github.com/Flamefork/fleet</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure-contrib</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/clojure</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/clojure</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.theoryinpractise</groupId>
- <artifactId>clojure-maven-plugin</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>Clojure Maven Repository</id>
- <url>http://build.clojure.org/releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-</project>
View
10 project.clj
@@ -0,0 +1,10 @@
+(defproject
+ fleet "0.9.2-SNAPSHOT"
+ :description "Templating System for Clojure"
+ :url "http://github.com/Flamefork/fleet"
+
+ :dependencies [[org.clojure/clojure "1.1.0"]
+ [org.clojure/clojure-contrib "1.1.0"]]
+ :dev-dependencies [[lein-clojars "0.5.0-SNAPSHOT"]
+ [lein-javac "0.0.2-SNAPSHOT"]]
+ :repositories [["clojure-releases" "http://build.clojure.org/releases"]])
View
0  src/main/clojure/fleet.clj → src/fleet.clj
File renamed without changes
View
0  src/main/clojure/fleet/builder.clj → src/fleet/builder.clj
File renamed without changes
View
0  src/main/clojure/fleet/loader.clj → src/fleet/loader.clj
File renamed without changes
View
0  src/main/clojure/fleet/parser.clj → src/fleet/parser.clj
File renamed without changes
View
0  src/main/clojure/fleet/runtime.clj → src/fleet/runtime.clj
File renamed without changes
View
0  src/main/clojure/fleet/util.clj → src/fleet/util.clj
File renamed without changes
View
0  src/main/java/fleet/util/CljString.java → src/fleet/util/CljString.java
File renamed without changes
View
8 src/test/clojure/fleet/parser_builder_test.clj → test/fleet/parser_builder_test.clj
@@ -4,12 +4,12 @@
[fleet parser builder]))
(deftest parse-test
- (let [tpl (slurp "src/test/fleet/second/post_tpl.fleet")
- ast (slurp "src/test/fleet/second/post_tpl.ast.clj")]
+ (let [tpl (slurp "test/resources/second/post_tpl.fleet")
+ ast (slurp "test/resources/second/post_tpl.ast.clj")]
(is (= (parse tpl) (read-string ast)))))
(deftest build-test
- (let [ast (read-string (slurp "src/test/fleet/second/post_tpl.ast.clj"))
- clj (slurp "src/test/fleet/second/post_tpl.clj")]
+ (let [ast (read-string (slurp "test/resources/second/post_tpl.ast.clj"))
+ clj (slurp "test/resources/second/post_tpl.clj")]
; (println (build '(post) ast))
(is (= (build '(post) ast) clj))))
View
0  src/test/clojure/fleet/runtime_test.clj → test/fleet/runtime_test.clj
File renamed without changes
View
0  src/test/clojure/fleet/util_test.clj → test/fleet/util_test.clj
File renamed without changes
View
10 src/test/clojure/fleet_api_test.clj → test/fleet_api_test.clj
@@ -13,15 +13,15 @@
"html" :xml
:fleet :bypass])
-(fleet-ns tpl "src/test/fleet/ns" filters)
+(fleet-ns tpl "test/resources/ns" filters)
(deftest fleet-ns-test
(let [initial-ns *ns*]
- (fleet-ns 'tpl "src/test/fleet/ns" filters)
+ (fleet-ns 'tpl "test/resources/ns" filters)
(is (= *ns* initial-ns))
(is (=
(tpl.posts/posts-html test-posts test-data)
- (slurp "src/test/fleet/ns/posts/posts.html")))))
+ (slurp "test/resources/ns/posts/posts.html")))))
(deftest error-reporting-test
(let [e (is (thrown? ClassCastException (tpl.posts/exceptional)))
@@ -32,9 +32,9 @@
(deftest cross-lang-test
(is (=
(tpl.posts/update (first test-posts))
- (slurp "src/test/fleet/ns/posts/update.js"))))
+ (slurp "test/resources/ns/posts/update.js"))))
(deftest layout-test
(is (=
(tpl/layout (tpl.posts/posts-html test-posts test-data))
- (slurp "src/test/fleet/ns/posts/posts_with_layout.html"))))
+ (slurp "test/resources/ns/posts/posts_with_layout.html"))))
View
4 src/test/clojure/fleet_lang_test.clj → test/fleet_lang_test.clj
@@ -7,12 +7,12 @@
(defmacro fileet
"Convinient way to define test templates"
[args filename]
- `(fleet ~args (slurp (str "src/test/fleet/" ~filename ".fleet")) {:escaping :xml}))
+ `(fleet ~args (slurp (str "test/resources/" ~filename ".fleet")) {:escaping :xml}))
(defmacro readhtml
"Convinient way to read test data"
[filename]
- `(slurp (str "src/test/fleet/" ~filename ".html")))
+ `(slurp (str "test/resources/" ~filename ".html")))
(def test-posts
[{:body "First Post" :tags ["tag1" "tag2" "tag3"]},
View
0  src/test/fleet/first/test_tpl.fleet → test/resources/first/test_tpl.fleet
File renamed without changes
View
0  src/test/fleet/first/test_tpl.html → test/resources/first/test_tpl.html
File renamed without changes
View
0  src/test/fleet/ns/layout.html.fleet → test/resources/ns/layout.html.fleet
File renamed without changes
View
0  src/test/fleet/ns/posts/exceptional.fleet → test/resources/ns/posts/exceptional.fleet
File renamed without changes
View
0  src/test/fleet/ns/posts/post.html.fleet → test/resources/ns/posts/post.html.fleet
File renamed without changes
View
0  src/test/fleet/ns/posts/posts.html → test/resources/ns/posts/posts.html
File renamed without changes
View
0  src/test/fleet/ns/posts/posts.html.fleet → test/resources/ns/posts/posts.html.fleet
File renamed without changes
View
0  src/test/fleet/ns/posts/posts_with_layout.html → test/resources/ns/posts/posts_with_layout.html
File renamed without changes
View
0  src/test/fleet/ns/posts/update.js → test/resources/ns/posts/update.js
File renamed without changes
View
0  src/test/fleet/ns/posts/update.js.fleet → test/resources/ns/posts/update.js.fleet
File renamed without changes
View
0  src/test/fleet/second/esc_posts_tpl.html → test/resources/second/esc_posts_tpl.html
File renamed without changes
View
0  src/test/fleet/second/post_tpl.ast.clj → test/resources/second/post_tpl.ast.clj
File renamed without changes
View
0  src/test/fleet/second/post_tpl.clj → test/resources/second/post_tpl.clj
File renamed without changes
View
0  src/test/fleet/second/post_tpl.fleet → test/resources/second/post_tpl.fleet
File renamed without changes
View
0  src/test/fleet/second/posts_tpl.fleet → test/resources/second/posts_tpl.fleet
File renamed without changes
View
0  src/test/fleet/second/posts_tpl.html → test/resources/second/posts_tpl.html
File renamed without changes
View
0  src/test/fleet/third/anon_posts_tpl.fleet → test/resources/third/anon_posts_tpl.fleet
File renamed without changes
View
0  src/test/fleet/third/anon_posts_tpl.html → test/resources/third/anon_posts_tpl.html
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.