Merge pull request #120 from shen-tian/master

andrewmcveigh · web-flow · commit 0cd828de77f3 · 2017-11-14T13:24:43.000Z
Add weekyear/week functionality
diff --git a/src/cljs_time/core.cljs b/src/cljs_time/core.cljs
@@ -77,7 +77,8 @@ true
   ceorce date-times to or from other types, see cljs-time.coerce."
   (:refer-clojure :exclude [= extend second])
   (:require
-   [cljs-time.internal.core :as internal :refer [leap-year? format]]
+   [cljs-time.internal.core :as internal :refer [leap-year? format
+                                                 get-week-year]]
    [clojure.string :as string]
    goog.date.Interval
    goog.date)
@@ -118,7 +119,8 @@ expected."}
   (minus- [this period] "Returns a new date/time corresponding to the given date/time moved backwards by the given Period(s).")
   (first-day-of-the-month- [this] "Returns the first day of the month")
   (last-day-of-the-month- [this] "Returns the last day of the month")
-  (week-number-of-year [this] "Returs the number of weeks in the year"))
+  (week-number-of-year [this] "Returns the week of the week based year of the given date/time")
+  (week-year [this] "Returns the the week based year of the given date/time."))
 
 (defprotocol InTimeUnitProtocol
   "Interface for in-<time unit> functions"
@@ -211,6 +213,8 @@ expected."}
   (week-number-of-year [this]
     (goog.date/getWeekNumber
      (.getYear this) (.getMonth this) (.getDate this)))
+  (week-year [this] 
+    (get-week-year (.getYear this) (.getMonth this) (.getDate this)))
 
   goog.date.DateTime
   (year [this] (.getYear this))
@@ -235,6 +239,8 @@ expected."}
   (week-number-of-year [this]
     (goog.date/getWeekNumber
      (.getYear this) (.getMonth this) (.getDate this)))
+  (week-year [this] 
+    (get-week-year (.getYear this) (.getMonth this) (.getDate this)))
 
   goog.date.Date
   (year [this] (.getYear this))
@@ -258,7 +264,9 @@ expected."}
      (period :days 1)))
   (week-number-of-year [this]
     (goog.date/getWeekNumber
-     (.getYear this) (.getMonth this) (.getDate this))))
+     (.getYear this) (.getMonth this) (.getDate this)))
+  (week-year [this] 
+    (get-week-year (.getYear this) (.getMonth this) (.getDate this))))
 
 (def utc #js {:id "UTC" :std_offset 0 :names ["UTC"] :transitions []})
 
diff --git a/src/cljs_time/internal/core.cljs b/src/cljs_time/internal/core.cljs
@@ -3,7 +3,8 @@
   (:require
    [clojure.string :as string]
    [goog.string :as gstring]
-   [goog.string.format]))
+   [goog.string.format]
+   [goog.date]))
 
 (def months
   ["January" "February" "March" "April" "May" "June" "July" "August"
@@ -36,7 +37,8 @@
     (and (leap-year? year) (= month 2)) inc))
 
 (defn valid-date?
-  [{:keys [years months days hours minutes seconds millis] :as d}]
+  [{:keys [years months days hours minutes seconds millis
+           weekyear weekyear-week day-of-week] :as d}]
   (let [months?  (when months (<= 1 months 12))
         dim      (if years
                    (and months months? (year-corrected-dim years months))
@@ -45,11 +47,20 @@
         hours?   (when hours (<= 0 hours 23))
         minutes? (when minutes (<= 0 minutes 59))
         seconds? (when seconds (<= 0 seconds 60))
-        millis?  (when millis (<= 0 millis 999))]
-    (if (->> [months? days? hours? minutes? seconds? millis?]
+        millis?  (when millis (<= 0 millis 999))
+        weekyear-week? (when weekyear-week (<= 1 weekyear-week 53))
+        day-of-week? (when day-of-week (<= 1 day-of-week 7))]
+    (if (->> [months? days? hours? minutes? seconds? millis? 
+              weekyear-week? day-of-week?]
              (remove nil?)
              (every? true?))
-      d
+      (if (not (and (or years months days)
+                    (or weekyear weekyear-week day-of-week)))
+        d
+        (throw 
+         (ex-info "Mixing year, month, day and week-year week-number fields"
+                  {:type :invalid-date :date d
+                   :errors {}})))
       (throw
        (ex-info "Date is not valid"
                 {:type :invalid-date :date d
@@ -59,7 +70,9 @@
                            (false? hours?)   (assoc :hours hours)
                            (false? minutes?) (assoc :minutes minutes)
                            (false? seconds?) (assoc :seconds seconds)
-                           (false? millis?)  (assoc :millis millis))})))))
+                           (false? millis?)  (assoc :millis millis)
+                           (false? weekyear-week?) (assoc :weekyear-week weekyear-week)
+                           (false? day-of-week?) (assoc :day-of-week day-of-week))})))))
 
 (defn index-of [coll x]
   (first (keep-indexed #(when (= %2 x) %1) coll)))
@@ -97,3 +110,15 @@
         (update-in [:weeks] scale-fn)
         (update-in [:months] scale-fn)
         (update-in [:years] scale-fn))))
+
+(defn get-week-year
+  "Counterpart ot goog.date/getWeekNumber. 
+  month 0 is jan per goog.date"
+  [year month date]
+  (let [january (= month 0)
+        december (= month 11)
+        week-number (goog.date/getWeekNumber year month date)]
+    (cond 
+      (and january (>= week-number 52)) (dec year)
+      (and december (= week-number 1))  (inc year)
+      :else year)))
diff --git a/src/cljs_time/internal/parse.cljs b/src/cljs_time/internal/parse.cljs
@@ -101,6 +101,11 @@
   ([lower upper]
    (fn [s] (parse-period s :days lower upper))))
 
+(defn parse-day-of-week
+  ([limit] (parse-day 1 limit))
+  ([lower upper]
+   (fn [s] (parse-period s :day-of-week lower upper))))
+
 (defn parse-hours
   ([limit] (parse-hours 1 limit))
   ([lower upper]
@@ -254,6 +259,7 @@
       "E"    (parse-day-name true)
       "EEE"  (parse-day-name true)
       "EEEE" (parse-day-name false)
+      "e"    (parse-day-of-week 1 2)
       "a"    (parse-meridiem)
       "A"    (parse-meridiem)
       "Z"    (parse-timezone :dddd)
@@ -285,20 +291,40 @@
           (throw (err))
           out)))))
 
-(defn compile [class {:keys [default-year] :as fmt} values]
-  (let [{:keys [years months days
-                hours HOURS minutes seconds millis
-                meridiem timezone]
-         :as date-map} (->> values
-                            (remove (comp #{:quoted} first))
-                            (into {}))
-        year (.getYear (Date.))
+(defn infer-years
+  [years default-year]
+  (let [year (.getYear (Date.))
         pivot (- year 30)
         century (- year (mod year 100))
         years (or years default-year 0)
         years (cond-> years
                 (< years (mod (+ pivot 50) 100))
-                (+ century))
+                (+ century))]
+    years))
+
+(defn week-date->gregorian
+  [{:keys [weekyear weekyear-week day-of-week] :as date-map}]
+  (if (and weekyear weekyear-week)
+    (let [date (Date. weekyear 0 4)]
+      (.add date (Interval. 0 0 (* 7 (dec weekyear-week))))
+      (.add date (Interval. 0 0 (- (or day-of-week 1) 
+                                   (inc (mod (dec (.getDay date)) 7)))))
+      (-> date-map
+          (assoc :years (.getYear date))
+          (assoc :months (inc (.getMonth date)))
+          (assoc :days (.getDate date))))
+    date-map))
+
+(defn compile [class fmt values]
+  (let [{:keys [years months days
+                hours HOURS minutes seconds millis
+                meridiem timezone]
+         :as date-map} (->> values
+                            (remove (comp #{:quoted} first))
+                            (into {})
+                            (i/valid-date?)
+                            (week-date->gregorian))
+        years (infer-years years (:default-year fmt))
         months (when months (dec months))
         hours (if meridiem
                 (if (#{:pm :PM} meridiem)
@@ -312,7 +338,6 @@
         timezone (if (instance? Interval timezone)
                    timezone
                    (Interval. Interval.SECONDS 0))]
-    (i/valid-date? date-map)
     (doto (case class
             :goog.date.Date
             (Date. years months days)
diff --git a/src/cljs_time/internal/unparse.cljs b/src/cljs_time/internal/unparse.cljs
@@ -50,6 +50,16 @@
    (fn [s d]
      (unparse-period s d (.getDate d) min max))))
 
+(defn unparse-day-of-week
+  ".getDay returns 0-6, shifts to 1-7"
+  ([min] (unparse-day-of-week min min))
+  ([min max]
+   (fn [s d]
+     (let [raw-day-of-week (.getDay d)
+           day-of-week (if (= raw-day-of-week 0)
+                         7 raw-day-of-week)]
+       (unparse-period s d day-of-week min max)))))
+
 (defn unparse-day-of-year
   ([min] (unparse-day min min))
   ([min max]
@@ -88,16 +98,12 @@
   ([min] (unparse-weekyear min min))
   ([min max]
    (fn [s d]
-     (let [year (.getYear d) month (.getMonth d) day (.getDate d)
-           january (= month 0)
-           december (= month 11)
-           week-number (goog.date/getWeekNumber year month day)
-           weekyear (cond (and january (>= week-number 52))
-                          (dec year)
-                          (and december (= week-number 1))
-                          (inc year)
-                          :else year)]
-       (unparse-period s d weekyear min max)))))
+     (let [year (.getYear d) 
+           month (.getMonth d) 
+           day (.getDate d)]
+       (unparse-period s d 
+                       (i/get-week-year year month day) 
+                       min max)))))
 
 (defn unparse-weekyear-week
   ([min] (unparse-weekyear-week min min))
@@ -159,6 +165,7 @@
       "xxxx" [:weekyear 4 4]
       "w"    [:weekyear-week 1 2]
       "ww"   [:weekyear-week 2 2]
+      "e"    [:day-of-week 1 1]
       "E"    [:day-name true]
       "EEE"  [:day-name true]
       "EEEE" [:day-name false]
@@ -194,6 +201,7 @@
     :weekyear       (apply unparse-weekyear args)
     :weekyear-week  (apply unparse-weekyear-week args)
     :day-name       (apply unparse-day-name args)
+    :day-of-week    (apply unparse-day-of-week args)
     :meridiem       (apply unparse-meridiem args)
     :timezone       (apply unparse-timezone args)
     :ordinal-suffix (let [[k] (syntax-list (dec i))]
diff --git a/test/cljs_time/core_test.cljs b/test/cljs_time/core_test.cljs
@@ -18,7 +18,7 @@
       years? months? weeks? days? hours? minutes? seconds?
       extend start end mins-ago default-time-zone
       to-default-time-zone from-default-time-zone
-      overlap week-number-of-year floor]]
+      overlap week-number-of-year week-year floor]]
     [cljs-time.extend]))
 
 (deftest test-now
@@ -550,6 +550,12 @@
   (is (= 1 (week-number-of-year (date-time 2012 12 31))))
   (is (= 1 (week-number-of-year (date-time 2013 1 1)))))
 
+(deftest test-week-year
+  (is (= 2015 (week-year (date-time 2014 12 29))))
+  (is (= 2015 (week-year (date-time 2015 1 5))))
+  (is (= 2009 (week-year (date-time 2010 1 3))))
+  (is (= 2010 (week-year (date-time 2010 1 4)))))
+
 (deftest test-number-of-days-in-the-month
   (is (= 31 (number-of-days-in-the-month 2012 1)))
   (is (= 31 (number-of-days-in-the-month (date-time 2012 1 3))))
diff --git a/test/cljs_time/format_test.cljs b/test/cljs_time/format_test.cljs
@@ -369,14 +369,29 @@
     (is (= "W02" (format/unparse fmt (time/date-time 2015 1 5))))
     (is (= "W01" (format/unparse fmt (time/date-time 2010 1 4))))
     (is (= "W01" (format/unparse fmt (time/date-time 2008 12 29)))))
-  (comment
-    ;; no built in support for week-year in goog.date
-    (let [fmt (format/formatters :weekyear-week)]
-      (is (= "2015-W01" (format/unparse fmt (time/date-time 2014 12 29))))
-      (is (= "2015-W02" (format/unparse fmt (time/date-time 2015 1 5))))
-      (is (= "2009-W53" (format/unparse fmt (time/date-time 2010 1 3))))
-      (is (= "2010-W01" (format/unparse fmt (time/date-time 2010 1 4))))
-      (is (= "2009-W01" (format/unparse fmt (time/date-time 2008 12 29)))))))
+  (let [fmt (format/formatters :weekyear-week)]
+    (is (= "2015-W01" (format/unparse fmt (time/date-time 2014 12 29))))
+    (is (= "2015-W02" (format/unparse fmt (time/date-time 2015 1 5))))
+    (is (= "2009-W53" (format/unparse fmt (time/date-time 2010 1 3))))
+    (is (= "2010-W01" (format/unparse fmt (time/date-time 2010 1 4))))
+    (is (= "2009-W01" (format/unparse fmt (time/date-time 2008 12 29))))))
+
+(deftest weekyear-week-day-test
+  (let [fmt (format/formatters :weekyear-week-day)]
+    (is (= "2015-W01-1" 
+           (format/unparse fmt (time/date-time 2014 12 29))))
+    (is (= "2015-W01-2" 
+           (format/unparse fmt (time/date-time 2014 12 30))))
+    (is (= "2015-W01-7" 
+           (format/unparse fmt (time/date-time 2015 1 4))))
+    (is (= "2009-W53-7"
+           (format/unparse fmt (time/date-time 2010 1 3))))
+    (is (= (time/date-time 2014 12 29)
+           (format/parse fmt "2015-W01-1")))
+    (is (= (time/date-time 2014 12 30)
+           (format/parse fmt "2015-W01-2")))
+    (is (= (time/date-time 2015 1 4)
+           (format/parse fmt "2015-W01-7")))))
 
 (deftest parse-MM-test
   (is (= (date-time 2012 1 1)
