Added number ns.

r0man · Jul 6, 2012 · 6f81523 · 6f81523
1 parent 3bb9078
commit 6f81523
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ lib
 /.lein-plugins
 /.crossover-cljs
 /stale/dependencies
+/out
diff --git a/index.html b/index.html
@@ -14,7 +14,7 @@
   <body>
     <div id="content">
       <script type="text/javascript">var CLOSURE_NO_DEPS = true;</script>
-      <script type="text/javascript" src="../target/inflections-debug.js"></script>
+      <script type="text/javascript" src="./target/inflections-debug.js"></script>
       <script type="text/javascript">inflections.repl.connect();</script>
   </body>
 </html>
diff --git a/project.clj b/project.clj
@@ -1,13 +1,19 @@
 (defproject inflections "0.7.0-SNAPSHOT"
-  :description "Rails-like inflections for Clojure."
+  :description "Rails-like inflections for Clojure(Script)."
   :url "http://github.com/r0man/inflections-clj"
   :author "Roman Scherer"
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.4.0"]
-                 [org.clojure/clojurescript "0.0-1424"]]
+                 [org.clojure/clojurescript "0.0-1443"]]
-  :plugins [[lein-cljsbuild "0.2.1"]]
+  :plugins [[lein-cljsbuild "0.2.2"]]
   :hooks [leiningen.cljsbuild]
-  :cljsbuild {:builds [{:compiler {:output-to "target/inflections-debug.js"}
+  :cljsbuild {:builds [{:compiler {:output-to "target/inflections-test.js"
+                                   :optimizations :advanced
+                                   :pretty-print true}
+                        :source-path "test/cljs"}
+                       {:compiler {:output-to "target/inflections-debug.js"
+                                   :optimizations :whitespace
+                                   :pretty-print true}
                         :source-path "src/cljs"}
                        {:compiler {:output-to "target/inflections.js"
                                    :optimizations :advanced

diff --git a/src/clj/inflections/number.clj b/src/clj/inflections/number.clj
@@ -0,0 +1,16 @@
+(ns inflections.number)
+
+(defn parse-float
+  "Parse `s` as a float number."
+  [s] (try (Float/parseFloat (str s))
+           (catch NumberFormatException _ nil)))
+
+(defn parse-integer
+  "Parse `s` as a integer."
+  [s] (try (Integer/parseInt (str s))
+           (catch NumberFormatException _ nil)))
+
+(defn parse-long
+  "Parse `s` as a long."
+  [s] (try (Long/parseLong (str s))
+           (catch NumberFormatException _ nil)))
diff --git a/src/cljs/inflections/number.cljs b/src/cljs/inflections/number.cljs
@@ -0,0 +1,11 @@
+(ns inflections.number)
+
+(defn parse-float
+  "Parse `s` as a floating-point number."
+  [s] (let [n (js/parseFloat (str s))]
+        (if-not (js/isNaN n) n)))
+
+(defn parse-integer
+  "Parse `s` as a integer."
+  [s] (let [n (js/parseInt (str s))]
+        (if-not (js/isNaN n) n)))
diff --git a/test-cljs.sh b/test-cljs.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+if [ ! -f target/inflections-test.js ]; then
+    lein cljsbuild once
+fi
+echo "inflections.test.run()" | d8 --shell target/inflections-test.js
diff --git a/test/clj/inflections/test/number.clj b/test/clj/inflections/test/number.clj
@@ -0,0 +1,24 @@
+(ns inflections.test.number
+  (:use clojure.test
+        inflections.number))
+
+(deftest test-parse-float
+  (is (nil? (parse-float nil)))
+  (is (nil? (parse-float "")))
+  (is (= 1.0 (parse-float "1")))
+  (is (= 10.0 (parse-float "10.0")))
+  (is (= -10.0 (parse-float "-10.0"))))
+
+(deftest test-parse-integer
+  (is (nil? (parse-integer nil)))
+  (is (nil? (parse-integer "")))
+  (is (= 1 (parse-integer "1")))
+  (is (= 10 (parse-integer "10")))
+  (is (= -10 (parse-integer "-10"))))
+
+(deftest test-parse-long
+  (is (nil? (parse-long nil)))
+  (is (nil? (parse-long "")))
+  (is (= 1 (parse-long "1")))
+  (is (= 10 (parse-long "10")))
+  (is (= -10 (parse-long "-10"))))
diff --git a/test/cljs/inflections/test.cljs b/test/cljs/inflections/test.cljs
@@ -0,0 +1,8 @@
+(ns inflections.test
+  (:require [inflections.test.core :as core]
+            [inflections.test.number :as number]))
+
+(defn ^:export run []
+  (core/test)
+  (number/test)
+  "All tests passed.")
diff --git a/test/cljs/inflections/test/number.cljs b/test/cljs/inflections/test/number.cljs
@@ -0,0 +1,20 @@
+(ns inflections.test.number
+  (:require [inflections.number :refer [parse-float parse-integer]]))
+
+(defn test-parse-float []
+  (assert (nil? (parse-float nil)))
+  (assert (nil? (parse-float "")))
+  (assert (= 1.0 (parse-float "1")))
+  (assert (= 10.0 (parse-float "10.0")))
+  (assert (= -10.0 (parse-float "-10.0"))))
+
+(defn test-parse-integer []
+  (assert (nil? (parse-integer nil)))
+  (assert (nil? (parse-integer "")))
+  (assert (= 1 (parse-integer "1")))
+  (assert (= 10 (parse-integer "10")))
+  (assert (= -10 (parse-integer "-10"))))
+
+(defn test []
+  (test-parse-float)
+  (test-parse-integer))