DVF-1990 Export Server improvement

Author: RomanLubushkin

project.clj

@@ -1,8 +1,8 @@
-(defproject export-server "1.1.4"
-  :description "AnyChart export server, AnyChart Bundle version 7.9.1"
+(defproject export-server "1.2.0"
+  :description "AnyChart export server, AnyChart Bundle version 7.10.0"
   :url "https://github.com/AnyChart/export-server"
   :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
+            :url  "http://www.eclipse.org/legal/epl-v10.html"}
   :jvm-opts ["-Dphantomjs.binary.path=/usr/local/bin/phantomjs"]
   :dependencies [[org.clojure/clojure "1.6.0"]
                  ;http
@@ -22,8 +22,19 @@
                  [org.clojure/tools.cli "0.3.1"]
 
                  ;rasterization
-                 [clj-pdf "1.11.17"]
-                 [tikkba "0.5.0"]
+                 [clj-pdf "2.2.0"]
+                 [tikkba "0.5.0" :exclusions [org.clojure/clojure org.clojars.pallix/batik]]
+                 [org.clojars.pallix/xerces "2.5.0"]
+                 [org.clojars.pallix/xml-apis "2.5.0"]
+                 [org.clojars.pallix/xml-apis-ext "2.5.0"]
+
+                 [org.apache.xmlgraphics/batik-transcoder "1.8"]
+                 [org.apache.xmlgraphics/batik-xml "1.8"]
+                 [org.apache.xmlgraphics/batik-codec "1.7"]
+
+                 ;csv to xslx
+                 [dk.ative/docjure "1.10.0"]
+                 [org.clojure/data.csv "0.1.3"]
 
                  ;JSON
                  [cheshire "5.3.1"]

src/export_server/cmd_handlers.clj

@@ -2,6 +2,14 @@
   (:require [export-server.utils.rasterizator :as rasterizator])
   (:require [clojure.java.io :as io]))
 
+
+(defn- get-pdf-size [options]
+  (if (and
+      (contains? options :pdf-width)
+      (contains? options :pdf-height)
+      (not (nil? (:pdf-width options)))
+      (not (nil? (:pdf-height options)))) [(:pdf-width options) (:pdf-height options)] (:pdf-size options)))
+
 (defn out [result options ext]
   (let [output-file (if (:output-file options) (:output-file options) (str (java.util.UUID/randomUUID)))
         output-path (:output-path options)
@@ -30,7 +38,7 @@
 (defn pdf [options]
   (let [script (if (:script options) (:script options) (slurp (:input-file options)))
         svg ((rasterizator/script-to-svg script true true options) :result)
-        image (:result (rasterizator/svg-to-pdf svg (:pdf-size options) (:pdf-landscape options) (:pdf-x options) (:pdf-y options)))]
+        image (:result (rasterizator/svg-to-pdf svg (get-pdf-size options) (:pdf-landscape options) (:pdf-x options) (:pdf-y options)))]
     (out image options ".pdf")))
 
 

src/export_server/core.clj

@@ -136,7 +136,17 @@
     :parse-fn #(keyword %)
     ]
 
-   ["-x" "--pdf-x PDF-X" "Pad X"
+   ["-X" "--pdf-width PDF-WIDTH" "Pdf width"
+    :default (:pdf-width config/defaults)
+    :parse-fn #(Integer/parseInt %)
+    ]
+
+   ["-Y" "--pdf-height PDF-HEIGHT" "Pdf height"
+    :default (:pdf-width config/defaults)
+    :parse-fn #(Integer/parseInt %)
+    ]
+
+   ["-x" "--pdf-x PDF-X" "Pdf X"
     :default (:pdf-x config/defaults)
     :parse-fn #(Integer/parseInt %)
     ]
@@ -181,6 +191,10 @@
            (POST "/jpg" [] web/jpg)
            (POST "/svg" [] web/svg)
            (POST "/pdf" [] web/pdf)
+           (POST "/xml" [] web/xml)
+           (POST "/json" [] web/json)
+           (POST "/csv" [] web/csv)
+           (POST "/xlsx" [] web/xlsx)
            (route/not-found "<p>Page not found.</p>"))
 
 (def app (-> app-routes wrap-params))

src/export_server/utils/config.clj

@@ -60,5 +60,7 @@
                :pdf-size :a4
                :pdf-x 0
                :pdf-y 0
+               :pdf-width nil
+               :pdf-height nil
                :pdf-landscape false
                })

src/export_server/utils/params_validator.clj

@@ -9,21 +9,21 @@
 (def ^{:private true} boolean-re #"(?i)^(true|false|0|1)$")
 (def ^{:private true} ratio-re #"(?i)([0-9]+\.[0-9]+)")
 
-(def ^{:private true} rasterization-data-fields-validations {"data" v/required})
+
+(def ^{:private true} data-fields-validations {"data" v/required})
 
 (def ^{:private true} image-fields-validations
   {"width"                   [[v/matches pixel-re :message "Width must be a number or pixel string"]]
    "height"                  [[v/matches pixel-re :message "Height must be a number or pixel string"]]
-   "forceTransparentWhite"   [[v/matches boolean-re  :message "Height must be a boolean or one of the numbers: 0, 1"]]
+   "forceTransparentWhite"   [[v/matches boolean-re :message "Height must be a boolean or one of the numbers: 0, 1"]]
    "force-transparent-white" [[v/matches boolean-re :message "Height must be a boolean or one of the numbers: 0, 1"]]
    "quality"                 [[v/matches ratio-re :message "Quality must be in range: 0.1 - 1."]]
    })
 
 (defn- available-pdf-size? [size]
   (if (nil? size)
     true
-    (contains? available-pdf-sizes (keyword size)))
-  )
+    (contains? available-pdf-sizes (keyword size))))
 
 (def ^{:private true} pdf-fields-validations
   {"pdfSize"   [[available-pdf-size? :message (str "pdfSize must be one of the values:" (clojure.string/join ", " (map name (keys available-pdf-sizes))))]]
@@ -35,8 +35,9 @@
    "landscape" [[v/matches boolean-re :message "Landscape must be a boolean or one of the numbers: 0, 1"]]
    })
 
-(def ^{:private true} image-params-validations (merge rasterization-data-fields-validations image-fields-validations))
-(def ^{:private true} pdf-params-validations (merge rasterization-data-fields-validations pdf-fields-validations))
+
+(def ^{:private true} image-params-validations (merge data-fields-validations image-fields-validations))
+(def ^{:private true} pdf-params-validations (merge data-fields-validations pdf-fields-validations))
 
 
 (defn validate-image-params [params]
@@ -52,6 +53,9 @@
     (not (or (contains? params "responseType") (contains? params "response-type"))) [[(str "response-type must be one of the values: " (clojure.string/join ", " (map name available-rasterization-response-types)))]]
     :else (bouncer/validate params pdf-params-validations)))
 
+
+(defn validate-save-data-params [params] (bouncer/validate params data-fields-validations))
+
 (defn valid-result? [result] (nil? (get result 0)))
 
 (defn get-error-message [result] (clojure.string/join "," (get result 0)))

src/export_server/utils/rasterizator.clj

@@ -2,14 +2,14 @@
   (:import (org.openqa.selenium WebDriverException)
            (org.openqa.selenium.phantomjs PhantomJSDriver)
            (org.openqa.selenium.remote DesiredCapabilities)
-           (java.io ByteArrayOutputStream)
            (org.apache.batik.transcoder.image JPEGTranscoder)
            (org.apache.batik.transcoder.image PNGTranscoder)
            (org.apache.batik.transcoder TranscoderInput)
            (org.apache.batik.transcoder TranscoderOutput)
            (org.apache.batik.transcoder SVGAbstractTranscoder)
-           (java.lang Float)
            (java.io StringReader)
+           (java.io ByteArrayOutputStream)
+           (java.lang Float)
            )
   (:require [clojure.data.codec.base64 :as b64]
             [tikkba.transcoder :as transcoder]
@@ -103,7 +103,6 @@
             transcoder-input (new TranscoderInput string-reader)
             transcoder-output (new TranscoderOutput out)
             transcoder (new JPEGTranscoder)]
-
         (.addTranscodingHint transcoder JPEGTranscoder/KEY_QUALITY (float quality))
         (.addTranscodingHint transcoder JPEGTranscoder/KEY_WIDTH (float widht))
         (.addTranscodingHint transcoder JPEGTranscoder/KEY_HEIGHT (float height))

src/export_server/utils/responce.clj

@@ -31,6 +31,11 @@
                         ".svg" "image/svg+xml"
                         ".pdf" "application/pdf"
                         ".png" "image/png"
+                        ".xml" "application/xml"
+                        ".json" "application/json"
+                        ".csv" "text/csv"
+                        ".xls" "application/vnd.ms-excel"
+                        ".xlsx" "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                         ".jpg" "image/jpeg"))
         (header "Content-Length" (.length file))
         (header "Last-Modified" (format-date (last-modified-date file)))

src/export_server/web_handlers.clj

@@ -1,17 +1,20 @@
 (ns export-server.web-handlers
   (:require [cheshire.core :refer :all]
             [compojure.core :refer :all]
+            [dk.ative.docjure.spreadsheet :as spreadheet]
+            [clojure.data.csv :as csv-parser]
             [export-server.utils.responce :refer :all]
             [export-server.utils.rasterizator :as rastr]
             [export-server.utils.params-validator :as params-validator]
             [export-server.utils.config :as config]
-            [export-server.utils.rasterizator :as rast]))
+            [export-server.utils.rasterizator :as rast])
+  (:import (org.apache.commons.io.output ByteArrayOutputStream)))
 
 
 ;=======================================================================================================================
 ; Params to png/jpg/pdf
 ;=======================================================================================================================
-(defn get-number-unit [map key] (Integer/parseInt (first(re-find #"([-+]?[0-9]+)" (map key)))))
+(defn get-number-unit [map key] (Integer/parseInt (first (re-find #"([-+]?[0-9]+)" (map key)))))
 
 (def allow-script-executing (atom true))
 
@@ -21,6 +24,7 @@
 
 (defn get-pdf-size [params]
   (cond
+    (and (contains? params "pdf-width") (contains? params "pdf-height")) [(get-number-unit params "pdf-width") (get-number-unit params "pdf-height")]
     (contains? params "pdf-size") (params "pdf-size")
     (contains? params "pdfSize") (params "pdfSize")
     :else (:pdf-size config/defaults)))
@@ -123,6 +127,9 @@
       :else {:ok false :result "Unknown data type"})))
 
 
+(defn- get-file-name [params] (if (and (contains? params "file-name") (string? (params "file-name"))) (params "file-name") "anychart"))
+
+
 ;=======================================================================================================================
 ; Handlers
 ;=======================================================================================================================
@@ -135,11 +142,10 @@
         (if (to-png-result :ok)
           (if (= response-type "base64")
             (json-success (rast/to-base64 (to-png-result :result)))
-            (file-success (to-png-result :result) "anychart" ".png"))
+            (file-success (to-png-result :result) (get-file-name params) ".png"))
           (json-error (to-png-result :result))))
-      (json-error (params-validator/get-error-message validation-result)))
-    )
-  )
+      (json-error (params-validator/get-error-message validation-result)))))
+
 
 (defn jpg [request]
   (let [params (request :form-params)
@@ -150,10 +156,11 @@
         (if (to-jpg-result :ok)
           (if (= response-type "base64")
             (json-success (rast/to-base64 (to-jpg-result :result)))
-            (file-success (to-jpg-result :result) "anychart" ".jpg"))
+            (file-success (to-jpg-result :result) (get-file-name params) ".jpg"))
           (json-error (to-jpg-result :result))))
       (json-error (params-validator/get-error-message validation-result)))))
 
+
 (defn pdf [request]
   (let [params (request :form-params)
         validation-result (params-validator/validate-pdf-params params)]
@@ -163,11 +170,12 @@
         (if (to-pdf-result :ok)
           (if (= response-type "base64")
             (json-success {:result (rast/to-base64 (to-pdf-result :result))})
-            (file-success (to-pdf-result :result) "anychart" ".pdf"))
+            (file-success (to-pdf-result :result) (get-file-name params) ".pdf"))
           (json-error (to-pdf-result :result)))
         )
       (json-error (params-validator/get-error-message validation-result)))))
 
+
 (defn svg [request]
   (let [params (request :form-params)
         validation-result (params-validator/validate-image-params params)]
@@ -177,8 +185,45 @@
         (if (to-svg-result :ok)
           (if (= response-type "base64")
             (json-success (rast/to-base64 (.getBytes (to-svg-result :result))))
-            (file-success (.getBytes (to-svg-result :result)) "anychart" ".svg"))
+            (file-success (.getBytes (to-svg-result :result)) (get-file-name params) ".svg"))
           (json-error (to-svg-result :result)))
         )
       (json-error (params-validator/get-error-message validation-result)))))
 
+
+(defn xml [request]
+  (let [params (request :form-params)
+        validation-result (params-validator/validate-save-data-params params)]
+    (if (params-validator/valid-result? validation-result)
+      (file-success (.getBytes (params "data")) (get-file-name params) ".xml")
+      (json-error (params-validator/get-error-message validation-result)))))
+
+
+(defn json [request]
+  (let [params (request :form-params)
+        validation-result (params-validator/validate-save-data-params params)]
+    (if (params-validator/valid-result? validation-result)
+      (file-success (.getBytes (params "data")) (get-file-name params) ".json")
+      (json-error (params-validator/get-error-message validation-result)))))
+
+
+(defn csv [request]
+  (let [params (request :form-params)
+        validation-result (params-validator/validate-save-data-params params)]
+    (if (params-validator/valid-result? validation-result)
+      (file-success (.getBytes (params "data")) (get-file-name params) ".csv")
+      (json-error (params-validator/get-error-message validation-result)))))
+
+
+(defn xlsx [request]
+  (let [params (request :form-params)
+        file-name (get-file-name params)
+        validation-result (params-validator/validate-save-data-params params)]
+    (if (params-validator/valid-result? validation-result)
+      (let [csv (csv-parser/read-csv (params "data"))
+            wb (spreadheet/create-workbook file-name csv)
+            output (new ByteArrayOutputStream)]
+        (spreadheet/save-workbook! output wb)
+        (file-success (.toByteArray output) file-name ".xlsx"))
+      (json-error (params-validator/get-error-message validation-result)))))
+