nkf 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99fe300695064529e277ba99c695e957548f0e636b2901e7eba88a4a62ac5c6c
-  data.tar.gz: 74a4a2835c227cb45348608c0bb2a206ff8462dfae5df7b803638e254e05572d
+  metadata.gz: 80abcab4e210d9e745b5d037d33f5c140a246bdf0639d8918b00941f55f087bf
+  data.tar.gz: a2a366513904ff9d4ead77e97b0ef95b94bd3d132bd4248cba2b2f1318c00cdb
 SHA512:
-  metadata.gz: c7f58fd74f820302552e7c83271857e63df0d0e622f950570fd1c934efb6f334cc23cf69e8195a26ad79310721a0bb0a06461e098c073c2fefe5be664ae36072
-  data.tar.gz: 54289152cd0158f6f07d5cbfac794175aa75b510ca20ab7f7d6b13b9a01b76eb78e02d81ae2498ddae5be3565f90f175da0b1686945c6a24f19211ea65f697f6
+  metadata.gz: a97fab49ddd1ea39c2ebe55a91eeb2729b1a5a7d3176497d9565cd422eaed8736885d460b82e833a5fab159f866f1204cf79bb5d019720ee7bf106c7ef777116
+  data.tar.gz: 74920f57c2595f31afc7666bad29b0f2b8f4919fbadc72c3af1d2dd3e83f16d64c52d20e5cba07cdb93c4b188745cf157c5e32bc76c5b7d83c63d52005be31ff

data/.gitignore

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

data/{LICENSE.txt → BSDL}

@@ -4,10 +4,10 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

data/COPYING

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
+
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
+
+   b. use the modified software only within your corporation or
+      organization.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
+
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
+
+   b. accompany the distribution with the machine-readable source of
+      the software.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
+
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.

data/Gemfile

@@ -1,5 +1,15 @@
 source "https://rubygems.org"
 
-gem "rake"
-gem "rake-compiler"
-gem "test-unit"
+gemspec
+
+group :development do
+  gem "rake"
+  gem "rake-compiler"
+  gem "test-unit"
+  gem "test-unit-ruby-core"
+end
+
+group :sig do
+  gem "rbs"
+  gem "rdoc"
+end

data/LEGAL

@@ -0,0 +1,26 @@
+# -*- rdoc -*-
+
+= LEGAL NOTICE INFORMATION
+--------------------------
+
+All the files in this distribution are covered under either the Ruby's
+license (see the file COPYING) or public-domain except some files
+mentioned below.
+
+[ext/nkf/nkf-utf8/config.h]
+[ext/nkf/nkf-utf8/nkf.c]
+[ext/nkf/nkf-utf8/utf8tbl.c]
+
+  These files are under the following license.  So to speak, it is
+  copyrighted semi-public-domain software.
+
+  >>>
+    Copyright (C) 1987:: Fujitsu LTD. (Itaru ICHIKAWA)
+
+    Everyone is permitted to do anything on this program
+    including copying, modifying, improving,
+    as long as you don't try to pretend that you wrote it.
+    i.e., the above copyright notice has to appear in all copies.
+    Binary distribution requires original version messages.
+    You don't have to ask before copying, redistribution or publishing.
+    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.

data/Rakefile

@@ -7,6 +7,37 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/test_*.rb"]
 end
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("nkf")
+namespace :rbs do
+  Rake::TestTask.new(test: :compile) do |t|
+    t.libs << "test_sig"
+    t.ruby_opts << "-rtest_helper"
+    t.test_files = FileList["test_sig/test_*.rb"]
+    t.warning = true
+  end
+
+  desc 'Update RBS comments'
+  task :annotate do
+    require "tmpdir"
+
+    Dir.mktmpdir do |tmpdir|
+      sh("rdoc --ri --output #{tmpdir}/doc --root=. lib")
+      sh("rbs annotate --no-system --no-gems --no-site --no-home -d #{tmpdir}/doc sig")
+    end
+  end
+end
+
+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;
+    }
+}