style(core): fix cljfmt styling issues

Author: alehatsman

src/clj_postgresql/coerce.clj

@@ -13,19 +13,19 @@
 
 (defmethod geojson->postgis :LineString
   [m]
-  (st/line-string (:coordinates m)))  
+  (st/line-string (:coordinates m)))
 
 (defmethod geojson->postgis :MultiLineString
   [m]
-  (st/multi-line-string (:coordinates m)))  
+  (st/multi-line-string (:coordinates m)))
 
 (defmethod geojson->postgis :Polygon
   [m]
-  (st/polygon (:coordinates m)))  
+  (st/polygon (:coordinates m)))
 
 (defmethod geojson->postgis :MultiPolygon
   [m]
-  (st/multi-polygon (:coordinates m)))  
+  (st/multi-polygon (:coordinates m)))
 
 (defprotocol PostgisToCoords
   (postgis->coords [o]))
@@ -54,7 +54,7 @@
   org.postgis.MultiPolygon
   (postgis->coords [o]
     (mapv postgis->coords (.getPolygons o))))
-      
+
 (defprotocol PostgisToGeoJSON
   (postgis->geojson [o]))
 
@@ -83,4 +83,3 @@
   (postgis->geojson [o]
     {:type :MultiPolygon
      :coordinates (postgis->coords o)}))
-  

src/clj_postgresql/core.clj

@@ -1,6 +1,6 @@
 (ns clj-postgresql.core
   "Allow using PostgreSQL from Clojure as effortlessly as possible by reading connection parameter defaults from
-PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by reading password from ~/.pgpass if available." 
+  PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by reading password from ~/.pgpass if available."
   (:require [clj-postgresql.types]
             [cheshire.core :as json]
             [clojure.xml :as xml]
@@ -21,19 +21,19 @@ PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by readi
 
 (defn getenv->map
   "Convert crazy non-map thingy which comes from (System/getenv) into a keywordized map.
-   If no argument given, fetch env with (System/getenv)."
+  If no argument given, fetch env with (System/getenv)."
   ([x]
-    {:pre [(= (type x) java.util.Collections$UnmodifiableMap)]
-     :post [(map? %)]}
-    (zipmap
-      (map keyword (keys x))
-      (vals x)))
+   {:pre [(= (type x) java.util.Collections$UnmodifiableMap)]
+    :post [(map? %)]}
+   (zipmap
+    (map keyword (keys x))
+    (vals x)))
   ([]
-    (getenv->map (System/getenv))))
+   (getenv->map (System/getenv))))
 
 (defn default-spec
   "Reasonable defaults as with the psql command line tool.
-   Use username for user and db. Don't use host."
+  Use username for user and db. Don't use host."
   []
   (let [username (java.lang.System/getProperty "user.name")]
     {:dbtype "postgresql"
@@ -46,15 +46,15 @@ PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by readi
   {:pre [(map? env)]
    :post [(map? %)]}
   (cond-> {}
-          PGDATABASE (assoc :dbname PGDATABASE)
-          PGHOST (assoc :host PGHOST)
-          PGPORT (assoc :port PGPORT)
-          PGUSER (assoc :user PGUSER)))
+    PGDATABASE (assoc :dbname PGDATABASE)
+    PGHOST (assoc :host PGHOST)
+    PGPORT (assoc :port PGPORT)
+    PGUSER (assoc :user PGUSER)))
 
 (defn spec
   "Create database spec for PostgreSQL. Uses PG* environment variables by default
-   and acceps options in the form:
-   (pg-spec :dbname ... :host ... :port ... :user ... :password ...)"
+  and acceps options in the form:
+  (pg-spec :dbname ... :host ... :port ... :user ... :password ...)"
   [& {:keys [password] :as opts}]
   {:post [(contains? % :dbname)
           (contains? % :user)]}
@@ -65,7 +65,7 @@ PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by readi
                        spec-opts)
         password (or password (pgpass/pgpass-lookup db-spec))]
     (cond-> (merge extra-opts db-spec)
-            password (assoc :password password))))
+      password (assoc :password password))))
 
 (defn pool
   [& rest]
@@ -83,9 +83,9 @@ PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by readi
   [db]
   (jdbc/with-db-metadata [md db]
     (->> (doall (jdbc/metadata-result (.getTables md nil nil nil (into-array ["TABLE"]))))
-      (map :table_name)
-      (map keyword)
-      (set))))
+         (map :table_name)
+         (map keyword)
+         (set))))
 
 ;;
 ;; Types
@@ -121,70 +121,69 @@ PostgreSQL environment variables PGDATABASE, PGHOST, PGPORT, PGUSER and by readi
 (defn point
   "Create a PGpoint object"
   ([x y]
-    (PGpoint. x y))
+   (PGpoint. x y))
   ([obj]
-    (cond
-      (instance? PGpoint obj) obj
-      (coll? obj) (point (first obj) (second obj))
-      :else (PGpoint. (str obj)))))
+   (cond
+     (instance? PGpoint obj) obj
+     (coll? obj) (point (first obj) (second obj))
+     :else (PGpoint. (str obj)))))
 
 (defn box
   "Create a PGbox object"
   ([p1 p2]
-    (PGbox. (point p1) (point p2)))
+   (PGbox. (point p1) (point p2)))
   ([x1 y1 x2 y2]
-    (PGbox. x1 y1 x2 y2))
+   (PGbox. x1 y1 x2 y2))
   ([obj]
-    (if (instance? PGbox obj)
-      obj
-      (PGbox. (str obj)))))
+   (if (instance? PGbox obj)
+     obj
+     (PGbox. (str obj)))))
 
 (defn circle
   "Create a PGcircle object"
   ([x y r]
-    (PGcircle. x y r))
+   (PGcircle. x y r))
   ([center-point r]
-    (PGcircle. (point center-point) r))
+   (PGcircle. (point center-point) r))
   ([obj]
-    (if (instance? PGcircle obj)
-      obj
-      (PGcircle. (str obj)))))
+   (if (instance? PGcircle obj)
+     obj
+     (PGcircle. (str obj)))))
 
 (defn line
   "Create a PGline object"
   ([x1 y1 x2 y2]
-    (PGline. x1 y1 x2 y2))
+   (PGline. x1 y1 x2 y2))
   ([p1 p2]
-    (PGline. (point p1) (point p2)))
+   (PGline. (point p1) (point p2)))
   ([obj]
-    (if (instance? PGline obj)
-      obj
-      (PGline. (str obj)))))
+   (if (instance? PGline obj)
+     obj
+     (PGline. (str obj)))))
 
 (defn lseg
   "Create a PGlseg object"
   ([x1 y1 x2 y2]
-    (PGlseg. x1 y1 x2 y2))
+   (PGlseg. x1 y1 x2 y2))
   ([p1 p2]
-    (PGlseg. (point p1) (point p2)))
+   (PGlseg. (point p1) (point p2)))
   ([obj]
-    (if (instance? PGlseg obj)
-      obj
-      (PGlseg. (str obj)))))
-    
+   (if (instance? PGlseg obj)
+     obj
+     (PGlseg. (str obj)))))
+
 (defn path
   "Create a PGpath object"
   ([points open?]
-    (PGpath. (into-array PGpoint (map point points)) open?))
+   (PGpath. (into-array PGpoint (map point points)) open?))
   ([obj]
-    (if (instance? PGpath obj)
-      obj
-      (PGpath. (str obj)))))
+   (if (instance? PGpath obj)
+     obj
+     (PGpath. (str obj)))))
 
 (defn polygon
   "Create a PGpolygon object"
   [points-or-str]
   (if (coll? points-or-str)
     (PGpolygon. ^"[Lorg.postgresql.geometric.PGpoint;" (into-array PGpoint (map point points-or-str)))
     (PGpolygon. ^String (str points-or-str))))
-    

src/clj_postgresql/geojson.clj

@@ -102,10 +102,10 @@
 (defn schema-pred
   [schema m]
   (try (s/validate schema m)
-    true
-    (catch Exception e
-      false)))
-    
+       true
+       (catch Exception e
+         false)))
+
 (defn point?
   [m]
   (schema-pred Point m))
@@ -122,5 +122,4 @@
    :post [(s/validate MultiPoint %)]}
   {:type :MultiPoint
    :coordinates nil})
-  
-  
+

src/clj_postgresql/geometric/Point.clj

@@ -1,10 +1,10 @@
 (ns clj-postgresql.geometric.Point
   "Example implementation of a PGobject that also implements
-   Clojure's ISeq and shows as a sequence of two numbers."  
+   Clojure's ISeq and shows as a sequence of two numbers."
   (:gen-class
-    :extends org.postgresql.geometric.PGpoint
-    :implements [clojure.lang.Counted clojure.lang.ISeq]
-    :main false))
+   :extends org.postgresql.geometric.PGpoint
+   :implements [clojure.lang.Counted clojure.lang.ISeq]
+   :main false))
 
 (defn to-list
   [^org.postgresql.geometric.PGpoint this]

src/clj_postgresql/pgpass.clj

@@ -26,12 +26,12 @@
 (defn pgpass-matches?
   "(filter (partial pgpass-matches? spec) pgpass-lines)"
   [{:keys [host port dbname user]} {:keys [pg-hostname pg-port pg-database pg-username pg-password]}]
-  (when 
-      (and
-       (or (= pg-hostname "*") (= pg-hostname host) (and (= pg-hostname "localhost") (nil? host)))
-       (or (= pg-port "*") (= pg-port port) (and (= pg-port "5432") (nil? port)))
-       (or (= pg-database "*") (= pg-database dbname))
-       (or (= pg-username "*") (= pg-username user)))
+  (when
+   (and
+    (or (= pg-hostname "*") (= pg-hostname host) (and (= pg-hostname "localhost") (nil? host)))
+    (or (= pg-port "*") (= pg-port port) (and (= pg-port "5432") (nil? port)))
+    (or (= pg-database "*") (= pg-database dbname))
+    (or (= pg-username "*") (= pg-username user)))
     pg-password))
 
 (defn pgpass-lookup

src/clj_postgresql/protocol.clj

@@ -157,9 +157,9 @@
 (defn send!
   [^SocketChannel sc bufs]
   (as-> bufs x
-        (map #(.rewind ^ByteBuffer %) x)
-        (into-array ByteBuffer x)
-        (.write sc ^"[Ljava.nio.ByteBuffer;" x)))
+    (map #(.rewind ^ByteBuffer %) x)
+    (into-array ByteBuffer x)
+    (.write sc ^"[Ljava.nio.ByteBuffer;" x)))
 
 (defn recv!
   [^SocketChannel sc]
@@ -172,7 +172,7 @@
       (.read sc ^ByteBuffer content-bb)
       (.rewind content-bb)
       (response type len content-bb))))
-      
+
 (defn converse
   []
   (with-open [sc (SocketChannel/open (InetSocketAddress. "127.0.0.1" 5432))]
@@ -192,7 +192,6 @@
     (pprint (recv! sc))
     (send! sc (terminate-message))))
 
-
 ;; startup
 ;; ReadyForQuery
 ;; dostuff
@@ -264,7 +263,6 @@
 ;;
 
 
-
 ;;
 ;; pg-async ?
 ;;

src/clj_postgresql/spatial.clj

@@ -6,7 +6,7 @@
   "Returns the set SRID of a geometry object"
   [^Geometry geometry]
   (.getSrid geometry))
-  
+
 (defn with-srid!
   "Return the geometry object with SRID set. Alters the object."
   [^Geometry geometry srid]
@@ -20,21 +20,21 @@
            (>= (count x) 2)
            (<= (count x) 3)
            (every? number? (map number? x)))))
-  
+
 (defn point
   "Make a 2D or 3D Point."
   ([x y]
-    (Point. x y))
+   (Point. x y))
   ([x y z]
-    (Point. x y z))
+   (Point. x y z))
   ([coll-or-str]
-    (cond (instance? Point coll-or-str) coll-or-str
-          (coll? coll-or-str) (let [x (first coll-or-str)
-                                    y (second coll-or-str)]
-                                (if-let [z (nth coll-or-str 2 nil)]
-                                  (Point. x y z)
-                                  (Point. x y)))
-          :else (Point. (str coll-or-str)))))
+   (cond (instance? Point coll-or-str) coll-or-str
+         (coll? coll-or-str) (let [x (first coll-or-str)
+                                   y (second coll-or-str)]
+                               (if-let [z (nth coll-or-str 2 nil)]
+                                 (Point. x y z)
+                                 (Point. x y)))
+         :else (Point. (str coll-or-str)))))
 
 (defn multi-point
   "Make a MultiPoint from collection of Points."