wareki 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e6a9393b513cbd061933550558007a4aaed2d8
-  data.tar.gz: 381b7cf7b1e169d6c6f46775eb06d9a3306c5937
+  metadata.gz: 580a31cae7a0a20059c2e914c08a0fd5793fa715
+  data.tar.gz: 0d965affe4eb6a63e64b2c7fc3dd3f0038fe87e4
 SHA512:
-  metadata.gz: 3f2d1c15b3b9ab624c4413b05a57645d350855365f0d1dc9e3c7f119d2670c649955124e40bd7963867da21a85cc130cec3837aff1f96fd78f1d67fa03943bd7
-  data.tar.gz: a42f7a5f4e3c6819e3497fd0b612b3c70d8282b3ef860296f15a0cd4e84b6ebe4005d9b4e3a7fb8b182cc95de50159abf769601ec39404500f61d9d1230ed1e9
+  metadata.gz: 4118d6b51ee6f34dde41d0009a57e695bf4c2e5070e64a014b87f2b5747eb8ef798ea89bab59cdbdc078a8fe7d7d605197d862e45bd089e817fe8d768204e596
+  data.tar.gz: b9206e669bdd95e22fabe2cf8f4c200c69e04abbc07d56bced3802456745b8ac1da4c909f0c87ab3f39d75dd98ae57f1fcbea2530aafe5808bc8f27980701e99

data/ChangeLog

@@ -0,0 +1,21 @@
+2017-02-04  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.3
+	* Fix last day of era/year handling issue (#2)
+	* Fix kansuji converter for large numbers
+	  (This is NOT affected with ordinal date numbers)
+
+2015-09-03  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.2
+	* Fix file permissions (#1)
+
+2015-08-23  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.1
+	* Fix gemspec: dependency of ruby version
+
+2015-08-23  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.0.
+	* First release

data/README.rdoc

@@ -1,5 +1,9 @@
 = 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]
+{<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]
+
 == 概要
 
 日本の和暦をサポートするライブラリです。
@@ -96,6 +100,14 @@ Gemfile に以下のようにするか、
 * 旧暦: {suikawiki - 旧暦}[http://wiki.suikawiki.org/n/%E6%97%A7%E6%9A%A6#section-%E5%AF%BE%E7%85%A7%E8%A1%A8%E3%81%A8%E5%A4%89%E6%8F%9B%E3%83%84%E3%83%BC%E3%83%AB] にある「日本暦日原典」第4版準拠の先発グレゴリオ暦対照表
 * 元号: {Wikipedia - 元号一覧_(日本)}[https://ja.wikipedia.org/wiki/%E5%85%83%E5%8F%B7%E4%B8%80%E8%A6%A7_%28%E6%97%A5%E6%9C%AC%29] のユリウス歴とグレゴリオ暦表記の物を利用しています
 
+== ライセンス
+
+{The BSD 2-Clause License}[https://opensource.org/licenses/BSD-2-Clause]
+
+== 作者
+
+Tatsuki Sugiura <sugi@nemui.org>
+
 == TODO
 * 北朝モード
 * Wareki::Date で各種計算のサポート

data/lib/wareki/common.rb

@@ -7,7 +7,7 @@ module Wareki
   GREGORIAN_START_YEAR = 1873
   IMPERIAL_START = 1480041  # Date.new(-660, 2, 11, Date::GREGORIAN).jd
   IMPERIAL_START_YEAR = -660
-  DATE_INFINITY = ::Date.new(2**(0.size * 8 -2) -1, 12, 31) # Use max Fixnum as year.
+  DATE_INFINITY = ::Date.new(280000000, 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]
   ERA_BY_NAME['皇紀'] = ERA_BY_NAME['神武天皇即位紀元'] = Era.new('皇紀', -660, 1480041, DATE_INFINITY.jd)

data/lib/wareki/date.rb

@@ -172,7 +172,7 @@ module Wareki
       when :s; month
       when :S; Utils.i_to_zen(month)
       when :Sk; Utils.i_to_kan(month)
-      when :SK; ALT_MONTH_NAME[month-1]
+      when :SK; Utils.alt_month_name(month)
       when :l; leap_month? ? "'" : ""
       when :L; leap_month? ? "’" : ""
       when :Lk; leap_month? ? "閏" : ""

data/lib/wareki/utils.rb

@@ -1,8 +1,10 @@
+# coding: utf-8
 module Wareki
   module Utils
     module_function
     def kan_to_i(str)
-      ret = 0
+      ret3 = 0
+      ret4 = 0
       curnum = nil
       str == "零" and return 0
       str.to_s.each_char do |c|
@@ -17,31 +19,36 @@ module Wareki
         when "〇", "０", "0"
           curnum and curnum *= 10
         when "卄", "廿"
-          ret += 20
+          ret3 += 20
           curnum = nil
         when "卅", "丗"
-          ret += 30
+          ret3 += 30
           curnum = nil
         when "卌"
-          ret += 40
+          ret3 += 40
           curnum = nil
         when "皕"
-          ret += 200
+          ret3 += 200
           curnum = nil
-        when "十", "百", "千", "万", "億", "兆"
+        when "万", "億", "兆", "京", "垓"
           if curnum
-            ret += curnum * 10 ** (["十", "百", "千", "万", "億", "兆"].index(c)+1)
-          else
-            ret += 10 ** (["十", "百", "千", "万", "億", "兆"].index(c)+1)
+            ret3 += curnum
+            curnum = nil
           end
+          ret3 = 1 if ret3 == 0
+          ret4 += ret3 * 10 ** ((["万", "億", "兆", "京", "垓"].index(c)+1)*4)
+          ret3 = 0
+        when "十", "百", "千"
+          curnum ||= 1
+          ret3 += curnum * 10 ** (["十", "百", "千"].index(c)+1)
           curnum = nil
         end
       end
       if curnum
-        ret += curnum
+        ret3 += curnum
         curnum = nil
       end
-      ret
+      ret4 + ret3
     end
 
     def i_to_kan(num, opts = {})
@@ -160,14 +167,17 @@ module Wareki
 
     def find_year(d)
       jd = _to_jd(d)
-      YEAR_DEFS.bsearch{|y| y.end > jd }
+      YEAR_DEFS.bsearch{|y| y.end >= jd }
     end
 
     def find_era(d)
       jd = _to_jd(d)
-      e = ERA_DEFS.bsearch{|e| e.end > jd }
-      e.start > jd and return nil
-      e
+      ERA_DEFS.reverse_each { |e|
+        e.start > jd and next
+        e.end < jd and next
+        return e
+      }
+      return nil
     end
   end
 end

data/lib/wareki/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ChangeLog
 - LICENSE
 - README.rdoc
 - lib/wareki.rb
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)