when_exe 0.3.7 → 0.3.8

data/test/test.rb

@@ -51,6 +51,8 @@ require './test/googlecalendar'
 require './test/region/m17n'
 require './test/region/residue'
 require './test/region/christian'
+require './test/region/swedish'
+require './test/region/armenian'
 require './test/region/japanese'
 require './test/region/chinese'
 require './test/region/vietnamese'
@@ -63,5 +65,10 @@ require './test/region/mayan'
 require './test/region/jewish'
 require './test/region/french'
 require './test/region/coptic'
+require './test/region/bahai'
+require './test/region/discordian'
+require './test/region/zoroastrian'
 require './test/region/yerm'
+require './test/region/reforms'
+require './test/region/shire'
 require './test/region/geologicalage'

data/test/test/basictypes.rb

@@ -326,6 +326,28 @@ module MiniTest
           end
         end
       end
+
+      def test__abbr_and_extra_year_digits
+
+        assert_equal('-00500',     When.when?('-005').to_s)
+        assert_equal('2013-01-05', When.when?('-005', {:abbr=>2013}).to_s)
+        assert_equal('-000005',    When.when?('-005', {:extra_year_digits=>2}).to_s)
+
+        assert_equal('1900',       When.when?('19').to_s)
+        assert_equal('1900',       When.when?('19', {:extra_year_digits=>0 }).to_s)
+        assert_equal('0019',       When.when?('19', {:extra_year_digits=>-1}).to_s)
+
+        [['019',        ["0019",    -2, "0019-01-01"  ]],
+         ['0019',       ["0019",    -2, "0019-01-01"  ]],
+         ['+019',       ["1900",    -4, "1900-01-01"  ]],
+         ['-119',       ["-11900",  -4, "-11900-01-01"]],
+         ['-0119',      ["-00119",  -2, "-00119-01-01"]],
+         ['+01985-04',  ["1985-04", -1, "1985-04-01"  ]],
+         ['+001985-04', ["1985-04", -1, "1985-04-01"  ]]].each do |sample|
+          date = When.when?(sample[0])
+          assert_equal(sample[1], [date.to_s, date.precision, date.floor.to_s])
+        end
+      end
     end
 
     #

data/test/test/coordinates.rb

@@ -350,7 +350,8 @@ module MiniTest::Coordinates
         assert_equal( '40.0000N', location.lat_s)
         assert_equal('139.421322E',location.long_s)
       else
-        puts "\nTests for JSON have been skipped at line #{__LINE__} of #{__FILE__.split(/\//)[-1]}.\n"
+        puts
+        puts "Tests for JSON have been skipped at line #{__LINE__} of #{__FILE__.split(/\//)[-1]}."
       end
     end
 

data/test/test/ephemeris.rb

@@ -57,9 +57,21 @@ module MiniTest::Ephemeris
   class Formula < MiniTest::TestCase
     def test__sunrise
 
-      today = '2014-3-4'
+      assert_raises(NoMethodError) { When.when?('2012-11-15').sunrise }
+
+      assert_equal(nil, When.when?('2013-06-21T+09:00', :long=>135, :lat=>70).sunrise)
+
+      if Object.const_defined?(:TZInfo)
+        assert_equal(0, /2012-11-15T06:16/ =~ When.when?('2012-11-15', :tz=>'Asia/Tokyo').sunrise.to_s)
+        assert_equal(0, /2012-11-15T06:16/ =~ When.when?('2012-11-15', :tz=>'Asia/Tokyo', :location=>'_l:long=139.7414&lat=35.6581').sunrise.to_s)
+      else
+        puts
+        puts "Tests for TZInfo have been skipped at line #{__LINE__} of #{__FILE__.split(/\//)[-1]}."
+      end
+      assert_equal(0, /2012-11-15T06:16/ =~ When.when?('2012-11-15T+09:00', :long=>139.7414, :lat=>35.6581).sunrise.to_s)
+      assert_equal(0, /2012-11-14T21:16/ =~ When.when?('2012-11-15', :long=>139.7414, :lat=>35.6581).sunrise.to_s)
 
-      assert_raises(NoMethodError) { When.when?(today).sunrise }
+      today = '2014-3-4'
 
       location = When.Location('long=139.413012E&lat=35.412222N')
       assert_equal(0, /2014-03-03T21:07/ =~ When.when?(today, {:location=>location}).sunrise.to_s)
@@ -80,4 +92,24 @@ module MiniTest::Ephemeris
       assert_equal('2014-07-07T13:15+09:00', formula2.nearest_past(date, 0.5).floor(When::MINUTE).to_s)
     end
   end
+
+  if Object.const_defined?(:TZInfo)
+    class Note < MiniTest::TestCase
+      def test__tide
+
+        sample = [%w(2013-10-02T02:58+09:00 _n:Ephemeris/Notes::day::Tide::Low_Tide),
+                  %w(2013-10-02T09:09+09:00 _n:Ephemeris/Notes::day::Tide::High_Tide),
+                  %w(2013-10-02T15:20+09:00 _n:Ephemeris/Notes::day::Tide::Low_Tide),
+                  %w(2013-10-02T21:32+09:00 _n:Ephemeris/Notes::day::Tide::High_Tide)]
+
+        note = When.CalendarNote('Ephemeris?interval=0.0')
+        date = When.when?('2013-10-02', :tz=>'Asia/Tokyo')
+        note.tide(date).each do |d|
+          assert_equal(sample.shift, [d.floor(When::MINUTE).to_s, d.events[0].iri(true)])
+        end
+      end
+    end
+  else
+    puts "Tests for TZInfo have been skipped at line #{__LINE__} of #{__FILE__.split(/\//)[-1]}."
+  end
 end

data/test/test/icalendar.rb

@@ -802,6 +802,18 @@ module MiniTest:V
       assert_equal([], sample)
     end
 
+    def test__each_5
+      event5 = When::V::Event.new({
+          'rrule'   => 'FREQ=MONTHLY;BYMONTHDAY=31',
+          'dtstart' => 'VALUE=DATE:20070131'
+        })
+      sample =%w(2007-01-31 2007-03-31 2007-05-31 2007-07-31 2007-08-31
+                 2007-10-31 2007-12-31 2008-01-31 2008-03-31 2008-05-31)
+      event5.enum_for(When.when?('20070101'), :forward, 10).each do |date|
+        assert_equal(sample.shift, date.to_s)
+      end
+    end
+
     class Enumerator < MiniTest::TestCase
 
       def test_nothing

data/test/test/inspect.rb

@@ -112,6 +112,42 @@ module MiniTest
           end
         end
       end
-   end
+    end
+
+    def test__month_included
+      assert_equal([['December 2013',
+                    ['*', '-', '-', '-', '-', '-', 1, 2],
+                    ['*', 3, 4, 5, 6, 7, 8, 9],
+                    ['*', 10, 11, 12, 13, 14, 15, 16],
+                    ['*', 17, 18, 19, 20, 21, 22, 23],
+                    ['*', 24, 25, 26, 27, 28, 29, 30, 31]]],
+
+        When.when?('2013-12-30').month_included('WorldWeek') {|date, type|
+          case type
+          when When::YEAR  ; date.strftime('%Y')
+          when When::MONTH ; date.strftime('%B %Y')
+          when When::WEEK  ; '*'
+          when When::DAY   ; date[When::DAY]
+          else             ; '-'
+          end
+        })
+    end
+
+    def test__round
+      date = When.when?("2010-09-29T14:45:12.33+09:00")
+      assert_equal(%w(2010-09-29T14:45:12.33+09:00 2010-09-29T14:45:12+09:00), [date.to_s, date.to_s(3, true)])
+
+      date = When.when?('2013-10-28T23:59:59.999', :clock=>'+09:00', :precision=>3)
+      assert_equal(%w(2013-10-28T23:59:59+09:00    2013-10-28T24:00:00+09:00), [date.to_s, date.to_s(3, true)])
+
+      date = When.when?('2013-10-28T23:59:59.999', :clock=>'+09:00')
+      assert_equal(%w(2013-10-28T23:59:59.99+09:00 2013-10-28T24:00:00+09:00), [date.to_s, date.to_s(3, true)])
+
+      date = When.when?('2013-10-28T23:59:29.999', :clock=>'+09:00')
+      assert_equal(%w(2013-10-28T23:59:29.99+09:00 2013-10-28T23:59+09:00),    [date.to_s, date.to_s(2, true)])
+
+      date = When.when?('2013-10-28T23:59:30.001', :clock=>'+09:00')
+      assert_equal(%w(2013-10-28T23:59:30.00+09:00 2013-10-28T24:00+09:00),    [date.to_s, date.to_s(2, true)])
+    end
   end
 end

data/test/test/parts.rb

@@ -119,10 +119,11 @@ LOCALE
 
     def test__prefix
       date = When.when?('0594-09=12^Japanese')
-      assert_equal(["閏長月", String], [date.name('Month').label.to_s, date.name('Month').label.class])
-      assert_equal(["閏長月", String], [date.name('Month').to_s,  date.name('Month').to_s.class])
+      assert_equal(["閏九月", String], [date.name('Month').label.to_s, date.name('Month').label.class])
+      assert_equal(["閏九月", String], [date.name('Month').to_s,  date.name('Month').to_s.class])
       assert_equal("http://ja.wikipedia.org/wiki/%E9%96%8F", date.name('Month').reference('ja'))
-      assert_equal("閏長月", date.name('Month').translate('日本語'))
+      assert_equal("閏九月", date.name('Month').translate('日本語'))
+      assert_equal("閏長月", date.name('Month').translate('alias'))
       assert_equal("Intercalary Month 9", date.name('Month').translate('en_US'))
     end
 

data/test/test/region/armenian.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2014 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Armenian < MiniTest::TestCase
+    def test__armenian
+      date = When.when?('1-1-1^^Armenian')
+      assert_equal(["0001-01-01", "0552-07-11"], [date.to_s, (When::Julian ^ date).to_s])
+
+      date = When.when?('1462-1-1^^Armenian')
+      assert_equal(["1462-01-01", "2012-07-24"], [date.to_s, (When::Gregorian ^ date).to_s])
+    end
+  end
+end

data/test/test/region/bahai.rb

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2014 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Bahai < MiniTest::TestCase
+    def test_bahai
+      date = When.when? '1.9.1.1.1^^Bahai?location=(_co:Iranian::Tehran)'
+      [["01.09.01.01.01", "1996-03-20", 2450163],
+       ["01.09.02.01.01", "1997-03-20", 2450528],
+       ["01.09.03.01.01", "1998-03-21", 2450894],
+       ["01.09.04.01.01", "1999-03-21", 2451259],
+       ["01.09.05.01.01", "2000-03-20", 2451624],
+       ["01.09.06.01.01", "2001-03-20", 2451989],
+       ["01.09.07.01.01", "2002-03-21", 2452355],
+       ["01.09.08.01.01", "2003-03-21", 2452720],
+       ["01.09.09.01.01", "2004-03-20", 2453085],
+       ["01.09.10.01.01", "2005-03-20", 2453450],
+       ["01.09.11.01.01", "2006-03-21", 2453816],
+       ["01.09.12.01.01", "2007-03-21", 2454181],
+       ["01.09.13.01.01", "2008-03-20", 2454546],
+       ["01.09.14.01.01", "2009-03-20", 2454911],
+       ["01.09.15.01.01", "2010-03-21", 2455277],
+       ["01.09.16.01.01", "2011-03-21", 2455642],
+       ["01.09.17.01.01", "2012-03-20", 2456007],
+       ["01.09.18.01.01", "2013-03-20", 2456372],
+       ["01.09.19.01.01", "2014-03-21", 2456738],
+       ["01.10.01.01.01", "2015-03-21", 2457103],
+       ["01.10.02.01.01", "2016-03-20", 2457468],
+       ["01.10.03.01.01", "2017-03-20", 2457833],
+       ["01.10.04.01.01", "2018-03-21", 2458199],
+       ["01.10.05.01.01", "2019-03-21", 2458564],
+       ["01.10.06.01.01", "2020-03-20", 2458929],
+       ["01.10.07.01.01", "2021-03-20", 2459294],
+       ["01.10.08.01.01", "2022-03-21", 2459660],
+       ["01.10.09.01.01", "2023-03-21", 2460025],
+       ["01.10.10.01.01", "2024-03-20", 2460390],
+       ["01.10.11.01.01", "2025-03-20", 2460755],
+       ["01.10.12.01.01", "2026-03-20", 2461120],
+       ["01.10.13.01.01", "2027-03-21", 2461486],
+       ["01.10.14.01.01", "2028-03-20", 2461851]].each do |sample|
+        assert_equal(sample, [date.to_s, (When::Gregorian ^ date).to_s, date.to_i])
+        date += When::P1Y
+      end
+
+      date = When.when? '2001.3.21'
+      400.times do
+        assert_equal([1,1], (When.Calendar('Bahai') ^ date).cal_date[-2..-1])
+        date += When::P1Y
+      end
+    end
+  end
+end

data/test/test/region/chinese.rb

@@ -9,6 +9,17 @@
 module MiniTest
 
   class Chinese < MiniTest::TestCase
+    def test_chinese_table
+      assert_equal({1677=>{"iJ"=>"Ij"},
+                    1698=>{"jK"=>"Jk"},
+                    1709=>{"aB"=>"Ab", "jK"=>"Jk"},
+                    1727=>{"cC"=>"Cc"},
+                    1730=>{"Cd"=>"cD"},
+                    1751=>{"Jk"=>"jK"},
+                    1778=>{"Cd"=>"cD"},
+                    1841=>{"kL"=>"Kl"}}, When.Calendar('Korean').verify(When.Calendar('Chinese1645'), 1654..1911))
+    end
+
     def test_chinese_date
 
       emd = When.Resource('_c:EphemerisBasedSolar?time_basis=+09:00')
@@ -110,7 +121,7 @@ module MiniTest
     def test_chinese_epoch
       date = When.when?('天保2.10.01')
       assert_equal([2390126, "天保02(1831).10.01", "神無月"],
-                   [date.to_i, date.to_s, date.name('Month')])
+                   [date.to_i, date.to_s, date.name('Month')/'alias'])
       assert_equal("1831-11-04", (When.Calendar('Gregorian') ^ When.when?('天保02.10.01')).to_s)
 
 #=begin
@@ -132,8 +143,8 @@ module MiniTest
       assert_raises(ArgumentError) { When.when?('天保3(0563).10.01') }
 
       date = When.when?('始皇帝26*10.01')
-      assert_equal([1640641, "始皇帝26(-220)*10.01", "十月"],
-                   [date.to_i, date.to_s, date.name('Month')])
+      assert_equal([1640641, 1640641, "始皇帝26(-220)*10.01", "十月"],
+                   [date.to_i, date.floor(When::YEAR).to_i, date.to_s, date.name('Month')])
 
       cc_221 = When.Resource('_c:Chinese_221')
       [

data/test/test/region/christian.rb

@@ -94,41 +94,6 @@ module MiniTest
     end
   end
 
-  class Swedish < MiniTest::TestCase
-    def test__swedish_date
-
-      dates = []
-      jdns  = []
-      [2342042, 2346424].each do |base|
-        (-3..+3).each do |diff|
-          jdn    = base + diff
-          jdate  = When::Julian  ^ jdn
-          s1date = When::Swedish ^ jdn
-          s2date = When.tm_pos(*(s1date.cal_date + [{:frame=>When::Swedish}]))
-          dates << s1date.to_s
-          jdns  << [s1date.to_s == s2date.to_s, s1date.to_i == jdn, s2date.to_i == jdn].uniq
-        end
-      end
-
-      assert_equal(%w(1700-02-26 1700-02-27 1700-02-28 1700-03-01 1700-03-02 1700-03-03 1700-03-04
-                      1712-02-26 1712-02-27 1712-02-28 1712-02-29 1712-02-30 1712-03-01 1712-03-02), dates)
-      assert_equal([[true]], jdns.uniq)
-    end
-
-    def test__swedish_easter
-
-      dates = []
-      civil = When.Calendar('Civil?old=Swedish&reform_date=1753-03-01')
-      ((1700..1711).to_a + (1740..1752).to_a+[1802,1805,1818]).each do |year|
-         dates << When.tm_pos(year, {:frame=>civil}).easter.to_s
-      end
-      assert_equal(%w(1700-04-01 1701-04-21 1702-04-06 1703-03-29 1704-04-17 1705-04-02 1706-03-25
-                      1707-04-14 1708-04-05 1709-04-18 1710-04-10 1711-03-26 1740-04-06 1741-03-22
-                      1742-03-14 1743-04-03 1744-03-18 1745-04-07 1746-03-30 1747-03-22 1748-04-03
-                      1749-03-26 1750-03-18 1751-03-31 1752-03-22 1802-04-25 1805-04-21 1818-03-29), dates)
-    end
-  end
-
   class Civil < MiniTest::TestCase
     def test__border
       frame = When.Calendar('Civil?reform=1752-9-14&border=0-3-25(1753)0-1-1')
@@ -166,6 +131,22 @@ module MiniTest
       end
     end
 
+    def test_civil_epoch
+      epoch = 1001
+      diff  = 1 - epoch
+      civil = When.Calendar("Civil?origin_of_MSC=#{diff}&old=(Julian?origin_of_MSC=#{diff})")
+      assert_equal('0582-10-04', (civil ^ When.when?('1582-10-14')).to_s)
+      assert_equal('0582-10-15', (civil ^ When.when?('1582-10-15')).to_s)
+      date  = When.when?("1000-1-1", :frame=>civil)
+      assert_equal('1014-01-01', (date & When.Residue('甲午').to('year')).to_s)
+      assert_equal(%w(1000-01-01 2000-01-01), [date.to_s, (When::Gregorian^date).to_s])
+      399.times do
+        date += When::P1Y
+        cal_date = date.cal_date
+        assert_equal((When::Gregorian^date).cal_date, [cal_date[0]-diff] + cal_date[1..2])
+      end
+    end
+
     def test__reform_year
       date = When.when?('1752^^Civil?reform=1752-9-14&border=(1000)0-3-25(1753)0-1-1')
       assert_equal(

data/test/test/region/discordian.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2014 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Discordian < MiniTest::TestCase
+    def test_discordian
+      date = When.when? '2001.1.1'
+      400.times do |i|
+        assert_equal([2001+i+1166,1,1], (When::Discordian ^ date).cal_date)
+        date += When::P1Y
+      end
+    end
+  end
+end

data/test/test/region/indian.rb

@@ -50,8 +50,36 @@ module MiniTest
       cc     = When.Calendar('HinduSolar?type=SBS')
       date   = When.when?('1913-01-01', {:frame=>cc})
       assert_equal([2448361, "1913-01-01", "1991-04-14"], [date.to_i, date.to_s, date.to_date.to_s])
-      date   = When::CalendarNote::HinduNote::Dates.new(date)
-      assert_equal(2448361, date.to_i)
+      dates   = When::CalendarNote::HinduNote::Dates.new(date)
+      assert_equal(2448361, dates.to_i)
+      assert_equal('Prajāpati', When.CalendarNote('HinduNote').samvatsara(dates)/'en')
+    end
+
+    def test_indian_date_4
+      date = When.when? '2001.2.28'
+      assert_equal('1922-12-09', (When::IndianNationalSolar ^ date).to_s)
+      399.times do
+        date += When::P1Y
+        assert_equal([12,9], (When::IndianNationalSolar ^ date).cal_date[-2..-1])
+      end
+    end
+
+    def test_indian_date_5
+      date = When.when? '2014.3.14'
+      assert_equal('0546-01-01', (When::Nanakshahi ^ date).to_s)
+      399.times do
+        date += When::P1Y
+        assert_equal([1,1], (When::Nanakshahi ^ date).cal_date[-2..-1])
+      end
+    end
+
+    def test_indian_date_6
+      date = When.when? '2014.4.14'
+      assert_equal('1421-01-01', (When::RevisedBengali ^ date).to_s)
+      399.times do
+        date += When::P1Y
+        assert_equal([1,1], (When::RevisedBengali ^ date).cal_date[-2..-1])
+      end
     end
   end
 end

data/test/test/region/japanese.rb

@@ -167,6 +167,10 @@ module MiniTest
         When::CalendarNote::Japanese::SolarTerms.send(:patch=, {})
       end
       When::CalendarNote::Japanese::SolarTerms.send(:patch=, nil)
+
+      assert_equal('白露(135.375/560)',
+        When.when?('康和1.8.14').notes(:notes=>'廿四節気', :shoyo=>true)[:value].simplify.to_s)
+
     end
 
     def test__lunar_phases
@@ -201,6 +205,21 @@ module MiniTest
       end
     end
 
+    def test__eclipse
+      date = When.when?('貞観4.2.1')
+      assert_equal('夜日蝕七分', date.notes({:notes=>'日食'}).value)
+      assert_equal(nil, date.notes({:notes=>'日食', :solar_eclipse=>1}).value)
+
+      date = When.when?('貞観4.2.15')
+      assert_equal('(月蝕ニ分)', date.notes({:notes=>'月食'}).value)
+      assert_equal(nil, date.notes({:notes=>'月食', :lunar_eclipse=>3}).value)
+    end
+
+    def test_japanese_lunisolar
+      assert_equal({1850=>{"hI"=>"Hi"}, 1866=>{"cD"=>"Cd"}, 1884=>{"cD"=>"Cd"}, 1947=>{"b"=>"c"}},
+                    When.Calendar('Japanese').verify(When.Calendar('JapaneseTwin::旧暦'), 1844..2033))
+    end
+
     def test_japanese_era
       assert_raises(RangeError) {When.TemporalPosition("正慶", 2, 11)}
       assert_equal("延元02(1337).01.08",          When.when?("建武4.1.8").to_s)
@@ -216,6 +235,11 @@ module MiniTest
                       弘長 文永 建治 弘安 正応 永仁 正安 乾元 嘉元 徳治
                       延慶 応長 正和 文保 元応 元亨 正中 嘉暦 元徳 元弘),
                    When.era('鎌倉時代')[0].map { |era| era.label.to_s})
+
+      date = When.when?('768-10-20^^Gregorian')
+      assert_equal('神護景雲02(0768).09.02',                        (date ^ When.CalendarEra('Japanese'))[0].to_s)
+      assert_equal('日本?V=0764::奈良時代::神護景雲02(0768).09.01', (date ^ When.CalendarEra('Japanese?V=0764'))[0].to_s)
+      assert_equal('日本::奈良時代::神護景雲02(0768).09.02',        (date ^ When.CalendarEra('Japanese'))[0].to_s)
     end
 =begin
     def test_japanese_date