nkf 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99fe300695064529e277ba99c695e957548f0e636b2901e7eba88a4a62ac5c6c
-  data.tar.gz: 74a4a2835c227cb45348608c0bb2a206ff8462dfae5df7b803638e254e05572d
+  metadata.gz: f82f8f21210cbbd491307967db9c664a2afc2707edadb6a93151391c273d83d9
+  data.tar.gz: 91c3a5ef30e7cc7d6f11d4fad788f16ceec857dc2f988fd7a0c70b36ca322d38
 SHA512:
-  metadata.gz: c7f58fd74f820302552e7c83271857e63df0d0e622f950570fd1c934efb6f334cc23cf69e8195a26ad79310721a0bb0a06461e098c073c2fefe5be664ae36072
-  data.tar.gz: 54289152cd0158f6f07d5cbfac794175aa75b510ca20ab7f7d6b13b9a01b76eb78e02d81ae2498ddae5be3565f90f175da0b1686945c6a24f19211ea65f697f6
+  metadata.gz: 6c50ad8960ac5ac3f16b2956a30f483753ab0bc394e507b335ea0b85b44ee306a23842789457a5c220431667ddca34b9c121b74cd238acc84a7c1964d6ef59aa
+  data.tar.gz: c63500824d58fa3a27c119bc20dc49237e3be1c5f1d531606af5514d6d79f860f99ca44d8b12388773024f79374994fb2b1bcd96cdbb543c549dda21edf4a796

data/.github/workflows/test.yml

@@ -3,15 +3,22 @@ name: build
 on: [push, pull_request]
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-jruby
+      min_version: 2.5
+
   build:
+    needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ '3.0', 2.7, 2.6, 2.5, head ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -9,3 +9,6 @@
 *.bundle
 *.dll
 *.so
+lib/nkf.jar
+.idea
+nkf.iml

data/Rakefile

@@ -7,6 +7,18 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/test_*.rb"]
 end
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("nkf")
+if RUBY_ENGINE == "jruby"
+  require "rake/javaextensiontask"
+  Rake::JavaExtensionTask.new("nkf") do |ext|
+    ext.source_version = "1.8"
+    ext.target_version = "1.8"
+    ext.ext_dir = "ext/java"
+  end
+
+  task :build => :compile
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new("nkf")
+end
+
 task :default => :test

data/ext/java/org/jruby/ext/nkf/Command.java

@@ -0,0 +1,58 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2011 Koichiro Ohba <koichiro@meadowy.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.nkf;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class Command {
+    private final List<Option> options = new ArrayList<Option>();
+    public boolean hasOption(String opt) {
+        for (Option option : options) {
+            if (opt.equals(option.getOpt())) return true;
+            if (opt.equals(option.getLongOpt())) return true;
+        }
+        return false;
+    }
+    public void addOption(Option opt) {
+        options.add(opt);
+    }
+    public Option getOption(String opt) {
+        for (Option option : options) {
+            if (opt.equals(option.getOpt())) return option;
+            if (opt.equals(option.getLongOpt())) return option;
+        }
+        return null;
+    }
+    public String getOptionValue(String opt) {
+        return getOption(opt).getValue();
+    }
+    public String toString() {
+        return options.toString();
+    }
+}

data/ext/java/org/jruby/ext/nkf/CommandParser.java

@@ -0,0 +1,70 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2011 Koichiro Ohba <koichiro@meadowy.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.nkf;
+
+public class CommandParser {
+    public Command parse(Options opt, String args) {
+        Command cc = new Command();
+        String[] tokens = args.split("\\s");
+        for (int i = 0; i < tokens.length; i++) {
+            // long option
+            if (tokens[i].startsWith("--")) {
+                String s = stripDash(tokens[i]);
+                if (opt.hasLongOption(s)) {
+                    cc.addOption(opt.matchLongOption(s));
+                }
+            } else {
+                // short option
+                String s = stripDash(tokens[i]);
+                int max = s.length();
+                for (int j = 0; j < max; j++) {
+                    if (opt.hasShortOption(s)) {
+                        Option cmd = opt.matchShortOption(s);
+                        if (cmd.getValue() != null) {
+                            int op_len = cmd.getValue().length();
+                            s = s.substring(op_len);
+                            j = j + op_len;
+                        }
+                        cc.addOption(cmd);
+                    }
+                    s = s.substring(1);
+                }
+            }
+        }
+        return cc;
+    }
+    private String stripDash(String s) {
+        if (s.startsWith("--")) {
+            return s.substring(2, s.length());
+        } else if (s.startsWith("-")) {
+            return s.substring(1, s.length());
+        } else {
+            return s;
+        }
+    }
+}

data/ext/java/org/jruby/ext/nkf/NKFLibrary.java

@@ -0,0 +1,13 @@
+package org.jruby.ext.nkf;
+
+import org.jruby.Ruby;
+import org.jruby.runtime.load.Library;
+
+import java.io.IOException;
+
+public class NKFLibrary implements Library {
+    @Override
+    public void load(Ruby ruby, boolean b) throws IOException {
+        RubyNKF.load(ruby);
+    }
+}

data/ext/java/org/jruby/ext/nkf/Option.java

@@ -0,0 +1,80 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2011 Koichiro Ohba <koichiro@meadowy.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.nkf;
+
+import java.util.regex.Pattern;
+
+public class Option {
+    private final String opt;
+    private final String longOpt;
+    private boolean hasArg = false;
+    private String value = null;
+    private Pattern pattern;
+
+    public Option(String opt, String longOpt, String pattern) {
+        this.opt = opt;
+        this.longOpt = longOpt;
+        if (pattern != null) {
+            this.hasArg = true;
+            this.pattern = Pattern.compile(pattern);
+        }
+    }
+    String getOpt() { return opt; }
+    String getLongOpt() { return longOpt; }
+    boolean hasShortOpt() {
+        return opt != null;
+    }
+    boolean hasLongOpt() {
+        return longOpt != null;
+    }
+    boolean hasArg() {
+        return hasArg;
+    }
+    public String getValue() {
+        return value;
+    }
+    void setValue(String v) {
+        value = v;
+    }
+    String getKey() {
+        if (opt == null)
+            return longOpt;
+        else
+            return opt;
+    }
+    Pattern pattern() {
+        return pattern;
+    }
+    public String toString() {
+        return "[opt: " + opt
+            + " longOpt: " + longOpt
+            + " hasArg: " + hasArg
+            + " pattern: " + pattern
+            + " value: " + value + "]";
+    }
+}

data/ext/java/org/jruby/ext/nkf/Options.java

@@ -0,0 +1,109 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2011 Koichiro Ohba <koichiro@meadowy.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.nkf;
+
+import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.regex.Matcher;
+
+public class Options {
+    private final Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> longOpts = new LinkedHashMap<String, Option>();
+
+    public Options addOption(String opt) {
+        return addOption(opt, null);
+    }
+    public Options addOption(String opt, String longOpt) {
+        return addOption(opt, longOpt, null);
+    }
+    public Options addOption(String opt, String longOpt, String pattern) {
+        return addOption(new Option(opt, longOpt, pattern));
+    }
+    public Options addOption(Option opt) {
+        if (opt.hasLongOpt()) {
+            longOpts.put(opt.getLongOpt(), opt);
+        }
+        if (opt.hasShortOpt()) {
+            shortOpts.put(opt.getOpt(), opt);
+        }
+        return this;
+    }
+    boolean hasShortOption(String opt) {
+        for (Map.Entry<String , Option> e : shortOpts.entrySet()) {
+            if (opt.startsWith(e.getKey())) {
+                return true;
+            }
+        }
+        return false;
+    }
+    public Option matchShortOption(String opt) {
+        // independent of opt length
+        for (Map.Entry<String , Option> e : shortOpts.entrySet()) {
+            //System.out.println(opt + " = " + e.getKey());
+            if (opt.startsWith(e.getKey())) {
+                //System.out.println("match[" + e.getKey() + "]");
+                Option cmd = e.getValue();
+                if (cmd.hasArg()) {
+                    Matcher m = cmd.pattern().matcher(opt);
+                    if (m.find()) {
+                        //System.out.println("regix[" + m.group() + "]");
+                        cmd.setValue(m.group());
+                    }
+                }
+                return cmd;
+            }
+        }
+        return null;
+    }
+    boolean hasLongOption(String opt) {
+        for (Map.Entry<String , Option> e : longOpts.entrySet()) {
+            if (opt.startsWith(e.getKey())) {
+                return true;
+            }
+        }
+        return false;
+    }
+    Option matchLongOption(String opt) {
+        for (Map.Entry<String , Option> e : longOpts.entrySet()) {
+            //System.out.println(opt + " = " + e.getKey());
+            if (opt.startsWith(e.getKey())) {
+                //System.out.println("match[" + e.getKey() + "]");
+                Option cmd = e.getValue();
+                if (cmd.hasArg()) {
+                    Matcher m = cmd.pattern().matcher(opt);
+                    if (m.find()) {
+                        //System.out.println("regix[" + m.group() + "]");
+                        cmd.setValue(m.group(1));
+                    }
+                }
+                return cmd;
+            }
+        }
+        return null;
+    }
+}

data/ext/java/org/jruby/ext/nkf/RubyNKF.java

@@ -0,0 +1,601 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2007-2011 Koichiro Ohba <koichiro@meadowy.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.nkf;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.jcodings.Encoding;
+import org.jcodings.specific.ASCIIEncoding;
+import org.jcodings.specific.UTF8Encoding;
+import org.jcodings.transcode.EConv;
+import org.jcodings.transcode.EConvFlags;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+import org.jruby.util.KCode;
+import org.jruby.util.Pack;
+import org.jruby.util.io.EncodingUtils;
+
+@JRubyModule(name="NKF")
+public class RubyNKF {
+    public static enum NKFCharset {
+        AUTO(0, "x-JISAutoDetect"),
+        // no ISO-2022-JP in jcodings
+        JIS(1, "ISO-2022-JP"),
+        EUC(2, "EUC-JP"),
+        SJIS(3, "Shift_JIS"),
+        BINARY(4, null),
+        NOCONV(4, null),
+        UNKNOWN(0, null),
+        ASCII(5, "iso-8859-1"),
+        UTF8(6, "UTF-8"),
+        UTF16(8, "UTF-16"),
+        UTF32(12, "UTF-32"),
+        OTHER(16, null),
+        BASE64(20, "base64"),
+        QENCODE(21, "qencode"),
+        MIME_DETECT(22, "MimeAutoDetect");
+
+        private NKFCharset(int value, String charset) {
+            this.value = value;
+            this.charset = charset;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCharset() {
+            return charset;
+        }
+
+        private final int value;
+        private final String charset;
+    }
+
+    private static final ByteList BEGIN_MIME_STRING = new ByteList(ByteList.plain("=?"));
+    private static final ByteList END_MIME_STRING = new ByteList(ByteList.plain("?="));
+    private static final ByteList PACK_BASE64 = new ByteList(ByteList.plain("m"));
+    private static final ByteList PACK_QENCODE = new ByteList(ByteList.plain("M"));
+
+    public static final Map<Integer, String> NKFCharsetMap = new HashMap<Integer, String>(20, 1);
+
+    public static void load(Ruby runtime) {
+        createNKF(runtime);
+    }
+
+    public static void createNKF(Ruby runtime) {
+        final RubyModule NKF = runtime.defineModule("NKF");
+        final String version = "2.1.2";
+        final String relDate = "2011-09-08";
+
+        NKF.defineConstant("NKF_VERSION", runtime.newString(version));
+        NKF.defineConstant("NKF_RELEASE_DATE", runtime.newString(relDate));
+        NKF.defineConstant("VERSION", runtime.newString(version + ' ' + '(' + "JRuby" + '_' + relDate + ')'));
+
+        for ( NKFCharset charset : NKFCharset.values() ) {
+            NKFCharsetMap.put(charset.value, charset.name());
+
+            if (charset.value > 12 ) continue;
+            NKF.defineConstant(charset.name(), charsetMappedValue(runtime, charset));
+        }
+
+        NKF.defineAnnotatedMethods(RubyNKF.class);
+    }
+
+    @JRubyMethod(name = "guess", module = true)
+    public static IRubyObject guess(ThreadContext context, IRubyObject recv, IRubyObject s) {
+        return charsetMappedValue(context.runtime, guess(context, s));
+    }
+
+    public static NKFCharset guess(ThreadContext context, IRubyObject s) {
+        // TODO: Fix charset usage for JRUBY-4553
+        Ruby runtime = context.runtime;
+        if (!s.respondsTo("to_str")) {
+            throw runtime.newTypeError("can't convert " + s.getMetaClass() + " into String");
+        }
+        ByteList bytes = s.convertToString().getByteList();
+        ByteBuffer buf = ByteBuffer.wrap(bytes.getUnsafeBytes(), bytes.begin(), bytes.length());
+        CharsetDecoder decoder;
+        try {
+            decoder = Charset.forName("x-JISAutoDetect").newDecoder();
+        } catch (UnsupportedCharsetException e) {
+            throw runtime.newStandardError("charsets.jar is required to use NKF#guess. Please install JRE which supports m17n.");
+        }
+        try {
+            decoder.decode(buf);
+
+            if ( ! decoder.isCharsetDetected() ) {
+                return NKFCharset.UNKNOWN;
+            }
+            Charset charset = decoder.detectedCharset();
+            String name = charset.name();
+            if ("Shift_JIS".equals(name)) {
+                return NKFCharset.SJIS;
+            }
+            if ("Windows-31j".equalsIgnoreCase(name)) {
+                return NKFCharset.JIS;
+            }
+            if ("EUC-JP".equals(name)) {
+                return NKFCharset.EUC;
+            }
+            if ("ISO-2022-JP".equals(name)) {
+                return NKFCharset.JIS;
+            }
+        }
+        catch (CharacterCodingException e) {
+            // fall through and try direct encoding
+        }
+
+        if (bytes.getEncoding() == UTF8Encoding.INSTANCE) {
+            return NKFCharset.UTF8;
+        }
+        if (bytes.getEncoding().toString().startsWith("UTF-16")) {
+            return NKFCharset.UTF16;
+        }
+        if (bytes.getEncoding().toString().startsWith("UTF-32")) {
+            return NKFCharset.UTF32;
+        }
+        return NKFCharset.UNKNOWN;
+    }
+
+    private static IRubyObject charsetMappedValue(final Ruby runtime, final NKFCharset charset) {
+        final Encoding encoding;
+        switch (charset) {
+            case AUTO: case NOCONV: case UNKNOWN: return runtime.getNil();
+            case BINARY:
+                encoding = runtime.getEncodingService().getAscii8bitEncoding();
+                return runtime.getEncodingService().convertEncodingToRubyEncoding(encoding);
+        }
+
+        encoding = runtime.getEncodingService().getEncodingFromString(charset.getCharset());
+        return runtime.getEncodingService().convertEncodingToRubyEncoding(encoding);
+    }
+
+    @JRubyMethod(name = "guess1", module = true)
+    public static IRubyObject guess1(ThreadContext context, IRubyObject recv, IRubyObject str) {
+        return guess(context, recv, str);
+    }
+
+    @JRubyMethod(name = "guess2", module = true)
+    public static IRubyObject guess2(ThreadContext context, IRubyObject recv, IRubyObject str) {
+        return guess(context, recv, str);
+    }
+
+    @JRubyMethod(name = "nkf", module = true)
+    public static IRubyObject nkf(ThreadContext context, IRubyObject recv, IRubyObject opt, IRubyObject str) {
+        Ruby runtime = context.runtime;
+
+        if (!opt.respondsTo("to_str")) {
+            throw runtime.newTypeError("can't convert " + opt.getMetaClass() + " into String");
+        }
+
+        if (!str.respondsTo("to_str")) {
+            throw runtime.newTypeError("can't convert " + str.getMetaClass() + " into String");
+        }
+
+        Map<String, NKFCharset> options = parseOpt(opt.convertToString().toString());
+
+        if (options.get("input").getValue() == NKFCharset.AUTO.getValue()) {
+            options.put("input", guess(context, str));
+        }
+
+        ByteList bstr = str.convertToString().getByteList();
+        final Converter converter;
+        if (Converter.isMimeText(bstr, options)) {
+            converter = new MimeConverter(context, options);
+        } else {
+            converter = new DefaultConverter(context, options);
+        }
+
+        RubyString result = converter.convert(bstr);
+
+        if (options.get("mime-encode") == NKFCharset.BASE64) {
+            result = Converter.encodeMimeString(runtime, result, PACK_BASE64);
+        } else if (options.get("mime-encode") == NKFCharset.QENCODE) {
+            result = Converter.encodeMimeString(runtime, result, PACK_QENCODE);
+        }
+
+        return result;
+    }
+
+    public static Command parseOption(String s) {
+        Options options = new Options();
+        options.addOption("b");
+        options.addOption("u");
+        options.addOption("j", "jis");
+        options.addOption("s", "sjis");
+        options.addOption("e", "euc");
+        options.addOption("w", null, "[0-9][0-9]");
+        options.addOption("J", "jis-input");
+        options.addOption("S", "sjis-input");
+        options.addOption("E", "euc-input");
+        options.addOption("W", null, "[0-9][0-9]");
+        options.addOption("t");
+        options.addOption("i_");
+        options.addOption("o_");
+        options.addOption("r");
+        options.addOption("h1", "hiragana");
+        options.addOption("h2", "katakana");
+        options.addOption("h3", "katakana-hiragana");
+        options.addOption("T");
+        options.addOption("l");
+        options.addOption("f", null, "[0-9]+-[0-9]*");
+        options.addOption("F");
+        options.addOption("Z", null, "[0-3]");
+        options.addOption("X");
+        options.addOption("x");
+        options.addOption("B", null, "[0-2]");
+        options.addOption("I");
+        options.addOption("L", null, "[uwm]");
+        options.addOption("d");
+        options.addOption("c");
+        options.addOption("m", null, "[BQN0]");
+        options.addOption("M", null, "[BQ]");
+        options.addOption(null, "fj");
+        options.addOption(null, "unix");
+        options.addOption(null, "mac");
+        options.addOption(null, "msdos");
+        options.addOption(null, "windows");
+        options.addOption(null, "mime");
+        options.addOption(null, "base64");
+        options.addOption(null, "mime-input");
+        options.addOption(null, "base64-input");
+        options.addOption(null, "ic", "ic=(.*)");
+        options.addOption(null, "oc", "oc=(.*)");
+        options.addOption(null, "fb-skip");
+        options.addOption(null, "fb-html");
+        options.addOption(null, "fb-xml");
+        options.addOption(null, "fb-perl");
+        options.addOption(null, "fb-java");
+        options.addOption(null, "fb-subchar", "fb-subchar=(.*)");
+        options.addOption(null, "no-cp932ext");
+        options.addOption(null, "cap-input");
+        options.addOption(null, "url-input");
+        options.addOption(null, "numchar-input");
+        options.addOption(null, "no-best-fit-chars");
+
+        CommandParser parser = new CommandParser();
+        Command cmd = parser.parse(options, s);
+        return cmd;
+    }
+
+    private static Map<String, NKFCharset> parseOpt(String s) {
+        Map<String, NKFCharset> options = new HashMap<String, NKFCharset>();
+
+        // default options
+        options.put("input", NKFCharset.AUTO);
+        options.put("output", NKFCharset.JIS);
+        options.put("mime-decode", NKFCharset.MIME_DETECT);
+        options.put("mime-encode", NKFCharset.NOCONV);
+
+        Command cmd = parseOption(s);
+        if (cmd.hasOption("j")) {
+            options.put("output", NKFCharset.JIS);
+        }
+        if (cmd.hasOption("s")) {
+            options.put("output", NKFCharset.SJIS);
+        }
+        if (cmd.hasOption("e")) {
+            options.put("output", NKFCharset.EUC);
+        }
+        if (cmd.hasOption("w")) {
+            Option opt = cmd.getOption("w");
+            if ("32".equals(opt.getValue())) {
+                options.put("output", NKFCharset.UTF32);
+            } else if("16".equals(opt.getValue())) {
+                options.put("output", NKFCharset.UTF16);
+            } else {
+                options.put("output", NKFCharset.UTF8);
+            }
+        }
+        if (cmd.hasOption("J")) {
+            options.put("input", NKFCharset.JIS);
+        }
+        if (cmd.hasOption("S")) {
+            options.put("input", NKFCharset.SJIS);
+        }
+        if (cmd.hasOption("E")) {
+            options.put("input", NKFCharset.EUC);
+        }
+        if (cmd.hasOption("W")) {
+            Option opt = cmd.getOption("W");
+            if ("32".equals(opt.getValue())) {
+                options.put("input", NKFCharset.UTF32);
+            } else if("16".equals(opt.getValue())) {
+                options.put("input", NKFCharset.UTF16);
+            } else {
+                options.put("input", NKFCharset.UTF8);
+            }
+        }
+        if (cmd.hasOption("m")) {
+            Option opt = cmd.getOption("m");
+            if (opt.getValue() == null) {
+                options.put("mime-decode", NKFCharset.MIME_DETECT);
+            } else if ("B".equals(opt.getValue())) {
+                options.put("mime-decode", NKFCharset.BASE64);
+            } else if ("Q".equals(opt.getValue())) {
+                options.put("mime-decode", NKFCharset.QENCODE);
+            } else if ("N".equals(opt.getValue())) {
+                // TODO: non-strict option
+            } else if ("0".equals(opt.getValue())) {
+                options.put("mime-decode", NKFCharset.NOCONV);
+            }
+        }
+        if (cmd.hasOption("M")) {
+            Option opt = cmd.getOption("M");
+            if (opt.getValue() == null) {
+                options.put("mime-encode", NKFCharset.NOCONV);
+            } else if ("B".equals(opt.getValue())) {
+                options.put("mime-encode", NKFCharset.BASE64);
+            } else if ("Q".equals(opt.getValue())) {
+                options.put("mime-encode", NKFCharset.QENCODE);
+            }
+        }
+        if (cmd.hasOption("base64")) {
+            options.put("mime-encode", NKFCharset.BASE64);
+        }
+        if (cmd.hasOption("oc")) {
+            Option opt = cmd.getOption("oc");
+            if ("ISO-2022-JP".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.JIS);
+            } else if ("EUC-JP".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.EUC);
+            } else if ("CP932".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.SJIS);
+            } else if ("Shift_JIS".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.SJIS);
+            } else if ("Windows-31J".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.JIS);
+            } else if ("UTF-8".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF8);
+            } else if ("UTF-8N".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF8);
+            } else if ("UTF-16".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF16);
+            } else if ("UTF-16BE-BOM".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF16);
+            } else if ("UTF-32".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF32);
+            } else if ("UTF-32BE-BOM".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("output", NKFCharset.UTF32);
+            }
+        }
+        if (cmd.hasOption("ic")) {
+            Option opt = cmd.getOption("ic");
+            if ("ISO-2022-JP".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.JIS);
+            } else if ("EUC-JP".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.EUC);
+            } else if ("CP932".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.SJIS);
+            } else if ("Shift_JIS".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.SJIS);
+            } else if ("Windows-31J".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.SJIS);
+            } else if ("UTF-8".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF8);
+            } else if ("UTF-8N".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF8);
+            } else if ("UTF-16".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF16);
+            } else if ("UTF-16BE-BOM".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF16);
+            } else if ("UTF-32".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF32);
+            } else if ("UTF-32BE-BOM".compareToIgnoreCase(opt.getValue()) == 0) {
+                options.put("input", NKFCharset.UTF32);
+            }
+        }
+
+        return options;
+    }
+
+    static abstract class Converter {
+
+        protected final ThreadContext context;
+        protected final Map<String, NKFCharset> options;
+
+        public Converter(ThreadContext ctx, Map<String, NKFCharset> opt) {
+            context = ctx;
+            options = opt;
+        }
+
+        static boolean isMimeText(ByteList str, Map<String, NKFCharset> options) {
+            if (str.length() <= 6) {
+                return false;
+            }
+            if (options.get("mime-decode") == NKFCharset.NOCONV) {
+                return false;
+            }
+            if (str.indexOf(BEGIN_MIME_STRING) < 0) {
+                return false;
+            }
+            if (str.lastIndexOf(END_MIME_STRING) < 0) {
+                return false;
+            }
+            return true;
+        }
+
+        private static RubyString encodeMimeString(Ruby runtime, RubyString str, ByteList format) {
+            RubyArray array = RubyArray.newArray(runtime, str);
+            return Pack.pack(runtime, array, format).chomp(runtime.getCurrentContext());
+        }
+
+        abstract RubyString convert(ByteList str);
+
+        ByteList convert_byte(ByteList str, String inputCharset, NKFCharset output) {
+            String outputCharset = output.getCharset();
+
+            if (inputCharset == null) {
+                inputCharset = str.getEncoding().toString();
+            }
+
+            if (outputCharset.equals(inputCharset)) {
+                return str.dup();
+            }
+
+            byte[] outCharsetBytes = outputCharset.getBytes();
+
+            EConv ec = EncodingUtils.econvOpenOpts(context, inputCharset.getBytes(), outCharsetBytes, 0, context.nil);
+
+            if (ec == null) {
+                throw context.runtime.newArgumentError("invalid encoding pair: " + inputCharset + " to " + outputCharset);
+            }
+
+            ByteList converted = EncodingUtils.econvStrConvert(context, ec, str, EConvFlags.INVALID_REPLACE);
+
+            converted.setEncoding(context.runtime.getEncodingService().findEncodingOrAliasEntry(outCharsetBytes).getEncoding());
+
+            return converted;
+        }
+    }
+
+    static class DefaultConverter extends Converter {
+
+        public DefaultConverter(ThreadContext ctx, Map<String, NKFCharset> opt) {
+            super(ctx, opt);
+        }
+
+        RubyString convert(ByteList str) {
+            NKFCharset input = options.get("input");
+            NKFCharset output = options.get("output");
+            ByteList b = convert_byte(str,
+                    input.getCharset(),
+                    output);
+            return context.runtime.newString(b);
+        }
+    }
+
+    static class MimeConverter extends Converter {
+
+        public MimeConverter(ThreadContext ctx, Map<String, NKFCharset> opt) {
+            super(ctx, opt);
+        }
+
+        private String detectCharset(String charset) {
+            if (charset.compareToIgnoreCase(NKFCharset.UTF8.getCharset()) == 0) {
+                return NKFCharset.UTF8.getCharset();
+            } else if (charset.compareToIgnoreCase(NKFCharset.JIS.getCharset()) == 0) {
+                return NKFCharset.JIS.getCharset();
+            } else if (charset.compareToIgnoreCase(NKFCharset.EUC.getCharset()) == 0) {
+                return NKFCharset.EUC.getCharset();
+            } else {
+                return NKFCharset.ASCII.getCharset();
+            }
+        }
+
+        private ByteList decodeMimeString(String str) {
+            String[] mime = str.split("^=\\?|\\?|\\?=$");
+            String charset = detectCharset(mime[1]);
+            int encode = mime[2].charAt(0);
+            RubyString body = EncodingUtils.newExternalStringWithEncoding(context.runtime, mime[3], ASCIIEncoding.INSTANCE);
+
+            final RubyArray<?> array;
+            if ('B' == encode || 'b' == encode) { // BASE64
+                array = Pack.unpack(context, body, PACK_BASE64);
+            } else { // Qencode
+                array = Pack.unpack(context, body, PACK_QENCODE);
+            }
+            RubyString s = (RubyString) array.entry(0);
+            ByteList decodeStr = s.asString().getByteList();
+
+            return convert_byte(decodeStr, charset, options.get("output"));
+        }
+
+        RubyString makeRubyString(ArrayList<ByteList> list) {
+            ByteList r = new ByteList();
+            for (ByteList l : list) {
+                r.append(l);
+            }
+            return context.runtime.newString(r);
+        }
+
+        RubyString convert(ByteList str) {
+            String s = Helpers.decodeByteList(context.runtime, str);
+            String[] token = s.split("\\s");
+            ArrayList<ByteList> raw_data = new ArrayList<ByteList>();
+
+            for (int i = 0; i < token.length; i++) {
+                raw_data.add(decodeMimeString(token[i]));
+            }
+
+            return makeRubyString(raw_data);
+        }
+
+    }
+
+    @Deprecated
+    public static final NKFCharset AUTO = NKFCharset.AUTO;
+    // no ISO-2022-JP in jcodings
+    @Deprecated
+    public static final NKFCharset JIS = NKFCharset.JIS;
+    @Deprecated
+    public static final NKFCharset EUC = NKFCharset.EUC;
+    @Deprecated
+    public static final NKFCharset SJIS = NKFCharset.SJIS;
+    @Deprecated
+    public static final NKFCharset BINARY = NKFCharset.BINARY;
+    @Deprecated
+    public static final NKFCharset NOCONV = NKFCharset.NOCONV;
+    @Deprecated
+    public static final NKFCharset UNKNOWN = NKFCharset.UNKNOWN;
+    @Deprecated
+    public static final NKFCharset ASCII = NKFCharset.ASCII;
+    @Deprecated
+    public static final NKFCharset UTF8 = NKFCharset.UTF8;
+    @Deprecated
+    public static final NKFCharset UTF16 = NKFCharset.UTF16;
+    @Deprecated
+    public static final NKFCharset UTF32 = NKFCharset.UTF32;
+    @Deprecated
+    public static final NKFCharset OTHER = NKFCharset.OTHER;
+    @Deprecated
+    public static final NKFCharset BASE64 = NKFCharset.BASE64;
+    @Deprecated
+    public static final NKFCharset QENCODE = NKFCharset.QENCODE;
+    @Deprecated
+    public static final NKFCharset MIME_DETECT = NKFCharset.MIME_DETECT;
+}

data/ext/nkf/nkf.c

@@ -9,7 +9,7 @@
 
 #define RUBY_NKF_REVISION "$Revision$"
 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-#define NKF_GEM_VERSION "0.1.3"
+#define NKF_GEM_VERSION "0.2.0"
 
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"

data/lib/nkf.rb

@@ -0,0 +1,6 @@
+if RUBY_ENGINE == "jruby"
+  require 'nkf.jar'
+  JRuby::Util.load_ext('org.jruby.ext.nkf.NKFLibrary')
+else
+  require 'nkf.so'
+end

data/nkf.gemspec

@@ -11,8 +11,8 @@ end
 Gem::Specification.new do |spec|
   spec.name          = "nkf"
   spec.version       = source_version
-  spec.authors       = ["NARUSE Yui"]
-  spec.email         = ["naruse@airemix.jp"]
+  spec.authors       = ["NARUSE Yui", "Charles Oliver Nutter"]
+  spec.email         = ["naruse@airemix.jp", "headius@headius.com"]
 
   spec.summary       = %q{Ruby extension for Network Kanji Filter}
   spec.description   = %q{Ruby extension for Network Kanji Filter}
@@ -28,8 +28,16 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+
+  if Gem::Platform === spec.platform and spec.platform =~ 'java' or RUBY_ENGINE == 'jruby'
+    spec.platform = 'java'
+    spec.licenses      += ["EPL-2.0", "LGPL-2.1"]
+    spec.files += Dir["lib/nkf.jar"]
+  else
+    spec.extensions    = ["ext/nkf/extconf.rb"]
+  end
+
   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,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: nkf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - NARUSE Yui
+- Charles Oliver Nutter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extension for Network Kanji Filter
 email:
 - naruse@airemix.jp
+- headius@headius.com
 executables: []
 extensions:
 - ext/nkf/extconf.rb
@@ -28,6 +30,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ext/java/org/jruby/ext/nkf/Command.java
+- ext/java/org/jruby/ext/nkf/CommandParser.java
+- ext/java/org/jruby/ext/nkf/NKFLibrary.java
+- ext/java/org/jruby/ext/nkf/Option.java
+- ext/java/org/jruby/ext/nkf/Options.java
+- ext/java/org/jruby/ext/nkf/RubyNKF.java
 - ext/nkf/extconf.rb
 - ext/nkf/nkf-utf8/config.h
 - ext/nkf/nkf-utf8/nkf.c
@@ -36,6 +44,7 @@ files:
 - ext/nkf/nkf-utf8/utf8tbl.h
 - ext/nkf/nkf.c
 - lib/kconv.rb
+- lib/nkf.rb
 - nkf.gemspec
 homepage: https://github.com/ruby/nkf
 licenses:
@@ -59,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.6.0.dev
 signing_key:
 specification_version: 4
 summary: Ruby extension for Network Kanji Filter