when_exe 0.3.4 → 0.3.5

data/test/test/region/coptic.rb

@@ -0,0 +1,27 @@
+# -*- 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 Test
+
+  class Coptic < Test::Unit::TestCase
+    def test__coptic
+      julian    = When.Calendar('Julian')
+      gregorian = When.Calendar('Gregorian')
+      ethiopian = When.Calendar('Coptic?Epoch=8Y')
+      egyptian  = When.Calendar('Coptic?Epoch=284Y')
+
+      [['2010-8-29', %w(2010-08-29 2010-09-11 2003-01-01 1727-01-01)],
+       ['2011-8-30', %w(2011-08-30 2011-09-12 2004-01-01 1728-01-01)],
+       ['2012-8-29', %w(2012-08-29 2012-09-11 2005-01-01 1729-01-01)],
+       ['2013-8-29', %w(2013-08-29 2013-09-11 2006-01-01 1730-01-01)]].each do |sample|
+        date = When.when?(sample[0], :frame=>julian)
+        assert_equal(sample[1], [date.to_s, (gregorian ^ date).to_s, (ethiopian ^ date).to_s, (egyptian ^ date).to_s])
+      end
+    end
+  end
+end

data/test/test/region/indian.rb

@@ -50,7 +50,7 @@ module Test
       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::CalendarTypes::CalendarNote::HinduNote::Dates.new(date)
+      date   = When::CalendarNote::HinduNote::Dates.new(date)
       assert_equal(2448361, date.to_i)
     end
   end

data/test/test/region/japanese.rb

@@ -155,15 +155,15 @@ module Test
               long  = dates.cal4note.s_terms.position(date)
               notes = date.notes(:indices => When::DAY,
                                  :notes   => (13<<9|1<<48|1<<71),
-                                 :locale  => 'ja').map {|n| n[:value]}
+                                 :locale  => 'ja').simplify[:value].compact
               result << [date.to_m17n/'ja', notes]
             end
           end
         end
         assert_equal(sample.shift, result)
-        When::CalendarTypes::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, {})
+        When::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, {})
       end
-      When::CalendarTypes::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, nil)
+      When::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, nil)
     end
 
     def test__lunar_phases
@@ -194,7 +194,7 @@ module Test
        %w(平成26.11.22 平成26.11.29 平成26.12.06 平成26.12.14),
        %w(平成26.12.22 平成26.12.29)
       ].each do |month|
-        assert_equal([true], month.map {|date| When.when?(date).notes('月相').kind_of?(Hash)}.uniq)
+        assert_equal([true], month.map {|date| When.when?(date).is?('月相')}.uniq)
       end
     end
 =begin

data/test/test/region/jewish.rb

@@ -53,7 +53,7 @@ module Test
         date += When.Duration('P1Y')
       end
 
-      assert_equal("Common::BCE3761(-3760).10.07",
+      assert_equal("BCE3761(-3760).10.07",
                    (When.era('BCE')[0] ^ When.Calendar('Jewish').domain[''].first).to_s)
 
     end

data/test/test/region/m17n.rb

@@ -11,7 +11,7 @@ module Test
   class M17n < Test::Unit::TestCase
 
     First = [
-      ["CalendarTerms", "CalendarTerms", "http://en.wikipedia.org/wiki/CalendarTerms"],
+      ["CalendarTerms", "CalendarTerms", ""],
       ["Month",      "月", "http://ja.wikipedia.org/wiki/%E6%9C%88_(%E6%9A%A6)"],
       ["Month",      "月", "http://ja.wikipedia.org/wiki/%E6%9C%88_(%E6%9A%A6)"],
       ["January",   "1月", "http://ja.wikipedia.org/wiki/1%E6%9C%88"]
@@ -132,20 +132,22 @@ module Test
 
        ['1985-1-1',
          {:calendar=>["_c:Gregorian"], :sdn=>2446067, :cal_date=>[1985, 1, 1],
-          :notes=>[[{:note=>"Month", :value=>"January"}],[]]}],
+          :notes=>[[{:note=>"Month", :value=>"January"}],[{:note=>"Week", :value=>"Tuesday(1)"}]]}],
 
        ['明治7.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2405651, :cal_date=>[7, 5, 7],
           :notes=>[[{:note=>"干支",  :value=>"甲戌(10)", :position=>"共通"}],
                    [{:note=>"月名",  :value=>"May",      :position=>"月建"}],
-                   [{:note=>"干支",  :value=>"甲子(00)", :position=>"共通"},
+                   [{:note=>"七曜",  :value=>"Thursday(3)", :position=>"共通"},
+                    {:note=>"干支",  :value=>"甲子(00)", :position=>"共通"},
                     {:note=>"六曜",  :value=>"赤口",     :position=>"民間"}]]}],
 
        ['明治17.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2409304, :cal_date=>[17, 5, 7],
           :notes=>[[{:note=>"干支",  :value=>"甲申(20)", :position=>"共通"}],
                    [{:note=>"月名",  :value=>"May",      :position=>"月建"}],
-                   [{:note=>"干支",  :value=>"丁巳(53)", :position=>"共通"},
+                   [{:note=>"七曜",  :value=>"Wednesday(2)", :position=>"共通"},
+                    {:note=>"干支",  :value=>"丁巳(53)", :position=>"共通"},
                     {:note=>"六曜",  :value=>"先負",     :position=>"民間"}]]}],
 
        ['CE-2010.06.08T12:00:00+09:00',
@@ -166,7 +168,7 @@ module Test
 
       ].each do |sample|
         date, verify = sample
-        list = When.when?(date).to_h({:simple=>true})
+        list = When.when?(date).to_h({:method=>:to_m17n, :prefix=>true})
         [:calendar, :cal_date, :sdn, :clk_time].each do |key|
           assert_equal(verify[key], list[key])
         end

data/test/test/region/residue.rb

@@ -92,8 +92,8 @@ module Test
     def test__epoch_in_CE
       cals  = [
         'Gregorian',
-        'EgyptianCoptic',
-        'EthiopianCoptic',
+        'Coptic?Epoch=284Y',
+        'Coptic?Epoch=8Y',
         'IndianNationalSolar',
         'HinduSolar?type=SBV',
         'HinduSolar?type=SBVZ',

data/test/test/region/vietnamese.rb

@@ -0,0 +1,102 @@
+# -*- 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 Test
+
+  class Vietnamese < Test::Unit::TestCase
+
+    Sample1 = [%w(紹明2.1.1                                1139-02-08 紹明02(1139).01.01),
+               %w(ベトナム?LY=VSL::李朝::紹明2.1.1         1138-02-19 ベトナム?LY=VSL::李朝::紹明02(1138).01.01),
+               %w(嗣徳2.8.1                                1849-09-17 ベトナム::阮朝::嗣徳02(1849).08.01),
+               %w(ベトナム?LY=VSL&DN=LDNK::阮朝::嗣徳2.8.1 1849-09-16 ベトナム?LY=VSL&DN=LDNK::阮朝::嗣徳02(1849).08.01),
+               %w(ベトナム::後期黎朝::福泰2.7.1            1644-08-02 ベトナム::後期黎朝::福泰02(1644).07.01),
+               %w(ベトナム::広南::阮福瀾10.7.1             1644-08-03 ベトナム::広南::阮福瀾10(1644).07.01),
+               %w(ベトナム::後期黎朝::慶徳4.9.1            1652-10-02 ベトナム::後期黎朝::慶徳04(1652).09.01),
+               %w(ベトナム::広南::阮福瀕4.9.1              1652-10-03 ベトナム::広南::阮福瀕04(1652).09.01),
+               %w(ベトナム::阮朝::建福1.1.31               1884-02-26 ベトナム::阮朝::建福01(1884).01.31)]
+
+    Sample2 = [%w(1659-01- 1659-01-23),
+               %w(1659-01= 1659-02-21),
+               %w(1659-02- 1659-03-23),
+               %w(1659-03- 1659-04-21),
+               %w(1659-04- 1659-05-21),
+               %w(1659-05- 1659-06-20),
+               %w(1659-06- 1659-07-19),
+               %w(1659-07- 1659-08-18),
+               %w(1659-08- 1659-09-16),
+               %w(1659-09- 1659-10-16),
+               %w(1659-10- 1659-11-14),
+               %w(1659-11- 1659-12-14),
+               %w(1659-12- 1660-01-12),
+               %w(1660-01- 1660-02-11),
+               %w(1660-02- 1660-03-11),
+               %w(1660-03- 1660-04-10),
+               %w(1660-04- 1660-05-09),
+               %w(1660-05- 1660-06-08),
+               %w(1660-06- 1660-07-07),
+               %w(1660-07- 1660-08-06),
+               %w(1660-08- 1660-09-05),
+               %w(1660-09- 1660-10-04),
+               %w(1660-10- 1660-11-03),
+               %w(1660-11- 1660-12-02),
+               %w(1660-12- 1661-01-01),
+
+               %w(1659-01- 1659-01-23),
+               %w(1659-01= 1659-02-22),
+               %w(1659-02- 1659-03-23),
+               %w(1659-03- 1659-04-21),
+               %w(1659-04- 1659-05-21),
+               %w(1659-05- 1659-06-20),
+               %w(1659-06- 1659-07-19),
+               %w(1659-07- 1659-08-18),
+               %w(1659-08- 1659-09-16),
+               %w(1659-09- 1659-10-16),
+               %w(1659-10- 1659-11-15), # 1659-11-14 ではない
+               %w(1659-11- 1659-12-14),
+               %w(1659-12- 1660-01-12),
+               %w(1660-01- 1660-02-11),
+               %w(1660-02- 1660-03-11),
+               %w(1660-03- 1660-04-10),
+               %w(1660-04- 1660-05-09),
+               %w(1660-05- 1660-06-08),
+               %w(1660-06- 1660-07-07),
+               %w(1660-07- 1660-08-06),
+               %w(1660-08- 1660-09-05),
+               %w(1660-09- 1660-10-04),
+               %w(1660-10- 1660-11-03),
+               %w(1660-11- 1660-12-03), # 1660-12-02 ではない
+               %w(1660-12- 1661-01-01)]
+
+    def test_vietnamese_era
+
+      When.CalendarEra('Vietnamese')
+      When.CalendarEra('Vietnamese?LY=VSL')
+      When.CalendarEra('Vietnamese?LY=VSL&DN=LDNK')
+
+      Sample1.each do |sample|
+        date = When.when?(sample[0])
+        assert_equal(sample[1..2], [date.to_date.to_s, date.to_s])
+      end
+    end
+
+    def test_vietnamese_date
+
+      When.CalendarEra('Vietnamese')
+
+      sample = Sample2
+      [1544, 1631].each do |epoch|
+        calendar = When.Calendar('Vietnamese' + epoch.to_s)
+        date = When.TemporalPosition(1659, 1, :frame=>calendar)
+        25.times do
+          assert_equal(sample.shift, [date.to_s, date.to_date.to_s])
+          date = date.next
+        end
+      end
+    end
+  end
+end

data/test/test/timestandard.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2011-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 Test::TimeStandard
+
+  class UniversalTime < Test::Unit::TestCase
+    def view(time)
+      return time unless time.instance_of?(When::Coordinates::LeapSeconds)
+      return [time.trunk, time.branch, time.second]
+    end
+
+    def test__delta_t
+      date  = When.when?('2009-01-01T00:00:00Z')
+      assert_equal("2008-12-31T23:59:01Z", (date - When::TM::IntervalLength.new(60, 'second')).to_s)
+      assert_equal("2008-12-31T23:59:00Z", (date - When::Duration('PT60S')).to_s)
+
+      date  = When::TM::JulianDate.dynamical_time((2500000-(When::TM::JulianDate::JD19700101-0.5))*675)
+      assert_equal(2500000.0, +date)
+      assert_equal(true, +date > date.to_f)
+
+      date  = When::TM::JulianDate.universal_time((2500000-(When::TM::JulianDate::JD19700101-0.5))*675)
+      assert_equal(2500000.0, date.to_f)
+      assert_equal(true, +date > date.to_f)
+
+      assert_equal((40 + 377.0/2048), When::TimeStandard.delta_t(When.when?('1970-01-01T').to_f))
+
+      date  = When.when?('2008-10-31T23:59:60Z')
+      assert_equal([[2008, 11, 1], [0, 0, 0, 0]], [date.cal_date, date.clk_time.clk_time])
+
+      pair  = When::Coordinates::Pair.new(1,1)
+      assert_equal([-1, -1, 1], [0.9, 1, 1.1].map {|v| v<=>pair})
+
+      time  = When.Resource('_t:UniversalTime')
+      date0 = When.when?('2008-12-31T23:59:58Z') ^ When.Duration('1s') # Duration('PT1S')
+      [
+        "2008-12-31T23:59:58Z",
+        "2008-12-31T23:59:59Z",
+        "2008-12-31T23:59:60Z",
+        "2009-01-01T00:00:00Z",
+        "2009-01-01T00:00:01Z"
+      ].each do |sample|
+        date = date0.next
+        assert_equal([sample, true], [date.to_s, date.universal_time == time.from_dynamical_time(date.dynamical_time)])
+      end
+
+      it = When::V::Event.new({
+          'rrule'   => 'FREQ=MINUTELY;BYSECOND=59,60',
+          'dtstart' => '2008-12-31T23:58:59Z'
+      }).each
+
+      [
+        "2008-12-31T23:58:59Z",
+        "2008-12-31T23:59:59Z",
+        "2009-01-01T00:00:59Z",
+        "2009-01-01T00:01:59Z"
+      ].each do |sample|
+        assert_equal(sample, it.next.to_s)
+      end
+
+      it = When::V::Event.new({
+          'rrule'   => 'FREQ=1s', #;BYSECOND=59,60',
+          'dtstart' => '2008-12-31T23:59:58Z'
+      }).each
+
+      [
+        "2008-12-31T23:59:58Z",
+        "2008-12-31T23:59:59Z",
+        "2008-12-31T23:59:60Z",
+        "2009-01-01T00:00:00Z",
+        "2009-01-01T00:00:01Z"
+      ].each do |sample|
+        assert_equal(sample, it.next.to_s)
+      end
+    end
+  end
+end

data/test/test/tmposition.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-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.

data/test/test/tmreference.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011 Takashi SUGA
+  Copyright (C) 2011-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.

data/when_exe.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Takashi SUGA"]
   s.email       = ["suchowan@box.email.ne.jp"]
   s.homepage    = "http://www.asahi-net.or.jp/~dd6t-sg/"
-  s.summary     = %q{A multicultural and multilingualized calendar library based on ISO 8601, ISO 19108 and RFC 5545}
-  s.description = %q{This library supports ISO 8601, ISO 19108, RFC 5545 and RFC6350. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html for the recent history (Sorry only in Japanese).}
+  s.summary     = %q{A multicultural and multilingualized calendar library based on ISO 8601, ISO 19108, RFC 5545 and RFC6350}
+  s.description = %q{A multicultural and multilingualized calendar library based on ISO 8601, ISO 19108, RFC 5545 and RFC6350. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html for the recent history (Sorry only in Japanese).}
 
   s.rubyforge_project = "when_exe"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: when_exe
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000Z
+date: 2014-04-23 00:00:00.000000000Z
 dependencies: []
-description: This library supports ISO 8601, ISO 19108, RFC 5545 and RFC6350. This
-  version is a beta version and in the evaluation stage. So, its APIs may be changed
-  in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html for
-  the recent history (Sorry only in Japanese).
+description: A multicultural and multilingualized calendar library based on ISO 8601,
+  ISO 19108, RFC 5545 and RFC6350. This version is a beta version and in the evaluation
+  stage. So, its APIs may be changed in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html
+  for the recent history (Sorry only in Japanese).
 email:
 - suchowan@box.email.ne.jp
 executables:
@@ -36,6 +36,7 @@ files:
 - bin/when.rb.config
 - lib/when_exe.rb
 - lib/when_exe/basictypes.rb
+- lib/when_exe/calendarnote.rb
 - lib/when_exe/calendartypes.rb
 - lib/when_exe/coordinates.rb
 - lib/when_exe/core/compatibility.rb
@@ -146,7 +147,9 @@ files:
 - lib/when_exe/region/chinese.rb
 - lib/when_exe/region/chinese_calendar.rb
 - lib/when_exe/region/chinese_epoch.rb
+- lib/when_exe/region/chinese_twin.rb
 - lib/when_exe/region/christian.rb
+- lib/when_exe/region/coptic.rb
 - lib/when_exe/region/ephemeric_notes.rb
 - lib/when_exe/region/far_east.rb
 - lib/when_exe/region/french.rb
@@ -157,6 +160,7 @@ files:
 - lib/when_exe/region/japanese.rb
 - lib/when_exe/region/japanese_notes.rb
 - lib/when_exe/region/japanese_residues.rb
+- lib/when_exe/region/japanese_twin.rb
 - lib/when_exe/region/javanese.rb
 - lib/when_exe/region/jewish.rb
 - lib/when_exe/region/korean.rb
@@ -194,11 +198,13 @@ files:
 - test/examples/Test.ics
 - test/examples/USA-DST.ics
 - test/examples/geometric_complex.rb
+- test/examples/sample.json
 - test/examples/sample.xml
 - test/examples/today.rb
 - test/test.rb
 - test/test.rb.config
 - test/test/basictypes.rb
+- test/test/calendarnote.rb
 - test/test/calendartypes.rb
 - test/test/coordinates.rb
 - test/test/ephemeris.rb
@@ -208,6 +214,7 @@ files:
 - test/test/parts.rb
 - test/test/region/chinese.rb
 - test/test/region/civil.rb
+- test/test/region/coptic.rb
 - test/test/region/french.rb
 - test/test/region/geologicalage.rb
 - test/test/region/indian.rb
@@ -223,6 +230,8 @@ files:
 - test/test/region/sun.rb
 - test/test/region/thai.rb
 - test/test/region/tibetan.rb
+- test/test/region/vietnamese.rb
+- test/test/timestandard.rb
 - test/test/tmobjects.rb
 - test/test/tmposition.rb
 - test/test/tmreference.rb
@@ -251,6 +260,6 @@ rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A multicultural and multilingualized calendar library based on ISO 8601,
-  ISO 19108 and RFC 5545
+  ISO 19108, RFC 5545 and RFC6350
 test_files: []
 has_rdoc: