date 3.3.0 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f9dbfb1646ace90580d6570a44a1bb30d0754e1724d95d714999e94aff623c
-  data.tar.gz: 95773c2dc052bcb4e14d17eef85ec9d8bf9d743d3c050fea36ba698c6211b1e7
+  metadata.gz: 6ccf42407789dcdf94598ab68332e1860f4f2b5f5820d7b2b2bd8ae283088160
+  data.tar.gz: 988c7bded5cb20a4b68283216eeaaddf874a15765705919fe372bdeaf58d1c2a
 SHA512:
-  metadata.gz: b32ae525d4bfe627069b342527ff6af61550f1f1d7bafd8de7aa0736a3a48e9333769103987138c4abb86c84ec0ce4389843fb9333d6c8dfe2dd47b7defb7490
-  data.tar.gz: 299a268ba590b6a291a6535096e64c02cd45f12e0e7b92114fdba075d932d4e72862c59ad0200e7c034ab74b1fcac47514cd25bc28bb7e7d8696bac685a2b7c2
+  metadata.gz: f99b7157afc55d925ffe6ea0f786ce4dc377a30786bb8045b71019db65cd056c83edbd4a979925060ed0daaae2f0cc71f19c04d0b89df53b6a39c70ad6005457
+  data.tar.gz: d4d955554151f00b3e0db05cf684d5e7c47655654fd3174aa3e1c67b14a9fa8696092219eac5e540ae9d9abe8c05b06e13bb4ff74c754c33b7e075e9b5498597

data/ext/date/date_core.c

@@ -27,6 +27,10 @@ static VALUE eDateError;
 static VALUE half_days_in_day, day_in_nanoseconds;
 static double positive_inf, negative_inf;
 
+// used by deconstruct_keys
+static VALUE sym_year, sym_month, sym_day, sym_yday, sym_wday;
+static VALUE sym_hour, sym_min, sym_sec, sym_sec_fraction, sym_zone;
+
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
 
 #define f_abs(x) rb_funcall(x, rb_intern("abs"), 0)
@@ -60,7 +64,8 @@ static VALUE datetime_initialize(int argc, VALUE *argv, VALUE self);
 
 #define RETURN_FALSE_UNLESS_NUMERIC(obj) if(!RTEST(rb_obj_is_kind_of((obj), rb_cNumeric))) return Qfalse
 inline static void
-check_numeric(VALUE obj, const char* field) {
+check_numeric(VALUE obj, const char* field)
+{
     if(!RTEST(rb_obj_is_kind_of(obj, rb_cNumeric))) {
         rb_raise(rb_eTypeError, "invalid %s (not numeric)", field);
     }
@@ -7432,6 +7437,96 @@ d_lite_jisx0301(VALUE self)
     return strftimev(fmt, self, set_tmx);
 }
 
+static VALUE
+deconstruct_keys(VALUE self, VALUE keys, int is_datetime)
+{
+    VALUE h = rb_hash_new();
+    long i;
+
+    get_d1(self);
+
+    if (NIL_P(keys)) {
+        rb_hash_aset(h, sym_year, m_real_year(dat));
+        rb_hash_aset(h, sym_month, INT2FIX(m_mon(dat)));
+        rb_hash_aset(h, sym_day, INT2FIX(m_mday(dat)));
+        rb_hash_aset(h, sym_yday, INT2FIX(m_yday(dat)));
+        rb_hash_aset(h, sym_wday, INT2FIX(m_wday(dat)));
+        if (is_datetime) {
+            rb_hash_aset(h, sym_hour, INT2FIX(m_hour(dat)));
+            rb_hash_aset(h, sym_min, INT2FIX(m_min(dat)));
+            rb_hash_aset(h, sym_sec, INT2FIX(m_sec(dat)));
+            rb_hash_aset(h, sym_sec_fraction, m_sf_in_sec(dat));
+            rb_hash_aset(h, sym_zone, m_zone(dat));
+        }
+
+        return h;
+    }
+    if (!RB_TYPE_P(keys, T_ARRAY)) {
+        rb_raise(rb_eTypeError,
+                 "wrong argument type %"PRIsVALUE" (expected Array or nil)",
+                 rb_obj_class(keys));
+
+    }
+
+    for (i=0; i<RARRAY_LEN(keys); i++) {
+        VALUE key = RARRAY_AREF(keys, i);
+
+        if (sym_year == key) rb_hash_aset(h, key, m_real_year(dat));
+        if (sym_month == key) rb_hash_aset(h, key, INT2FIX(m_mon(dat)));
+        if (sym_day == key) rb_hash_aset(h, key, INT2FIX(m_mday(dat)));
+        if (sym_yday == key) rb_hash_aset(h, key, INT2FIX(m_yday(dat)));
+        if (sym_wday == key) rb_hash_aset(h, key, INT2FIX(m_wday(dat)));
+        if (is_datetime) {
+            if (sym_hour == key) rb_hash_aset(h, key, INT2FIX(m_hour(dat)));
+            if (sym_min == key) rb_hash_aset(h, key, INT2FIX(m_min(dat)));
+            if (sym_sec == key) rb_hash_aset(h, key, INT2FIX(m_sec(dat)));
+            if (sym_sec_fraction == key) rb_hash_aset(h, key, m_sf_in_sec(dat));
+            if (sym_zone == key) rb_hash_aset(h, key, m_zone(dat));
+        }
+    }
+    return h;
+}
+
+/*
+ *  call-seq:
+ *    deconstruct_keys(array_of_names_or_nil) -> hash
+ *
+ *  Returns a hash of the name/value pairs, to use in pattern matching.
+ *  Possible keys are: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>,
+ *  <tt>:wday</tt>, <tt>:yday</tt>.
+ *
+ *  Possible usages:
+ *
+ *    d = Date.new(2022, 10, 5)
+ *
+ *    if d in wday: 3, day: ..7  # uses deconstruct_keys underneath
+ *      puts "first Wednesday of the month"
+ *    end
+ *    #=> prints "first Wednesday of the month"
+ *
+ *    case d
+ *    in year: ...2022
+ *      puts "too old"
+ *    in month: ..9
+ *      puts "quarter 1-3"
+ *    in wday: 1..5, month:
+ *      puts "working day in month #{month}"
+ *    end
+ *    #=> prints "working day in month 10"
+ *
+ *  Note that deconstruction by pattern can also be combined with class check:
+ *
+ *    if d in Date(wday: 3, day: ..7)
+ *      puts "first Wednesday of the month"
+ *    end
+ *
+ */
+static VALUE
+d_lite_deconstruct_keys(VALUE self, VALUE keys)
+{
+    return deconstruct_keys(self, keys, /* is_datetime=false */ 0);
+}
+
 #ifndef NDEBUG
 /* :nodoc: */
 static VALUE
@@ -8740,6 +8835,47 @@ dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
 			 iso8601_timediv(self, n));
 }
 
+/*
+ *  call-seq:
+ *    deconstruct_keys(array_of_names_or_nil) -> hash
+ *
+ *  Returns a hash of the name/value pairs, to use in pattern matching.
+ *  Possible keys are: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>,
+ *  <tt>:wday</tt>, <tt>:yday</tt>, <tt>:hour</tt>, <tt>:min</tt>,
+ *  <tt>:sec</tt>, <tt>:sec_fraction</tt>, <tt>:zone</tt>.
+ *
+ *  Possible usages:
+ *
+ *    dt = DateTime.new(2022, 10, 5, 13, 30)
+ *
+ *    if d in wday: 1..5, hour: 10..18  # uses deconstruct_keys underneath
+ *      puts "Working time"
+ *    end
+ *    #=> prints "Working time"
+ *
+ *    case dt
+ *    in year: ...2022
+ *      puts "too old"
+ *    in month: ..9
+ *      puts "quarter 1-3"
+ *    in wday: 1..5, month:
+ *      puts "working day in month #{month}"
+ *    end
+ *    #=> prints "working day in month 10"
+ *
+ *  Note that deconstruction by pattern can also be combined with class check:
+ *
+ *    if d in DateTime(wday: 1..5, hour: 10..18, day: ..7)
+ *      puts "Working time, first week of the month"
+ *    end
+ *
+ */
+static VALUE
+dt_lite_deconstruct_keys(VALUE self, VALUE keys)
+{
+    return deconstruct_keys(self, keys, /* is_datetime=true */ 1);
+}
+
 /* conversions */
 
 #define f_subsec(x) rb_funcall(x, rb_intern("subsec"), 0)
@@ -9370,6 +9506,17 @@ Init_date_core(void)
     id_ge_p = rb_intern_const(">=");
     id_eqeq_p = rb_intern_const("==");
 
+    sym_year = ID2SYM(rb_intern_const("year"));
+    sym_month = ID2SYM(rb_intern_const("month"));
+    sym_yday = ID2SYM(rb_intern_const("yday"));
+    sym_wday = ID2SYM(rb_intern_const("wday"));
+    sym_day = ID2SYM(rb_intern_const("day"));
+    sym_hour = ID2SYM(rb_intern_const("hour"));
+    sym_min = ID2SYM(rb_intern_const("min"));
+    sym_sec = ID2SYM(rb_intern_const("sec"));
+    sym_sec_fraction = ID2SYM(rb_intern_const("sec_fraction"));
+    sym_zone = ID2SYM(rb_intern_const("zone"));
+
     half_days_in_day = rb_rational_new2(INT2FIX(1), INT2FIX(2));
 
 #if (LONG_MAX / DAY_IN_SECONDS) > SECOND_IN_NANOSECONDS
@@ -9691,6 +9838,8 @@ Init_date_core(void)
     rb_define_method(cDate, "httpdate", d_lite_httpdate, 0);
     rb_define_method(cDate, "jisx0301", d_lite_jisx0301, 0);
 
+    rb_define_method(cDate, "deconstruct_keys", d_lite_deconstruct_keys, 1);
+
 #ifndef NDEBUG
     rb_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
 #endif
@@ -9901,6 +10050,8 @@ Init_date_core(void)
     rb_define_method(cDateTime, "rfc3339", dt_lite_rfc3339, -1);
     rb_define_method(cDateTime, "jisx0301", dt_lite_jisx0301, -1);
 
+    rb_define_method(cDateTime, "deconstruct_keys", dt_lite_deconstruct_keys, 1);
+
     /* conversions */
 
     rb_define_method(rb_cTime, "to_time", time_to_time, 0);

data/ext/date/date_strptime.c

@@ -10,28 +10,15 @@
 static const char *day_names[] = {
     "Sunday", "Monday", "Tuesday", "Wednesday",
     "Thursday", "Friday", "Saturday",
-    "Sun", "Mon", "Tue", "Wed",
-    "Thu", "Fri", "Sat"
 };
+static const int ABBREVIATED_DAY_NAME_LENGTH = 3;
 
 static const char *month_names[] = {
     "January", "February", "March", "April",
     "May", "June", "July", "August", "September",
     "October", "November", "December",
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static const char *merid_names[] = {
-    "am", "pm",
-    "a.m.", "p.m."
-};
-
-static const char *extz_pats[] = {
-    ":z",
-    "::z",
-    ":::z"
 };
+static const int ABBREVIATED_MONTH_NAME_LENGTH = 3;
 
 #define sizeof_array(o) (sizeof o / sizeof o[0])
 
@@ -75,7 +62,7 @@ num_pattern_p(const char *s)
 #define NUM_PATTERN_P() num_pattern_p(&fmt[fi + 1])
 
 static long
-read_digits(const char *s, VALUE *n, size_t width)
+read_digits(const char *s, size_t slen, VALUE *n, size_t width)
 {
     size_t l;
 
@@ -83,7 +70,7 @@ read_digits(const char *s, VALUE *n, size_t width)
         return 0;
 
     l = 0;
-    while (ISDIGIT(s[l])) {
+    while (l < slen && ISDIGIT(s[l])) {
         if (++l == width) break;
     }
 
@@ -131,7 +118,7 @@ do { \
 #define READ_DIGITS(n,w) \
 do { \
     size_t l; \
-    l = read_digits(&str[si], &n, w); \
+    l = read_digits(&str[si], slen - si, &n, w); \
     if (l == 0) \
 	fail();	\
     si += l; \
@@ -161,6 +148,12 @@ do { \
 
 VALUE date_zone_to_diff(VALUE);
 
+static inline int
+head_match_p(size_t len, const char *name, const char *str, size_t slen, size_t si)
+{
+    return slen - si >= len && strncasecmp(name, &str[si], len) == 0;
+}
+
 static size_t
 date__strptime_internal(const char *str, size_t slen,
 			const char *fmt, size_t flen, VALUE hash)
@@ -168,9 +161,18 @@ date__strptime_internal(const char *str, size_t slen,
     size_t si, fi;
     int c;
 
+#define HEAD_MATCH_P(len, name) head_match_p(len, name, str, slen, si)
     si = fi = 0;
 
     while (fi < flen) {
+	if (isspace((unsigned char)fmt[fi])) {
+	    while (si < slen && isspace((unsigned char)str[si]))
+		si++;
+	    while (++fi < flen && isspace((unsigned char)fmt[fi]));
+	    continue;
+	}
+
+	if (si >= slen) fail();
 
 	switch (fmt[fi]) {
 	  case '%':
@@ -194,12 +196,11 @@ date__strptime_internal(const char *str, size_t slen,
 		{
 		    int i;
 
-		    for (i = 0; i < (int)sizeof_array(extz_pats); i++)
-			if (strncmp(extz_pats[i], &fmt[fi],
-					strlen(extz_pats[i])) == 0) {
-			    fi += i;
-			    goto again;
-			}
+		    for (i = 1; i < 3 && fi + i < flen && fmt[fi+i] == ':'; ++i);
+		    if (fmt[fi+i] == 'z') {
+			fi += i - 1;
+			goto again;
+		    }
 		    fail();
 		}
 
@@ -209,10 +210,12 @@ date__strptime_internal(const char *str, size_t slen,
 		    int i;
 
 		    for (i = 0; i < (int)sizeof_array(day_names); i++) {
-			size_t l = strlen(day_names[i]);
-			if (strncasecmp(day_names[i], &str[si], l) == 0) {
+			const char *day_name = day_names[i];
+			size_t l = strlen(day_name);
+			if (HEAD_MATCH_P(l, day_name) ||
+			    HEAD_MATCH_P(l = ABBREVIATED_DAY_NAME_LENGTH, day_name)) {
 			    si += l;
-			    set_hash("wday", INT2FIX(i % 7));
+			    set_hash("wday", INT2FIX(i));
 			    goto matched;
 			}
 		    }
@@ -225,10 +228,12 @@ date__strptime_internal(const char *str, size_t slen,
 		    int i;
 
 		    for (i = 0; i < (int)sizeof_array(month_names); i++) {
-			size_t l = strlen(month_names[i]);
-			if (strncasecmp(month_names[i], &str[si], l) == 0) {
+			const char *month_name = month_names[i];
+			size_t l = strlen(month_name);
+			if (HEAD_MATCH_P(l, month_name) ||
+			    HEAD_MATCH_P(l = ABBREVIATED_MONTH_NAME_LENGTH, month_name)) {
 			    si += l;
-			    set_hash("mon", INT2FIX((i % 12) + 1));
+			    set_hash("mon", INT2FIX(i + 1));
 			    goto matched;
 			}
 		    }
@@ -402,18 +407,19 @@ date__strptime_internal(const char *str, size_t slen,
 
 	      case 'P':
 	      case 'p':
+		if (slen - si < 2) fail();
 		{
-		    int i;
-
-		    for (i = 0; i < 4; i++) {
-			size_t l = strlen(merid_names[i]);
-			if (strncasecmp(merid_names[i], &str[si], l) == 0) {
-			    si += l;
-			    set_hash("_merid", INT2FIX((i % 2) == 0 ? 0 : 12));
-			    goto matched;
-			}
+		    char c = str[si];
+		    const int hour = (c == 'P' || c == 'p') ? 12 : 0;
+		    if (!hour && !(c == 'A' || c == 'a')) fail();
+		    if ((c = str[si+1]) == '.') {
+			if (slen - si < 4 || str[si+3] != '.') fail();
+			c = str[si += 2];
 		    }
-		    fail();
+		    if (!(c == 'M' || c == 'm')) fail();
+		    si += 2;
+		    set_hash("_merid", INT2FIX(hour));
+		    goto matched;
 		}
 
 	      case 'Q':
@@ -587,7 +593,7 @@ date__strptime_internal(const char *str, size_t slen,
 
 		    b = rb_backref_get();
 		    rb_match_busy(b);
-		    m = f_match(pat, rb_usascii_str_new2(&str[si]));
+		    m = f_match(pat, rb_usascii_str_new(&str[si], slen - si));
 
 		    if (!NIL_P(m)) {
 			VALUE s, l, o;
@@ -619,22 +625,13 @@ date__strptime_internal(const char *str, size_t slen,
 		if (str[si] != '%')
 		    fail();
 		si++;
-		if (fi < flen)
-		    if (str[si] != fmt[fi])
+		if (fi < flen) {
+		    if (si >= slen || str[si] != fmt[fi])
 			fail();
-		si++;
+		    si++;
+		}
 		goto matched;
 	    }
-	  case ' ':
-	  case '\t':
-	  case '\n':
-	  case '\v':
-	  case '\f':
-	  case '\r':
-	    while (isspace((unsigned char)str[si]))
-		si++;
-	    fi++;
-	    break;
 	  default:
 	  ordinal:
 	    if (str[si] != fmt[fi])

data/lib/date.rb

@@ -4,7 +4,7 @@
 require 'date_core'
 
 class Date
-  VERSION = "3.3.0" # :nodoc:
+  VERSION = "3.3.3" # :nodoc:
 
   # call-seq:
   #   infinite? -> false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.3
 platform: ruby
 authors:
 - Tadayoshi Funaba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies: []
 description: A subclass of Object includes Comparable module for handling dates.
 email:
@@ -42,7 +42,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="