ya_kansuji 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b533562701ef0ed367dc665df6190ad55d8e967b6301b2edd915c594eb96337
-  data.tar.gz: 81f83784f8e57fc41efff6a9c1f757aad7e3d9c3dcb9b406296f771de09b214b
+  metadata.gz: 3ae15d72bf1414795e2fc0b0c8b31b292dde3fec64183ad0c8407b561a27dcc0
+  data.tar.gz: b5a101d4e735075625e4190be2bd6e4a57d2ce419a80312ce256a427fe17dd55
 SHA512:
-  metadata.gz: dc82119a8fb4b6d60513e12816c08f1e7d61e53678bef560036d6084f13a1e72ac3c4b19277b94dc4eab8e286f2d7dddd9c8b728c51dcca4b3ac437e356ec486
-  data.tar.gz: 9600d3bc5233393c6ce2c1fdae3cddc119e1f38c12bd6643da8ce8dffb151791d9edb7d4edaff66c6d42c103d2e59dcdc57eabf786556f977fdfdc876753afcb
+  metadata.gz: bc79795e352c88129045537e093d76fb59169f2424faa0416a2cf9d829e8a6763ba0fa2a06e1e31e8c1032ed04c0fdb96e54e5677216ca355955f622f67e1c76
+  data.tar.gz: 4fd9683d6c48f51ba18bee9e47fa8e393f150a4f0471ddd0c98e5886dda6a52a99a39d34c9e8383b0e7285465d11fd7f51fc3b7f65b1da3507fcfa7e525c51c3

data/ChangeLog

@@ -1,3 +1,16 @@
+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
+	* Minor changes to cleanup build with ruby 3.x
+	* Strip whitespace on parsing.
+
 2019-04-21  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.2.0

data/README.md

@@ -1,9 +1,10 @@
 # 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)
 
 Yet another (ultimate) Japanese Kansuji library for ruby.
 
@@ -20,6 +21,7 @@ YaKansuji は ruby 用の日本語の漢数字ライブラリです。 和暦ラ
   * 位取り (2億0010万 / 千〇〇二)
   * 大字 (千皕卅肆)
   * カンマ表現 (12,345 / 5億3,456万 / 二万、五十)
+  * 負数 (マイナス五十)
 * 数値から漢数字, 漢字混じり数値文字列フォーマット
   * 複数のビルトインフォーマッタ
   * フォーマッタプラグイン機構
@@ -45,6 +47,7 @@ gem 'ya_kansuji'
 
 ```ruby
 YaKansuji.to_i("一〇二四") # => 1024
+YaKansuji.to_i("マイナス一〇二四") # => -1024
 ```
 
 ### フォーマット (数値 → 漢数字)
@@ -53,6 +56,7 @@ YaKansuji.to_i("一〇二四") # => 1024
 
 ```ruby
 YaKansuji.to_kan(12345)  # => 一万二千三百四十五
+YaKansuji.to_kan(-12345) # => マイナス一万二千三百四十五
 ```
 
 このさい、2つめの引数にシンボルを渡すことにより、フォーマッタを切り替えることができます。
@@ -77,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/core_refine.rb

@@ -2,15 +2,15 @@
 
 require 'ya_kansuji'
 
-# String and Integer refinements with YaKansuji
 module YaKansuji
+  # String and Integer refinements with YaKansuji
   module CoreRefine
     refine String do
       def to_i(base = nil)
         if base.nil? || base == :kan || base == :kansuji
           YaKansuji.to_i self
         else
-          super base
+          super
         end
       end
     end

data/lib/ya_kansuji/formatter/gov.rb

@@ -1,6 +1,6 @@
-# Simple kansuji formatter
 module YaKansuji
   module Formatter
+    # Formatter for Japan government-style kansuji
     module Gov
       module_function
 
@@ -9,14 +9,14 @@ module YaKansuji
 
         parts = []
         (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / 10_000**(UNIT_EXP4.size - ridx4)).to_i % 10_000
+          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
           next if i4.zero?
 
           if i4 == 1
             parts << "1#{unit4}"
             next
           end
-          parts << i4.to_s + unit4
+          parts << (i4.to_s + unit4)
         end
         parts.join(', ')
       end

data/lib/ya_kansuji/formatter/judic_h.rb

@@ -1,6 +1,7 @@
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
+    # Formatter for Jpanese judicial style kansuji (arabic numerals version)
     module JudicH
       module_function
 
@@ -10,13 +11,13 @@ module YaKansuji
         ret = ''
         head = true
         (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / 10_000**(UNIT_EXP4.size - ridx4)).to_i % 10_000
+          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
           next if i4.zero?
 
           if head
-            ret << i4.to_s + unit4
+            ret << (i4.to_s + unit4)
           else
-            ret << ('%04d' % i4) + unit4
+            ret << (('%04d' % i4) + unit4)
           end
           head = false
         end

data/lib/ya_kansuji/formatter/judic_v.rb

@@ -1,6 +1,7 @@
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
+    # Formatter for Jpanese judicial style kansuji (kanji numerals version)
     module JudicV
       module_function
 
@@ -10,13 +11,13 @@ module YaKansuji
         ret = ''
         head = true
         (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / 10_000**(UNIT_EXP4.size - ridx4)).to_i % 10_000
+          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
           next if i4.zero?
 
           if head
-            ret << i4.to_s + unit4
+            ret << (i4.to_s + unit4)
           else
-            ret << ('%04d' % i4) + unit4
+            ret << (('%04d' % i4) + unit4)
           end
           head = false
         end

data/lib/ya_kansuji/formatter/lawyer.rb

@@ -1,6 +1,7 @@
 # Simple kansuji formatter
 module YaKansuji
   module Formatter
+    # Formatter for Jpanese lawyer style kansuji
     module Lawyer
       module_function
 
@@ -9,7 +10,7 @@ module YaKansuji
 
         ret = ''
         (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / 10_000**(UNIT_EXP4.size - ridx4)).to_i % 10_000
+          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
           next if i4.zero?
 
           if i4 == 1
@@ -17,7 +18,7 @@ module YaKansuji
             next
           end
 
-          ret << (i4 >= 1000 ? "#{i4.to_s[0]},#{i4.to_s[1..-1]}" : i4.to_s) + unit4
+          ret << ((i4 >= 1000 ? "#{i4.to_s[0]},#{i4.to_s[1..-1]}" : i4.to_s) + unit4)
         end
         ret
       end

data/lib/ya_kansuji/formatter/simple.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-# Simple kansuji formatter
 module YaKansuji
   module Formatter
+    # Simple kansuji formatter
     module Simple
       module_function
 
@@ -11,7 +11,7 @@ module YaKansuji
 
         ret = ''
         (UNIT_EXP4.reverse + ['']).each_with_index do |unit4, ridx4|
-          i4 = (num / 10_000**(UNIT_EXP4.size - ridx4)).to_i % 10_000
+          i4 = (num / (10_000**(UNIT_EXP4.size - ridx4))).to_i % 10_000
           next if i4.zero?
 
           if i4 == 1
@@ -19,7 +19,7 @@ module YaKansuji
             next
           end
           (UNIT_EXP3.reverse + ['']).each_with_index do |unit3, ridx3|
-            i3 = (i4 / 10**(UNIT_EXP3.size - ridx3)).to_i % 10
+            i3 = (i4 / (10**(UNIT_EXP3.size - ridx3))).to_i % 10
             next if i3.zero?
 
             if i3 == 1 && unit3 != ''

data/lib/ya_kansuji/version.rb

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

data/lib/ya_kansuji.rb

@@ -7,24 +7,26 @@ require 'ya_kansuji/core_refine'
 module YaKansuji
   UNIT_EXP3 = %w(十 百 千).freeze
   UNIT_EXP4 = %w(万 億 兆 京 垓 𥝱 穣 溝 澗 正 載 極 恒河沙 阿僧祇 那由他 不可思議 無量大数).freeze
-  NUM_ALT_CHARS = '〇一二三四五六七八九０１２３４５６７８９零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖拾什陌佰阡仟萬秭'.freeze
-  NUM_NORMALIZED_CHARS = '01234567890123456789011122233345677789十十百百千千万𥝱'.freeze
+  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
-  REGEXP = /(?:#{REGEXP_PART})+/.freeze
+  # rubocop:enable Lint/DuplicateRegexpCharacterClassElement
+  REGEXP = /(?:マイナス)?(?:#{REGEXP_PART})+/.freeze
   @@formatters = {}
 
   module_function
 
   def to_i(str)
     str = str.to_s.tr(NUM_ALT_CHARS, NUM_NORMALIZED_CHARS)
-    str.gsub!(/[,，、:space:]/, '')
+    str.gsub!(/[,，、[:space:]]/, '')
     matched = REGEXP.match(str) or return 0
     ret3 = 0
     ret4 = 0
@@ -63,11 +65,11 @@ module YaKansuji
           curnum = nil
         end
         ret3 = 1 if ret3.zero?
-        ret4 += ret3 * 10**((UNIT_EXP4.index(c) + 1) * 4)
+        ret4 += ret3 * (10**((UNIT_EXP4.index(c) + 1) * 4))
         ret3 = 0
       when *UNIT_EXP3
         curnum ||= 1
-        ret3 += curnum * 10**(UNIT_EXP3.index(c) + 1)
+        ret3 += curnum * (10**(UNIT_EXP3.index(c) + 1))
         curnum = nil
       end
     end
@@ -75,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)
@@ -98,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,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ya_kansuji
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2026-07-13 00:00:00.000000000 Z
+dependencies: []
 description: |
   Pure ruby library of Japanese kansuji.
   Bi-directional convert support between number and kanji string.
@@ -66,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
@@ -76,8 +36,9 @@ files:
 homepage: https://github.com/sugi/ya_kansuji
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,9 +53,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Japanese kansuji library for ruby
 test_files: []