Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JRuby extension to the gem #15

Merged
merged 4 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
ruby-versions:
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
with:
engine: cruby
engine: cruby-jruby
min_version: 2.5

build:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
*.bundle
*.dll
*.so
lib/nkf.jar
.idea
nkf.iml
16 changes: 14 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 58 additions & 0 deletions ext/java/org/jruby/ext/nkf/Command.java
Original file line number Diff line number Diff line change
@@ -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();
}
}
70 changes: 70 additions & 0 deletions ext/java/org/jruby/ext/nkf/CommandParser.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
13 changes: 13 additions & 0 deletions ext/java/org/jruby/ext/nkf/NKFLibrary.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
80 changes: 80 additions & 0 deletions ext/java/org/jruby/ext/nkf/Option.java
Original file line number Diff line number Diff line change
@@ -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 + "]";
}
}
109 changes: 109 additions & 0 deletions ext/java/org/jruby/ext/nkf/Options.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
Loading