ya_kansuji 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9deb8ed6a818c9939482fc8c6408ec00659a67810dfc0eb034ae9bcc821a43
-  data.tar.gz: 701f44b2de1b5186c1f92f8779840af3ae2ca873fd820a4120e4d653ed194888
+  metadata.gz: 97f2f4c063933b7c86ede7c11d8d34704e612f7eb4e82e2f60f469d8aa8ded4c
+  data.tar.gz: 4aa55c66f2d6b5ae168278e0b2b1a096e062ae1a3e96d31bcb118f415c184bb0
 SHA512:
-  metadata.gz: c8c3263df051a72dc07c1a8a38acf59f1f94c8b896bb9f2d718637f0b808d7d6b0c02bf43975c892fb1c634a5affd9f02f094be4911a926d5218ab467a6ff794
-  data.tar.gz: 69c8d4b5413a6ec864ac3d7e4e70d258c0f01ecd7684f30ff6c4a414b59751403807eb2850be44489a900df306e54e4f16e50f36555a165675c9f16c4ba33e55
+  metadata.gz: 0203eaef1b77450bd6ea5c9666cf695bfe72fd7fb21d966d18bb177fa38db3ca500dff690841c3f1b5d25b9406c62f7bf38a90be98f6c5983f5df68fe65df8cb
+  data.tar.gz: 7a420d832dbd4da1149ac293820dca4f510226c53513bc1f579d2fa889cc8b16708f717406c76be8937f21623090eaf7d073896234296598e40e36a8275091ae

data/ChangeLog

@@ -1,3 +1,20 @@
+2026-07-14  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 1.2.0
+	* Require Ruby 2.3.0 or later
+	* Accept formatter and options on Integer#to_kan core extension
+	* Accept :kansuji as base symbol on String#to_i core extension
+	* Raise RangeError when formatting values outside the supported 72-digit range
+	* Avoid circular require warnings between the main and refinement entrypoints
+	* Optimize formatter chunk processing (up to ~9x faster, far fewer allocations)
+
+2026-07-13  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 1.1.0
+	* Support leading "マイナス" for negative numbers on parsing
+	* Fix regexp construction bug for single-character units
+	* CI maintenance (update ruby versions, tolerate Coveralls failure)
+
 2025-03-09  Tatsuki Sugiura <sug@nemui.org>
 
 	* Version: 1.0.0
@@ -12,4 +29,3 @@
 2019-04-15  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.1.0
-

data/README.md

@@ -1,8 +1,8 @@
 # YaKansuji - もう一つの (やりすぎ) ruby 漢数字ライブラリ
 
 [<img src="https://badge.fury.io/rb/ya_kansuji.svg" alt="Gem Version" />](https://badge.fury.io/rb/ya_kansuji)
-[<img src="https://travis-ci.org/sugi/ya_kansuji.svg?branch=master" alt="Build Status" />](https://travis-ci.org/sugi/ya_kansuji)
-[<img src="https://coveralls.io/repos/sugi/ya_kansuji/badge.svg?branch=master&service=github" alt="Coverage Status" />](https://coveralls.io/github/sugi/ya_kansuji?branch=master)
+[<img src="https://github.com/sugi/ya_kansuji/actions/workflows/ruby.yml/badge.svg" alt="Build Status" />](https://github.com/sugi/ya_kansuji/actions/workflows/ruby.yml)
+[<img src="https://coveralls.io/repos/github/sugi/ya_kansuji/badge.svg?branch=master" alt="Coverage Status" />](https://coveralls.io/github/sugi/ya_kansuji?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/007f79c6f7f6e82daa20/maintainability)](https://codeclimate.com/github/sugi/ya_kansuji/maintainability)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/048e7a2f52cb48908c4deba7ce696f08)](https://app.codacy.com/gh/sugi/ya_kansuji/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 
@@ -21,6 +21,7 @@ YaKansuji は ruby 用の日本語の漢数字ライブラリです。 和暦ラ
   * 位取り (2億0010万 / 千〇〇二)
   * 大字 (千皕卅肆)
   * カンマ表現 (12,345 / 5億3,456万 / 二万、五十)
+  * 負数 (マイナス五十)
 * 数値から漢数字, 漢字混じり数値文字列フォーマット
   * 複数のビルトインフォーマッタ
   * フォーマッタプラグイン機構
@@ -46,6 +47,7 @@ gem 'ya_kansuji'
 
 ```ruby
 YaKansuji.to_i("一〇二四") # => 1024
+YaKansuji.to_i("マイナス一〇二四") # => -1024
 ```
 
 ### フォーマット (数値 → 漢数字)
@@ -54,8 +56,12 @@ YaKansuji.to_i("一〇二四") # => 1024
 
 ```ruby
 YaKansuji.to_kan(12345)  # => 一万二千三百四十五
+YaKansuji.to_kan(-12345) # => マイナス一万二千三百四十五
 ```
 
+対応する値域は `-(10**72 - 1)` から `10**72 - 1` です。
+数値として整数化した値がこの範囲を超える場合、`RangeError` が発生します。
+
 このさい、2つめの引数にシンボルを渡すことにより、フォーマッタを切り替えることができます。
 
 ```ruby
@@ -78,6 +84,7 @@ YaKansuji.to_kan(12340005, :judic_h) # => "１２３４万０００５"
 
 `YaKansuji#register_formatter` を使うと独自のフォーマッタを登録できます。
 `#call` を持つ任意のオブジェクトもしくはブロックを渡します。第1引数に数字、第2引数にオプションが渡ります。
+負数を渡した場合も、フォーマッタには絶対値 (非負整数) が渡され、符号 (「マイナス」) は `to_kan` 側で前置されます。
 
 ```ruby
 YaKansuji.register_formatter :hoge, -> (num, opts = {}) {
@@ -109,6 +116,7 @@ using YaKansuji::CoreRefine
 
 puts "二万".to_i     # => 20000
 puts 20000.to_kan   #= > "二万"
+puts 20000.to_kan(:gov) # => "2万"
 ```
 
 ちなみに、 `to_i` に base が渡された場合は、漢数字が解釈されずにビルトインクラスのものが呼ばれます。
@@ -117,6 +125,7 @@ puts 20000.to_kan   #= > "二万"
 using YaKansuji::CoreRefine
 
 puts "12万".to_i      # => 120000
+puts "12万".to_i(:kansuji) # => 120000
 puts "12万".to_i(16)  # => 18
 ```
 

data/lib/ya_kansuji/core_ext/integer.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'ya_kansuji'
+
+# Core extension by kansuji
+class Integer
+  def to_kan(formatter = :simple, options = {})
+    YaKansuji.to_kan self, formatter, options
+  end
+end

data/lib/ya_kansuji/core_ext/string.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'ya_kansuji'
+
+# Core extension by kansuji
+class String
+  alias _to_i_ya_kansuji_orig to_i unless defined?(_to_i_ya_kansuji_orig)
+
+  def to_i(base = nil)
+    if base.nil? || base == :kan || base == :kansuji
+      YaKansuji.to_i self
+    else
+      _to_i_ya_kansuji_orig(base)
+    end
+  end
+end

data/lib/ya_kansuji/core_ext.rb

@@ -1,23 +1,4 @@
 # frozen_string_literal: true
 
-require 'ya_kansuji'
-
-# Core extension by kansuji
-class String
-  alias _to_i_ya_kansuji_orig to_i unless defined?(_to_i_ya_kansuji_orig)
-
-  def to_i(base = nil)
-    if base.nil? || base == :kan
-      YaKansuji.to_i self
-    else
-      _to_i_ya_kansuji_orig(base)
-    end
-  end
-end
-
-# Core extension by kansuji
-class Integer
-  def to_kan
-    YaKansuji.to_kan self
-  end
-end
+require 'ya_kansuji/core_ext/string'
+require 'ya_kansuji/core_ext/integer'

data/lib/ya_kansuji/core_refine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ya_kansuji'
-
 module YaKansuji
   # String and Integer refinements with YaKansuji
   module CoreRefine
@@ -16,9 +14,11 @@ module YaKansuji
     end
 
     refine Integer do
-      def to_kan(formatter = :simple)
-        YaKansuji.to_kan self, formatter
+      def to_kan(formatter = :simple, options = {})
+        YaKansuji.to_kan self, formatter, options
       end
     end
   end
 end
+
+require 'ya_kansuji' unless YaKansuji.respond_to?(:to_i) && YaKansuji.respond_to?(:to_kan)

data/lib/ya_kansuji/formatter/gov.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module YaKansuji
   module Formatter
     # Formatter for Japan government-style kansuji
@@ -8,10 +10,12 @@ module YaKansuji
         return '0' if num.zero?
 
         parts = []
-        (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
+        chunks = Formatter.split_by_unit4(num)
+        (chunks.size - 1).downto(0) do |idx4|
+          i4 = chunks[idx4]
           next if i4.zero?
 
+          unit4 = Formatter::UNIT4_UNITS[idx4]
           if i4 == 1
             parts << "1#{unit4}"
             next

data/lib/ya_kansuji/formatter/judic_h.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
@@ -8,12 +10,14 @@ module YaKansuji
       def call(num, _options = {})
         return '０' if num.zero?
 
-        ret = ''
+        ret = +''
         head = true
-        (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
+        chunks = Formatter.split_by_unit4(num)
+        (chunks.size - 1).downto(0) do |idx4|
+          i4 = chunks[idx4]
           next if i4.zero?
 
+          unit4 = Formatter::UNIT4_UNITS[idx4]
           if head
             ret << (i4.to_s + unit4)
           else

data/lib/ya_kansuji/formatter/judic_v.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
@@ -8,12 +10,14 @@ module YaKansuji
       def call(num, _options = {})
         return '〇' if num.zero?
 
-        ret = ''
+        ret = +''
         head = true
-        (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
+        chunks = Formatter.split_by_unit4(num)
+        (chunks.size - 1).downto(0) do |idx4|
+          i4 = chunks[idx4]
           next if i4.zero?
 
+          unit4 = Formatter::UNIT4_UNITS[idx4]
           if head
             ret << (i4.to_s + unit4)
           else

data/lib/ya_kansuji/formatter/lawyer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
@@ -8,11 +10,13 @@ module YaKansuji
       def call(num, _options = {})
         return '0' if num.zero?
 
-        ret = ''
-        (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
+        ret = +''
+        chunks = Formatter.split_by_unit4(num)
+        (chunks.size - 1).downto(0) do |idx4|
+          i4 = chunks[idx4]
           next if i4.zero?
 
+          unit4 = Formatter::UNIT4_UNITS[idx4]
           if i4 == 1
             ret << "1#{unit4}"
             next

data/lib/ya_kansuji/formatter/simple.rb

@@ -4,33 +4,43 @@ module YaKansuji
   module Formatter
     # Simple kansuji formatter
     module Simple
+      DIGITS = %w(一 二 三 四 五 六 七 八 九).freeze
+      UNITS = ([''] + UNIT_EXP3).freeze
+
       module_function
 
       def call(num, _options = {})
         return '零' if num.zero?
 
-        ret = ''
-        (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
+        ret = nil
+        chunks = Formatter.split_by_unit4(num)
+        (chunks.size - 1).downto(0) do |idx4|
+          i4 = chunks[idx4]
           next if i4.zero?
 
+          ret ||= +''
+          unit4 = Formatter::UNIT4_UNITS[idx4]
           if i4 == 1
-            ret += "一#{unit4}"
+            ret << '一' << unit4
             next
           end
-          (UNIT_EXP3.reverse + ['']).each_with_index do |unit3, ridx3|
-            i3 = (i4 / (10**(UNIT_EXP3.size - ridx3))).to_i % 10
+
+          divisor = 1000
+          3.downto(0) do |idx3|
+            i3 = (i4 / divisor) % 10
+            divisor /= 10
             next if i3.zero?
 
-            if i3 == 1 && unit3 != ''
-              ret += unit3
+            unit3 = UNITS[idx3]
+            if i3 == 1 && !unit3.empty?
+              ret << unit3
             else
-              ret += i3.to_s.tr('123456789', '一二三四五六七八九') + unit3
+              ret << DIGITS[i3 - 1] << unit3
             end
           end
-          ret += unit4
+          ret << unit4
         end
-        ret
+        ret || ''
       end
       YaKansuji.register_formatter :simple, self
     end

data/lib/ya_kansuji/formatter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module YaKansuji
+  # Shared helpers for built-in formatters.
+  module Formatter
+    UNIT4_BASE = 10_000
+    UNIT4_CHUNK_LIMIT = UNIT_EXP4.size + 1
+    UNIT4_UNITS = ([''] + UNIT_EXP4).freeze
+
+    module_function
+
+    def split_by_unit4(num)
+      chunks = []
+      UNIT4_CHUNK_LIMIT.times do
+        num, chunk = num.divmod(UNIT4_BASE)
+        chunks << chunk
+        break if num.zero?
+      end
+      chunks
+    end
+  end
+end

data/lib/ya_kansuji/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module YaKansuji
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.2.0'
 end

data/lib/ya_kansuji.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 require 'ya_kansuji/version'
-require 'ya_kansuji/core_refine'
 
 # Yet another Kansuji library for ruby.
 module YaKansuji
   UNIT_EXP3 = %w(十 百 千).freeze
   UNIT_EXP4 = %w(万 億 兆 京 垓 𥝱 穣 溝 澗 正 載 極 恒河沙 阿僧祇 那由他 不可思議 無量大数).freeze
+  MAX_VALUE = (10_000**(UNIT_EXP4.size + 1)) - 1
   NUM_ALT_CHARS = '〇一二三四五六七八九０１２３４５６７８９零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖拾什陌佰阡仟萬秭'
   NUM_NORMALIZED_CHARS = '01234567890123456789011122233345677789十十百百千千万𥝱'
   # rubocop:disable Lint/DuplicateRegexpCharacterClassElement
   REGEXP_PART = %r{
     [
       #{(NUM_ALT_CHARS + NUM_NORMALIZED_CHARS).chars.uniq.join}
-      #{(UNIT_EXP3 + UNIT_EXP4).find_all { |u| u.length == 1 }}
+      #{(UNIT_EXP3 + UNIT_EXP4).find_all { |u| u.length == 1 }.join}
       卄廿卅丗卌皕
     ] |
     #{UNIT_EXP4.find_all { |u| u.length > 1 }.join('|')}
   }x.freeze
   # rubocop:enable Lint/DuplicateRegexpCharacterClassElement
-  REGEXP = /(?:#{REGEXP_PART})+/.freeze
+  REGEXP = /(?:マイナス)?(?:#{REGEXP_PART})+/.freeze
   @@formatters = {}
 
   module_function
@@ -77,7 +77,8 @@ module YaKansuji
       ret3 += curnum
       curnum = nil
     end
-    ret4 + ret3
+    ret = ret4 + ret3
+    matched[0].start_with?('マイナス') ? -ret : ret
   end
 
   def register_formatter(sym, proc = nil, &block)
@@ -100,6 +101,12 @@ module YaKansuji
 
   def to_kan(num, formatter = :simple, options = {})
     num.respond_to?(:_to_i_ya_kansuji_orig) ? num = num._to_i_ya_kansuji_orig : num = num.to_i
+    if num.abs > MAX_VALUE
+      raise RangeError, "Value must be between #{-MAX_VALUE} and #{MAX_VALUE}"
+    end
+
+    return "マイナス#{to_kan(-num, formatter, options)}" if num.negative?
+
     if formatter.respond_to? :call
       formatter.call num, options
     elsif @@formatters[formatter]
@@ -110,8 +117,10 @@ module YaKansuji
   end
 end
 
+require 'ya_kansuji/formatter'
 require 'ya_kansuji/formatter/simple'
 require 'ya_kansuji/formatter/gov'
 require 'ya_kansuji/formatter/lawyer'
 require 'ya_kansuji/formatter/judic_v'
 require 'ya_kansuji/formatter/judic_h'
+require 'ya_kansuji/core_refine' unless defined?(YaKansuji::CoreRefine)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ya_kansuji
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-09 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies: []
 description: |
   Pure ruby library of Japanese kansuji.
@@ -24,7 +24,10 @@ files:
 - README.md
 - lib/ya_kansuji.rb
 - lib/ya_kansuji/core_ext.rb
+- lib/ya_kansuji/core_ext/integer.rb
+- lib/ya_kansuji/core_ext/string.rb
 - lib/ya_kansuji/core_refine.rb
+- lib/ya_kansuji/formatter.rb
 - lib/ya_kansuji/formatter/gov.rb
 - lib/ya_kansuji/formatter/judic_h.rb
 - lib/ya_kansuji/formatter/judic_v.rb
@@ -44,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="