rudachi 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515a2588b078bce3a050c6e1c4cd115524daaf5edfb71b76024e44ca9cb1cf26
-  data.tar.gz: eeb369e360a30b5dc050820c0b77ce4f9e98f6f9babac3e7700009ba8d2b372f
+  metadata.gz: b2a7d72805e33fa5e12884193bf931d6bdf7ce16d6f9243022c7fcedad8c2f23
+  data.tar.gz: '0050952b57a66b96a89ed7cebf5dc51caed87a2437cf9c4dc494b62578f90f20'
 SHA512:
-  metadata.gz: 989c5f7acc769e3b9304592db515f30192bdf51d1aa2ce3578b380d30a06d229cfa8f96bc818d7245adeb3b72a8fa657178796a2a08cab3addb6658236219e7d
-  data.tar.gz: 704c0e1053077802101e7218fae201a53a2adf44203f66ef2bf8093c3c8f4de208b06c7e905b2c54aeb3c2a009bb392f73f92181633c4417081a4675245f866f
+  metadata.gz: a1a1799c8bcda90ec099a44fedc81f2c2018cd1fec7fbbf1065b1dcde5282ff0d427702b3f5276679adac88ebcf27cd6370f987ebb5aa751d660b96392b91c86
+  data.tar.gz: e25716b5b9b2483bb5c3433482d0b655ddb2eee944d18d1b9fdacca409aa26a8faf20ad350d478fffcbfe0f9761e867208e81a3396749b6f189195e35e4d1f03

data/README.md

@@ -1,5 +1,5 @@
 # Rudachi
-JRuby wrapper for [Sudachi](https://github.com/WorksApplications/Sudachi).
+Ruby wrapper for [Sudachi](https://github.com/WorksApplications/Sudachi).
 
 #### Text
 ```rb
@@ -29,7 +29,13 @@ File.read('output.txt')
 
 ## Requirements
 
-- [JRuby](https://github.com/jruby/jruby) 9.1.3.0 or later
+#### Ruby
+- Ruby 2.3.0 or newer
+- [rjb](https://github.com/arton/rjb) 1.1.1 or newer
+- [Sudachi](https://github.com/WorksApplications/Sudachi)
+
+#### JRuby
+- [JRuby](https://github.com/jruby/jruby) 9.1.3.0 or newer
 - [Sudachi](https://github.com/WorksApplications/Sudachi)
 
 ## Installation

data/lib/rudachi/{dependencies.rb → dependencies/jruby.rb}

@@ -1,20 +1,42 @@
 require 'java'
+require 'rudachi/lazy_load'
+require Rudachi.jar_path
+
 java_import 'java.lang.System'
 java_import 'java.io.PrintStream'
 java_import 'java.io.ByteArrayInputStream'
 java_import 'java.io.ByteArrayOutputStream'
 java_import 'java.nio.charset.StandardCharsets'
-
-require Rudachi.jar_path
 java_import 'com.worksap.nlp.sudachi.SudachiCommandLine'
 
 module Rudachi
   module Java
+    String                = ::Java::JavaLang::String
     System                = ::Java::JavaLang::System
+    PrintStream           = ::Java::JavaIo::PrintStream
     ByteArrayInputStream  = ::Java::JavaIo::ByteArrayInputStream
     ByteArrayOutputStream = ::Java::JavaIo::ByteArrayOutputStream
-    PrintStream           = ::Java::JavaIo::PrintStream
     UTF_8                 = ::Java::JavaNioCharset::StandardCharsets::UTF_8
     SudachiCommandLine    = ::Java::ComWorksapNlpSudachi::SudachiCommandLine
   end
+
+  module StreamProcessor
+    class InvalidInclusion < StandardError; end
+
+    def self.included(base)
+      raise InvalidInclusion unless base.ancestors.include?(TextParser)
+    end
+
+    def parse(io)
+      output_stream do |output|
+        take_stdin(io.to_inputstream) do
+          take_stdout(output) do
+            Java::SudachiCommandLine.main(Option.cmds(@opts))
+          end
+        end
+      end
+    end
+
+    LazyLoad.run_load_hooks(:stream_processor)
+  end
 end

data/lib/rudachi/dependencies/ruby.rb

@@ -0,0 +1,37 @@
+require 'rjb'
+require 'rudachi/lazy_load'
+
+Rjb::load(Rudachi.jar_path.to_s)
+
+module Rudachi
+  module Java
+    String                = Rjb::import('java.lang.String')
+    System                = Rjb::import('java.lang.System')
+    PrintStream           = Rjb::import('java.io.PrintStream')
+    ByteArrayInputStream  = Rjb::import('java.io.ByteArrayInputStream')
+    ByteArrayOutputStream = Rjb::import('java.io.ByteArrayOutputStream')
+    UTF_8                 = Rjb::import('java.nio.charset.StandardCharsets').UTF_8
+    SudachiCommandLine    = Rjb::import('com.worksap.nlp.sudachi.SudachiCommandLine')
+  end
+
+  module StreamProcessor
+    class InvalidInclusion < StandardError; end
+
+    TERM = ?\n
+
+    def self.included(base)
+      raise InvalidInclusion unless base.ancestors.include?(TextParser)
+    end
+
+    def parse(io)
+      ret = []
+      while data = io.gets
+        ret << super(data).strip
+      end
+
+      ret.join(TERM)
+    end
+
+    LazyLoad.run_load_hooks(:stream_processor)
+  end
+end

data/lib/rudachi/file_parser.rb

@@ -9,7 +9,7 @@ module Rudachi
 
     def initialize(**opts)
       Rudachi.load!
-      @opts = Option.new(opts)
+      @opts = Option.new(**opts)
     end
 
     def parse(path)

data/lib/rudachi/lazy_load.rb

@@ -0,0 +1,16 @@
+module Rudachi
+  module LazyLoad
+    @@hooks = {}
+
+    class << self
+      def on_load(name, &block)
+        @@hooks[name] ||= []
+        @@hooks[name] << block
+      end
+
+      def run_load_hooks(name)
+        @@hooks[name]&.each(&:call)
+      end
+    end
+  end
+end

data/lib/rudachi/loader.rb

@@ -1,14 +1,13 @@
 module Rudachi
-  class UnavailableError < StandardError; end;
-
   class << self
     def load!
-      raise UnavailableError, 'jruby_required' unless jruby?
-      require 'rudachi/dependencies'
+      if jruby?
+        require 'rudachi/dependencies/jruby'
+      else
+        require 'rudachi/dependencies/ruby'
+      end
     end
 
-    private
-
     def jruby?
       RUBY_PLATFORM == 'java'
     end

data/lib/rudachi/stream_parser.rb

@@ -1,11 +1,10 @@
+require 'rudachi/lazy_load'
 require 'rudachi/text_parser'
 
 module Rudachi
   class StreamParser < TextParser
-    private
-
-    def input_stream(stream)
-      stream.to_inputstream
+    LazyLoad.on_load(:stream_processor) do
+      include StreamProcessor
     end
   end
 end

data/lib/rudachi/text_parser.rb

@@ -24,7 +24,7 @@ module Rudachi
 
     def input_stream(text)
       Java::ByteArrayInputStream.new(
-        text.to_java.getBytes(Java::UTF_8)
+        Java::String.new(text).getBytes(Java::UTF_8)
       )
     end
   end

data/lib/rudachi/version.rb

@@ -1,3 +1,3 @@
 module Rudachi
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: rudachi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - SongCastle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
-dependencies: []
-description: A JRuby wrapper for Sudachi.
+date: 2022-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rjb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+description: A Ruby wrapper for Sudachi.
 email: "-"
 executables: []
 extensions: []
@@ -20,8 +34,10 @@ files:
 - lib/rudachi.rb
 - lib/rudachi/config.rb
 - lib/rudachi/configurable.rb
-- lib/rudachi/dependencies.rb
+- lib/rudachi/dependencies/jruby.rb
+- lib/rudachi/dependencies/ruby.rb
 - lib/rudachi/file_parser.rb
+- lib/rudachi/lazy_load.rb
 - lib/rudachi/loader.rb
 - lib/rudachi/option/boolean_option.rb
 - lib/rudachi/option/config.rb
@@ -51,5 +67,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A JRuby wrapper for Sudachi
+summary: A Ruby wrapper for Sudachi
 test_files: []