wareki 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 024750af6c60493ab9b817b2ac9e81a7cffd96f5
-  data.tar.gz: 61981fbbe3734009c05bbaabe56370c9b083cbcf
+SHA256:
+  metadata.gz: 790c42a6f6b07acda3701e35d179140baf9435df3866c3e4604ab5bcc484e55f
+  data.tar.gz: ddf6f052c60fe43faec942b48b3ffaef9ac7d801e9a8ac67c6cdd2ea9672156d
 SHA512:
-  metadata.gz: 8bdbf8c2f81dc966ede8c24633fb8a6c541e4e2b30907d3d804da4e01a43387420b534811b79f7e7c6b8482630b59afd58eabed2f301089f2f4302c2f6d7185e
-  data.tar.gz: 5b7093d249fad9fe6389620104f04f40aeebbd14e000a5c8c3fa120f45bbf14ad562ef48c9a57f111a7ac0a9ec779c4a8b67f54fe68eb837324bc8ae3d103586
+  metadata.gz: 02a4b54f5f344cb75c64bf16be764cc073d503a0c7efe9a6b6695a3aff62fb7bedbdaa1c6ef7a2e9a6e86f83e396c2b38a257e19f84034b6766bc0879c200c29
+  data.tar.gz: 2c8581f1e91da2535d335136fafaa55f6b8a901169a4003df570801ab8c548f2109fc0e98108b0752427e55590f88178681d9ffb41efcf17b4367ee382bfe6a3

data/ChangeLog

@@ -1,3 +1,8 @@
+2018-09-19  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 0.2.2
+	* Tiny improvement on date validation
+
 2018-08-27  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.2.1

data/README.rdoc

@@ -87,11 +87,12 @@ Gemfile に以下のようにするか、
 == 仕様、限界、制限など
 
 * 作者は暦の専門家ではまったくありません。ツッコミお待ちしています。
-* 皇紀と旧暦が出力できますが、旧暦445年1月1日(先発グレゴリオ暦で445年1月25日)より前の日付はサポートしていません。扱おうとすると UnsupportedDateRange 例外を上げます。
+* 皇紀と旧暦が出力できますが、旧暦445年1月1日(先発グレゴリオ暦で445年1月25日)より前の日付はサポートしていません。扱おうとすると Wareki::UnsupportedDateRange 例外を上げます。
+* また Date 型からの変換の場合、 現状「大化」で1年1月1日扱いになる日(ユリウス暦で645年2月2日、先発グレゴリオ暦では645年2月5日)より前の日付はサポートしていません。こちらも Wareki::UnsupportedDateRange 例外がおきます。
 * 日本暦日原典の対照表が、どの暦法を元にしているのか分かっていません。単にデータだけを利用しています。
 * 内部的には全てユリウス日を経由して変換しています。
 * パース時には元号の存在しない年(例: 霊亀百年)を受け入れます。しかし現状、Date に変換した場合この情報は捨てられ、パース時の元号を復元することはできません。(Wareki::Date を直接扱えば可能です)
-* 改暦による存在しない日(明治5年12月3日〜31日)は基本的に例外を上げます。が、現状このチェックは完全ではありません。
+* 改暦による存在しない日(明治5年12月3日〜31日)は基本的に例外(ArgumentError)を上げます。が、現状このチェックは完全ではありません。
 * 北朝の元号も解釈できます。しかし現在の所、北朝の元号で文字列にフォーマットすることはできません。
 * 10月の別名は「神無月」しかサポートしていません
 * 将来の日付に関しては、現在の元号がずっと継続しているとみなします
@@ -111,9 +112,3 @@ Gemfile に以下のようにするか、
 == 作者
 
 Tatsuki Sugiura <sugi@nemui.org>
-
-== TODO
-* 北朝モード
-* Wareki::Date で各種計算のサポート
-* 元号として "西暦" サポート?
-* 元号の切り替え日を和暦ベースで計算するようにする?

data/lib/wareki/common.rb

@@ -1,19 +1,19 @@
-# coding: utf-8
 require 'wareki/calendar_def'
 require 'wareki/era_def'
 require 'date'
+# Wareki module common constants definitions
 module Wareki
-  GREGORIAN_START = 2405160 # Date.new(1873, 1, 1, Date::GREGORIAN).jd
+  GREGORIAN_START = 2_405_160 # Date.new(1873, 1, 1, Date::GREGORIAN).jd
   GREGORIAN_START_YEAR = 1873
-  IMPERIAL_START = 1480041  # Date.new(-660, 2, 11, Date::GREGORIAN).jd
+  IMPERIAL_START = 1_480_041  # Date.new(-660, 2, 11, Date::GREGORIAN).jd
   IMPERIAL_START_YEAR = -660
-  DATE_INFINITY = ::Date.new(280000000, 12, 31) # Use 280000000 for jruby limitation...
-  YEAR_BY_NUM = Hash[*YEAR_DEFS.map{|y| [y.year, y]}.flatten].freeze
-  ERA_BY_NAME = Hash[*(ERA_NORTH_DEFS + ERA_DEFS).map {|g| [g.name, g]}.flatten]
-  ERA_BY_NAME['皇紀'] = ERA_BY_NAME['神武天皇即位紀元'] = Era.new('皇紀', -660, 1480041, DATE_INFINITY.jd)
-  ERA_BY_NAME['西暦'] = ERA_BY_NAME[''] = Era.new('西暦', 1, 1721424, DATE_INFINITY.jd)
+  DATE_INFINITY = ::Date.new(280_000_000, 12, 31) # Use 280000000 for jruby limitation...
+  YEAR_BY_NUM = Hash[*YEAR_DEFS.map { |y| [y.year, y] }.flatten].freeze
+  ERA_BY_NAME = Hash[*(ERA_NORTH_DEFS + ERA_DEFS).map { |g| [g.name, g] }.flatten]
+  ERA_BY_NAME['皇紀'] = ERA_BY_NAME['神武天皇即位紀元'] = Era.new('皇紀', -660, 1_480_041, DATE_INFINITY.jd)
+  ERA_BY_NAME['西暦'] = ERA_BY_NAME[''] = Era.new('西暦', 1, 1_721_424, DATE_INFINITY.jd)
   ERA_BY_NAME.keys.each do |era_name|
-    alt_era_name = era_name.tr("宝霊神応暦祥寿斎観寛徳禄万福禎国亀", "寳靈神應曆祥壽斉觀寬德祿萬福禎國龜")
+    alt_era_name = era_name.tr('宝霊神応暦祥寿斎観寛徳禄万福禎国亀', '寳靈神應曆祥壽斉觀寬德祿萬福禎國龜')
     alt_era_name == era_name and next
     ERA_BY_NAME[alt_era_name] = ERA_BY_NAME[era_name]
   end
@@ -21,7 +21,7 @@ module Wareki
     ERA_BY_NAME[short] = ERA_BY_NAME[canon]
   end
   ERA_BY_NAME.freeze
-  NUM_CHARS = "零〇一二三四五六七八九十卄廿卅丗卌肆百皕千万億兆0123456789０１２３４５６７８９"
+  NUM_CHARS = '零〇一二三四五六七八九十卄廿卅丗卌肆百皕千万億兆0123456789０１２３４５６７８９'.freeze
   ALT_MONTH_NAME = %w(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月 神無月 霜月 師走).freeze
   REGEX = %r{^
     (?<era_name>西暦|紀元前|#{ERA_BY_NAME.keys.join('|')})?
@@ -35,11 +35,10 @@ module Wareki
   class UnsupportedDateRange < StandardError; end
 
   module_function
+
   def parse_to_date(str, start = ::Date::ITALY)
-    begin
-      Date.parse(str).to_date(start)
-    rescue ArgumentError => e
-      ::Date.parse(str, true, start)
-    end
+    Date.parse(str).to_date(start)
+  rescue ArgumentError
+    ::Date.parse(str, true, start)
   end
 end

data/lib/wareki/date.rb

@@ -1,10 +1,10 @@
-# coding: utf-8
 require 'date'
 require 'wareki/common'
 require 'wareki/utils'
+require 'wareki/kansuji'
 module Wareki
+  # Wareki date handling class, main implementation.
   class Date
-    attr_reader :jd
     attr_accessor :year, :month, :day, :era_year, :era_name
 
     def self.today
@@ -14,27 +14,26 @@ module Wareki
     def self._check_invalid_date(era, year, month, day)
       month == 12 or return true
       day > 2 or return true
-      (era == "明治" && year == 5 ||
-       era.to_s == "" && year == GREGORIAN_START_YEAR - 1 ||
+      (era == '明治' && year == 5 ||
        %w(皇紀 神武天皇即位紀元).member?(era) &&
-       year == GREGORIAN_START_YEAR - IMPERIAL_START_YEAR - 1) or
-        return true
-      false
+       year == GREGORIAN_START_YEAR - IMPERIAL_START_YEAR - 1) and
+        return false
+      true
     end
 
     def self._parse(str)
-      match = REGEX.match(str.to_s.gsub(/[[:space:]]/, '')) or 
+      match = REGEX.match(str.to_s.gsub(/[[:space:]]/, '')) or
         raise ArgumentError, "Invaild Date: #{str}"
       era = match[:era_name]
-      (year = Utils.kan_to_i(match[:year])) > 0 or
+      (year = Kansuji.k2i(match[:year])) > 0 or
         raise ArgumentError, "Invalid year: #{str}"
       month = day = 1
 
-      era.to_s != "" && era.to_s != "紀元前" && !ERA_BY_NAME[era] and
+      era.to_s != '' && era.to_s != '紀元前' && !ERA_BY_NAME[era] and
         raise ArgumentError, "Date parse failed: Invalid era name '#{match[:era_name]}'"
 
       if match[:month]
-        month = Utils.kan_to_i(match[:month])
+        month = Kansuji.k2i(match[:month])
       elsif match[:alt_month]
         month = Utils.alt_month_name_to_i(match[:alt_month])
       end
@@ -43,10 +42,10 @@ module Wareki
         raise ArgumentError, "Invalid month: #{str}"
 
       if match[:day]
-        if match[:day] == "晦"
-          day = Utils.last_day_of_month(ERA_BY_NAME[era].year + year -1, month, match[:is_leap])
+        if match[:day] == '晦'
+          day = Utils.last_day_of_month(ERA_BY_NAME[era].year + year - 1, month, match[:is_leap])
         else
-          day = Utils.kan_to_i(match[:day])
+          day = Kansuji.k2i(match[:day])
         end
       end
 
@@ -75,24 +74,24 @@ module Wareki
     end
 
     def self.imperial(year, month = 1, day = 1, is_leap_month = false)
-      new("皇紀", year, month, day, is_leap_month)
+      new('皇紀', year, month, day, is_leap_month)
     end
 
     def initialize(era_name, era_year, month = 1, day = 1, is_leap_month = false)
-      if era_name.to_s != "" && era_name != "紀元前" && !ERA_BY_NAME[era_name]
-        raise ArgumentError, "Undefined era '#{era_name}'"
-      end
+      raise ArgumentError, "Undefined era '#{era_name}'" if
+        era_name.to_s != '' && era_name != '紀元前' && !ERA_BY_NAME[era_name]
+
       @month = month
       @day = day
       @is_leap_month = is_leap_month
       @era_name = era_name
       @era_year = era_year
-      if era_name.to_s == "" || era_name == "西暦"
+      if era_name.to_s == '' || era_name == '西暦'
         @year = @era_year
-      elsif era_name == "皇紀" || era_name == "神武天皇即位紀元"
-        @year = era_year + IMPERIAL_START_YEAR
-      elsif era_name.to_s == "紀元前"
+      elsif era_name.to_s == '紀元前'
         @year = -@era_year
+      elsif %w(皇紀 神武天皇即位紀元).include? era_name
+        @year = era_year + IMPERIAL_START_YEAR
       else
         @year = ERA_BY_NAME[era_name].year + era_year - 1
       end
@@ -119,30 +118,27 @@ module Wareki
     end
 
     def month_index
-      if @era_name == "" || @era_name == "西暦" || @era_name == "紀元前" || @year >= GREGORIAN_START_YEAR
-        return month -1
-      end
+      return month - 1 if
+        ['', '西暦', '紀元前'].include?(@era_name) || @year >= GREGORIAN_START_YEAR
 
       yobj = YEAR_BY_NUM[@year] or
-        raise UnsupportedDateRange, "Cannot get year info of #{self.inspect}"
+        raise UnsupportedDateRange, "Cannot get year info of #{inspect}"
       idx = month - 1
-      if leap_month? || yobj.leap_month && month > yobj.leap_month
-        idx += 1
-      end
+      idx += 1 if leap_month? || yobj.leap_month && month > yobj.leap_month
       idx
     end
 
     def jd
       @jd and return @jd
 
-      if @era_name == "西暦" || @era_name == "" || @era_name == "紀元前"
+      ['', '西暦', '紀元前'].include?(@era_name) and
         return @jd = ::Date.new(@year, month, day, ::Date::ITALY).jd
-      elsif @year >= GREGORIAN_START_YEAR
+
+      @year >= GREGORIAN_START_YEAR and
         return @jd = ::Date.new(@year, month, day, ::Date::GREGORIAN).jd
-      end
 
       yobj = YEAR_BY_NUM[@year] or
-        raise UnsupportedDateRange, "Cannot convert to jd #{self.inspect}"
+        raise UnsupportedDateRange, "Cannot convert to jd #{inspect}"
       @jd = yobj.month_starts[month_index] + day - 1
     end
 
@@ -154,83 +150,81 @@ module Wareki
       to_date.to_time
     end
 
-    def strftime(format_str = "%JF")
+    def strftime(format_str = '%JF')
       ret = format_str.to_str.gsub(/%J([fFyYegGoOiImMsSlLdD][kK]?)/) { format($1) || $& }
-      ret.index("%") or return ret
+      ret.index('%') or return ret
       d = to_date
       d.respond_to?(:_wareki_strftime_orig) ? d._wareki_strftime_orig(ret) : d.strftime(ret)
     end
 
     def format(key)
       case key.to_sym
-      when :e; era_name
-      when :g; era_name.to_s == "" ? '' : era_year
-      when :G; era_name.to_s == "" ? '' : Utils.i_to_zen(era_year)
-      when :Gk; era_name.to_s == "" ? '' : Utils.i_to_kan(era_year)
+      when :e  then era_name
+      when :g  then era_name.to_s == '' ? '' : era_year
+      when :G  then era_name.to_s == '' ? '' : Kansuji.i2z(era_year)
+      when :Gk then era_name.to_s == '' ? '' : Kansuji.i2k(era_year)
       when :GK
-        if era_name.to_s == ""
+        if era_name.to_s == ''
           ''
         elsif era_year == 1
-          "元"
+          '元'
         else
-          Utils.i_to_kan(era_year)
+          Kansuji.i2k(era_year)
         end
-      when :o; year
-      when :O; Utils.i_to_zen(year)
-      when :Ok; Utils.i_to_kan(year)
-      when :i; imperial_year
-      when :I; Utils.i_to_zen(imperial_year)
-      when :Ik; Utils.i_to_kan(imperial_year)
-      when :s; month
-      when :S; Utils.i_to_zen(month)
-      when :Sk; Utils.i_to_kan(month)
-      when :SK; Utils.alt_month_name(month)
-      when :l; leap_month? ? "'" : ""
-      when :L; leap_month? ? "’" : ""
-      when :Lk; leap_month? ? "閏" : ""
-      when :d; day
-      when :D; Utils.i_to_zen(day)
-      when :Dk; Utils.i_to_kan(day)
+      when :o  then year
+      when :O  then Kansuji.i2z(year)
+      when :Ok then Kansuji.i2k(year)
+      when :i  then imperial_year
+      when :I  then Kansuji.i2z(imperial_year)
+      when :Ik then Kansuji.i2k(imperial_year)
+      when :s  then month
+      when :S  then Kansuji.i2z(month)
+      when :Sk then Kansuji.i2k(month)
+      when :SK then Utils.alt_month_name(month)
+      when :l  then leap_month? ? "'" : ''
+      when :L  then leap_month? ? '’' : ''
+      when :Lk then leap_month? ? '閏' : ''
+      when :d  then day
+      when :D  then Kansuji.i2z(day)
+      when :Dk then Kansuji.i2k(day)
       when :DK
         if month == 1 && !leap_month? && day == 1
-          "元"
+          '元'
         elsif day == 1
-          "朔"
+          '朔'
         elsif day == Utils.last_day_of_month(year, month, leap_month?)
-          "晦"
+          '晦'
         else
-          Utils.i_to_kan(day)
+          Kansuji.i2k(day)
         end
-      when :m; "#{format(:s)}#{format(:l)}"
-      when :M; "#{format(:Lk)}#{format(:S)}"
-      when :Mk; "#{format(:Lk)}#{format(:Sk)}"
-      when :y; "#{format(:e)}#{format(:g)}"
-      when :Y; "#{format(:e)}#{format(:G)}"
-      when :Yk; "#{format(:e)}#{format(:Gk)}"
-      when :YK; "#{format(:e)}#{format(:GK)}"
-      when :f; "#{format(:e)}#{format(:g)}年#{format(:s)}#{format(:l)}月#{format(:d)}日"
-      when :F; "#{format(:e)}#{format(:GK)}年#{format(:Lk)}#{format(:Sk)}月#{format(:Dk)}日"
-      else
-        nil
+      when :m  then "#{format(:s)}#{format(:l)}"
+      when :M  then "#{format(:Lk)}#{format(:S)}"
+      when :Mk then "#{format(:Lk)}#{format(:Sk)}"
+      when :y  then "#{format(:e)}#{format(:g)}"
+      when :Y  then "#{format(:e)}#{format(:G)}"
+      when :Yk then "#{format(:e)}#{format(:Gk)}"
+      when :YK then "#{format(:e)}#{format(:GK)}"
+      when :f  then "#{format(:e)}#{format(:g)}年#{format(:s)}#{format(:l)}月#{format(:d)}日"
+      when :F  then "#{format(:e)}#{format(:GK)}年#{format(:Lk)}#{format(:Sk)}月#{format(:Dk)}日"
       end
     end
 
     def eql?(other)
       begin
-        [:year, :month, :day, :era_year, :era_name, :leap_month?].each do |attr|
+        %i[year month day era_year era_name leap_month?].each do |attr|
           other.public_send(attr) == public_send(attr) or return false
         end
-      rescue => e
+      rescue NoMethodError, NotImplementedError
         return false
       end
       true
     end
-    alias_method :==, :eql?
+    alias == eql?
 
     def ===(other)
       begin
         other.jd == jd or return false
-      rescue => e
+      rescue NoMethodError, NotImplementedError
         return false
       end
       true
@@ -245,8 +239,8 @@ module Wareki
     end
 
     def _to_jd_for_calc(other)
-      other.class.to_s == "ActiveSupport::Duration" and
-        raise NotImplementedError, "Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric."
+      other.class.to_s == 'ActiveSupport::Duration' and
+        raise NotImplementedError, 'Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric.'
       other.respond_to?(:to_date) and other = other.to_date
       other.respond_to?(:jd) and other = other.jd
       other

data/lib/wareki/kansuji.rb

@@ -0,0 +1,108 @@
+module Wareki
+  # Utilities of kansuji/integer converter.
+  module Kansuji
+    UNIT_SUFFIX1 = {
+      '千' => 1000,
+      '百' => 100,
+      '十' => 10,
+      '' => 1,
+    }.freeze
+    UNIT_SUFFIX2 = {
+      '京' => 10_000_000_000_000_000,
+      '兆' => 1_000_000_000_000,
+      '億' => 100_000_000,
+      '万' => 10_000,
+      '' => 1,
+    }.freeze
+
+    module_function
+
+    def kan_to_i(str)
+      ret3 = 0
+      ret4 = 0
+      curnum = nil
+      str == '零' and return 0
+      str.to_s.each_char do |c|
+        case c
+        when '正', '元', '朔',
+          '一', '二', '三', '四', '五', '六', '七', '八', '九', '肆',
+          '1', '2', '3', '4', '5', '6', '7', '8', '9',
+          '１', '２', '３', '４', '５', '６', '７', '８', '９'
+          if curnum
+            curnum *= 10
+          else
+            curnum = 0
+          end
+          curnum += c.tr('一二三四五六七八九１２３４５６７８９肆元朔正', '1234567891234567894111').to_i
+        when '〇', '０', '0'
+          curnum and curnum *= 10
+        when '卄', '廿'
+          ret3 += 20
+          curnum = nil
+        when '卅', '丗'
+          ret3 += 30
+          curnum = nil
+        when '卌'
+          ret3 += 40
+          curnum = nil
+        when '皕'
+          ret3 += 200
+          curnum = nil
+        when '万', '億', '兆', '京', '垓'
+          if curnum
+            ret3 += curnum
+            curnum = nil
+          end
+          ret3 = 1 if ret3.zero?
+          ret4 += ret3 * 10**((%w[万 億 兆 京 垓].index(c) + 1) * 4)
+          ret3 = 0
+        when '十', '百', '千'
+          curnum ||= 1
+          ret3 += curnum * 10**(%w[十 百 千].index(c) + 1)
+          curnum = nil
+        end
+      end
+      if curnum
+        ret3 += curnum
+        curnum = nil
+      end
+      ret4 + ret3
+    end
+
+    def i_to_kan(num)
+      ret = ''
+      UNIT_SUFFIX2.each do |unit4, rank4|
+        i4 = (num / rank4).to_i % 10_000
+        next if i4.zero?
+
+        if i4 == 1
+          ret += "一#{unit4}"
+          next
+        end
+
+        UNIT_SUFFIX1.each do |unit1, rank1|
+          i1 = (i4 / rank1).to_i % 10
+          next if i1.zero?
+
+          if i1 == 1 && unit1 != ''
+            ret += unit1
+          else
+            ret += i1.to_s.tr('123456789', '一二三四五六七八九') + unit1
+          end
+        end
+        ret += unit4
+      end
+      ret
+    end
+
+    def i_to_zen(num)
+      num.to_s.tr('0123456789', '０１２３４５６７８９')
+    end
+
+    class << self
+      alias i2k i_to_kan
+      alias k2i kan_to_i
+      alias i2z i_to_zen
+    end
+  end
+end

data/lib/wareki/std_ext.rb

@@ -1,19 +1,21 @@
 require 'date'
 require 'wareki/date'
 module Wareki
+  # :nodoc:
   module StdExt
   end
 end
+# :nodoc:
 class Date
   JAPAN = Wareki::GREGORIAN_START
 
   def to_wareki_date
-    Wareki::Date.jd(self.jd)
+    Wareki::Date.jd(jd)
   end
 
-  alias_method :_wareki_strftime_orig, :strftime
-  def strftime(format = "%F")
-    if format.index("%J")
+  alias _wareki_strftime_orig strftime
+  def strftime(format = '%F')
+    if format.index('%J')
       to_wareki_date.strftime(format)
     else
       _wareki_strftime_orig(format)
@@ -21,13 +23,11 @@ class Date
   end
 
   class << self
-    alias_method :_wareki_parse_orig, :parse
+    alias _wareki_parse_orig parse
     def parse(str, comp = true, start = ::Date::ITALY)
-      begin
-        Wareki::Date.parse(str).to_date(start)
-      rescue => e
-        ::Date._wareki_parse_orig(str, comp, start)
-      end
+      Wareki::Date.parse(str).to_date(start)
+    rescue ArgumentError, Wareki::UnsupportedDateRange
+      ::Date._wareki_parse_orig(str, comp, start)
     end
   end
 end

data/lib/wareki/utils.rb

@@ -1,107 +1,17 @@
-# coding: utf-8
 module Wareki
+  # Static utility methods.
   module Utils
-    UNIT_SUFFIX1 = {
-      '千' => 1000,
-      '百' => 100,
-      '十' => 10,
-      ''   => 1,
-    }
-    UNIT_SUFFIX2 = {
-      '京' => 10000000000000000,
-      '兆' => 1000000000000,
-      '億' => 100000000,
-      '万' => 10000,
-      ''   => 1,
-    }
     module_function
-    def kan_to_i(str)
-      ret3 = 0
-      ret4 = 0
-      curnum = nil
-      str == "零" and return 0
-      str.to_s.each_char do |c|
-        case c
-        when *%w(正 元 朔 一 二 三 四 五 六 七 八 九 肆 1 2 3 4 5 6 7 8 9 １ ２ ３ ４ ５ ６ ７ ８ ９)
-          if curnum
-            curnum *= 10
-          else
-            curnum = 0
-          end
-          curnum += c.tr("一二三四五六七八九１２３４５６７８９肆元朔正", "1234567891234567894111").to_i
-        when "〇", "０", "0"
-          curnum and curnum *= 10
-        when "卄", "廿"
-          ret3 += 20
-          curnum = nil
-        when "卅", "丗"
-          ret3 += 30
-          curnum = nil
-        when "卌"
-          ret3 += 40
-          curnum = nil
-        when "皕"
-          ret3 += 200
-          curnum = nil
-        when "万", "億", "兆", "京", "垓"
-          if curnum
-            ret3 += curnum
-            curnum = nil
-          end
-          ret3 = 1 if ret3 == 0
-          ret4 += ret3 * 10 ** ((["万", "億", "兆", "京", "垓"].index(c)+1)*4)
-          ret3 = 0
-        when "十", "百", "千"
-          curnum ||= 1
-          ret3 += curnum * 10 ** (["十", "百", "千"].index(c)+1)
-          curnum = nil
-        end
-      end
-      if curnum
-        ret3 += curnum
-        curnum = nil
-      end
-      ret4 + ret3
-    end
-
-    def i_to_kan(num, opts = {})
-      ret = ''
-      UNIT_SUFFIX2.each do |unit4, rank4|
-        i4 = (num / rank4).to_i % 10000
-        if i4 == 0
-          next
-        elsif i4 == 1
-          ret += "一#{unit4}"
-          next
-        end
-        UNIT_SUFFIX1.each do |unit1, rank1|
-          i1 = (i4 / rank1).to_i % 10
-          if i1 == 0
-            next
-          elsif i1 == 1 && unit1 != ""
-            ret += unit1
-          else
-            ret += i1.to_s.tr('123456789', '一二三四五六七八九') + unit1
-          end
-        end
-        ret += unit4
-      end
-      ret
-    end
-
-    def i_to_zen(num)
-      num.to_s.tr('0123456789', '０１２３４５６７８９')
-    end
 
     def last_day_of_month(year, month, is_leap)
       if year >= GREGORIAN_START_YEAR
-        _last_day_of_month_gregorian(year, month, is_leap)
+        _last_day_of_month_gregorian(year, month)
       else
         _last_day_of_month_from_defs(year, month, is_leap)
       end
     end
 
-    def _last_day_of_month_gregorian(year, month, is_leap)
+    def _last_day_of_month_gregorian(year, month)
       tmp_y = year
       tmp_m = month
       if month == 12
@@ -110,16 +20,14 @@ module Wareki
       else
         tmp_m += 1
       end
-      (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN)-1).day
+      (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN) - 1).day
     end
 
     def _last_day_of_month_from_defs(year, month, is_leap)
       yobj = YEAR_BY_NUM[year] or
-        raise UnsupportedDateRange, "Cannot find year #{self.inspect}"
+        raise UnsupportedDateRange, "Cannot find year #{inspect}"
       month_idx = month - 1
-      if is_leap || yobj.leap_month && yobj.leap_month < month
-        month_idx += 1
-      end
+      month_idx += 1 if is_leap || yobj.leap_month && yobj.leap_month < month
       yobj.month_days[month_idx]
     end
 
@@ -133,9 +41,9 @@ module Wareki
     end
 
     def _to_date(d)
-      if d.kind_of? ::Date
+      if d.is_a? ::Date
         d # nothing to do
-      elsif d.kind_of?(Time)
+      elsif d.is_a?(Time)
         d.to_date
       else
         ::Date.jd(d.to_i)
@@ -143,9 +51,9 @@ module Wareki
     end
 
     def _to_jd(d)
-      if d.kind_of? ::Date
+      if d.is_a? ::Date
         d.jd
-      elsif d.kind_of?(Time)
+      elsif d.is_a?(Time)
         d.to_date.jd
       else
         d.to_i
@@ -159,32 +67,31 @@ module Wareki
 
       yobj = find_year(d) or raise UnsupportedDateRange, "Unsupported date: #{d.inspect}"
       month = 0
-      is_leap = false
       if yobj.month_starts.last <= d.jd
         month = yobj.month_starts.count
       else
-        month = yobj.month_starts.find_index {|m| d.jd <= (m - 1) }
+        month = yobj.month_starts.find_index { |m| d.jd <= (m - 1) }
       end
-      month_start = yobj.month_starts[month-1]
+      month_start = yobj.month_starts[month - 1]
       is_leap = (yobj.leap_month == (month - 1))
       yobj.leap_month && yobj.leap_month < month and
         month -= 1
-      [yobj.year, month, d.jd - month_start +1, is_leap]
+      [yobj.year, month, d.jd - month_start + 1, is_leap]
     end
 
     def find_year(d)
       jd = _to_jd(d)
-      YEAR_DEFS.bsearch{|y| y.end >= jd }
+      YEAR_DEFS.bsearch { |y| y.end >= jd }
     end
 
     def find_era(d)
       jd = _to_jd(d)
-      ERA_DEFS.reverse_each { |e|
+      ERA_DEFS.reverse_each do |e|
         e.start > jd and next
         e.end < jd and next
         return e
-      }
-      return nil
+      end
+      nil
     end
   end
 end

data/lib/wareki/version.rb

@@ -1,3 +1,3 @@
 module Wareki
-  VERSION = "0.2.1"
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,59 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tatsuki Sugiura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-09-19 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
+        version: '0'
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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: '0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Pure ruby library of Wareki (Japanese calendar date) that supports string
-  parsing, formatting, and bi-directional convertion with standard Date class.
+description: |
+  Pure ruby library of Wareki (Japanese calendar date) that supports string parsing,
+  formatting, and bi-directional convertion with standard Date class.
 email:
 - sugi@nemui.org
 executables: []
@@ -68,6 +69,7 @@ files:
 - lib/wareki/common.rb
 - lib/wareki/date.rb
 - lib/wareki/era_def.rb
+- lib/wareki/kansuji.rb
 - lib/wareki/std_ext.rb
 - lib/wareki/utils.rb
 - lib/wareki/version.rb
@@ -75,7 +77,7 @@ homepage: https://github.com/sugi/wareki
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)
 test_files: []