rudachi 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43021bc769b0005c5d46c3abde244756712ce1419b82ae884729508aab64780
-  data.tar.gz: 5f3b2f74e771d2b3feb8d6de4abf7d59864da6108904437c28a498f2ae6d1e98
+  metadata.gz: 1cd976cea8211f4f452c2cd20a3fb286828d449aa346ea54458e98ecf47819aa
+  data.tar.gz: 7b8b886b6dc1467d33fdd44878ce1a490c13c7aacd6a40bd80e68ddcea631801
 SHA512:
-  metadata.gz: 38535bc9cee7b34ee2ab3219294484d30758c82b4c2a85f53cb36519700eb52d2e44f75160ba2aee24a626a7dc95c5a02774bfd10c86da18067a7d6afcd33996
-  data.tar.gz: 289e76174d4f7053e71c2c276635ab6b2283b48c220cb498615c88605ffec6a41f3888c89a80ad728383170c5052c3dd76be81a02bef91dc38f4049b18db1c21
+  metadata.gz: 6c21aaea246963a585ceee7800f13013797ae16f10386c933e01d3f1709ed96a5a7bcfd0d5f0e9e0a43ba17b9be2a7d2db0ce9a82ec446673ff2cf3b48a016fa
+  data.tar.gz: c06e0239aa4c8bae28f9a4b60d00beb66aea07a7d85760126a2e875e539a46a6716aace54f62f3f193edee31c8e8300c34bf1b2be8908b4acc2285d366bc1b7b

data/README.md

@@ -1,20 +1,20 @@
 # Rudachi
 [Sudachi](https://github.com/WorksApplications/Sudachi) wrapper Gem for JRuby.
 
-- Text base
+#### For Text
 ```rb
 Rudachi::TextParser.parse('東京都へ行く')
 => "東京都\t名詞,固有名詞,地名,一般,*,*\t東京都\nへ\t助詞,格助詞,*,*,*,*\tへ\n行く\t動詞,非自立可能,*,*,五段-カ行,終止形-一般\t行く\nEOS\n"
 ```
 
-- File base
+#### For File
 ```rb
 File.open('sample.txt', 'w') { |f| f << '東京都へ行く' }
 Rudachi::FileParser.parse('sample.txt')
 => "東京都\t名詞,固有名詞,地名,一般,*,*\t東京都\nへ\t助詞,格助詞,*,*,*,*\tへ\n行く\t動詞,非自立可能,*,*,五段-カ行,終止形-一般\t行く\nEOS\n"
 ```
 
-- With some options
+#### With [some options](https://github.com/WorksApplications/Sudachi#options)
 ```rb
 Rudachi::TextParser.new(o: 'result.txt', m: 'A').parse('東京都へ行く')
 File.read('result.txt')
@@ -28,9 +28,9 @@ File.read('result.txt')
 
 ## 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))
+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))
 
-- Install the Sudachi JAR file
+##### Install the Sudachi JAR file
 ```sh
 $ wget https://github.com/WorksApplications/Sudachi/releases/download/v0.5.3/sudachi-0.5.3-executable.zip
 $ unzip sudachi-0.5.3-executable.zip
@@ -38,7 +38,7 @@ $ ls sudachi-0.5.3
 LICENSE-2.0.txt  README.md  javax.json-1.1.jar	jdartsclone-1.2.0.jar  licenses  sudachi-0.5.3.jar  sudachi.json  sudachi_fulldict.json
 ```
 
-- Install the Sudachi dictionary
+##### Install the Sudachi dictionary
 ```sh
 $ wget http://sudachi.s3-website-ap-northeast-1.amazonaws.com/sudachidict/sudachi-dictionary-latest-full.zip
 $ unzip -j -d sudachi-dictionary-latest-full sudachi-dictionary-latest-full.zip
@@ -51,7 +51,7 @@ LEGAL  LICENSE-2.0.txt	system_core.dic
 
 ```rb
 # Gemfile
-gem 'rudachi', git: 'https://github.com/SongCastle/rudachi.git', tag: 'v1.0.0'
+gem 'rudachi'
 ```
 
 Then run `bundle install` .
@@ -59,6 +59,8 @@ Then run `bundle install` .
 3. Initialize Rudachi
 
 ```rb
+require 'rudachi'
+
 Rudachi.configure do |config|
   config.jar_path = 'sudachi-0.5.3/sudachi-0.5.3.jar'
 end
@@ -68,11 +70,9 @@ Rudachi::Option.configure do |config|
 end
 ```
 
-4. Dit it !!
+4. Did it !!
 
 ```rb
-require 'rudachi'
-
 Rudachi::TextParser.parse('こんにちは世界')
 => "こんにちは\t感動詞,一般,*,*,*,*\t今日は\n世界\t名詞,普通名詞,一般,*,*,*\t世界\nEOS\n"
 ```

data/lib/rudachi/config.rb

@@ -1,32 +1,8 @@
 require 'rudachi/configurable'
+require 'rudachi/option/string_option'
 
 module Rudachi
   extend Configurable
 
-  config_accessor :jar_path,  default: '/usr/java/lib/sudachi.jar'
-
-  module Option
-    extend Configurable
-
-    # @see https://github.com/WorksApplications/Sudachi#options
-    config_accessor :r,  default: nil
-    config_accessor :s,  default: nil
-    config_accessor :p,  default: '/usr/java/lib'
-    config_accessor :m,  default: 'C'
-    config_accessor :o,  default: nil
-    config_accessor :t,  default: nil
-    config_accessor :ts, default: nil
-    config_accessor :a,  default: nil
-    config_accessor :f,  default: nil
-    config_accessor :d,  default: nil
-    config_accessor :h,  default: nil
-
-    def self.cmds(opts)
-      class_variables.each_with_object([]) do |name, flags|
-        key = name.to_s.delete('@@')
-        val = opts[key] || opts[key.to_sym] || class_variable_get(name) or next
-        flags << "-#{key}" << val.to_s
-      end
-    end
-  end
+  config_accessor :jar_path, klass: Option::StringOption, default: '/usr/java/lib/sudachi.jar'
 end

data/lib/rudachi/configurable.rb

@@ -6,13 +6,12 @@ module Rudachi
 
     private
 
-    def config_accessor(name, default: nil)
-      attr_def = <<~EOS
+    def config_accessor(name, klass:, default:)
+      module_eval <<~EOS
         def self.#{name}; @@#{name}; end
-        def self.#{name}=(val); @@#{name} = val; end
+        def self.#{name}=(val); @@#{name} = #{klass}.new(val); end
       EOS
-      module_eval(attr_def)
-      class_variable_set("@@#{name}", default)
+      public_send("#{name}=", default)
     end
   end
 end

data/lib/rudachi/file_parser.rb

@@ -1,4 +1,4 @@
-require 'rudachi/config'
+require 'rudachi/option/config'
 require 'rudachi/loader'
 
 module Rudachi
@@ -11,7 +11,7 @@ module Rudachi
       Rudachi.load!
 
       @output = Java::ByteArrayOutputStream.new
-      @opts   = opts
+      @opts   = Option.new(opts)
     end
 
     def parse(path)

data/lib/rudachi/loader.rb

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

data/lib/rudachi/option/boolean_option.rb

@@ -0,0 +1,14 @@
+module Rudachi
+  class Option
+    class BooleanOption < Delegator
+      def initialize(bool)
+        raise ArgumentError, 'must be `false` or `true`' unless bool.is_a?(FalseClass) || bool.is_a?(TrueClass)
+        @value = bool
+      end
+
+      def __getobj__; @value; end
+      def enable?; @value; end
+      def with_arg?; false; end
+    end
+  end
+end

data/lib/rudachi/option/config.rb

@@ -0,0 +1,47 @@
+require 'rudachi/configurable'
+require 'rudachi/option/boolean_option'
+require 'rudachi/option/string_option'
+
+module Rudachi
+  class Option
+    extend Configurable
+
+    # @see https://github.com/WorksApplications/Sudachi#options
+    config_accessor :r,  klass: StringOption,  default: nil
+    config_accessor :s,  klass: StringOption,  default: nil
+    config_accessor :p,  klass: StringOption,  default: nil
+    config_accessor :m,  klass: StringOption,  default: nil
+    config_accessor :o,  klass: StringOption,  default: nil
+    config_accessor :a,  klass: BooleanOption, default: false
+    config_accessor :d,  klass: BooleanOption, default: false
+    config_accessor :t,  klass: BooleanOption, default: false
+    config_accessor :ts, klass: BooleanOption, default: false
+    config_accessor :f,  klass: BooleanOption, default: false
+    config_accessor :h,  klass: BooleanOption, default: false
+
+    def self.cmds(opts=Option.new)
+      class_variables.each_with_object([]) do |name, flags|
+        key = name[2..-1].to_sym
+        opt = opts.get(key) { class_variable_get(name) }
+        next unless opt&.enable?
+        flags << "-#{key}"
+        flags << opt.to_s if opt.with_arg?
+      end
+    end
+
+    def initialize(**hash)
+      @opts = hash.each_with_object({}) do |(key, val), _hash|
+        raise ArgumentError, %{unknown option "#{key}"} unless self.class.class_variable_defined?("@@#{key}")
+        begin
+          _hash[key.to_sym] = self.class.class_variable_get("@@#{key}").class.new(val)
+        rescue ArgumentError => e
+          raise ArgumentError, %{"#{key}" #{e.message}}
+        end
+      end
+    end
+
+    def get(key, &block)
+      @opts.key?(key) ? @opts[key] : block&.call
+    end
+  end
+end

data/lib/rudachi/option/string_option.rb

@@ -0,0 +1,14 @@
+module Rudachi
+  class Option
+    class StringOption < Delegator
+      def initialize(str)
+        raise ArgumentError, 'must be `nil` or `String`' unless str.nil? || str.is_a?(String)
+        @value = str
+      end
+
+      def __getobj__; @value; end
+      def enable?; !!@value; end
+      def with_arg?; true; end
+    end
+  end
+end

data/lib/rudachi/version.rb

@@ -1,3 +1,3 @@
 module Rudachi
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

data/lib/rudachi.rb

@@ -1,3 +1,4 @@
 require 'rudachi/config'
+require 'rudachi/option/config'
 require 'rudachi/file_parser'
 require 'rudachi/text_parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rudachi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - SongCastle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Sudachi wrapper for JRuby.
 email: "-"
@@ -23,6 +23,9 @@ files:
 - lib/rudachi/dependencies.rb
 - lib/rudachi/file_parser.rb
 - lib/rudachi/loader.rb
+- lib/rudachi/option/boolean_option.rb
+- lib/rudachi/option/config.rb
+- lib/rudachi/option/string_option.rb
 - lib/rudachi/text_parser.rb
 - lib/rudachi/version.rb
 homepage: https://github.com/SongCastle/rudachi