numeja 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520ab7906a5d82346ed2ee353f58cae06fd9b1c0
-  data.tar.gz: b8c3922301bd727522750c49ee8d83cdf5991da5
+  metadata.gz: 9f6217c15351374c091ab0e636f7e921a1782cdc
+  data.tar.gz: 7925c6b89c8043c8c0a68b51d37132e95c9316e4
 SHA512:
-  metadata.gz: '097c234b903715bfd8ca46d8e2b9b7582f23f05606834c5ef2114d70ae2bd6b8502cd89c56c4b562ee10623fb46f7a3eb501a0aa19a010ef549cfcd84722f32d'
-  data.tar.gz: 139724b38040b64f8742876a713e678435e2acc2da6695049c31c68044e2bc0741448499233f5d015889c60296116b52a291c1660d314e7593130ae46ed1b2a9
+  metadata.gz: fab32b436ef7926fadc16896729069c401825e2ea61f973f87e43012415167dabb05f1a542837b56882ea9cc0417e068b9a25b9333693c69cd712dcdd6e0aa52
+  data.tar.gz: 32066e7eb61577c3a7d2cfbc1938295ee417b61a9dc804a5895f4e4dceabff2d8761c7267ef4b2bb568b977d7df6b18ebcb8a09599d9209cc8a707274d18333b

data/.gitignore

@@ -6,4 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/vendor/
+/vendor/
+Gemfile.lock

data/README.md

@@ -2,6 +2,8 @@
            
 Parse numbers in japanese numerals from String
 
+漢数字とかをInteger or Floatに変換するGem
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ima
+    $ gem install numeja
 
 ## Usage
 
@@ -32,5 +34,7 @@ Numeja.numerize('５０５') #  => 505
 Numeja.numerize('九八七六五四三二一零') # => 9_876_543_210
 Numeja.numerize('九分八厘七毛六糸五忽四微三繊二沙零塵一埃') # => 0.9876543201
 Numeja.numerize('九割八分七厘六毛五糸四忽三微二繊零沙一塵') # => 0.9876543201
+Numeja.numerize('二分の一') # => 0.5
+Numeja.numerize('三分の一') # => 0.33333333333...
 
 ```

data/lib/numeja.rb

@@ -1,4 +1,6 @@
 require 'numeja/version'
+require 'delegate'
+require 'numeja/number'
 
 module Numeja
   JA_大字 = {
@@ -46,16 +48,16 @@ module Numeja
   }.freeze
 
   JA_下数 = {
-    '十' => 10**1,
-    '百' => 10**2,
-    '千' => 10**3
+    '十' => 10 ** 1,
+    '百' => 10 ** 2,
+    '千' => 10 ** 3
   }.freeze
 
   JA_上数 = {
-    '万' => 10**4,
-    '億' => 10**8,
-    '兆' => 10**12,
-    '京' => 10**16,
+    '万' => 10 ** 4,
+    '億' => 10 ** 8,
+    '兆' => 10 ** 12,
+    '京' => 10 ** 16,
     #  '垓': 10 ** 20,
     #  '秭': 10 ** 24,
     #  '𥝱': 10 ** 24,
@@ -73,29 +75,29 @@ module Numeja
   }.freeze
 
   JA_小数 = {
-    '分' => 10**-1,
-    '厘' => 10**-2,
-    '毛' => 10**-3,
-    '糸' => 10**-4,
-    '忽' => 10**-5,
-    '微' => 10**-6,
-    '繊' => 10**-7,
-    '沙' => 10**-8,
-    '塵' => 10**-9,
-    '埃' => 10**-10
+    '分' => 10 ** -1,
+    '厘' => 10 ** -2,
+    '毛' => 10 ** -3,
+    '糸' => 10 ** -4,
+    '忽' => 10 ** -5,
+    '微' => 10 ** -6,
+    '繊' => 10 ** -7,
+    '沙' => 10 ** -8,
+    '塵' => 10 ** -9,
+    '埃' => 10 ** -10
   }.freeze
 
   JA_割合用小数 = {
-    '割' => 10**-1,
-    '分' => 10**-2,
-    '厘' => 10**-3,
-    '毛' => 10**-4,
-    '糸' => 10**-5,
-    '忽' => 10**-6,
-    '微' => 10**-7,
-    '繊' => 10**-8,
-    '沙' => 10**-9,
-    '塵' => 10**-10
+    '割' => 10 ** -1,
+    '分' => 10 ** -2,
+    '厘' => 10 ** -3,
+    '毛' => 10 ** -4,
+    '糸' => 10 ** -5,
+    '忽' => 10 ** -6,
+    '微' => 10 ** -7,
+    '繊' => 10 ** -8,
+    '沙' => 10 ** -9,
+    '塵' => 10 ** -10
   }.freeze
   REGEXP_旧字 = Regexp.new(Numeja::JA_大字.keys.join('|').to_s, 'g').freeze
   REGEXP_数字 = Regexp.new(Numeja::JA_数字.keys.join('|').to_s, 'g').freeze
@@ -119,128 +121,17 @@ module Numeja
     #   Numeja.numerize('玖阡捌陌漆拾陸億伍仟肆佰參十貳万壹千弐百卅４') => 987_654_321_234
     #   Numeja.numerize('５０５') => 505
     #   Numeja.numerize('九八七六五四三二一零') => 9_876_543_210
-    #   Numeja.numerize('九分八厘七毛六糸五忽四微三繊二沙零塵一埃') => 0.9876543201)
-    #   Numeja.numerize('九割八分七厘六毛五糸四忽三微二繊零沙一塵') => 0.9876543201)
+    #   Numeja.numerize('九分八厘七毛六糸五忽四微三繊二沙零塵一埃') => 0.9876543201
+    #   Numeja.numerize('九割八分七厘六毛五糸四忽三微二繊零沙一塵') => 0.9876543201
+    #   Numeja.numerize('二分の一') => 0.5
+    #   Numeja.numerize('三分の一') => 0.33333333333...
     def numerize(str)
-      nomarized = nomarize(str)
-      units     = parse_large_numbers(nomarized)
-      units.reduce(0) do |t, unit|
-        large_prefix = JA_上数[unit[:digit]]
-        if large_prefix.nil?
-          integer_part, decimal_part = split_digit(unit[:unit])
-          int                        = integer_part.nil? ? 0 : parse_integer_part(integer_part)
-          decimal                    = decimal_part.nil? ? 0 : parse_decimal_part(decimal_part)
-          t += int + decimal
-        else
-          integer = parse_integer_part(unit[:unit])
-          t += integer * large_prefix
-        end
-        t
-      end
-    end
-
-    private
-
-    # Return numerals parts
-    #
-    # @return [Array<String>]
-    #
-    # @api private
-    # @since 0.0.1
-    def split_digit(str)
-      i = str.index(/.分|.割/)
-      if i.nil?
-        [str]
-      elsif i.zero?
-        [nil, str]
+      if str.index('分の').nil?
+        Numeja::Number.new(str)
       else
-        [str[0..i - 1], str[i..-1]]
-      end
-    end
-
-    # Return nomarized Kansuuji
-    #
-    # @return [::String]
-    #
-    # @api private
-    # @since 0.0.1
-    def nomarize(str)
-      str
-        .tr('０-９', '0-9')
-        .gsub(REGEXP_旧字, JA_大字)
-        .gsub(REGEXP_数字, JA_数字)
-    end
-
-    # Return nomarized Kansuuji
-    #
-    # @return [::String]
-    #
-    # @api private
-    # @since 0.0.1
-    def parse_integer_part(input)
-      total = 0
-      tmp   = 0
-      return input.to_i if input =~ /^[0-9]+$/
-      input.gsub(REGEXP_数字, JA_数字).each_char do |s|
-        unit_prefix = JA_下数[s]
-        unless unit_prefix.nil?
-          if tmp > 0
-            total += tmp * unit_prefix
-            tmp = 0
-          else
-            total += unit_prefix
-          end
-        end
-        tmp += s.to_i
-      end
-      total + tmp
-    end
-
-    # Return parsed decimal part
-    #
-    # @return [Integer, Float]
-    #
-    # @api private
-    # @since 0.0.1
-    def parse_decimal_part(str)
-      map = if str.index('割')
-              Numeja::JA_割合用小数
-            else
-              Numeja::JA_小数
-      end
-      keys = map.keys()
-      keys.reduce(0) do |t, ja_digit|
-        index = str.index(ja_digit)
-        break t if index.nil?
-        unit = str.slice!(0, index)
-        str.slice!(0, 1)
-        t += (unit.to_f * map[ja_digit])
-        t
-      end
-    end
-
-    # Return large number parts
-    #
-    # @return [::Hash]
-    #
-    # @api private
-    # @since 0.0.1
-    def parse_large_numbers(str)
-      # (?<year>(.*)億)(?<oku>(.*)万)
-      splited = Numeja::JA_上数.keys.reverse.map do |ja_digit|
-        index = str.index(ja_digit)
-        next if index.nil?
-        unit  = str.slice!(0, index)
-        digit = str.slice!(0, 1)
-        {
-          digit: digit,
-          unit:  unit
-        }
+        denominator, molecule = str.split('分の').map { |s| Numeja::Number.new(s) }
+        molecule.to_f / denominator.to_f
       end
-      splited.push(
-        digit: '',
-        unit:  str
-      ).compact
     end
   end
 end

data/lib/numeja/number.rb

@@ -0,0 +1,133 @@
+module Numeja
+  # Number class
+  # @class private
+  # @since 0.0.2
+  class Number < DelegateClass(Integer)
+    def initialize(str)
+      @str = str
+      super(parse)
+    end
+
+    private
+
+    def parse
+      nomarized = nomarize(@str)
+      units = parse_large_numbers(nomarized)
+      @result = units.reduce(0) do |t, unit|
+        large_prefix = JA_上数[unit[:digit]]
+        if large_prefix.nil?
+          integer_part, decimal_part = split_digit(unit[:unit])
+          int = integer_part.nil? ? 0 : parse_integer_part(integer_part)
+          decimal = decimal_part.nil? ? 0 : parse_decimal_part(decimal_part)
+          t += int + decimal
+        else
+          integer = parse_integer_part(unit[:unit])
+          t += integer * large_prefix
+        end
+        t
+      end
+    end
+
+    # Return numerals parts
+    #
+    # @return [Array<String>]
+    #
+    # @api private
+    # @since 0.0.1
+    def split_digit(str)
+      i = str.index(/.分|.割/)
+      if i.nil?
+        [str]
+      elsif i.zero?
+        [nil, str]
+      else
+        [str[0..i - 1], str[i..-1]]
+      end
+    end
+
+    # Return nomarized Kansuuji
+    #
+    # @return [::String]
+    #
+    # @api private
+    # @since 0.0.1
+    def nomarize(str)
+      str
+        .tr('０-９', '0-9')
+        .gsub(REGEXP_旧字, JA_大字)
+        .gsub(REGEXP_数字, JA_数字)
+    end
+
+    # Return nomarized Kansuuji
+    #
+    # @return [::String]
+    #
+    # @api private
+    # @since 0.0.1
+    def parse_integer_part(input)
+      total = 0
+      tmp = 0
+      return input.to_i if input =~ /^[0-9]+$/
+      input.gsub(REGEXP_数字, JA_数字).each_char do |s|
+        unit_prefix = JA_下数[s]
+        unless unit_prefix.nil?
+          if tmp > 0
+            total += tmp * unit_prefix
+            tmp = 0
+          else
+            total += unit_prefix
+          end
+        end
+        tmp += s.to_i
+      end
+      total + tmp
+    end
+
+    # Return parsed decimal part
+    #
+    # @return [Integer, Float]
+    #
+    # @api private
+    # @since 0.0.1
+    def parse_decimal_part(str)
+      map = if str.index('割')
+              Numeja::JA_割合用小数
+            else
+              Numeja::JA_小数
+            end
+      keys = map.keys()
+      keys.reduce(0) do |t, ja_digit|
+        index = str.index(ja_digit)
+        break t if index.nil?
+        unit = str.slice!(0, index)
+        str.slice!(0, 1)
+        t += (unit.to_f * map[ja_digit])
+        t
+      end
+    end
+
+    # Return large number parts
+    #
+    # @return [::Hash]
+    #
+    # @api private
+    # @since 0.0.1
+    def parse_large_numbers(str)
+      # (?<year>(.*)億)(?<oku>(.*)万)
+      splited = Numeja::JA_上数.keys.reverse.map do |ja_digit|
+        index = str.index(ja_digit)
+        next if index.nil?
+        unit = str.slice!(0, index)
+        digit = str.slice!(0, 1)
+        {
+          digit: digit,
+          unit: unit
+        }
+      end
+      splited.push(
+        digit: '',
+        unit: str
+      ).compact
+    end
+  end
+end

data/lib/numeja/version.rb

@@ -1,3 +1,3 @@
 module Numeja
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/numeja.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numeja
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Akira Takahashi
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: coveralls
+  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
@@ -121,11 +149,11 @@ files:
 - ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/numeja.rb
+- lib/numeja/number.rb
 - lib/numeja/version.rb
 - numeja.gemspec
 homepage: https://github.com/rike422/numeja

data/Gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    numeja (0.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    coderay (1.1.2)
-    docile (1.3.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    power_assert (1.1.1)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rr (1.2.1)
-    rubocop (0.56.0)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    test-unit (3.2.8)
-      power_assert
-    test-unit-context (0.5.1)
-      test-unit (>= 2.4.0)
-    test-unit-full (0.0.5)
-      test-unit
-      test-unit-context
-      test-unit-notify
-      test-unit-rr
-      test-unit-runner-tap
-    test-unit-notify (1.0.4)
-      test-unit (>= 2.4.9)
-    test-unit-rr (1.0.5)
-      rr (>= 1.1.1)
-      test-unit (>= 2.5.2)
-    test-unit-runner-tap (1.1.2)
-      test-unit
-    unicode-display_width (1.3.2)
-    yard (0.9.12)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  numeja!
-  pry
-  rake
-  rubocop
-  simplecov
-  test-unit-full
-  yard
-
-BUNDLED WITH
-   1.16.1