Merge pull request #32 from 200ok-ch/change-runtime-env-from-lumo-to-clojure

Change runtime env from lumo to clojure

Author: munen

.gitignore

@@ -2,3 +2,16 @@
 .cpcache
 .classpath
 .lumo_cache/
+/target
+/classes
+/checkouts
+profiles.clj
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+/.lein-*
+/.nrepl-port
+/.prepl-port
+.hgignore
+.hg/

project.clj

@@ -0,0 +1,19 @@
+(defproject easy "0.1.0-SNAPSHOT"
+  :description "FIXME: write description"
+  :url "http://example.com/FIXME"
+  :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
+            :url "https://www.eclipse.org/legal/epl-2.0/"}
+  :dependencies [[org.clojure/clojure "1.11.3"]
+                 [clj-time "0.15.2"]
+                 [org.clojure/data.csv "1.1.0"]
+                 [clj-commons/clj-yaml "1.0.27"]
+                 [hbs "1.0.3"]
+                 [org.clojure/tools.cli "1.1.230"]]
+  :main ^:skip-aot easy.core
+  :target-path "target/%s"
+  :profiles {:uberjar {:aot :all
+                       :jvm-opts ["-Dclojure.compiler.direct-linking=true"]}
+             :dev {:plugins [[lein-binplus "0.6.8"]]}}
+  :bin {:name "easy"
+        :bin-path "~/bin"
+        :jvm-opts ["-server" "-Dfile.encoding=utf-8" "$JVM_OPTS" ]})

src/easy/collect.cljs src/easy/collect.cljsrc/easy/collect.cljs renamed to src/easy/collect.clj

@@ -1,18 +1,15 @@
 (ns easy.collect
-  (:require [lumo.util :as lumo]
-            [easy.util :as util]
+  (:require [easy.util :as util]
             [easy.log :as log]
             [clojure.tools.cli :refer [parse-opts]]
-            [cljs.pprint :refer [pprint]]
-            [cljs.spec.alpha :as s]
+            [clojure.pprint :refer [pprint]]
+            [clojure.spec.alpha :as s]
             [clojure.string :refer [join]]))
 
-
 (def cli-options
   [;; ["-d" "--debug" "Debug output"]
    ])
 
-
 (defn- read-and-parse
   "Reads & parses YAML files (incl. applying any frontmatter event
   templates & source annotation)."
@@ -22,18 +19,15 @@
       util/parse-yaml
       (util/annotate path)))
 
-
 (defn- harmonize [events]
   (map (partial util/harmonize-date-field :date) events))
 
-
-(defn -main
-  [& args]
+(defn -main [& args]
   (let [cli (parse-opts args cli-options)
         path (or (-> cli :arguments first) ".")
         options (-> cli :options)]
     (->> path
-         lumo/file-seq
+         util/file-seq
          (filter #(re-matches #"[^.].*\.yml$" %))
          (map read-and-parse)
          (apply concat)

src/easy/common.cljs src/easy/common.cljsrc/easy/common.cljs renamed to src/easy/common.clj

@@ -1,13 +1,12 @@
 (ns easy.common
   "This namespace covers the common requirements for all events."
-  (:require [cljs.spec.alpha :as s]
+  (:require [clojure.spec.alpha :as s]
             [easy.util :as util :refer [assoc*]]
-            [cljs-time.core :as cljs-time]
-            [cljs-time.format :as time]))
-
-
-;; spec
+            [clj-time.core :as time]
+            [clj-time.coerce :as coerce]
+            [clj-time.format :as format]))
 
+;;; spec
 
 (def match-iso-date (partial re-matches #"^\d{4}-\d\d-\d\d$"))
 (def match-template (partial re-matches #".*\.hbs"))
@@ -26,7 +25,8 @@
                 "salary"           ;; Gehalt
                 "outlay"           ;; Spesenabrechnung
                 "redistribution"   ;; "200ok Sozialfaktor"
-                "dctd"})           ;; Diner's Club Transaction Details
+                "dctd"             ;; Diner's Club Transaction Details
+                "pfcc"})           ;; Postfinance Credit Cards
 
 (s/def ::date (s/or :date util/date?
                     :iso-string (s/and string? match-iso-date)))
@@ -39,37 +39,29 @@
                                 ::file]))
 (s/def ::events (s/coll-of ::event))
 
-
-;; helpers
-
+;;; helpers
 
 (defn ignore-warning?
   "Checks if `evt` has `:ignore-warnings` set for `key`."
   [evt key]
   (->> (get evt :ignore-warnings [])
        (util/include? (name key))))
 
-
 (defn harmonize [evt]
   (->> evt
        (util/harmonize-date-field :date)
        ;; TODO: remove, we don' use `:settled` anymore
        (util/harmonize-date-field :settled)))
 
-
 (defn validate!
   "Same as `util/validate!`, but with arguments swapped."
   [x spec]
   (util/validate! spec x))
 
-
 (defn make-iso-date [date]
-  (->> date
-       cljs-time/date-time
-       (time/unparse util/iso-formatter)))
-
+  (format/unparse util/iso-formatter date))
 
-;; transformers
+;;; transformers
 
 (defn add-iso-date
   "Transformer that takes the value of `:date`, builds an iso-date

src/easy/common/invoice_no.cljs src/easy/common/invoice_no.cljsrc/easy/common/invoice_no.cljs renamed to src/easy/common/invoice_no.clj

@@ -1,11 +1,9 @@
 (ns easy.common.invoice-no
   (:require [clojure.string :as str]
-            [cljs.spec.alpha :as s]
+            [clojure.spec.alpha :as s]
             [easy.util :as util]))
 
-
-;; spec
-
+;;; spec
 
 (def match-invoice-no (partial re-matches #"^\d+\.\d+\.\d+$"))
 
@@ -20,9 +18,7 @@
                                             ::number
                                             ::version])))
 
-
-;; transformers
-
+;;; transformers
 
 (defn- add-invoice-no
   "Compile `invoice-no` from invoice details like `customer-id`,
@@ -33,19 +29,17 @@
        (str/join ".")
        (util/assoc* evt :invoice-no)))
 
-
 (defn- add-invoice-no-details
   "Derive invoice details like `customer-id`, `number` and `version`
   from `invoice-no`, if given."
   [{:keys [invoice-no] :as evt}]
   (if invoice-no
     (->> (str/split invoice-no #"\.")
-         (map int)
+         (map util/parse-int)
          (zipmap [:customer-id :number :version])
          (util/merge* evt))
     evt))
 
-
 (def unify
   "Transform fn for events that attempts to provide both: a compiled
   `invoice-no` and invoice details like `customer-id`, `number` and

src/easy/common/tax.cljs src/easy/common/tax.cljsrc/easy/common/tax.cljs renamed to src/easy/common/tax.clj

@@ -1,15 +1,14 @@
 (ns easy.common.tax
-  (:require [cljs.spec.alpha :as s]
+  (:require [clojure.spec.alpha :as s]
             [easy.config :refer [config]]
             [easy.util :as util :refer [assoc*]]
             [easy.log :as log]
-            [easy.common :as common]))
-
+            [easy.common :as common]
+            [clj-time.core :as time]))
 
 ;; specs
 
-
-(s/def ::rate (s/and float? #(< 0 %) #(> 1 %)))
+(s/def ::rate (s/and number? #(< 0 %) #(> 1 %)))
 (s/def ::since util/date?)
 (s/def ::until util/date?)
 
@@ -19,10 +18,8 @@
 
 (s/def ::rates (s/coll-of ::rate-entry :kind vector?))
 
-
 ;; helpers
 
-
 (defn- assert-exactly-one [coll]
   (case (count coll)
     ;; non found -> abort
@@ -36,28 +33,25 @@
                       "Just picked the first from " coll))
       (first coll))))
 
-
 (defn lookup-rate
   [key {:keys [date]}]
   (->> @config
        key
        ;; TODO: use `(common/validate! ::rates)` here
-       (filter #(or (nil? (:since %)) (>= date (:since %))))
-       (filter #(or (nil? (:until %)) (<= date (:until %))))
+       (filter #(or (nil? (:since %)) (not (time/before? date (:since %)))))
+       (filter #(or (nil? (:until %)) (not (time/after? date (:until %)))))
        assert-exactly-one
        :rate))
 
-
 ;; transformers
 
-
 (defn add-period
   "The period is when the vat is due."
   ([evt] (add-period evt [:date]))
   ([evt date-path]
    (if-let [date (get-in evt date-path)]
-     (let [year (.getFullYear date)
-           semester (if (< (.getMonth date) 6) 1 2)
+     (let [year (time/year date)
+           semester (if (< (time/month date) 6) 1 2)
            period (str year "-H" semester)]
        (assoc* evt :period period))
      ;; no date found, in context of a nested transform, that's ok

src/easy/config.cljs src/easy/config.cljsrc/easy/config.cljs renamed to src/easy/config.clj

@@ -1,10 +1,8 @@
 (ns easy.config
   (:require [easy.util :as util]))
 
-
 ;; TODO: `config` should probably instead be named `environment`
 
-
 (def default-config
   "The easy config file is a YAML file with the following structure, e.g.
   ```
@@ -48,13 +46,14 @@
     :report
     {:template "templates/report.txt.hbs"}}})
 
-
 (def config (atom default-config))
 
+(defn load-config-file []
+  (if (util/file-exists? ".easy.yml")
+    (util/parse-yaml (slurp ".easy.yml"))
+    {}))
 
 (defn load! []
-  ;; TODO: check if file exists, otherwise print a helpful error
-  ;; message
-  (->> (util/slurp ".easy.yml")
-       util/parse-yaml
-       (swap! config util/deep-merge)))
+  (swap! config
+         util/deep-merge
+         (load-config-file)))