rudachi 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4e15eb13cac06919c3703fc9c3efa185267b3d90cfa965f393126e145ff8f9
-  data.tar.gz: c270fc32d9a7cc3bf06179e667dd5a264d880873b6004a1118ea6f3bcb57722c
+  metadata.gz: 72d5093c7585e3ffdf4792c81489924ab73d55988f7648b0249ff4c6669e5cb0
+  data.tar.gz: e780dc4a15c8575fc1ddee73c46923a3ea2c5d48ec175f54f6455d8b8fabb542
 SHA512:
-  metadata.gz: ab74a535d435b84dc0b25affde71cdea3eb4a9decec781a60f3e40069468b6fe02e4c26d2bbca3a3b5e317b5096c4766b02721fbf11cb093722494ef47db9bd3
-  data.tar.gz: a890984b99a0fdefaa4122db1e3f13bc9ba7df100af36e0e9dc9d2290e4b6d21172e1e416dc4c8d90e40fca830530ddf84fb5042c872c3966f452c3762f3d3bb
+  metadata.gz: 71f5f9c92949085bad0cacf1fffe6c7dfe9f3cc0974ae2ef1ce14b4888d72ba44ce9f74feba1b6937743c0c8c861a8a5cd3a1525d250ee499277a03fdf8890f8
+  data.tar.gz: aa843e075e6cc61aa6d275bfe2fe6caf80faa6cca22c41d5ee38da0ab444e1ade89402d0f14815dcc4d16c0558347b62cfa6a79c467f011243afa92b7a22424f

data/README.md

@@ -1,13 +1,13 @@
 # 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')

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,13 @@ module Rudachi
 
     private
 
-    def config_accessor(name, default: nil)
+    def config_accessor(name, klass:, default:)
       attr_def = <<~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/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.1'
+  VERSION = '1.1.0'
 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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - SongCastle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-09 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