zen_to_i 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3839de0a246d873410c9acd82dc4d4317c08112c12c9e3593e847cc61b6fff80
-  data.tar.gz: 79de8b4c92b8c373b3c0d10ae46e381cd265d5579630206302b59b571d5feeb8
+  metadata.gz: b7159a12adbda141423184a4769d10011e872607f7504df9f10ff47146d25880
+  data.tar.gz: 8b34203aaad6483c34acf49d7f7e3b07972a0dec470a56cfef3598156c9ab22d
 SHA512:
-  metadata.gz: 7ad359f8a19fc3ec4db4e9cb0be5d589a7405f2b7d35f234326991f0ea0a939525f1e31f6140748939d70b86a9928bac17e4ff3cec2a3c0a1f90b21dad32a52f
-  data.tar.gz: 5253f8272185f802f772b5145923e842236690324e69c5623c468fed4420c0cdb85c5c432ea285b09c6b920ea1c3eee7229e200963ad09a193a289b30ddf833e
+  metadata.gz: 66e00c3a2e43a09b7cf8e8cfa78d504fd798a8403c1f787ad4e03f7a34bd1ff05d2ac4033e80405cba4fe0a8b77c09c4fca7b656751c912ea067789f81ba0a56
+  data.tar.gz: e2a84957f2e08f246c001bbfd94b4bfc1e1bbe56d2a8a1c21a51d14684d072e394060a912be352ca6a938140975b8dd79c3aeeea888abebb9e431dbddea36042

data/README.md

@@ -1,39 +1,38 @@
 # ZenToI
-兆までの漢数字を半角数字に変換します。
-漢数字が続いていたらそれぞれ変換します。
+兆までの漢数字を半角数字に変換します。文章中に含まれる漢数字も変換できます。
 
-[![Build Status](https://travis-ci.org/yoshitsugu/zen_to_i.svg)](https://travis-ci.org/yoshitsugu/zen_to_i)
+[![Actions Status](https://github.com/yoshitsugu/zen_to_i/workflows/test/badge.svg)](https://github.com/yoshitsugu/zen_to_i/actions)
 
 ## Installation
 
-install via rubygems
+Install via RubyGems.
 
     $ gem install zen_to_i
 
-Or, you can use bundler. Please add this line to your application's Gemfile:
+Or, use Bundler. Add this line to your application's Gemfile:
 
-```ruby:Gemfile
-gem 'zen_to_i'
+```ruby
+gem "zen_to_i"
 ```
 
-And then execute:
+Then run:
 
     $ bundle
 
 ## Usage
 
-## 1. You can use `zen_to_i` command from your shell
+### 1. Use the `zen_to_i` command from your shell
 
     $ zen_to_i "一二三"
     123
 
-    # or you can use with pipe
+    # or use a pipe
     $ echo "一二三" | zen_to_i
     123
 
-Please call `bundle exec zen_to_i` if you install this gem via bundler.
+Please run `bundle exec zen_to_i` if you installed the gem via Bundler.
 
-### 2. In your Ruby script
+### 2. Use it in your Ruby script
 
 ```ruby
 require 'zen_to_i'
@@ -50,10 +49,9 @@ require 'zen_to_i'
 "三兆五十二万四十八".zen_to_i
 #=> "3000000520048"
 ```
-Note that `zen_to_i` returns String, not Integer.  
-  
-Or you can overwrite `to_i` method with Refinements.  
-This returns Integer same as default `to_i` method.
+Note that `zen_to_i` returns a String, not an Integer.
+
+You can also override `to_i` with a refinement. The override is active only in the lexical scope where `using ZenToI::Refine` appears, and returns an Integer like the built-in `to_i` method.
 
 ```ruby
 require "zen_to_i/refine"
@@ -61,30 +59,29 @@ require "zen_to_i/refine"
 using ZenToI::Refine
 
 "一二三".zen_to_i
-#=> "103"
+#=> "123"
 
 "一二三".to_i
-#=> 103
+#=> 123
 ```
 
-Also, you can implicitly overwrite `to_i` method by `require "zen_to_i/string_ext"`.  
-Of course it is very dangerous. Please be careful to use it.
+You can also replace `String#to_i` globally by requiring `zen_to_i/string_ext`. This affects all strings in the process; the original `to_i` implementation remains available as `String#_to_i`. Use this only when a global override is intended.
 
 ```ruby
 require "zen_to_i/string_ext"
 
 "一二三".zen_to_i
-#=> "103"
+#=> "123"
 
 "一二三".to_i
-#=> 103
+#=> 123
 ```
 
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. Fork the repository.
+2. Create a feature branch (`git checkout -b my-new-feature`).
+3. Commit your changes (`git commit -am 'Add some feature'`).
+4. Push the branch (`git push origin my-new-feature`).
+5. Create a pull request.

data/bin/zen_to_i

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 Signal.trap("INT") { abort }
 
@@ -17,7 +18,7 @@ begin
       puts l.zen_to_i
     end
   end
-rescue => e
+rescue StandardError => e
   warn e.inspect
   e.backtrace.each do |t|
     warn "  #{t}"

data/lib/zen_to_i/constant.rb

@@ -2,17 +2,23 @@
 
 module ZenToI
   module Constant
-    KANNUM = { "〇" => 0, "" => 1, "一" => 1, "二" => 2, "三" => 3, "四" => 4,
-               "五" => 5, "六" => 6, "七" => 7, "八" => 8, "九" => 9,
-               "零" => 0, "壱" => 1, "弐" => 2, "参" => 3, "肆" => 4,
-               "伍" => 5, "陸" => 6, "漆" => 7, "捌" => 8, "玖" => 9 }.freeze
-    KANORDER = { "十" => 10, "百" => 100, "千" => 1000, "" => 1, "拾" => 10,
-                 "陌" => 100, "佰" => 100, "阡" => 1000, "仟" => 1000 }.freeze
-    KANORDER_F = { "万" => 10**4, "億" => 10**8, "兆" => 10**12,
-                   "" => 1, "萬" => 10**4 }.freeze
-    ALL_KANSUUJI = KANNUM.keys + KANORDER.keys + KANORDER_F.keys
-    MAX_LOOP = 100
-    KANORDER_F_KEYS_REGEX = /([^#{KANORDER_F.keys.join('')}]*)([#{KANORDER_F.keys.join('')}]?)/.freeze
-    KANORDER_KEYS_REGEX = /([^#{KANORDER.keys.join('')}]*)([#{KANORDER.keys.join('')}]?)/.freeze
-  end.freeze
+    unless const_defined?(:KANNUM, false)
+      KANNUM = { "〇" => 0, "" => 1, "一" => 1, "二" => 2, "三" => 3, "四" => 4,
+                 "五" => 5, "六" => 6, "七" => 7, "八" => 8, "九" => 9,
+                 "零" => 0, "壱" => 1, "弐" => 2, "参" => 3, "肆" => 4,
+                 "伍" => 5, "陸" => 6, "漆" => 7, "捌" => 8, "玖" => 9 }.freeze
+      KANORDER = { "十" => 10, "百" => 100, "千" => 1000, "" => 1, "拾" => 10,
+                   "陌" => 100, "佰" => 100, "阡" => 1000, "仟" => 1000 }.freeze
+      KANORDER_F = { "万" => 10**4, "億" => 10**8, "兆" => 10**12,
+                     "" => 1, "萬" => 10**4 }.freeze
+      ALL_KANSUUJI = KANNUM.keys + KANORDER.keys + KANORDER_F.keys
+      MAX_LOOP = 100
+      KANORDER_F_KEYS_REGEX = /([^#{KANORDER_F.keys.join("")}]*)([#{KANORDER_F.keys.join("")}]?)/
+      KANORDER_KEYS_REGEX = /([^#{KANORDER.keys.join("")}]*)([#{KANORDER.keys.join("")}]?)/
+      ALL_KANSUUJI_REGEX = /([#{ALL_KANSUUJI.join("")}]+)/
+      KANNUM_PAIR_REGEX = /([#{KANNUM.keys.join("")}])([#{KANNUM.keys.join("")}])/
+    end
+  end
+
+  Constant.freeze
 end

data/lib/zen_to_i/mixin.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./constant"
+require_relative "constant"
 
 module ZenToI
   module Mixin
@@ -26,7 +26,7 @@ module ZenToI
 
       # 漢数字のところだけ切り出す
       def split_kansuuji(string)
-        string.split(/([#{ALL_KANSUUJI.join('')}]+)/)
+        string.split(ALL_KANSUUJI_REGEX)
       end
 
       # 位を表す数ではない普通の漢数字が続いていたらわける
@@ -44,9 +44,8 @@ module ZenToI
 
       def split_kansuuji_detail_inner(array)
         ary = array.map do |a|
-          if /([#{ALL_KANSUUJI.join('')}]+)/.match?(a)
-            kannum = KANNUM.keys.join("")
-            a.gsub(/([#{kannum}])([#{kannum}])/, '\1,\2').split(",")
+          if ALL_KANSUUJI_REGEX.match?(a)
+            a.gsub(KANNUM_PAIR_REGEX, '\1,\2').split(",")
           else
             a
           end
@@ -58,24 +57,27 @@ module ZenToI
       # それぞれに対して漢数字→数字を実行している。
       def convert_kansuuji(array)
         array.map do |a|
-          if /([#{ALL_KANSUUJI.join('')}]+)/.match?(a)
-            a.scan(KANORDER_F_KEYS_REGEX).inject(0) do |ret, (unit, order_f)|
-              unit_i = unit.scan(KANORDER_KEYS_REGEX).inject(-1) do |tmp, (kanji, order)|
-                tmp + KANNUM[kanji].to_i * KANORDER[order].to_i
-              end
-              ret + unit_i * KANORDER_F[order_f].to_i
-            end
+          if ALL_KANSUUJI_REGEX.match?(a)
+            sum_kansuuji(a)
           else
             a
           end
         end
       end
 
-      def format_location(string)
-        location_map.each do |key, value|
-          string.gsub!(/#{key}/, value)
+      def sum_kansuuji(str)
+        str.scan(KANORDER_F_KEYS_REGEX).inject(0) do |ret, (unit, order_f)|
+          ret + (unit_to_i(unit, order_f) * KANORDER_F[order_f].to_i)
+        end
+      end
+
+      # 大字だけの表記は 1 個分として数え、scan の末尾の空一致は桁を持たないので 0 とする。
+      def unit_to_i(unit, order_f)
+        return order_f.empty? ? 0 : 1 if unit.empty?
+
+        unit.scan(KANORDER_KEYS_REGEX).inject(-1) do |tmp, (kanji, order)|
+          tmp + (KANNUM[kanji].to_i * KANORDER[order].to_i)
         end
-        string
       end
   end
 end

data/lib/zen_to_i/refine.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "../zen_to_i"
+require_relative "to_i"
 
-module ZenToI::Refine
-  refine String do
-    alias_method :_to_i, :to_i
-
-    def to_i
-      self.zen_to_i._to_i
+# 読み込んでも String#to_i は変わらない。`using ZenToI::Refine` した範囲だけで差し替えが有効になる。
+module ZenToI
+  unless const_defined?(:Refine, false)
+    module Refine
+      refine String do
+        define_method(:_to_i, ZenToI::ToI.instance_method(:_to_i))
+        define_method(:to_i, ZenToI::ToI.instance_method(:to_i))
+      end
     end
   end
 end

data/lib/zen_to_i/string_ext.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require_relative "../zen_to_i"
+require_relative "to_i"
 
+# 読み込むと String#to_i が漢数字変換に差し替わる。元の実装は String#_to_i に残る。
 class String
-  alias_method :_to_i, :to_i
+  alias _to_i to_i unless String.method_defined?(:_to_i, false)
 
-  def to_i
-    self.zen_to_i._to_i
-  end
+  define_method(:to_i, ZenToI::ToI.instance_method(:to_i))
 end

data/lib/zen_to_i/to_i.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "../zen_to_i"
+
+module ZenToI
+  # string_ext.rb（グローバルに適用）と refine.rb（refinement 経由）で共有する。
+  module ToI
+    # 差し替え前の String#to_i を保持する。読み込み時点で String 自身が持つ
+    # ネイティブ実装を捕捉し、どのロード順でも素の to_i を参照できるようにする。
+    ORIGINAL_TO_I = String.instance_method(:to_i) unless const_defined?(:ORIGINAL_TO_I, false)
+
+    def to_i
+      ORIGINAL_TO_I.bind(zen_to_i).call
+    end
+
+    def _to_i(*)
+      ORIGINAL_TO_I.bind(self).call(*)
+    end
+  end
+end

data/lib/zen_to_i/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZenToI
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,85 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zen_to_i
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yoshitsugu
-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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: onkcop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: 全角文字に含まれる数字を半角の数値に変換。兆まで対応
 email:
 - zeroinon1206bass@gmail.com
@@ -88,29 +17,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - bin/zen_to_i
 - lib/zen_to_i.rb
 - lib/zen_to_i/constant.rb
 - lib/zen_to_i/mixin.rb
 - lib/zen_to_i/refine.rb
 - lib/zen_to_i/string_ext.rb
+- lib/zen_to_i/to_i.rb
 - lib/zen_to_i/version.rb
-- spec/refine_spec.rb
-- spec/string_ext_spec.rb
-- spec/zen_to_i_spec.rb
-- zen_to_i.gemspec
-homepage: ''
+homepage: https://github.com/yoshitsugu/zen_to_i
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -118,18 +39,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.6
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Japanese zenkaku to number
-test_files:
-- spec/refine_spec.rb
-- spec/string_ext_spec.rb
-- spec/zen_to_i_spec.rb
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rubocop.yml

@@ -1,6 +0,0 @@
-inherit_gem:
-  onkcop:
-    - "config/rubocop.yml"
-
-AllCops:
-  TargetRubyVersion: 2.4

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-script: bundle exec rspec

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/spec/refine_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "zen_to_i/refine"
-
-using ZenToI::Refine
-
-describe ZenToI::Refine do
-  describe "String#to_i refined" do
-    it "usingを使っていると漢数字は変換できる" do
-      expect("一二三".to_i).to eq 123
-    end
-  end
-end

data/spec/string_ext_spec.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "zen_to_i/string_ext"
-
-describe String do
-  describe "#to_i overwritten" do
-    it "to_iで漢数字変換ができる" do
-      expect("一二三".to_i).to eq 123
-    end
-  end
-end

data/spec/zen_to_i_spec.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "zen_to_i"
-
-describe ZenToI do
-  describe "String#zen_to_i" do
-    it "数字以外の文字の場合はそのまま返す" do
-      expect("hoge".zen_to_i).to eq "hoge"
-    end
-
-    it "漢数字の場合は半角数字に変換する" do
-      expect("一二三".zen_to_i).to eq "123"
-    end
-
-    it "位をあらわす漢数字を含む場合も半角数字に変換する" do
-      expect("百三".zen_to_i).to eq "103"
-    end
-
-    it "兆の位まで半角数字に変換する" do
-      expect("三兆五十二万四十八".zen_to_i).to eq "3000000520048"
-    end
-
-    it "大字でも変換可能" do
-      expect("肆佰参拾捌".zen_to_i).to eq "438"
-    end
-  end
-end

data/zen_to_i.gemspec

@@ -1,26 +0,0 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "zen_to_i/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "zen_to_i"
-  spec.version       = ZenToI::VERSION
-  spec.authors       = ["yoshitsugu"]
-  spec.email         = ["zeroinon1206bass@gmail.com"]
-  spec.description   = "全角文字に含まれる数字を半角の数値に変換。兆まで対応"
-  spec.summary       = "Japanese zenkaku to number"
-  spec.homepage      = ""
-  spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.4.6"
-
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "onkcop"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-end