rudachi 1.2.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515a2588b078bce3a050c6e1c4cd115524daaf5edfb71b76024e44ca9cb1cf26
-  data.tar.gz: eeb369e360a30b5dc050820c0b77ce4f9e98f6f9babac3e7700009ba8d2b372f
+  metadata.gz: 8665dde657a8011fe19b9232db227e1394500c39247fcb831ba1f4909a9f1993
+  data.tar.gz: a98385a7e9dd44fab7902314df579774b590c77a23964098ad1ec7dc1c9fa085
 SHA512:
-  metadata.gz: 989c5f7acc769e3b9304592db515f30192bdf51d1aa2ce3578b380d30a06d229cfa8f96bc818d7245adeb3b72a8fa657178796a2a08cab3addb6658236219e7d
-  data.tar.gz: 704c0e1053077802101e7218fae201a53a2adf44203f66ef2bf8093c3c8f4de208b06c7e905b2c54aeb3c2a009bb392f73f92181633c4417081a4675245f866f
+  metadata.gz: 59418d27a0ee99486685b934d3844e4d9bff691d7b745a2d81d9d50a3dcef721e1a683a3544ad54e8e3800fe8d10942a57244b7ae6d63ea25c0731caab4a33ee
+  data.tar.gz: 03b93983ef097c1ec2c96b26ebd802947d2dd0d3a6a4f5615f58f8dcd604147bd7b5f3bf227eff523e71c8b7c1ebe8ba1fa3ef52b6a2981068614b1d072f6aa4

data/README.md

@@ -32,6 +32,8 @@ File.read('output.txt')
 - [JRuby](https://github.com/jruby/jruby) 9.1.3.0 or later
 - [Sudachi](https://github.com/WorksApplications/Sudachi)
 
+For Ruby, please check [rudachi-rb](https://github.com/SongCastle/rudachi-rb).
+
 ## Installation
 
 1. Install JAR and dictionary of Sudachi ([Details](https://github.com/WorksApplications/Sudachi/blob/develop/docs/tutorial.md#linux-%E3%81%AE%E5%A0%B4%E5%90%88))

data/lib/rudachi/configurable.rb

@@ -11,7 +11,7 @@ module Rudachi
         def self.#{name}; @@#{name}; end
         def self.#{name}=(val); @@#{name} = #{klass}.new(val); end
       EOS
-      public_send("#{name}=", default)
+      send("#{name}=", default)
     end
   end
 end

data/lib/rudachi/dependencies.rb

@@ -1,20 +1,38 @@
 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
+
+    private
+
+    def input_stream(io)
+      io.to_inputstream
+    end
+
+    LazyLoad.run_load_hooks(:stream_processor, self)
+  end
 end

data/lib/rudachi/file_parser.rb

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

data/lib/rudachi/lazy_load.rb

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

data/lib/rudachi/loader.rb

@@ -1,16 +1,18 @@
 module Rudachi
-  class UnavailableError < StandardError; end;
+  module Loader
+    class UnavailableError < StandardError; end;
 
-  class << self
-    def load!
-      raise UnavailableError, 'jruby_required' unless jruby?
-      require 'rudachi/dependencies'
-    end
+    class << self
+      def load!
+        raise UnavailableError, 'jruby_required' unless jruby?
+        require 'rudachi/dependencies'
+      end
 
-    private
+      private
 
-    def jruby?
-      RUBY_PLATFORM == 'java'
+      def jruby?
+        RUBY_PLATFORM == 'java'
+      end
     end
   end
 end

data/lib/rudachi/option/boolean_option.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module Rudachi
   class Option
     class BooleanOption < Delegator
@@ -7,8 +9,8 @@ module Rudachi
       end
 
       def __getobj__; @value; end
-      def enable?; @value; end
-      def with_arg?; false; end
+      def enable?   ; @value; end
+      def with_arg? ; false ; end
     end
   end
 end

data/lib/rudachi/option/string_option.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module Rudachi
   class Option
     class StringOption < Delegator
@@ -6,9 +8,9 @@ module Rudachi
         @value = str
       end
 
-      def __getobj__; @value; end
-      def enable?; !!@value; end
-      def with_arg?; true; end
+      def __getobj__; @value  ; end
+      def enable?   ; !!@value; end
+      def with_arg? ; true    ; end
     end
   end
 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 |mod|
+      include mod
     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.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rudachi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.1
 platform: ruby
 authors:
 - SongCastle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies: []
 description: A JRuby wrapper for Sudachi.
 email: "-"
@@ -22,6 +22,7 @@ files:
 - lib/rudachi/configurable.rb
 - lib/rudachi/dependencies.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