iconv 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ade5a248ad7f987695736e3ca42183dd22239a73
-  data.tar.gz: 99e537f2952a300717cfae04dac1be83b540b96d
+SHA256:
+  metadata.gz: f18f6f9c75a01045651000747af72f97d71a633a1e3612597bc0afe4beeec73b
+  data.tar.gz: 1b7782c0429b79ab5d6b971e2c1ccc98878c7fe20e91baf5cb10aafc01cc7e50
 SHA512:
-  metadata.gz: 6b2429d50669f11196f317ce0100843a0b636ad828f01ea3370045a9165182b6e5bbbebfa15960ce267e64cdd5a7efa3465265e64f38beb60bd3cb59664c6aab
-  data.tar.gz: ddda802caed973d6c14d5974b3c5f88e18ce2d969aaeeea3a3668fa565a3dc4412cb56cb6be5fb232715833bb170f4db1eb78b9c372e085281af2e0971f2b80b
+  metadata.gz: a94e61fcf05f7a20d5046c8dc589115d0f4efb0683c051d8cf69d4908bb6848a641959d079442d2d7a8261cbe58706f7bc1aca6ae6e2d8bde24b7e114d904f8a
+  data.tar.gz: 1c8020bf2888c9fdefcdbb1b34675b2943d1a871cc54756b34e17f3dae6908c9ba94a2a38550ddbaf0453fd82a1b0c12cc103d9d8cb2053d2c78c79a3b7b0514

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - ruby-head
+  - 2.6.0
   - 2.5.0
   - 2.4.3
   - 2.3.6

data/ext/iconv/iconv.c

@@ -50,7 +50,6 @@ rb_set_errinfo(VALUE err)
     extern VALUE ruby_errinfo;
     ruby_errinfo = err;
 }
-#define ENCODING_GET(a) 0
 VALUE
 rb_sprintf(const char *format, ...)
 {
@@ -75,6 +74,13 @@ rb_sys_fail_str(VALUE msg)
 }
 #endif
 
+#ifdef HAVE_RUBY_ENCODING_H
+# define ICONV_ENCODING_SET(obj,idx) rb_ivar_set(obj, id_encoding, rb_enc_from_encoding(rb_enc_from_index(idx)))
+# define ICONV_ENCODING_GET(obj) rb_enc_to_index(rb_to_encoding(rb_ivar_get(obj, id_encoding)))
+#else
+# define ICONV_ENCODING_GET(a) 0
+#endif
+
 /*
  * Document-class: Iconv
  *
@@ -150,7 +156,7 @@ struct rb_iconv_opt_t
     VALUE discard_ilseq;
 };
 
-static ID id_transliterate, id_discard_ilseq;
+static ID id_transliterate, id_discard_ilseq, id_encoding;
 
 static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
@@ -734,7 +740,7 @@ iconv_initialize(int argc, VALUE *argv, VALUE self)
     DATA_PTR(self) = NULL;
     DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from, &opt, &idx));
 #ifdef HAVE_RUBY_ENCODING_H
-    if (idx >= 0) ENCODING_SET(self, idx);
+    if (idx >= 0) ICONV_ENCODING_SET(self, idx);
 #endif
     return self;
 }
@@ -760,7 +766,7 @@ iconv_s_open(int argc, VALUE *argv, VALUE self)
 
     self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
 #ifdef HAVE_RUBY_ENCODING_H
-    if (idx >= 0) ENCODING_SET(self, idx);
+    if (idx >= 0) ICONV_ENCODING_SET(self, idx);
 #endif
 
     if (rb_block_given_p()) {
@@ -946,7 +952,7 @@ iconv_init_state(VALUE self)
 {
     iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
     DATA_PTR(self) = NULL;
-    return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
+    return iconv_convert(cd, Qnil, 0, 0, ICONV_ENCODING_GET(self), NULL);
 }
 
 static VALUE
@@ -1027,7 +1033,7 @@ iconv_iconv(int argc, VALUE *argv, VALUE self)
 #endif
     }
 
-    return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
+    return iconv_convert(VALUE2ICONV(cd), str, start, length, ICONV_ENCODING_GET(self), NULL);
 }
 
 /*
@@ -1043,7 +1049,7 @@ iconv_conv(int argc, VALUE *argv, VALUE self)
 {
     iconv_t cd = VALUE2ICONV(check_iconv(self));
     VALUE str, s;
-    int toidx = ENCODING_GET(self);
+    int toidx = ICONV_ENCODING_GET(self);
 
     str = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
     if (argc > 0) {
@@ -1311,6 +1317,7 @@ Init_iconv(void)
     rb_failed = rb_intern("failed");
     id_transliterate = rb_intern("transliterate");
     id_discard_ilseq = rb_intern("discard_ilseq");
+    id_encoding = rb_intern("encoding");
 
     rb_gc_register_address(&charset_map);
     charset_map = rb_hash_new();

data/lib/iconv/version.rb

@@ -1,3 +1,3 @@
 class Iconv
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iconv
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - NARUSE, Yui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies: []
 description: iconv wrapper library
 email:
@@ -54,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: iconv wrapper library