nkf 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91d0012de880dc327a501e8cbcf616c0bf94f3631a7ffcfe7d312df4ee234d3
-  data.tar.gz: '0305883ba08acedfca7e3ecfbedd6046519130091e297e84b31f2c164cd557a1'
+  metadata.gz: 99fe300695064529e277ba99c695e957548f0e636b2901e7eba88a4a62ac5c6c
+  data.tar.gz: 74a4a2835c227cb45348608c0bb2a206ff8462dfae5df7b803638e254e05572d
 SHA512:
-  metadata.gz: 1e4d3a3a8d83b61eb5cd2800ffa606f288af719d09b936ed5357a84d2913f33629e2a752a03bb3bf53f59f3bdd5a0e9e1311110266aba448d873e54a34ce03d6
-  data.tar.gz: fc812b17abfdf9aea0e9eeacb62721e42974ba39749c5625be1022e743e030c2888f160101f79bcf02bd3a260bbc5007336802bba7fd32fd493a26a8cd64f6da
+  metadata.gz: c7f58fd74f820302552e7c83271857e63df0d0e622f950570fd1c934efb6f334cc23cf69e8195a26ad79310721a0bb0a06461e098c073c2fefe5be664ae36072
+  data.tar.gz: 54289152cd0158f6f07d5cbfac794175aa75b510ca20ab7f7d6b13b9a01b76eb78e02d81ae2498ddae5be3565f90f175da0b1686945c6a24f19211ea65f697f6

data/.git-blame-ignore-revs

@@ -0,0 +1,7 @@
+# This is a file used by GitHub to ignore the following commits on `git blame`.
+#
+# You can also do the same thing in your local repository with:
+# $ git config --local blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Expand tabs
+564b86c8de70b636d94df815c77c5989a7a45c3b

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/ext/nkf/nkf-utf8/nkf.c

@@ -144,7 +144,7 @@ static void w_oconv(nkf_char c2, nkf_char c1);
 static void w_oconv16(nkf_char c2, nkf_char c1);
 static void w_oconv32(nkf_char c2, nkf_char c1);
 
-typedef struct {
+typedef const struct {
     const char *name;
     nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
     void (*oconv)(nkf_char c2, nkf_char c1);
@@ -158,10 +158,10 @@ nkf_native_encoding NkfEncodingUTF_8 =		{ "UTF-8", w_iconv, w_oconv };
 nkf_native_encoding NkfEncodingUTF_16 =		{ "UTF-16", w_iconv16, w_oconv16 };
 nkf_native_encoding NkfEncodingUTF_32 =		{ "UTF-32", w_iconv32, w_oconv32 };
 
-typedef struct {
-    const int id;
+typedef const struct {
+    int id;
     const char *name;
-    const nkf_native_encoding *base_encoding;
+    nkf_native_encoding *base_encoding;
 } nkf_encoding;
 
 nkf_encoding nkf_encoding_table[] = {
@@ -204,9 +204,9 @@ nkf_encoding nkf_encoding_table[] = {
     {-1,		NULL,			NULL}
 };
 
-struct {
+static const struct {
     const char *name;
-    const int id;
+    int id;
 } encoding_name_to_id_table[] = {
     {"US-ASCII",		ASCII},
     {"ASCII",			ASCII},
@@ -4286,7 +4286,7 @@ static const unsigned char *mime_pattern[] = {
 
 
 /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
-nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
+static nkf_char (*const mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
     e_iconv, s_iconv, 0, 0, 0, 0, 0,
 #if defined(UTF8_INPUT_ENABLE)
     w_iconv, w_iconv,

data/ext/nkf/nkf.c

@@ -9,6 +9,7 @@
 
 #define RUBY_NKF_REVISION "$Revision$"
 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
+#define NKF_GEM_VERSION "0.1.3"
 
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
@@ -65,11 +66,11 @@ rb_encoding* rb_nkf_enc_get(const char *name)
 {
     int idx = rb_enc_find_index(name);
     if (idx < 0) {
-	nkf_encoding *nkf_enc = nkf_enc_find(name);
-	idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
-	if (idx < 0) {
-	    idx = rb_define_dummy_encoding(name);
-	}
+        nkf_encoding *nkf_enc = nkf_enc_find(name);
+        idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
+        if (idx < 0) {
+            idx = rb_define_dummy_encoding(name);
+        }
     }
     return rb_enc_from_index(idx);
 }
@@ -83,40 +84,40 @@ int nkf_split_options(const char *arg)
     int is_single_quoted = FALSE;
     int is_double_quoted = FALSE;
     for(i = 0; arg[i]; i++){
-	if(j == 255){
-	    return -1;
-	}else if(is_single_quoted){
-	    if(arg[i] == '\''){
-		is_single_quoted = FALSE;
-	    }else{
-		option[j++] = arg[i];
-	    }
-	}else if(is_escaped){
-	    is_escaped = FALSE;
-	    option[j++] = arg[i];
-	}else if(arg[i] == '\\'){
-	    is_escaped = TRUE;
-	}else if(is_double_quoted){
-	    if(arg[i] == '"'){
-		is_double_quoted = FALSE;
-	    }else{
-		option[j++] = arg[i];
-	    }
-	}else if(arg[i] == '\''){
-	    is_single_quoted = TRUE;
-	}else if(arg[i] == '"'){
-	    is_double_quoted = TRUE;
-	}else if(arg[i] == ' '){
-	    option[j] = '\0';
-	    options(option);
-	    j = 0;
-	}else{
-	    option[j++] = arg[i];
-	}
+        if(j == 255){
+            return -1;
+        }else if(is_single_quoted){
+            if(arg[i] == '\''){
+                is_single_quoted = FALSE;
+            }else{
+                option[j++] = arg[i];
+            }
+        }else if(is_escaped){
+            is_escaped = FALSE;
+            option[j++] = arg[i];
+        }else if(arg[i] == '\\'){
+            is_escaped = TRUE;
+        }else if(is_double_quoted){
+            if(arg[i] == '"'){
+                is_double_quoted = FALSE;
+            }else{
+                option[j++] = arg[i];
+            }
+        }else if(arg[i] == '\''){
+            is_single_quoted = TRUE;
+        }else if(arg[i] == '"'){
+            is_double_quoted = TRUE;
+        }else if(arg[i] == ' '){
+            option[j] = '\0';
+            options(option);
+            j = 0;
+        }else{
+            option[j++] = arg[i];
+        }
     }
     if(j){
-	option[j] = '\0';
-	options(option);
+        option[j] = '\0';
+        options(option);
     }
     return count;
 }
@@ -170,9 +171,9 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     rb_str_set_len(tmp, output_ctr);
 
     if (mimeout_f)
-	rb_enc_associate(tmp, rb_usascii_encoding());
+        rb_enc_associate(tmp, rb_usascii_encoding());
     else
-	rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+        rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
 
     return tmp;
 }
@@ -274,7 +275,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  {de/en}crypt ROT13/47
  *
- *  === -h[123] --hiragana --katakana --katakana-hiragana
+ *  === \-h[123] --hiragana --katakana --katakana-hiragana
  *
  *  [-h1 --hiragana] Katakana to Hiragana conversion.
  *
@@ -299,7 +300,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  New line preserving line folding.
  *
- *  === -Z[0-3]
+ *  === \-Z[0-3]
  *
  *  Convert X0208 alphabet (Fullwidth Alphabets) to ASCII.
  *
@@ -318,7 +319,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *  With <b>-x</b>, try to preserve X0208 kana and do not convert X0201 kana to X0208.
  *  In JIS output, ESC-(-I is used. In EUC output, SSO is used.
  *
- *  === -B[0-2]
+ *  === \-B[0-2]
  *
  *  Assume broken JIS-Kanji input, which lost ESC.
  *  Useful when your site is using old B-News Nihongo patch.
@@ -336,7 +337,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  Delete \r in line feed, Add \r in line feed.
  *
- *  === -m[BQN0]
+ *  === \-m[BQN0]
  *
  *  MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)
  *  To see ISO8859-1 (Latin-1) -l is necessary.
@@ -358,14 +359,14 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  [-MB] MIME encode Base64 stream.
  *
- *  [-MQ] Perfome quoted encoding.
+ *  [-MQ] Perform quoted encoding.
  *
  *  === -l
  *
  *  Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
  *  <b>-s</b>, <b>-e</b> and <b>-x</b> are not compatible with this option.
  *
- *  === -L[uwm]
+ *  === \-L[uwm]
  *
  *  new line mode
  *  Without this option, nkf doesn't convert line breaks.
@@ -500,4 +501,6 @@ Init_nkf(void)
     rb_define_const(mNKF, "NKF_VERSION", rb_str_new2(NKF_VERSION));
     /* Release date of nkf */
     rb_define_const(mNKF, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
+    /* Version of nkf library */
+    rb_define_const(mNKF, "GEM_VERSION", rb_str_new_cstr(NKF_GEM_VERSION));
 }

data/nkf.gemspec

@@ -1,6 +1,16 @@
+source_version = ["", "ext/nkf/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}nkf.c")) {|f|
+      f.gets("\n#define NKF_GEM_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+
 Gem::Specification.new do |spec|
   spec.name          = "nkf"
-  spec.version       = "0.1.1"
+  spec.version       = source_version
   spec.authors       = ["NARUSE Yui"]
   spec.email         = ["naruse@airemix.jp"]
 
@@ -21,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.extensions    = ["ext/nkf/extconf.rb"]
 end

metadata

@@ -1,22 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: nkf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - NARUSE Yui
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extension for Network Kanji Filter
 email:
 - naruse@airemix.jp
 executables: []
-extensions: []
+extensions:
+- ext/nkf/extconf.rb
 extra_rdoc_files: []
 files:
+- ".git-blame-ignore-revs"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
@@ -56,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Ruby extension for Network Kanji Filter