wareki 2.0.0 → 2.1.0

data/lib/wareki/common.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'wareki/calendar_def'
+require 'wareki/calendar'
 require 'wareki/era_def'
 require 'date'
 # Wareki module common constants definitions
@@ -12,7 +12,6 @@ module Wareki
   WESTERN_ERA_NAMES = ['', '西暦', '紀元前'].freeze
   IMPERIAL_ERA_NAMES = %w(皇紀 神武天皇即位紀元).freeze
   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
   KANJI_VARIANTS = {
     '宝' => '寳',
     '霊' => '靈',
@@ -89,7 +88,7 @@ module Wareki
     Date.parse(str).to_date(start)
   rescue InvalidDate
     raise
-  rescue ArgumentError, UnsupportedDateRange
+  rescue ArgumentError
     ::Date.parse(str, true, start)
   end
 end

data/lib/wareki/date.rb

@@ -145,11 +145,9 @@ module Wareki
       return month - 1 if
         WESTERN_ERA_NAMES.include?(@era_name) || @year >= GREGORIAN_START_YEAR
 
-      yobj = YEAR_BY_NUM[@year] or
+      Calendar.covers_year?(@year) or
         raise UnsupportedDateRange, "Cannot get year info of #{inspect}"
-      idx = month - 1
-      idx += 1 if leap_month? || (yobj.leap_month && month > yobj.leap_month)
-      idx
+      Calendar.month_index(@year, month, leap_month?)
     end
 
     def last_day_of_month
@@ -163,10 +161,10 @@ module Wareki
         raise InvalidDate, "invalid date (day out of range): #{inspect}"
       if !WESTERN_ERA_NAMES.include?(@era_name) && @year < GREGORIAN_START_YEAR
         # 暦テーブル外の年は従来どおり jd 変換時の UnsupportedDateRange に委ねる
-        yobj = YEAR_BY_NUM[@year] or return
-        !leap_month? || yobj.leap_month == month or
+        Calendar.covers_year?(@year) or return
+        !leap_month? || Calendar.leap_month(@year) == month or
           raise InvalidDate, "invalid date (no leap month): #{inspect}"
-        day <= yobj.month_days[month_index] or
+        day <= Calendar.last_day_of_month(@year, month, leap_month?) or
           raise InvalidDate, "invalid date (day out of range): #{inspect}"
       else
         leap_month? and
@@ -186,9 +184,9 @@ module Wareki
       @year >= GREGORIAN_START_YEAR and
         return @jd = ::Date.new(@year, month, day, ::Date::GREGORIAN).jd
 
-      yobj = YEAR_BY_NUM[@year] or
+      @jd = Calendar.to_jd(@year, month, day, leap_month?) or
         raise UnsupportedDateRange, "Cannot convert to jd #{inspect}"
-      @jd = yobj.month_starts[month_index] + day - 1
+      @jd
     end
 
     def to_date(start = ::Date::ITALY)
@@ -222,31 +220,31 @@ module Wareki
       when :e  then era_name
       when :g  then era_name.to_s == '' ? '' : Kernel.format(_number_format(opt), era_year)
       when :G  then era_name.to_s == '' ? '' : Utils.i2z(era_year)
-      when :Gk then era_name.to_s == '' ? '' : YaKansuji.to_kan(era_year, :simple)
+      when :Gk then era_name.to_s == '' ? '' : Utils.to_simple_kan(era_year)
       when :GK
         if era_name.to_s == ''
           ''
         elsif era_year == 1
           '元'
         else
-          YaKansuji.to_kan(era_year, :simple)
+          Utils.to_simple_kan(era_year)
         end
       when :o  then year
       when :O  then Utils.i2z(year)
-      when :Ok then YaKansuji.to_kan(year, :simple)
+      when :Ok then Utils.to_simple_kan(year)
       when :i  then imperial_year
       when :I  then Utils.i2z(imperial_year)
-      when :Ik then YaKansuji.to_kan(imperial_year, :simple)
+      when :Ik then Utils.to_simple_kan(imperial_year)
       when :s  then Kernel.format(_number_format(opt), month)
       when :S  then Utils.i2z(month)
-      when :Sk then YaKansuji.to_kan(month, :simple)
+      when :Sk then Utils.to_simple_kan(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 Kernel.format(_number_format(opt), day)
       when :D  then Utils.i2z(day)
-      when :Dk then YaKansuji.to_kan(day, :simple)
+      when :Dk then Utils.to_simple_kan(day)
       when :DK
         if month == 1 && !leap_month? && day == 1
           '元'
@@ -255,7 +253,7 @@ module Wareki
         elsif day == last_day_of_month
           '晦'
         else
-          YaKansuji.to_kan(day, :simple)
+          Utils.to_simple_kan(day)
         end
       when :m  then "#{format(:s, opt)}#{format(:l)}"
       when :M  then "#{format(:Lk)}#{format(:S)}"

data/lib/wareki/era_def.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 # coding: utf-8
+
+# Generated by build-util/gen-era-def.rb from manakai data-locale era-defs.json.
+# Do not edit this file directly.
 module Wareki
   DAY_MAX = 1684383730585466947585
   Era = Struct.new(:name, :year, :start, :end)
   ERA_DEFS = [
     Era.new("大化", 645, 1956842, 1958551),
-    Era.new("白雉", 650, 1958551, 1960259),
-    Era.new("朱鳥", 686, 1971845, 1971893),
+    Era.new("白雉", 650, 1958551, 1960339),
+    Era.new("朱鳥", 686, 1971845, 1972033),
     Era.new("大宝", 701, 1977221, 1978361),
     Era.new("慶雲", 704, 1978361, 1979692),
     Era.new("和銅", 708, 1979692, 1982487),
@@ -163,9 +166,9 @@ module Wareki
     Era.new("建武", 1334, 2208365, 2209133),
     Era.new("延元", 1336, 2209133, 2210638),
     Era.new("興国", 1340, 2210638, 2213069),
-    Era.new("正平", 1346, 2213069, 2221678),
-    Era.new("建徳", 1370, 2221678, 2222302),
-    Era.new("文中", 1372, 2222302, 2223453),
+    Era.new("正平", 1346, 2213069, 2221512),
+    Era.new("建徳", 1370, 2221512, 2222332),
+    Era.new("文中", 1372, 2222332, 2223453),
     Era.new("天授", 1375, 2223453, 2225533),
     Era.new("弘和", 1381, 2225533, 2226702),
     Era.new("元中", 1384, 2226702, 2229809),
@@ -255,8 +258,8 @@ module Wareki
   ].each(&:freeze).freeze
   ERA_NORTH_DEFS = [
     Era.new("大化", 645, 1956842, 1958551),
-    Era.new("白雉", 650, 1958551, 1960259),
-    Era.new("朱鳥", 686, 1971845, 1971893),
+    Era.new("白雉", 650, 1958551, 1960339),
+    Era.new("朱鳥", 686, 1971845, 1972033),
     Era.new("大宝", 701, 1977221, 1978361),
     Era.new("慶雲", 704, 1978361, 1979692),
     Era.new("和銅", 708, 1979692, 1982487),
@@ -407,15 +410,15 @@ module Wareki
     Era.new("元亨", 1321, 2203634, 2205008),
     Era.new("正中", 1324, 2205008, 2205527),
     Era.new("嘉暦", 1326, 2205527, 2206740),
-    Era.new("元徳", 1329, 2206740, 2207459),
+    Era.new("元徳", 1329, 2206740, 2207714),
     Era.new("元弘", 1331, 2207459, 2208365),
     Era.new("正慶", 1332, 2207714, 2208124),
     Era.new("建武", 1334, 2208365, 2210046),
     Era.new("延元", 1336, 2209133, 2210638),
     Era.new("興国", 1340, 2210638, 2213069),
-    Era.new("正平", 1346, 2213069, 2221678),
-    Era.new("建徳", 1370, 2221678, 2222302),
-    Era.new("文中", 1372, 2222302, 2223453),
+    Era.new("正平", 1346, 2213069, 2221512),
+    Era.new("建徳", 1370, 2221512, 2222332),
+    Era.new("文中", 1372, 2222332, 2223453),
     Era.new("天授", 1375, 2223453, 2225533),
     Era.new("弘和", 1381, 2225533, 2226702),
     Era.new("元中", 1384, 2226702, 2229809),

data/lib/wareki/std_ext.rb

@@ -43,24 +43,28 @@ class Date
   class << self
     alias _wareki_parse_orig parse
     def parse(str = '-4712-01-01', comp = true, start = ::Date::ITALY)
+      return ::Date._wareki_parse_orig(str, comp, start) if str.to_s.ascii_only?
+
       str = Wareki::Utils.normalize_time(str)
       str.to_s =~ Wareki::PARSE_QUICK_FILTER or
         return ::Date._wareki_parse_orig(str, comp, start)
       Wareki::Date.parse(str).to_date(start)
     rescue Wareki::InvalidDate
       raise
-    rescue ArgumentError, Wareki::UnsupportedDateRange
+    rescue ArgumentError
       ::Date._wareki_parse_orig(str, comp, start)
     end
 
     alias _wareki__parse_orig _parse
     def _parse(str, comp = true)
+      return ::Date._wareki__parse_orig(str, comp) if str.to_s.ascii_only?
+
       str = Wareki::Utils.normalize_time(str)
       str.to_s =~ Wareki::PARSE_QUICK_FILTER or
         return ::Date._wareki__parse_orig(str, comp)
       di = Wareki::Date._parse(str)
       wdate = Wareki::Date.new(di[:era], di[:year], di[:month], di[:day], di[:is_leap])
-    rescue ArgumentError, Wareki::UnsupportedDateRange
+    rescue ArgumentError
       ::Date._wareki__parse_orig(str, comp)
     else
       ::Date._wareki__parse_orig(str.sub(Wareki::REGEX, wdate.strftime('%F ')), comp)

data/lib/wareki/utils.rb

@@ -7,6 +7,7 @@ module Wareki
   module Utils
     TIME_FORMAT_DIRECTIVE_REGEX = /%J(-|[_0]{0,2}[0-9]*|)(T(?:[fF]|[HMS]k?))/.freeze
     TIME_FORMAT_EXPANSION_REGEX = /(?<!%)(?:%%)*\K#{TIME_FORMAT_DIRECTIVE_REGEX}/.freeze
+    SIMPLE_KANSUJI_CACHE = (0..99).map { |num| YaKansuji.to_kan(num, :simple).freeze }.freeze
 
     module_function
 
@@ -23,11 +24,8 @@ module Wareki
     end
 
     def _last_day_of_month_from_defs(year, month, is_leap)
-      yobj = YEAR_BY_NUM[year] or
+      Calendar.last_day_of_month(year, month, is_leap) or
         raise UnsupportedDateRange, "Cannot find year #{year}"
-      month_idx = month - 1
-      month_idx += 1 if is_leap || (yobj.leap_month && yobj.leap_month < month)
-      yobj.month_days[month_idx]
     end
 
     def era_year_to_civil(era_name, era_year)
@@ -94,24 +92,8 @@ module Wareki
       d.jd >= GREGORIAN_START and
         return [d.year, d.month, d.day, false]
 
-      yobj = find_year(d) or raise UnsupportedDateRange, "Unsupported date: #{d.inspect}"
-      month = 0
-      if yobj.month_starts.last <= d.jd
-        month = yobj.month_starts.count
-      else
-        month = yobj.month_starts.find_index { |m| d.jd <= (m - 1) }
-      end
-      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]
-    end
-
-    def find_year(d)
-      jd = _to_jd(d)
-      jd < YEAR_DEFS.first.start and return nil
-      YEAR_DEFS.bsearch { |y| y.end >= jd }
+      Calendar.find_date_ary(d.jd) or
+        raise UnsupportedDateRange, "Unsupported date: #{d.inspect}"
     end
 
     def find_era(d)
@@ -137,6 +119,13 @@ module Wareki
       end
     end
 
+    def to_simple_kan(num)
+      return SIMPLE_KANSUJI_CACHE[num].dup if
+        num.is_a?(Integer) && num >= 0 && num < SIMPLE_KANSUJI_CACHE.length
+
+      YaKansuji.to_kan(num, :simple)
+    end
+
     # 日本語の時刻表記 (漢数字・全角数字の時分秒、午前/午後、半、正午) を
     # 等価な "HH:MM(:SS)" 表記へ置換する。値の範囲チェックは行わず、
     # 妥当性判断は Ruby 標準パーサに委ねる (二十五時 -> "25:00")。
@@ -179,14 +168,13 @@ module Wareki
         nf = number_format(opt)
         Kernel.format("#{nf}時#{nf}分#{nf}秒", time.hour, time.min, time.sec)
       when :TF
-        "#{YaKansuji.to_kan(time.hour, :simple)}時#{YaKansuji.to_kan(time.min, :simple)}分" \
-        "#{YaKansuji.to_kan(time.sec, :simple)}秒"
+        "#{to_simple_kan(time.hour)}時#{to_simple_kan(time.min)}分#{to_simple_kan(time.sec)}秒"
       when :TH  then i2z(time.hour)
-      when :THk then YaKansuji.to_kan(time.hour, :simple)
+      when :THk then to_simple_kan(time.hour)
       when :TM  then i2z(time.min)
-      when :TMk then YaKansuji.to_kan(time.min, :simple)
+      when :TMk then to_simple_kan(time.min)
       when :TS  then i2z(time.sec)
-      when :TSk then YaKansuji.to_kan(time.sec, :simple)
+      when :TSk then to_simple_kan(time.sec)
       end
     end
 

data/lib/wareki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wareki
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
@@ -43,6 +43,7 @@ files:
 - LICENSE
 - README.md
 - lib/wareki.rb
+- lib/wareki/calendar.rb
 - lib/wareki/calendar_def.rb
 - lib/wareki/common.rb
 - lib/wareki/date.rb
@@ -64,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="