strptime 0.2.0.beta2 → 0.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1df53ebcd9f15ddf913c586ce3580cebe192a9
-  data.tar.gz: 1ec52362be465e23ad6226c6048e876075e3564c
+  metadata.gz: 5888a6c2d53ab4cc5a55654bb8322cbefed4cd5e
+  data.tar.gz: d46348be35b99abe4b4fd90bf7f4b555598d6131
 SHA512:
-  metadata.gz: 75b6df02855bb0488d0a42147210949814c3be497a91532cbe9adbd53560ef2c984afa5d4ffcaf7266b5c90c6fcfebcbc493e428690260f09a3fb9c80f4b5f5e
-  data.tar.gz: 3a03b9299174c34007491cc0ab98a7906e0841ef93b309786b1cc72fd4347a88c8719c704abd6805339c72bc1f3391ce32405d8ffb62905079eacf614a0ebbb9
+  metadata.gz: b751a50b7a9a78ee862f1cd461fb3dc0e5ea1d5eb7e9a2ec18d783d94ee6b13cea9504c01987e0bd63543e471d8619c30718a434134d5d70d018c98ed6b13397
+  data.tar.gz: 96e23338cb997b45315a6dbaafd544c8d0045b6d9d1846398809fc889856668ae98844766f97905564085dfd449993a834a2c1f810007496414b4d0596353494

data/ext/strptime/extconf.rb

@@ -2,5 +2,6 @@ require "mkmf"
 
 have_func('rb_timespec_now')
 have_func('rb_time_timespec_new')
+have_func('rb_time_utc_offset')
 
 create_makefile("strptime/strptime")

data/ext/strptime/strftime.c

@@ -3,6 +3,9 @@
 #include <time.h>
 
 VALUE rb_cStrftime;
+#ifndef HAVE_RB_TIME_UTC_OFFSET
+static ID id_gmtoff;
+#endif
 
 #define GetStrftimeval(obj, tobj) ((tobj) = get_strftimeval(obj))
 #define GetNewStrftimeval(obj, tobj) ((tobj) = get_new_strftimeval(obj))
@@ -65,7 +68,7 @@ strftime_exec0(void **pc, VALUE fmt, struct timespec *tsp, int gmtoff, size_t re
 	    LABEL_PTR(m), NULL, NULL, NULL,
 	    NULL, NULL, NULL, NULL,
 	    NULL, NULL, NULL, NULL,
-	    LABEL_PTR(y), NULL,
+	    LABEL_PTR(y), LABEL_PTR(z),
 	};
 	*pc = (void *)insns_address_table;
 	return Qnil;
@@ -163,6 +166,26 @@ strftime_exec0(void **pc, VALUE fmt, struct timespec *tsp, int gmtoff, size_t re
 	ADD_PC(1);
 	END_INSN(y)
     }
+    INSN_ENTRY(z)
+    {
+	int h, m, tmp=gmtoff;
+	if (gmtoff >= 0) {
+	    *p++ = '+';
+	} else {
+	    *p++ = '-';
+	    tmp = -tmp;
+	}
+	tmp /= 60;
+	h = (tmp / 60)&15; /* ignore too large offset */
+	m = tmp % 60;
+	*p++ = '0' + (h / 10);
+	*p++ = '0' + (h % 10);
+	*p++ = ':';
+	*p++ = '0' + (m / 10);
+	*p++ = '0' + (m % 10);
+	ADD_PC(1);
+	END_INSN(y)
+    }
     INSN_ENTRY(_60)
     {
 	size_t v = (size_t)GET_OPERAND(1);
@@ -233,6 +256,10 @@ strftime_compile(const char *fmt, size_t flen, size_t *rlenp)
 	      goto accept_format;
 	    case 'y':
 	      rlen += 2;
+	      goto accept_format;
+	    case 'z':
+	      rlen += 6;
+	      goto accept_format;
 accept_format:
 		tmp = insns_address_table[c - 'A'];
 		if (tmp) {
@@ -388,11 +415,16 @@ strftime_init_copy(VALUE copy, VALUE self)
 static VALUE
 strftime_exec(VALUE self, VALUE time)
 {
-    struct strftime_object *tobj;
+    struct strftime_object *sobj;
     struct timespec ts = rb_time_timespec(time);
-    GetStrftimeval(self, tobj);
+#ifdef HAVE_RB_TIME_UTC_OFFSET
+    int gmtoff = FIX2INT(rb_time_utc_offset(time));
+#else
+    int gmtoff = NUM2INT(rb_funcall(time, id_gmtoff, 0));
+#endif
+    GetStrftimeval(self, sobj);
 
-    return strftime_exec0(tobj->isns, tobj->fmt, &ts, 0, tobj->result_length);
+    return strftime_exec0(sobj->isns, sobj->fmt, &ts, gmtoff, sobj->result_length);
 }
 
 /*
@@ -459,4 +491,5 @@ Init_strftime(void)
     rb_define_method(rb_cStrftime, "exec", strftime_exec, 1);
     rb_define_method(rb_cStrftime, "execi", strftime_execi, 1);
     rb_define_method(rb_cStrftime, "source", strftime_source, 0);
+    id_gmtoff = rb_intern("gmtoff");
 }

data/lib/strptime/version.rb

@@ -1,3 +1,3 @@
 class Strptime
-  VERSION = "0.2.0.beta2"
+  VERSION = "0.2.0.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strptime
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
+  version: 0.2.0.beta3
 platform: ruby
 authors:
 - NARUSE, Yui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler