fixed clojure 1.2 deftype changes

jharwig · Apr 25, 2010 · 6f1f7a7 · jharwig · Apr 25, 2010 · 6f1f7a7
1 parent cca24c5
commit 6f1f7a7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/src/spriter/core.clj b/src/spriter/core.clj
@@ -41,7 +41,7 @@
     (.println writer (str "/* CSS Sprite File Generated by css-spriter on " (java.util.Date.) " ...*/\n" ))
     (let [css-writer (output-type outputs)]
       (println (str "Generated sprite PNG with "
-        (count (for [image (with-coordinates (layout-type layouts) images)] (write-css-selector css-writer writer image)))  
+        (count (for [image (with-coordinates (layout-type layouts) images)] (write-css-selector css-writer writer image)))
         " images")))))
 
 

diff --git a/src/spriter/layout.clj b/src/spriter/layout.clj
@@ -6,16 +6,15 @@
   (with-coordinates [l images]))
 
 (deftype Simple [direction]
-  :as this
   Layout
-  (sprite-dimensions [i]
+  (sprite-dimensions [this, i]
     (let [vertical (= direction :vertical)
           images (with-coordinates this i)
           x-dimension (apply max (map #((:dimensions %1) (if vertical 0 1)) images))
           y-dimension (+ ((:coordinates (last images)) (if vertical 1 0)) ((:dimensions (last images)) (if vertical 1 0)))
           dimensions [x-dimension y-dimension]]
         (if vertical dimensions (vec (reverse dimensions)))))
-  (with-coordinates [images]
+  (with-coordinates [_ images]
     (if (contains? (first images) :coordinates)
       images
       (let [vertical (= direction :vertical)
@@ -26,4 +25,4 @@
                 coord (if vertical coord (vec (reverse coord)))]
             (merge image {:coordinates coord})))))))
 
-(def layouts {:vertical (Simple :vertical) :horizontal (Simple :horizontal)})
+(def layouts {:vertical (new Simple :vertical) :horizontal (new Simple :horizontal)})
diff --git a/src/spriter/util.clj b/src/spriter/util.clj
@@ -19,4 +19,4 @@
 
 (defn num->css-str
   ([num] (num->css-str num "px"))
-  ([num unit] (apply str (if (zero? num) [0] [num unit]))))
+  ([num unit] (str num (when-not (zero? num) unit))))
diff --git a/src/spriter/writer.clj b/src/spriter/writer.clj
@@ -13,9 +13,8 @@
   (write-css-selector [c writer image]))
 
 (deftype Writer [format]
-  :as this
   CssWriter
-  (write-css-selector [writer image]
+  (write-css-selector [_ writer image]
     (let [class-name (str "." (image->class-name image))
           nl (if (= format :verbose) "\n" "")
           [css-width css-height] (map num->css-str (:dimensions image))
@@ -27,4 +26,4 @@
                             " background-position: " css-x " " css-y ";" nl
                             "}")))))
 
-(def outputs {:verbose (Writer :verbose) :compact (Writer :compact)})
+(def outputs {:verbose (new Writer :verbose) :compact (new Writer :compact)})
diff --git a/test/spriter/layout_test.clj b/test/spriter/layout_test.clj
@@ -11,5 +11,5 @@
 		(should (= (count coord-images) (count images)))))
 
 (testing "available layouts"
-  (should (= (:vertical layouts) (Simple :vertical)))
-  (should (= (:horizontal layouts) (Simple :horizontal))))
+  (should (not (nil? (:vertical layouts))))
+  (should (not (nil? (:horizontal layouts)))))