wareki 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 580a31cae7a0a20059c2e914c08a0fd5793fa715
-  data.tar.gz: 0d965affe4eb6a63e64b2c7fc3dd3f0038fe87e4
+  metadata.gz: 9b36739d46cbd6fd70410c22e27494c22d4bb895
+  data.tar.gz: cff175bc8ba633cb0521eb0d2e330be0f7568c09
 SHA512:
-  metadata.gz: 4118d6b51ee6f34dde41d0009a57e695bf4c2e5070e64a014b87f2b5747eb8ef798ea89bab59cdbdc078a8fe7d7d605197d862e45bd089e817fe8d768204e596
-  data.tar.gz: b9206e669bdd95e22fabe2cf8f4c200c69e04abbc07d56bced3802456745b8ac1da4c909f0c87ab3f39d75dd98ae57f1fcbea2530aafe5808bc8f27980701e99
+  metadata.gz: d388a21610e1f9be78807c87898d4c9b6df93302f6d8b97a7590e35b81903d2c6a69dde21aacead7d3384622f8c84cdd55ddd96cad850c6a8fe7e2ffde2075ed
+  data.tar.gz: 3091f85bde645d4d34ba827bd8e94e3bf4e332dbdf265c9ab6702414746a283e029bc06c4e75da871b37fa82373b5fb0506e278af9f5b2f23c34c0300acc769a

data/ChangeLog

@@ -1,3 +1,8 @@
+2017-06-01  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 0.1.4
+	* Add ad-hoc support for 西暦 and 紀元前
+
 2017-02-04  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version 0.1.3

data/lib/wareki/common.rb

@@ -11,6 +11,7 @@ module Wareki
   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)
   ERA_BY_NAME.keys.each do |era_name|
     alt_era_name = era_name.tr("宝霊神応暦祥寿斎観寛徳禄万福禎国亀", "寳靈神應曆祥壽斉觀寬德祿萬福禎國龜")
     alt_era_name == era_name and next
@@ -20,7 +21,7 @@ module Wareki
   NUM_CHARS = "零〇一二三四五六七八九十卄廿卅丗卌肆百皕千万億兆0123456789０１２３４５６７８９"
   ALT_MONTH_NAME = %w(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月 神無月 霜月 師走).freeze
   REGEX = %r{^
-    (?<era_name>西暦|#{ERA_BY_NAME.keys.join('|')})?
+    (?<era_name>西暦|紀元前|#{ERA_BY_NAME.keys.join('|')})?
     (?:(?<year>[元#{NUM_CHARS}]+)年)?
     (?:(?<is_leap>閏|潤|うるう)?
       (?:(?<month>[正#{NUM_CHARS}]+)月 |

data/lib/wareki/date.rb

@@ -18,7 +18,7 @@ module Wareki
       month = 1
       day = 1
 
-      if era.to_s != "" && !ERA_BY_NAME[era]
+      if era.to_s != "" && era.to_s != "紀元前" && !ERA_BY_NAME[era]
         raise ArgumentError, "Date parse failed: Invalid era name '#{match[:era_name]}'"
       end
 
@@ -73,7 +73,7 @@ module Wareki
     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]
+      if era_name.to_s != "" && era_name != "紀元前" && !ERA_BY_NAME[era_name]
         raise ArgumentError, "Undefined era '#{era_name}'"
       end
       @month = month
@@ -81,10 +81,12 @@ module Wareki
       @is_leap_month = is_leap_month
       @era_name = era_name
       @era_year = era_year
-      if era_name.to_s == ""
+      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 == "紀元前"
+        @year = -@era_year
       else
         @year = ERA_BY_NAME[era_name].year + era_year - 1
       end
@@ -111,7 +113,7 @@ module Wareki
     end
 
     def month_index
-      if @era_name == "西暦" || @year >= GREGORIAN_START_YEAR
+      if @era_name == "" || @era_name == "西暦" || @era_name == "紀元前" || @year >= GREGORIAN_START_YEAR
         return month -1
       end
 
@@ -127,7 +129,7 @@ module Wareki
     def jd
       @jd and return @jd
 
-      if @era_name == "西暦"
+      if @era_name == "西暦" || @era_name == "" || @era_name == "紀元前"
         return @jd = ::Date.new(@year, month, day, ::Date::ITALY).jd
       elsif @year >= GREGORIAN_START_YEAR
         return @jd = ::Date.new(@year, month, day, ::Date::GREGORIAN).jd

data/lib/wareki/version.rb

@@ -1,3 +1,3 @@
 module Wareki
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)