wareki 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17edc37b9e9bab6955fa886a4b2150927d75e1c
-  data.tar.gz: cf48656bd64cbbf26a3d541af8f553e649d4757e
+  metadata.gz: 024750af6c60493ab9b817b2ac9e81a7cffd96f5
+  data.tar.gz: 61981fbbe3734009c05bbaabe56370c9b083cbcf
 SHA512:
-  metadata.gz: 4b437da1a431d1059d5ff1a4f849e999613cb06ca94c0b6d47d86350cf7e18abc30bc993605a41432ab3f64c50a606406ee3c69dd484ee7f0d440372cb26efb5
-  data.tar.gz: 3cfc6b10e3906c358d57c19bf179f440df2b18c2365989f7b80d66637c628875fa16cc441d53dcbea9a582855b0e5ce93582d0b379397502a5d00930a65b21ff
+  metadata.gz: 8bdbf8c2f81dc966ede8c24633fb8a6c541e4e2b30907d3d804da4e01a43387420b534811b79f7e7c6b8482630b59afd58eabed2f301089f2f4302c2f6d7185e
+  data.tar.gz: 5b7093d249fad9fe6389620104f04f40aeebbd14e000a5c8c3fa120f45bbf14ad562ef48c9a57f111a7ac0a9ec779c4a8b67f54fe68eb837324bc8ae3d103586

data/ChangeLog

@@ -1,3 +1,8 @@
+2018-08-27  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 0.2.1
+	* Support square era name chars (㍾ ㍽ ㍼ ㍻)
+
 2017-07-25  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.2.0

data/README.rdoc

@@ -3,6 +3,7 @@
 {<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]
 {<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]
 
 == 概要
 
@@ -13,13 +14,13 @@
 == 機能
 
 * 和暦文字列のパース
-  * 旧字体を含む元号のサポート (慶應、萬延など)
-  * 漢数字サポート
+  * 旧字体、１文字元号のサポート (慶應、萬延、㍻ など)
+  * 全角数字、漢数字、全角ゼロのサポート (１０月、十月、一〇月)
   * 閏月サポート
-  * 月の別名(如月、弥生、師走など)のサポート
+  * 月の別名のサポート (如月、弥生、師走など)
   * 元年、正月、朔日、晦日、廿一日、卅日 などの特殊な表記の日付サポート
 * Date クラスの拡張
-  * strftime に和暦フォーマット文字列を追加
+  * 標準の strftime に和暦へのフォーマット文字列を追加
   * to_wareki_date を追加
   * Date::JAPAN (明治改暦日)の追加
 
@@ -37,14 +38,17 @@ Gemfile に以下のようにするか、
 
  require 'wareki'
 
+ # 和暦へのフォーマット
  Date.today.strftime("%JF")              # => "平成二十七年八月二十二日"
  Date.civil(1311, 7, 20).strftime("%JF") # => "応長元年閏六月四日"
 
- Date.today.to_wareki_date # => Wareki::Date インスタンス
- Wareki::Date.new("明治", 8, 2, 1).to_date # => 標準 Date インスタンス 1875-02-01
+ # 和暦のパース
+ Date.parse("正嘉元年 うるう3月 １２日") # => 標準 Date インスタンス 1257-04-27
 
+ # Wareki::Date を直接扱う場合
+ Date.today.to_wareki_date # => Wareki::Date インスタンス
  Wareki::Date.parse("正嘉元年 うるう3月 １２日") # => Wareki::Date インスタンス
- Date.parse("正嘉元年 うるう3月 １２日)" # => 標準 Date インスタンス 1257-04-27
+ Wareki::Date.new("明治", 8, 2, 1).to_date # => 標準 Date インスタンス 1875-02-01
 
 == フォーマット文字列
 

data/lib/wareki/common.rb

@@ -17,6 +17,9 @@ module Wareki
     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.freeze
   NUM_CHARS = "零〇一二三四五六七八九十卄廿卅丗卌肆百皕千万億兆0123456789０１２３４５６７８９"
   ALT_MONTH_NAME = %w(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月 神無月 霜月 師走).freeze

data/lib/wareki/date.rb

@@ -11,19 +11,27 @@ module Wareki
       jd(::Date.today.jd)
     end
 
+    def self._check_invalid_date(era, year, month, day)
+      month == 12 or return true
+      day > 2 or return true
+      (era == "明治" && year == 5 ||
+       era.to_s == "" && year == GREGORIAN_START_YEAR - 1 ||
+       %w(皇紀 神武天皇即位紀元).member?(era) &&
+       year == GREGORIAN_START_YEAR - IMPERIAL_START_YEAR - 1) or
+        return true
+      false
+    end
+
     def self._parse(str)
-      match = REGEX.match(str.to_s.gsub(/[[:space:]]/, ''))
-      if !match || !match[:year]
+      match = REGEX.match(str.to_s.gsub(/[[:space:]]/, '')) or 
         raise ArgumentError, "Invaild Date: #{str}"
-      end
       era = match[:era_name]
-      year = Utils.kan_to_i(match[:year])
-      month = 1
-      day = 1
+      (year = Utils.kan_to_i(match[:year])) > 0 or
+        raise ArgumentError, "Invalid year: #{str}"
+      month = day = 1
 
-      if era.to_s != "" && era.to_s != "紀元前" && !ERA_BY_NAME[era]
+      era.to_s != "" && era.to_s != "紀元前" && !ERA_BY_NAME[era] and
         raise ArgumentError, "Date parse failed: Invalid era name '#{match[:era_name]}'"
-      end
 
       if match[:month]
         month = Utils.kan_to_i(match[:month])
@@ -31,7 +39,7 @@ module Wareki
         month = Utils.alt_month_name_to_i(match[:alt_month])
       end
 
-      month > 12 || month < 0 and
+      month > 12 || month < 1 and
         raise ArgumentError, "Invalid month: #{str}"
 
       if match[:day]
@@ -42,13 +50,8 @@ module Wareki
         end
       end
 
-      if (era == "明治" && year == 5 ||
-          era.to_s == "" && year == GREGORIAN_START_YEAR - 1 ||
-          (era == "皇紀" || era == "神武天皇即位紀元") &&
-          year == GREGORIAN_START_YEAR - IMPERIAL_START_YEAR - 1) &&
-          month == 12 && day > 2
+      _check_invalid_date(era, year, month, day) or
         raise ArgumentError, "Invaild Date: #{str}"
-      end
 
       {era: era, year: year, month: month, day: day, is_leap: !!match[:is_leap]}
     end
@@ -234,23 +237,19 @@ module Wareki
     end
 
     def -(other)
-      if other.class.to_s == "ActiveSupport::Duration"
-        raise NotImplementedError, "Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric."
-      else
-        other.respond_to?(:to_date) and other = other.to_date
-        other.respond_to?(:jd) and other = other.jd
-        self.class.jd jd - other
-      end
+      self.class.jd jd - _to_jd_for_calc(other)
     end
 
     def +(other)
-      if other.class.to_s == "ActiveSupport::Duration"
+      self.class.jd jd + _to_jd_for_calc(other)
+    end
+
+    def _to_jd_for_calc(other)
+      other.class.to_s == "ActiveSupport::Duration" and
         raise NotImplementedError, "Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric."
-      else
-        other.respond_to?(:to_date) and other = other.to_date
-        other.respond_to?(:jd) and other = other.jd
-        self.class.jd jd + other
-      end
+      other.respond_to?(:to_date) and other = other.to_date
+      other.respond_to?(:jd) and other = other.jd
+      other
     end
   end
 end

data/lib/wareki/utils.rb

@@ -1,6 +1,19 @@
 # coding: utf-8
 module Wareki
   module Utils
+    UNIT_SUFFIX1 = {
+      '千' => 1000,
+      '百' => 100,
+      '十' => 10,
+      ''   => 1,
+    }
+    UNIT_SUFFIX2 = {
+      '京' => 10000000000000000,
+      '兆' => 1000000000000,
+      '億' => 100000000,
+      '万' => 10000,
+      ''   => 1,
+    }
     module_function
     def kan_to_i(str)
       ret3 = 0
@@ -53,13 +66,7 @@ module Wareki
 
     def i_to_kan(num, opts = {})
       ret = ''
-      {
-        '京' => 10000000000000000,
-        '兆' => 1000000000000,
-        '億' => 100000000,
-        '万' => 10000,
-        ''   => 1,
-      }.each do |unit4, rank4|
+      UNIT_SUFFIX2.each do |unit4, rank4|
         i4 = (num / rank4).to_i % 10000
         if i4 == 0
           next
@@ -67,12 +74,7 @@ module Wareki
           ret += "一#{unit4}"
           next
         end
-        {
-          '千' => 1000,
-          '百' => 100,
-          '十' => 10,
-          ''   => 1,
-        }.each do |unit1, rank1|
+        UNIT_SUFFIX1.each do |unit1, rank1|
           i1 = (i4 / rank1).to_i % 10
           if i1 == 0
             next
@@ -93,25 +95,32 @@ module Wareki
 
     def last_day_of_month(year, month, is_leap)
       if year >= GREGORIAN_START_YEAR
-        tmp_y = year
-        tmp_m = month
-        if month == 12
-          tmp_y += 1
-          tmp_m = 1
-        else
-          tmp_m += 1
-        end
-        day = (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN)-1).day
+        _last_day_of_month_gregorian(year, month, is_leap)
       else
-        yobj = YEAR_BY_NUM[year] or
-          raise UnsupportedDateRange, "Cannot find year #{self.inspect}"
-        month_idx = month - 1
-        if is_leap || yobj.leap_month && yobj.leap_month < month
-          month_idx += 1
-        end
-        day = yobj.month_days[month_idx]
+        _last_day_of_month_from_defs(year, month, is_leap)
+      end
+    end
+
+    def _last_day_of_month_gregorian(year, month, is_leap)
+      tmp_y = year
+      tmp_m = month
+      if month == 12
+        tmp_y += 1
+        tmp_m = 1
+      else
+        tmp_m += 1
       end
-      day
+      (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN)-1).day
+    end
+
+    def _last_day_of_month_from_defs(year, month, is_leap)
+      yobj = YEAR_BY_NUM[year] or
+        raise UnsupportedDateRange, "Cannot find year #{self.inspect}"
+      month_idx = month - 1
+      if is_leap || yobj.leap_month && yobj.leap_month < month
+        month_idx += 1
+      end
+      yobj.month_days[month_idx]
     end
 
     def alt_month_name_to_i(name)
@@ -145,9 +154,8 @@ module Wareki
 
     def find_date_ary(d)
       d = _to_date(d).new_start(::Date::GREGORIAN)
-      if d.jd >= GREGORIAN_START
+      d.jd >= GREGORIAN_START and
         return [d.year, d.month, d.day, false]
-      end
 
       yobj = find_year(d) or raise UnsupportedDateRange, "Unsupported date: #{d.inspect}"
       month = 0
@@ -159,9 +167,8 @@ module Wareki
       end
       month_start = yobj.month_starts[month-1]
       is_leap = (yobj.leap_month == (month - 1))
-      if yobj.leap_month && yobj.leap_month < month
+      yobj.leap_month && yobj.leap_month < month and
         month -= 1
-      end
       [yobj.year, month, d.jd - month_start +1, is_leap]
     end
 

data/lib/wareki/version.rb

@@ -1,3 +1,3 @@
 module Wareki
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-08-27 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.2.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)