wareki 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39f05936b30d97f43a06edb9d15c7d67bb719e96
-  data.tar.gz: ccd7b79a1bf1dd80c5d7941e3563776821bfa929
+SHA256:
+  metadata.gz: 1b97e0db45629f26f18ac0248bf9607823d956157cd3d3fac9ae29df4192f7c1
+  data.tar.gz: dfe01af9cad263a2dc429e1b9f220d9a66c111ff030214aaae3e5ea1199bb858
 SHA512:
-  metadata.gz: 362fd8803dc51359f7b90e3a56bad1767c6feb4d2253270cc0d6d748d35b98ac92bb6d9f24e2adcf45d57236a956b909d8e0f78cb7b9652306b4c1b12bd25835
-  data.tar.gz: 435a35906ed7100d2f808bdaf8051b9db778fc76e9ff0fcf8d8e646da5e1319a511ead388fe0159832b8268e681c5c231b1abf8c9ac996abf8c71e1ae70e0913
+  metadata.gz: cbc653ad671c59142a02f83d972c75519ec0d63c8fb77f1179be4b2d27e938dd2a3341f2be35b2143f26ad524d542293c2379a70baebf5a79c7d4d132509d888
+  data.tar.gz: d9a1b4dd4ae9e882dd4a330a3c566da85b52988716ec481f4c906c364855f92cadebe3d4a8ca064689c0abfa4e8f48bc64e206ac9175c1d25366a1684c9aa686

data/ChangeLog

@@ -1,3 +1,9 @@
+2019-04-01  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 0.4.0
+	* Add new era "令和"
+	* Support parse without year (#8)
+
 2018-11-09  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.3.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= ruby 和暦ライブラリ
+= wareki - ruby 和暦ライブラリ
 
 {<img src="https://badge.fury.io/rb/wareki.svg" alt="Gem Version" />}[https://badge.fury.io/rb/wareki]
 {<img src="https://travis-ci.org/sugi/wareki.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/sugi/wareki]
@@ -15,7 +15,7 @@
 
 * 和暦文字列のパース
   * 旧字体、１文字元号のサポート (慶應、萬延、㍻ など)
-  * 全角数字、漢数字、全角ゼロのサポート (１０月、十月、一〇月)
+  * 全角数字、漢数字、全角ゼロ、大字のサポート (１０月、十月、一〇月、拾月、什月)
   * 閏月サポート
   * 月の別名のサポート (如月、弥生、師走など)
   * 元年、正月、朔日、晦日、廿一日、卅日 などの特殊な表記の日付サポート

data/lib/wareki.rb

@@ -1,2 +1,3 @@
+require 'wareki/version'
 require 'wareki/date'
 require 'wareki/std_ext'

data/lib/wareki/calendar_def.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Wareki
   Year = Struct.new(:year, :start, :end, :leap_month, :month_starts, :month_days)
   YEAR_DEFS = [

data/lib/wareki/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wareki/calendar_def'
 require 'wareki/era_def'
 require 'date'
@@ -29,7 +31,7 @@ module Wareki
     (?:(?<is_leap>閏|潤|うるう)?
       (?:(?<month>[正#{NUM_CHARS}]+)月 |
          (?<alt_month>#{ALT_MONTH_NAME.join('|')})))?
-    (?:(?<day>[元朔晦#{NUM_CHARS}]+)日)?
+    (?:(?<day>[元朔晦#{NUM_CHARS}]+)日|元旦)?
   $}x.freeze
 
   class UnsupportedDateRange < StandardError; end

data/lib/wareki/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'wareki/common'
 require 'wareki/utils'
@@ -25,8 +27,12 @@ module Wareki
       match = REGEX.match(str.to_s.gsub(/[[:space:]]/, '')) or
         raise ArgumentError, "Invaild Date: #{str}"
       era = match[:era_name]
-      (year = Kansuji.k2i(match[:year])) > 0 or
-        raise ArgumentError, "Invalid year: #{str}"
+      if (era.nil? || era == '') && match[:year].nil?
+        year = Date.today.year
+      else
+        (year = Kansuji.k2i(match[:year])) > 0 or
+          raise ArgumentError, "Invalid year: #{str}"
+      end
       month = day = 1
 
       era.to_s != '' && era.to_s != '紀元前' && !ERA_BY_NAME[era] and

data/lib/wareki/era_def.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 # coding: utf-8
 module Wareki
+  DAY_MAX = 1684383730585466947585
   Era = Struct.new(:name, :year, :start, :end)
   ERA_DEFS = [
     Era.new("大化", 645, 1956842, 1958551),
@@ -248,7 +250,8 @@ module Wareki
     Era.new("明治", 1868, 2403357, 2419613),
     Era.new("大正", 1912, 2419614, 2424874),
     Era.new("昭和", 1926, 2424875, 2447534),
-    Era.new("平成", 1989, 2447535, 1684383730585466947585),
+    Era.new("平成", 1989, 2447535, 2458604),
+    Era.new("令和", 2019, 2458605, DAY_MAX),
   ].freeze
   ERA_NORTH_DEFS = [
     Era.new("大化", 645, 1956842, 1958551),
@@ -497,6 +500,7 @@ module Wareki
     Era.new("明治", 1868, 2403357, 2419613),
     Era.new("大正", 1912, 2419614, 2424874),
     Era.new("昭和", 1926, 2424875, 2447534),
-    Era.new("平成", 1989, 2447535, 1684383730585466947585),
+    Era.new("平成", 1989, 2447535, 2458604),
+    Era.new("令和", 2019, 2458605, DAY_MAX),
   ].freeze
 end

data/lib/wareki/kansuji.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wareki
   # Utilities of kansuji/integer converter.
   module Kansuji

data/lib/wareki/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wareki
   # Static utility methods.
   module Utils

data/lib/wareki/version.rb

@@ -1,3 +1,3 @@
 module Wareki
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-04-01 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
   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
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)