zen_to_i 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53867a13f9fae7bc43db15f95836a223ffe980d5
-  data.tar.gz: 10748a96c6d837e14637bc40a05d8461e6ce8499
+SHA256:
+  metadata.gz: 3839de0a246d873410c9acd82dc4d4317c08112c12c9e3593e847cc61b6fff80
+  data.tar.gz: 79de8b4c92b8c373b3c0d10ae46e381cd265d5579630206302b59b571d5feeb8
 SHA512:
-  metadata.gz: b414e37deb0dcedaa7e7521038fa4aa5ed5842796b7d1ae951789b3781c37eb00681e9863733db9b97f1cf2cda5d82bbe7a112479b0ff26b89bedb1116244c45
-  data.tar.gz: 234124278855d5f4f70b982f3c18644fbb8e437013b9c59de39f526f89b2e64e75cbf5e16338763b2b99cd83dea237b680b506151f10366905d81fa6718ff1c7
+  metadata.gz: 7ad359f8a19fc3ec4db4e9cb0be5d589a7405f2b7d35f234326991f0ea0a939525f1e31f6140748939d70b86a9928bac17e4ff3cec2a3c0a1f90b21dad32a52f
+  data.tar.gz: 5253f8272185f802f772b5145923e842236690324e69c5623c468fed4420c0cdb85c5c432ea285b09c6b920ea1c3eee7229e200963ad09a193a289b30ddf833e

data/.rubocop.yml

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

data/.travis.yml

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

data/Gemfile

@@ -1,6 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rspec'
-
-# Specify your gem's dependencies in zen_to_i.gemspec
 gemspec

data/README.md

@@ -6,21 +6,38 @@
 
 ## Installation
 
-Add this line to your application's Gemfile:
+install via rubygems
 
-    gem 'zen_to_i'
+    $ gem install zen_to_i
+
+Or, you can use bundler. Please add this line to your application's Gemfile:
+
+```ruby:Gemfile
+gem 'zen_to_i'
+```
 
 And then execute:
 
     $ bundle
 
-Or install it yourself as:
+## Usage
 
-    $ gem install zen_to_i
+## 1. You can use `zen_to_i` command from your shell
 
-## Usage
+    $ zen_to_i "一二三"
+    123
+
+    # or you can use with pipe
+    $ echo "一二三" | zen_to_i
+    123
+
+Please call `bundle exec zen_to_i` if you install this gem via bundler.
+
+### 2. In your Ruby script
 
 ```ruby
+require 'zen_to_i'
+
 "hoge".zen_to_i
 #=> "hoge"
 
@@ -33,6 +50,36 @@ Or install it yourself as:
 "三兆五十二万四十八".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.
+
+```ruby
+require "zen_to_i/refine"
+
+using ZenToI::Refine
+
+"一二三".zen_to_i
+#=> "103"
+
+"一二三".to_i
+#=> 103
+```
+
+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.
+
+```ruby
+require "zen_to_i/string_ext"
+
+"一二三".zen_to_i
+#=> "103"
+
+"一二三".to_i
+#=> 103
+```
+
 
 ## Contributing
 

data/bin/zen_to_i

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+Signal.trap("INT") { abort }
+
+require "zen_to_i"
+
+begin
+  if $stdin.tty?
+    if ARGV.length == 1
+      puts ARGV[0].zen_to_i
+    else
+      warn "Usage: zen_to_i (string)"
+      exit 1
+    end
+  else
+    $stdin.each_line do |l|
+      puts l.zen_to_i
+    end
+  end
+rescue => e
+  warn e.inspect
+  e.backtrace.each do |t|
+    warn "  #{t}"
+  end
+  exit 2
+end

data/lib/zen_to_i/constant.rb

@@ -1,15 +1,18 @@
-# encoding: utf-8
-class String
-  module Zen2Num
-    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
+# frozen_string_literal: true
+
+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
-  end
+    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
 end

data/lib/zen_to_i/mixin.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require_relative "./constant"
+
+module ZenToI
+  module Mixin
+    include ::ZenToI::Constant
+
+    def zen_to_i
+      result = kanji2num(self)
+      zen2han(result)
+    end
+
+    private
+
+      def kanji2num(str)
+        array = split_kansuuji(str)
+        array = split_kansuuji_detail(array)
+        result = convert_kansuuji(array)
+        result.join("")
+      end
+
+      def zen2han(str)
+        str.tr("０-９", "0-9")
+      end
+
+      # 漢数字のところだけ切り出す
+      def split_kansuuji(string)
+        string.split(/([#{ALL_KANSUUJI.join('')}]+)/)
+      end
+
+      # 位を表す数ではない普通の漢数字が続いていたらわける
+      def split_kansuuji_detail(array)
+        array_tmp = array.clone
+        array_result = array.clone
+        (1..MAX_LOOP).each do |_i|
+          array_result = split_kansuuji_detail_inner(array_result)
+          return array_result if array_result == array_tmp
+
+          array_tmp = array_result.clone
+        end
+        array_result
+      end
+
+      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(",")
+          else
+            a
+          end
+        end
+        ary.flatten
+      end
+
+      # ４桁ごとの単位（万、億、兆など）でまずわけ、
+      # それぞれに対して漢数字→数字を実行している。
+      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
+          else
+            a
+          end
+        end
+      end
+
+      def format_location(string)
+        location_map.each do |key, value|
+          string.gsub!(/#{key}/, value)
+        end
+        string
+      end
+  end
+end

data/lib/zen_to_i/refine.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "../zen_to_i"
+
+module ZenToI::Refine
+  refine String do
+    alias_method :_to_i, :to_i
+
+    def to_i
+      self.zen_to_i._to_i
+    end
+  end
+end

data/lib/zen_to_i/string_ext.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "../zen_to_i"
+
+class String
+  alias_method :_to_i, :to_i
+
+  def to_i
+    self.zen_to_i._to_i
+  end
+end

data/lib/zen_to_i/version.rb

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

data/lib/zen_to_i.rb

@@ -1,85 +1,7 @@
-# coding: utf-8
-require 'zen_to_i/version'
-require 'zen_to_i/constant'
+# frozen_string_literal: true
 
-class String
-  module Zen2Num
-    def zen_to_i
-      result = kanji2num(self)
-      zen2han(result)
-    end
-
-    def kanji2num(string)
-      array = split_kansuuji(string)
-      array = split_kansuuji_detail(array)
-      result = convert_kansuuji(array)
-      result.join('')
-    end
-    
-    def zen2han str
-      str.tr("０-９","0-9")
-    end
-    
-    private
-    
-    #漢数字のところだけ切り出す
-    def split_kansuuji(string)
-      string.split(/([#{ALL_KANSUUJI.join('')}]+)/)
-    end
-    
-    #位を表す数ではない普通の漢数字が続いていたらわける
-    def split_kansuuji_detail(array)
-      array_tmp = array.clone
-      array_result = array.clone
-      (1..MAX_LOOP).each{|i|
-        array_result = split_kansuuji_detail_inner(array_result)
-        if array_result == array_tmp
-          return array_result
-        else
-          array_tmp = array_result.clone
-        end
-      }
-      array_result
-    end
-    
-    def split_kansuuji_detail_inner(array)
-      array.map{|a|
-        if( a =~ /([#{ALL_KANSUUJI.join('')}]+)/)
-          kannum = KANNUM.keys.join('')
-          a.gsub(/([#{kannum}])([#{kannum}])/,'\1,\2').split(",")
-        else
-          a
-        end
-      }.flatten
-    end
+require "zen_to_i/mixin"
 
-    # ４桁ごとの単位（万、億、兆など）でまずわけ、
-    # それぞれに対して漢数字→数字を実行している。
-    def convert_kansuuji(array)
-      array.map{|a|
-        if( a =~ /([#{ALL_KANSUUJI.join('')}]+)/)
-          reg_order_f = /([^#{KANORDER_F.keys.join('')}]*)([#{KANORDER_F.keys.join('')}]?)/
-          a.scan( reg_order_f ).inject(0) do |ret, (lt_1000, order_f)|
-            reg_order = /([^#{KANORDER.keys.join('')}]*)([#{KANORDER.keys.join('')}]?)/
-            lt_1000_i = lt_1000.scan( reg_order ).inject(-1) do |tmp, (_1_9, order)|
-              tmp + KANNUM[_1_9].to_i * KANORDER[order].to_i
-            end
-            ret + lt_1000_i * KANORDER_F[order_f].to_i
-          end          
-        else
-          a
-        end
-      }
-    end
-    
-    
-    def format_location string
-      location_map.each{|key,value|
-        string.gsub!(/#{key}/,value)
-      }
-      string
-    end
-    
-  end
-  include Zen2Num
+class String
+  include ZenToI::Mixin
 end

data/spec/refine_spec.rb

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

@@ -0,0 +1,11 @@
+# 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/{lib/zen_to_i_spec.rb → zen_to_i_spec.rb}

@@ -1,8 +1,9 @@
-# coding: utf-8
-require File.dirname(__FILE__)+"/../spec_helper"
+# frozen_string_literal: true
+
+require "zen_to_i"
 
 describe ZenToI do
-  describe "String#zen_to_i" do 
+  describe "String#zen_to_i" do
     it "数字以外の文字の場合はそのまま返す" do
       expect("hoge".zen_to_i).to eq "hoge"
     end
@@ -22,6 +23,5 @@ describe ZenToI do
     it "大字でも変換可能" do
       expect("肆佰参拾捌".zen_to_i).to eq "438"
     end
-      
   end
 end

data/zen_to_i.gemspec

@@ -1,23 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'zen_to_i/version'
+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   = %q{全角文字に含まれる数字を半角の数値に変換。兆まで対応}
-  spec.summary       = %q{Japanese zenkaku to number}
+  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($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  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", "~> 1.3"
+  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

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: zen_to_i
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - yoshitsugu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+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: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,24 +66,45 @@ dependencies:
     - - ">="
       - !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'
 description: 全角文字に含まれる数字を半角の数値に変換。兆まで対応
 email:
 - zeroinon1206bass@gmail.com
-executables: []
+executables:
+- zen_to_i
 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/version.rb
-- spec/lib/zen_to_i_spec.rb
-- spec/spec_helper.rb
+- spec/refine_spec.rb
+- spec/string_ext_spec.rb
+- spec/zen_to_i_spec.rb
 - zen_to_i.gemspec
 homepage: ''
 licenses:
@@ -69,18 +118,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Japanese zenkaku to number
 test_files:
-- spec/lib/zen_to_i_spec.rb
-- spec/spec_helper.rb
+- spec/refine_spec.rb
+- spec/string_ext_spec.rb
+- spec/zen_to_i_spec.rb

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-# coding: utf-8
-require File.dirname(__FILE__)+"/../lib/zen_to_i"