jadtfmt 0.0.2 → 0.0.3

data/ext/jadtfmt.c

@@ -15,12 +15,12 @@ __declspec(dllexport) void Init_jadtfmt();
 #include "jadtfmt.h"
 #include "jadtfmt_icu.h"
 
-#define VERSION "0.0.2"
+#define VERSION "0.0.3"
 
 #define DEFAULT_INT(n) (NIL_P(n) ? 0 : NUM2INT(n))
 
 static VALUE JapaneseDateFormat;
-static VALUE pph_E, pph_N, pph_n, pph_E_pattern, pph_N_pattern, pph_n_pattern;
+static VALUE pph_G, pph_N, pph_n, pph_E, pph_G_pattern, pph_N_pattern, pph_n_pattern, pph_E_pattern;
 
 /* */
 static VALUE jadtfmt_initialize(int argc, VALUE *argv, VALUE self) {
@@ -141,10 +141,10 @@ static VALUE jadtfmt_Time_jastrftime(VALUE self, VALUE format) {
   Check_Type(format, T_STRING);
   jadtfmt = rb_funcall(JapaneseDateFormat, rb_intern("new"), 0);
 
-  if (rb_funcall(format, rb_intern("include?"), 1, pph_E)) {
-    rb_funcall(jadtfmt, rb_intern("apply_pattern"), 1, pph_E_pattern);
+  if (rb_funcall(format, rb_intern("include?"), 1, pph_G)) {
+    rb_funcall(jadtfmt, rb_intern("apply_pattern"), 1, pph_G_pattern);
     replace = rb_funcall(jadtfmt, rb_intern("format"), 1, self);
-    format = rb_funcall(format, rb_intern("gsub"), 2, pph_E, replace);
+    format = rb_funcall(format, rb_intern("gsub"), 2, pph_G, replace);
   }
 
   if (rb_funcall(format, rb_intern("include?"), 1, pph_N)) {
@@ -159,6 +159,12 @@ static VALUE jadtfmt_Time_jastrftime(VALUE self, VALUE format) {
     format = rb_funcall(format, rb_intern("gsub"), 2, pph_n, replace);
   }
 
+  if (rb_funcall(format, rb_intern("include?"), 1, pph_E)) {
+    rb_funcall(jadtfmt, rb_intern("apply_pattern"), 1, pph_E_pattern);
+    replace = rb_funcall(jadtfmt, rb_intern("format"), 1, self);
+    format = rb_funcall(format, rb_intern("gsub"), 2, pph_E, replace);
+  }
+
   return rb_funcall(self, rb_intern("strftime"), 1, format);
 }
 
@@ -189,10 +195,12 @@ void Init_jadtfmt() {
   rb_define_method(rb_cTime, "jadtfmt", jadtfmt_Time_jadtfmt, 1);
   rb_define_method(rb_cTime, "jastrftime", jadtfmt_Time_jastrftime, 1);
 
-  pph_E = rb_str_new2("%E");
+  pph_G = rb_str_new2("%G");
   pph_N = rb_str_new2("%N");
   pph_n = rb_str_new2("%n");
-  pph_E_pattern = rb_str_new2("G");
+  pph_E = rb_str_new2("%E");
+  pph_G_pattern = rb_str_new2("G");
   pph_N_pattern = rb_str_new2("yy");
   pph_n_pattern = rb_str_new2("y");
+  pph_E_pattern = rb_str_new2("E");
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jadtfmt
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - winebarrel
@@ -28,7 +28,7 @@ files:
 - ext/jadtfmt_icu.h
 - ext/extconf.rb
 has_rdoc: true
-homepage: http://rua.rubyforge.org
+homepage: http://jadtfmt.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --title