numerals_jp 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06c64d82998990eb828d8c1e8eddf2cbb5770ba
-  data.tar.gz: 163bb6aab7d20c672e6cc3477c09955832f0067b
+  metadata.gz: 9a061f27293e75c37ceba3128635cbebb21e7e61
+  data.tar.gz: f89d80120b7881490efe80e7a6521060cf94bf19
 SHA512:
-  metadata.gz: 81e58da93f1470649a663a3c1e62bdbbf54e7d901dd2598f42467f2667b133c812f8b736ab4c4b4cc42b6c4553d3cd59c936f76ddf50290bc42d071bb4db1a1d
-  data.tar.gz: 819f98c4bcb9c07578ea33951242f888ce4992a2a41a1a3782cdd53ccb3ccd0e15db47c66a02beb7de202bae54862b34f329fe770e7f6a6f98765a0c1808eb24
+  metadata.gz: 0c5a941fac1bc9b221d374af810b26302b0a3c34d5b14c8ccd572aac149b193510f89446626f2fe8a49b8bf7c80d5c86552cc22833c7c47080133511c973ad9a
+  data.tar.gz: fb54a206c2df82a5aabde5f657bdf32d7b7496e63d016bd62ace913ccfa8c5a526e48c40466fd19bc573b5b4c6a71be01d9faea92ec59910e4e2c2d151c21c49

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 2.2.2
+cache: bundler
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,9 +1,12 @@
 # numerals_jp
 
-A number converting library for japanese.
+[![Gem Version](https://badge.fury.io/rb/numerals_jp.svg)](https://badge.fury.io/rb/numerals_jp)
+[![Build Status](https://travis-ci.org/paralleltree/numerals_jp.svg?branch=master)](https://travis-ci.org/paralleltree/numerals_jp)
 
-This library converts between japanese numerals which are often used  
-(i.e., from 0 to 9,999,999,999,999,999) and arabic numerals.
+A numerals library for japanese.
+
+This library converts between arabic numerals and japanese numerals  
+which are often used(i.e., from 1 to 9,999,999,999,999,999).
 
 ## Installation
 
@@ -29,22 +32,41 @@ require 'numerals_jp'
 
 ### Convert from japanese numerals
 ```ruby
-"三十六".convert_from_jp_nums
+"三十六".jp_to_num
 # => "36"
 ```
 
 This method just replaces japanese numerals with arabic numerals.
 
 ```ruby
-"十二月三十一日".convert_from_jp_nums
+"十二月三十一日".jp_to_num
 # => "12月31日"
 ```
 
+### Convert to Japanese numerals
+```ruby
+106.to_jp
+# => "百六"
+
+19937.to_jp
+# => "一万九千九百三十七"
+```
+
 ## Roadmap
 
+Done:
+
+  * Support converting from integer to japanese numerals.
+
+Pending:
+
   * Support converting from japanese numerals without factor units.
   * Support converting from arabic numerals with japanese factor units.
-  * Support converting from integer to japanese numerals.
+
+## Other Integrations
+
+[![Code Climate](https://codeclimate.com/github/paralleltree/numerals_jp/badges/gpa.svg)](https://codeclimate.com/github/paralleltree/numerals_jp)
+[![Coverage Status](https://coveralls.io/repos/paralleltree/numerals_jp/badge.svg?branch=master&service=github)](https://coveralls.io/github/paralleltree/numerals_jp?branch=master)
 
 ## Contributing
 

data/lib/numerals_jp/constant.rb

@@ -0,0 +1,13 @@
+module NumeralsJp::Constant
+  NUMERALS = "一二三四五六七八九"
+  SMALL_FACTORS = {
+    "十" => 10,
+    "百" => 100,
+    "千" => 1000
+  }.freeze
+  LARGE_FACTORS = {
+    "万" => 10 ** 4,
+    "億" => 10 ** 8,
+    "兆" => 10 ** 12
+  }.freeze
+end

data/lib/numerals_jp/extension/integer.rb

@@ -0,0 +1,5 @@
+class Integer
+  def to_jp
+    NumeralsJp::IntegerConverter.to_jp(self)
+  end
+end

data/lib/numerals_jp/extension/string.rb

@@ -1,5 +1,5 @@
 class String
-  def convert_from_jp_nums
-    NumeralsJp::Converter.convert_from_jp_nums(self)
+  def jp_to_num
+    NumeralsJp::StringConverter.jp_to_num(self)
   end
 end

data/lib/numerals_jp/integer_converter.rb

@@ -0,0 +1,34 @@
+module NumeralsJp::IntegerConverter
+  include NumeralsJp::Constant
+
+  module_function
+  def to_jp(i)
+    raise ArgumentError.new("Argument out of range.") unless i > 0 && i < 10 ** 16
+
+    if i < 10000
+      split_digits(i, 1)
+        .zip([nil] + SMALL_FACTORS.keys)
+        .reject { |num, factor| num == 0 }
+        .map { |num, factor| "#{num if num != 1 || factor.nil?}#{factor}" }
+        .reverse
+        .join
+        .tr("1-9", NUMERALS)
+    else
+      split_digits(i, 4)
+        .zip([nil] + LARGE_FACTORS.keys)
+        .reject { |num, factor| num == 0 }
+        .map { |num, factor| "#{num.to_jp}#{factor}" }
+        .reverse
+        .join
+    end
+  end
+
+  def split_digits(i, limit)
+    [].tap do |arr|
+      while i > 0
+        arr << i % 10 ** limit
+        i /= 10 ** limit
+      end
+    end
+  end
+end

data/lib/numerals_jp/{converter.rb → string_converter.rb}

@@ -1,21 +1,12 @@
-module NumeralsJp::Converter
-  NUMERALS = "一二三四五六七八九"
-  SMALL_FACTORS = {
-    "十" => 10,
-    "百" => 100,
-    "千" => 1000
-  }.freeze
-  LARGE_FACTORS = {
-    "万" => 10 ** 4,
-    "億" => 10 ** 8,
-    "兆" => 10 ** 12
-  }.freeze
+module NumeralsJp::StringConverter
+  include NumeralsJp::Constant
+
   DETECT_PATTERN = /([#{NUMERALS}#{SMALL_FACTORS.keys.join}]+[#{LARGE_FACTORS.keys.join}]?)+/
   LARGE_EXTRACT_PATTERN = /([#{NUMERALS}#{SMALL_FACTORS.keys.join}]+)([#{LARGE_FACTORS.keys.join}])?/
   SMALL_EXTRACT_PATTERN = /(([#{NUMERALS}])?([#{SMALL_FACTORS.keys.join}])?)/
 
   module_function
-  def convert_from_jp_nums(str)
+  def jp_to_num(str)
     str.gsub(DETECT_PATTERN) do |s|
       s.scan(LARGE_EXTRACT_PATTERN).map { |m|
         m.first.scan(SMALL_EXTRACT_PATTERN).reject { |m| m.first.empty? }.map { |m|

data/lib/numerals_jp/version.rb

@@ -1,3 +1,3 @@
 module NumeralsJp
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/numerals_jp.rb

@@ -1,6 +1,9 @@
 require "numerals_jp/version"
-require "numerals_jp/converter"
+require "numerals_jp/constant"
+require "numerals_jp/string_converter"
+require "numerals_jp/integer_converter"
 require "numerals_jp/extension/string"
+require "numerals_jp/extension/integer"
 
 module NumeralsJp
 end

data/numerals_jp.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numerals_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - paralleltree
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.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'
 description: Number conversion between arabic numerals and japanese numerals.
 email:
 - paralleltree@outlook.com
@@ -67,8 +81,11 @@ files:
 - README.md
 - Rakefile
 - lib/numerals_jp.rb
-- lib/numerals_jp/converter.rb
+- lib/numerals_jp/constant.rb
+- lib/numerals_jp/extension/integer.rb
 - lib/numerals_jp/extension/string.rb
+- lib/numerals_jp/integer_converter.rb
+- lib/numerals_jp/string_converter.rb
 - lib/numerals_jp/version.rb
 - numerals_jp.gemspec
 homepage: https://github.com/paralleltree/numerals_jp