rudachi 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a7d72805e33fa5e12884193bf931d6bdf7ce16d6f9243022c7fcedad8c2f23
-  data.tar.gz: '0050952b57a66b96a89ed7cebf5dc51caed87a2437cf9c4dc494b62578f90f20'
+  metadata.gz: 4b76fd7addfd5f3bd28c0a037a2b3953ddb05a1f83af90aa154e64f54bdd4487
+  data.tar.gz: 57475d77337ee0e058672827ea83ccca6d2713543431deb8625ae6cce4e88abf
 SHA512:
-  metadata.gz: a1a1799c8bcda90ec099a44fedc81f2c2018cd1fec7fbbf1065b1dcde5282ff0d427702b3f5276679adac88ebcf27cd6370f987ebb5aa751d660b96392b91c86
-  data.tar.gz: e25716b5b9b2483bb5c3433482d0b655ddb2eee944d18d1b9fdacca409aa26a8faf20ad350d478fffcbfe0f9761e867208e81a3396749b6f189195e35e4d1f03
+  metadata.gz: a07a1ac681d0999c103ca0f27c12190a8fa95de9ab7a5613d7d6412709ce55b4eb4492c471a1fb10bf5d238b205e51b281b3cd5a6f54237577463a3a8563cbd2
+  data.tar.gz: 75c332d969191be48746969cd103716a3a2c02b7bf1222eaa11b293165635466aeddf93deaed367aba86dd2307fc3df8896eb81b255600fe87e8fa06a599b886

data/README.md

@@ -1,5 +1,5 @@
 # Rudachi
-Ruby wrapper for [Sudachi](https://github.com/WorksApplications/Sudachi).
+JRuby wrapper for [Sudachi](https://github.com/WorksApplications/Sudachi).
 
 #### Text
 ```rb
@@ -29,14 +29,10 @@ File.read('output.txt')
 
 ## Requirements
 
-#### Ruby
-- Ruby 2.3.0 or newer
-- [rjb](https://github.com/arton/rjb) 1.1.1 or newer
+- [JRuby](https://github.com/jruby/jruby) 9.1.3.0 or later
 - [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)
+For Ruby, please check [rudachi-rb](https://github.com/SongCastle/rudachi-rb).
 
 ## Installation
 

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/jruby.rb → dependencies.rb}

@@ -27,16 +27,12 @@ module Rudachi
       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
+    private
+
+    def input_stream(io)
+      io.to_inputstream
     end
 
-    LazyLoad.run_load_hooks(:stream_processor)
+    LazyLoad.run_load_hooks(:stream_processor, self)
   end
 end

data/lib/rudachi/file_parser.rb

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

data/lib/rudachi/lazy_load.rb

@@ -8,8 +8,10 @@ module Rudachi
         @@hooks[name] << block
       end
 
-      def run_load_hooks(name)
-        @@hooks[name]&.each(&:call)
+      def run_load_hooks(name, mod)
+        @@hooks[name]&.each do |hook|
+          hook.call(mod)
+        end
       end
     end
   end

data/lib/rudachi/loader.rb

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

data/lib/rudachi/option/boolean_option.rb

@@ -7,8 +7,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

@@ -6,9 +6,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

@@ -3,8 +3,8 @@ require 'rudachi/text_parser'
 
 module Rudachi
   class StreamParser < TextParser
-    LazyLoad.on_load(:stream_processor) do
-      include StreamProcessor
+    LazyLoad.on_load(:stream_processor) do |mod|
+      include mod
     end
   end
 end

data/lib/rudachi/version.rb

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

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rudachi
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - SongCastle
 autorequire: 
 bindir: bin
 cert_chain: []
-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.
+date: 2022-04-30 00:00:00.000000000 Z
+dependencies: []
+description: A JRuby wrapper for Sudachi.
 email: "-"
 executables: []
 extensions: []
@@ -34,8 +20,7 @@ files:
 - lib/rudachi.rb
 - lib/rudachi/config.rb
 - lib/rudachi/configurable.rb
-- lib/rudachi/dependencies/jruby.rb
-- lib/rudachi/dependencies/ruby.rb
+- lib/rudachi/dependencies.rb
 - lib/rudachi/file_parser.rb
 - lib/rudachi/lazy_load.rb
 - lib/rudachi/loader.rb
@@ -67,5 +52,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A Ruby wrapper for Sudachi
+summary: A JRuby wrapper for Sudachi
 test_files: []

data/lib/rudachi/dependencies/ruby.rb

@@ -1,37 +0,0 @@
-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