wareki 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be029e4138ca6a683ff52bd0e4070db0bb2e025a9e1024b3a0ad0cd60ca34fa
-  data.tar.gz: e8b300fd9f65529284acdb43e7dfbcd91c3a2e92f07824bcc3500fa78199c2dd
+  metadata.gz: 00264c0e982ca9fc5ddddf077d222e473281f09ae91d1fb4cfc5cd0b445c200a
+  data.tar.gz: 90d886bb8ef63e259e24134ccaeaf3df0722ebc415e15c932f5a6d770a93de55
 SHA512:
-  metadata.gz: ef1021d0c68056c285c2095c83b66adeb8ce25ed4d7530065f9e06e41ed3129251faf094bb599a4cc5c68506586a996b87ecb67c8d72f59da8c9328c2914c876
-  data.tar.gz: d98a3ed03d156f6a3a04931ec62ad4cce55dc008ffbd3c4529a6a41c0cd2b6e5279fce42246359177072568b22527da75dba637cf9050ff10883075934f33899
+  metadata.gz: 8b06ba92792afd6213be68dc40a836f1b7799e8e836052ce3ff17c036a7f33770a8319dc1e714a07168485c791b8e682622bfb5f21e2905696a35fa355a55892
+  data.tar.gz: ad8e3fd61fe9a697d13c90eeead0f3fdc6b973591f9cb99624e609224c326b1a3f8c775ef0d55b8ffbfc408285eb841fbee918d76bcb33fd0c7a03a45e86e766

data/ChangeLog

@@ -1,3 +1,13 @@
+2019-12-24  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 1.1.0
+
+	[ by Akinori MUSHA <knu@idaemons.org> ]
+	* Partially traditional kanji variants support
+	* Compatibility fix: Date.parse with no arguement
+	* Provides Date._parse overrides (currently no kansuji
+	  support for time fields at present)
+
 2019-04-15  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Verion: 1.0.0 🎉, compat with 0.x mostly.

data/README.md

@@ -4,6 +4,7 @@
 [<img src="https://travis-ci.org/sugi/wareki.svg?branch=master" alt="Build Status" />](https://travis-ci.org/sugi/wareki)
 [<img src="https://coveralls.io/repos/sugi/wareki/badge.svg?branch=master&service=github" alt="Coverage Status" />](https://coveralls.io/github/sugi/wareki?branch=master)
 [<img src="https://api.codeclimate.com/v1/badges/c9209422700b526d2b45/maintainability" />](https://codeclimate.com/github/sugi/wareki/maintainability)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9242ddf1725c404aac2d9f82b9bc1d75)](https://www.codacy.com/app/sugi/wareki?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=sugi/wareki&amp;utm_campaign=Badge_Grade)
 
 ## 概要
 
@@ -119,6 +120,8 @@ strftime が拡張されるので、 `config/locale/ja.yml` にそのままフ
 
 ## 追加フォーマット文字列一覧
 
+通常の strftime のフォーマット文字列に **加えて**、 以下が使用できます。これ以外のフォーマット文字列に関しては、そのまま strftime へ引き渡され、プラットフォーム依存で解決されます。
+
 * %Jf: "%Je%Jg年%Js%Jl月%Jd日" の略 (例: 平成23年3月12日)
 * %JF: "%Je%JGK年%JLk%JSk月%JDk日" の略 (例: 平成二十三年三月十二日)
 * %Jy: "%Je%Jg" の略 (元号+半角数字年)

data/lib/wareki.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wareki/version'
 require 'wareki/date'
 require 'wareki/std_ext'

data/lib/wareki/common.rb

@@ -11,28 +11,57 @@ module Wareki
   IMPERIAL_START_YEAR = -660
   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]
+  KANJI_VARIANTS = {
+    '宝' => '寳',
+    '霊' => '靈',
+    '神' => '神',
+    '応' => '應',
+    '暦' => '曆',
+    '祥' => '祥',
+    '寿' => '壽',
+    '斎' => '斉',
+    '観' => '觀',
+    '寛' => '寬',
+    '徳' => '德',
+    '禄' => '祿',
+    '万' => '萬',
+    '福' => '福',
+    '禎' => '禎',
+    '国' => '國',
+    '亀' => '龜',
+    '令' => '令',
+  }.freeze
+  SQUARE_ERAS = {
+    '㍾' => '明治',
+    '㍽' => '大正',
+    '㍼' => '昭和',
+    '㍻' => '平成',
+    '㋿' => '令和',
+  }.freeze
+  NORMALIZE_KANJI_VARIANTS_REGEX = Regexp.union(*KANJI_VARIANTS.values)
+  NORMALIZE_KANJI_VARIANTS_HASH = KANJI_VARIANTS.each_with_object({}) { |(n, s), h| s.each_char { |c| h[c] = n } }
+  NORMALIZE_KANJI_VARIANTS = ->(str) { str.gsub(NORMALIZE_KANJI_VARIANTS_REGEX, NORMALIZE_KANJI_VARIANTS_HASH) }
+  ERA_BY_NAME = Hash[*(ERA_NORTH_DEFS + ERA_DEFS).flat_map { |g| [g.name, g] }]
   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 and next
-    ERA_BY_NAME[alt_era_name] = ERA_BY_NAME[era_name]
-  end
-  {'㍾' => '明治', '㍽' => '大正', '㍼' => '昭和', '㍻' => '平成', '㋿' => '令和'}.each do |short, canon|
-    ERA_BY_NAME[short] = ERA_BY_NAME[canon]
-  end
+  ERA_BY_NAME.default_proc = ->(hash, key) { hash.fetch(SQUARE_ERAS[key] || NORMALIZE_KANJI_VARIANTS[key], nil) }
   ERA_BY_NAME.freeze
-  NUM_CHARS = '零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖〇一二三四五六七八九十拾什卄廿卅丗卌百陌佰皕阡仟千万萬億兆京垓0123456789０１２３４５６７８９'.freeze
+  ERA_REGEX = Regexp.new(
+    Regexp.union(*ERA_BY_NAME.keys, *SQUARE_ERAS.keys).source.gsub(
+      Regexp.union(*KANJI_VARIANTS.keys),
+      KANJI_VARIANTS.each_with_object({}) { |(canon, variants), h| h[canon] = "[#{canon}#{variants}]" }
+    )
+  )
+  NUM_CHARS = '零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖〇一二三四五六七八九十拾什卄廿卅丗卌百陌佰皕阡仟千万萬億兆京垓0123456789０１２３４５６７８９'
   ALT_MONTH_NAME = %w(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月 神無月 霜月 師走).freeze
-  REGEX = %r{^
-    (?<era_name>西暦|紀元前|#{ERA_BY_NAME.keys.join('|')})?
-    (?:(?<year>[元#{NUM_CHARS}]+)年)?
+  REGEX = %r{
+    (?:(?<era_name>紀元前|#{ERA_REGEX})?
+      (?:(?<year>[元#{NUM_CHARS}]+)年))?
     (?:(?<is_leap>閏|潤|うるう)?
       (?:(?<month>[正#{NUM_CHARS}]+)月 |
          (?<alt_month>#{ALT_MONTH_NAME.join('|')})))?
     (?:(?<day>[元朔晦#{NUM_CHARS}]+)日|元旦)?
-  $}x.freeze
+  }x.freeze
 
   class UnsupportedDateRange < StandardError; end
 

data/lib/wareki/date.rb

@@ -26,7 +26,8 @@ module Wareki
 
     def self._parse(str)
       str = str.to_s.gsub(/[[:space:]]/, '')
-      match = (!str.empty? && REGEX.match(str)) or
+      match = REGEX.match(str)
+      match && !match[0].empty? or
         raise ArgumentError, "Invaild Date: #{str}"
       era = match[:era_name]
       if (era.nil? || era == '') && match[:year].nil?

data/lib/wareki/std_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'wareki/date'
 module Wareki
@@ -24,10 +26,20 @@ class Date
 
   class << self
     alias _wareki_parse_orig parse
-    def parse(str, comp = true, start = ::Date::ITALY)
+    def parse(str = '-4712-01-01', comp = true, start = ::Date::ITALY)
       Wareki::Date.parse(str).to_date(start)
     rescue ArgumentError, Wareki::UnsupportedDateRange
       ::Date._wareki_parse_orig(str, comp, start)
     end
+
+    alias _wareki__parse_orig _parse
+    def _parse(str, comp = true)
+      di = Wareki::Date._parse(str)
+      wdate = Wareki::Date.new(di[:era], di[:year], di[:month], di[:day], di[:is_leap])
+    rescue ArgumentError, Wareki::UnsupportedDateRange
+      ::Date._wareki__parse_orig(str, comp)
+    else
+      ::Date._wareki__parse_orig(str.sub(Wareki::REGEX, wdate.strftime('%F ')), comp)
+    end
   end
 end

data/lib/wareki/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wareki
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ya_kansuji