wareki 1.1.0 → 2.1.0

data/lib/wareki/utils.rb

@@ -5,6 +5,10 @@ require 'ya_kansuji'
 module Wareki
   # Static utility methods.
   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
 
     def last_day_of_month(year, month, is_leap)
@@ -16,23 +20,42 @@ module Wareki
     end
 
     def _last_day_of_month_gregorian(year, month)
-      tmp_y = year
-      tmp_m = month
-      if month == 12
-        tmp_y += 1
-        tmp_m = 1
-      else
-        tmp_m += 1
-      end
-      (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN) - 1).day
+      ::Date.new(year, month, -1, ::Date::GREGORIAN).day
     end
 
     def _last_day_of_month_from_defs(year, month, is_leap)
-      yobj = YEAR_BY_NUM[year] or
-        raise UnsupportedDateRange, "Cannot find year #{inspect}"
-      month_idx = month - 1
-      month_idx += 1 if is_leap || yobj.leap_month && yobj.leap_month < month
-      yobj.month_days[month_idx]
+      Calendar.last_day_of_month(year, month, is_leap) or
+        raise UnsupportedDateRange, "Cannot find year #{year}"
+    end
+
+    def era_year_to_civil(era_name, era_year)
+      era_name = era_name.to_s
+      return era_year if ['', '西暦'].include?(era_name)
+      return -era_year if era_name == '紀元前'
+      return era_year + IMPERIAL_START_YEAR if IMPERIAL_ERA_NAMES.include?(era_name)
+
+      era = ERA_BY_NAME[era_name] or
+        raise ArgumentError, "Undefined era '#{era_name}'"
+      era.year + era_year - 1
+    end
+
+    def civil_to_era_year(era_name, year)
+      era_name = era_name.to_s
+      return year if ['', '西暦'].include?(era_name)
+      return -year if era_name == '紀元前'
+      return year - IMPERIAL_START_YEAR if IMPERIAL_ERA_NAMES.include?(era_name)
+
+      era = ERA_BY_NAME[era_name] or
+        raise ArgumentError, "Undefined era '#{era_name}'"
+      year - era.year + 1
+    end
+
+    def last_day_of_era_month(era_name, civil_year, month, is_leap)
+      if WESTERN_ERA_NAMES.include?(era_name.to_s)
+        ::Date.new(civil_year, month, -1, ::Date::ITALY).day
+      else
+        last_day_of_month(civil_year, month, is_leap)
+      end
     end
 
     def alt_month_name_to_i(name)
@@ -69,23 +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)
-      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)
@@ -111,6 +119,65 @@ 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")。
+    def normalize_time(str)
+      str.to_s =~ TIME_PARSE_QUICK_FILTER or return str
+      str.to_s.sub(TIME_REGEX) { _time_match_to_s(Regexp.last_match) }
+    end
+
+    def _time_match_to_s(match)
+      return '12:00' if match[:noon]
+
+      hour = k2i(match[:hour])
+      hour += 12 if match[:ampm] == '午後' && hour < 12
+      min = 0
+      min = 30 if match[:half]
+      min = k2i(match[:min]) if match[:min]
+      return Kernel.format('%<hour>02d:%<min>02d', hour: hour, min: min) unless match[:sec]
+
+      Kernel.format('%<hour>02d:%<min>02d:%<sec>02d', hour: hour, min: min, sec: k2i(match[:sec]))
+    end
+
+    def number_format(opt)
+      case opt
+      when '', '0', '_0' then '%02d'
+      when '-'           then '%d'
+      when /_\Z/         then '%2d'
+      when /0?_/         then "%#{opt.sub(/0?_/, '')}d"
+      when /_?0/         then "%#{opt.sub(/_?0/, '0')}d"
+      else "%0#{opt}d"
+      end
+    end
+
+    def expand_time_format(format_str, time)
+      format_str.to_str.gsub(TIME_FORMAT_EXPANSION_REGEX) { _format_time_directive($2, $1, time) || $& }
+    end
+
+    def _format_time_directive(key, opt, time)
+      case key.to_sym
+      when :Tf
+        nf = number_format(opt)
+        Kernel.format("#{nf}時#{nf}分#{nf}秒", time.hour, time.min, time.sec)
+      when :TF
+        "#{to_simple_kan(time.hour)}時#{to_simple_kan(time.min)}分#{to_simple_kan(time.sec)}秒"
+      when :TH  then i2z(time.hour)
+      when :THk then to_simple_kan(time.hour)
+      when :TM  then i2z(time.min)
+      when :TMk then to_simple_kan(time.min)
+      when :TS  then i2z(time.sec)
+      when :TSk then to_simple_kan(time.sec)
+      end
+    end
+
     # DEPRECATED
     def kan_to_i(*args)
       warn '[DEPRECATED] Wareki::Utils.kan_to_i: Please use ya_kansuji gem to handle kansuji'
@@ -120,7 +187,7 @@ module Wareki
     # DEPRECATED
     def i_to_kan(*args)
       warn '[DEPRECATED] Wareki::Utils.i_to_kan: Please use ya_kansuji gem to handle kansuji'
-      i2k(*args)
+      YaKansuji.to_kan(*args)
     end
   end
 end

data/lib/wareki/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ya_kansuji
@@ -30,48 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  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
-  prerelease: false
-  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.
@@ -85,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
@@ -95,9 +54,10 @@ files:
 - lib/wareki/version.rb
 homepage: https://github.com/sugi/wareki
 licenses:
-- BSD
-metadata: {}
-post_install_message: 
+- BSD-2-Clause
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,16 +65,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)
 test_files: []