iconv 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18f6f9c75a01045651000747af72f97d71a633a1e3612597bc0afe4beeec73b
-  data.tar.gz: 1b7782c0429b79ab5d6b971e2c1ccc98878c7fe20e91baf5cb10aafc01cc7e50
+  metadata.gz: 8f5a276d2517ce5592e1bbe94c3c8897bdaa70eb8d52fe334746ea8dd287013f
+  data.tar.gz: ec2d9899c3ce1f58aefab4516f2d79da7b301ded1e27473bc825645f7710e919
 SHA512:
-  metadata.gz: a94e61fcf05f7a20d5046c8dc589115d0f4efb0683c051d8cf69d4908bb6848a641959d079442d2d7a8261cbe58706f7bc1aca6ae6e2d8bde24b7e114d904f8a
-  data.tar.gz: 1c8020bf2888c9fdefcdbb1b34675b2943d1a871cc54756b34e17f3dae6908c9ba94a2a38550ddbaf0453fd82a1b0c12cc103d9d8cb2053d2c78c79a3b7b0514
+  metadata.gz: b43b19ba95361b57c2a3ff7778f344cb9ad5aeef98b24089fc4a698c5ebd286590ac76fcf9e274c799050fc02220219b090c6dd3c0df07697904348bbde36a9b
+  data.tar.gz: 609d4ab133902601820e5c4478387c7049fbedb2ce74b0def6c66c390e6fe886cf39697a4a2eb31544bfde98e1375b9a5aced9cd223711b64c0db84d5ace4623

data/.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.rbc
 *.so
+*.bundle
 *.swp
 .bundle
 .config

data/.travis.yml

@@ -12,7 +12,7 @@ rvm:
   - 1.9.2
   - 1.8.7
 
-before_install: gem install bundler
+before_install: gem install bundler -v '<2'
 
 branches:
   only:

data/Rakefile

@@ -7,7 +7,7 @@ NAME = 'iconv'
 # rule to build the extension: this says
 # that the extension should be rebuilt
 # after any change to the files in ext
-file "lib/#{NAME}/#{NAME}.so" =>
+file "lib/#{NAME}/#{NAME}.#{RbConfig::CONFIG['DLEXT']}" =>
     Dir.glob("ext/#{NAME}/*{.rb,.c}") do
   Dir.chdir("ext/#{NAME}") do
     # this does essentially the same thing
@@ -15,19 +15,19 @@ file "lib/#{NAME}/#{NAME}.so" =>
     ruby "extconf.rb", *ARGV.grep(/\A--/)
     sh "make", *ARGV.grep(/\A(?!--)/)
   end
-  cp "ext/#{NAME}/#{NAME}.so", "lib/#{NAME}"
+  cp "ext/#{NAME}/#{NAME}.#{RbConfig::CONFIG['DLEXT']}", "lib/#{NAME}"
 end
 
 # make the :test task depend on the shared
 # object, so it will be built automatically
 # before running the tests
-task :test => "lib/#{NAME}/#{NAME}.so"
+task :test => "lib/#{NAME}/#{NAME}.#{RbConfig::CONFIG['DLEXT']}"
 
 # use 'rake clean' and 'rake clobber' to
 # easily delete generated files
-CLEAN.include('ext/**/*{.o,.log,.so}')
-CLEAN.include('ext/**/Makefile')
-CLOBBER.include('lib/**/*.so')
+CLEAN.include("ext/**/*{.o,.log,.#{RbConfig::CONFIG['DLEXT']}}")
+CLEAN.include("ext/**/Makefile")
+CLOBBER.include("lib/**/*.#{RbConfig::CONFIG['DLEXT']}")
 
 # the same as before
 Rake::TestTask.new do |t|

data/ext/iconv/iconv.c

@@ -75,8 +75,14 @@ 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)))
+# define ICONV_ENCODING_SET(obj,idx) rb_ivar_set(obj, id_encindex, INT2FIX(idx))
+static int
+iconv_get_encindex(VALUE obj, ID id_encindex)
+{
+    VALUE num_or_nil = rb_ivar_get(obj, id_encindex);
+    return NIL_P(num_or_nil) ? 0 : FIX2INT(num_or_nil);
+}
+# define ICONV_ENCODING_GET(obj) iconv_get_encindex(obj, id_encindex)
 #else
 # define ICONV_ENCODING_GET(a) 0
 #endif
@@ -156,7 +162,7 @@ struct rb_iconv_opt_t
     VALUE discard_ilseq;
 };
 
-static ID id_transliterate, id_discard_ilseq, id_encoding;
+static ID id_transliterate, id_discard_ilseq, id_encindex;
 
 static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
@@ -1317,7 +1323,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");
+    id_encindex = rb_intern("encindex");
 
     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.6"
+  VERSION = "1.0.7"
 end

data/test/test_basic.rb

@@ -56,4 +56,12 @@ class TestIconv::Basic < TestIconv
       Iconv.iconv("X-UNKNOWN-1", "X-UNKNOWN-2") {break}
     }
   end
+
+  def test_github_issue_16
+    i = Iconv.new('SHIFT_JISX0213', 'UTF-8')
+    ret = i.iconv('ほげ')
+    ret << i.iconv(nil)
+    i.close
+    assert_equal "\x82\xD9\x82\xB0".b, ret
+  end
 end

metadata

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