ya_kansuji 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9deb8ed6a818c9939482fc8c6408ec00659a67810dfc0eb034ae9bcc821a43
-  data.tar.gz: 701f44b2de1b5186c1f92f8779840af3ae2ca873fd820a4120e4d653ed194888
+  metadata.gz: 3ae15d72bf1414795e2fc0b0c8b31b292dde3fec64183ad0c8407b561a27dcc0
+  data.tar.gz: b5a101d4e735075625e4190be2bd6e4a57d2ce419a80312ce256a427fe17dd55
 SHA512:
-  metadata.gz: c8c3263df051a72dc07c1a8a38acf59f1f94c8b896bb9f2d718637f0b808d7d6b0c02bf43975c892fb1c634a5affd9f02f094be4911a926d5218ab467a6ff794
-  data.tar.gz: 69c8d4b5413a6ec864ac3d7e4e70d258c0f01ecd7684f30ff6c4a414b59751403807eb2850be44489a900df306e54e4f16e50f36555a165675c9f16c4ba33e55
+  metadata.gz: bc79795e352c88129045537e093d76fb59169f2424faa0416a2cf9d829e8a6763ba0fa2a06e1e31e8c1032ed04c0fdb96e54e5677216ca355955f622f67e1c76
+  data.tar.gz: 4fd9683d6c48f51ba18bee9e47fa8e393f150a4f0471ddd0c98e5886dda6a52a99a39d34c9e8383b0e7285465d11fd7f51fc3b7f65b1da3507fcfa7e525c51c3

data/ChangeLog

@@ -1,3 +1,10 @@
+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

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,6 +56,7 @@ YaKansuji.to_i("一〇二四") # => 1024
 
 ```ruby
 YaKansuji.to_kan(12345)  # => 一万二千三百四十五
+YaKansuji.to_kan(-12345) # => マイナス一万二千三百四十五
 ```
 
 このさい、2つめの引数にシンボルを渡すことにより、フォーマッタを切り替えることができます。
@@ -78,6 +81,7 @@ YaKansuji.to_kan(12340005, :judic_h) # => "１２３４万０００５"
 
 `YaKansuji#register_formatter` を使うと独自のフォーマッタを登録できます。
 `#call` を持つ任意のオブジェクトもしくはブロックを渡します。第1引数に数字、第2引数にオプションが渡ります。
+負数を渡した場合も、フォーマッタには絶対値 (非負整数) が渡され、符号 (「マイナス」) は `to_kan` 側で前置されます。
 
 ```ruby
 YaKansuji.register_formatter :hoge, -> (num, opts = {}) {

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
+    YaKansuji.to_kan self
+  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
+      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/version.rb

@@ -1,3 +1,3 @@
 module YaKansuji
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/ya_kansuji.rb

@@ -13,13 +13,13 @@ module YaKansuji
   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,8 @@ 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
+    return "マイナス#{to_kan(-num, formatter, options)}" if num.negative?
+
     if formatter.respond_to? :call
       formatter.call num, options
     elsif @@formatters[formatter]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ya_kansuji
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.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,6 +24,8 @@ 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/gov.rb
 - lib/ya_kansuji/formatter/judic_h.rb