when_exe 0.3.4 → 0.3.5

data/lib/when_exe/version.rb

@@ -6,5 +6,5 @@
 =end
 
 module When
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/examples/Terms.m17n

@@ -1,12 +1,12 @@
 BEGIN:B:M17n
-# 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.
   NAMESPACE:[en=http://en.wikipedia.org/wiki/,
              ja=http://ja.wikipedia.org/wiki/]
   LOCALE:[=en:, ja=ja:, alias]
-  NAMES:[CalendarTerms]
+  NAMES:[CalendarTerms=]
 
   [Calendars_and_Eras=, 暦法と紀元=]
 

data/test/examples/sample.json

@@ -0,0 +1,16 @@
+[{},"When::Coordinates::Spatial",
+  {
+   "label" :
+     {
+       "label" : "Tokyo",
+       "names" : 
+         {""   : "Tokyo",
+          "ja" : "東京"
+         }
+     },
+   "lat"   : "#{lat:35.412011N}",
+   "long"  : "#{long:139.421322E}",
+   "alt"   : "#{alt:0}",
+   "datum" : "#{datum:JGD2000}"
+  }
+]

data/test/examples/sample.xml

@@ -6,7 +6,7 @@
           xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
           xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
           type="http://hosi.org/When/Coordinates/Spatial">
-  <rdfs:label country='Japan'>Tokyo</rdfs:label>
+  <rdfs:label country='Japan'>[Tokyo]</rdfs:label>
   <geo:lat>N35.412011</geo:lat>
   <geo:long>E139.421322</geo:long>
   <geo:alt>0</geo:alt>

data/test/test.rb

@@ -33,12 +33,14 @@ require 'when_exe/mini_application'
 require './test/parts'
 require './test/basictypes'
 require './test/ephemeris'
+require './test/timestandard'
 require './test/coordinates'
 require './test/icalendar'
 require './test/tmobjects'
 require './test/tmreference'
 require './test/tmposition'
 require './test/calendartypes'
+require './test/calendarnote'
 require './test/inspect'
 require './test/googlecalendar'
 require './test/region/m17n'
@@ -46,6 +48,7 @@ require './test/region/residue'
 require './test/region/civil'
 require './test/region/japanese'
 require './test/region/chinese'
+require './test/region/vietnamese'
 require './test/region/tibetan'
 require './test/region/thai'
 require './test/region/indian'
@@ -53,4 +56,5 @@ require './test/region/iran'
 require './test/region/mayan'
 require './test/region/jewish'
 require './test/region/french'
+require './test/region/coptic'
 require './test/region/geologicalage'

data/test/test/basictypes.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.
@@ -362,7 +362,7 @@ LOCALE
 
       def test__label
         assert_equal("Getsuyou", Term2.label.to_s)
-        assert_equal(When::BasicTypes::M17n, Term2.label.class)
+        assert_equal(String, Term2.label.class)
         assert_equal("Monday", Term3.label.to_s)
       end
     end

data/test/test/calendarnote.rb

@@ -0,0 +1,69 @@
+# -*- 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::CalendarNote
+
+  class Notes < Test::Unit::TestCase
+
+    def test__lunar_phases
+      assert_equal([[{:note=>"月相", :value=>"朔(-233/3040)", :position=>"中段"}]],
+        When.when?('承和2.4.2').notes(:notes=>'月相', :conditions=>{:shoyo=>true}))
+      assert_equal([[{:note=>"月相", :value=>"望(1478.5/3040)", :position=>"中段"}]],
+        When.when?('承和2.4.16').notes(:notes=>'月相', :conditions=>{:shoyo=>true}))
+      all = {}
+      assert_equal([[{:note=>"月相", :value=>"望(1478.5/3040)", :position=>"中段"}]],
+        When.when?('承和2.4.16').notes(:notes=>'月相', :shoyo=>true, :persistence=>all))
+      assert_equal({2026177=>[[{:note=>"月相", :value=>"望(1478.5/3040)", :position=>"中段"}]]}, all)
+    end
+
+    def test__persistence
+      all    = {}
+      notes0 = When.when?('平成25.9.22').notes(:persistence=>all)
+      notes1 = When.when?('平成25.9.23').notes(:persistence=>all)
+      notes2 = When.when?('平成25.9.24').notes(:persistence=>all)
+      notes3 = When.when?('平成25.9.23').notes(:persistence=>all)
+
+      [notes1, notes3].each do |notes|
+        assert_equal(
+          [[{:note=>"干支", :value=>"癸巳(29)", :position=>"共通"}],
+           [{:note=>"月名", :value=>"September", :position=>"月建"}],
+           [{:note=>"七曜", :value=>"Monday(0)", :position=>"共通"},
+            {:note=>"干支", :value=>"壬辰(28)", :position=>"共通"},
+            {:note=>"六曜", :value=>"友引", :position=>"民間"},
+            {:note=>"廿四節気", :value=>"秋分(180)", :position=>"時候"},
+            {:note=>"祝祭日", :value=>"秋分の日", :position=>"祝祭日"}]], notes)
+      end
+
+      assert_equal([["癸巳(29)"], ["September"], ["Monday(0)", "壬辰(28)", "友引", "秋分(180)", "秋分の日"]],
+        notes1.simplify[:value])
+
+      assert_equal([[{:note=>"月名", :value=>"September", :position=>"月建"}]], notes1.subset(:note=>/Month/))
+      assert_equal([[{:note=>"干支", :value=>"癸巳(29)", :position=>"共通"}],
+                    [{:note=>"干支", :value=>"壬辰(28)", :position=>"共通"}]], notes1.subset(:note=>'干支'))
+      assert_equal([[{:note=>"祝祭日", :value=>"秋分の日", :position=>"祝祭日"}]], notes1.subset(:value=>'秋分の日'))
+      assert_equal(nil, notes1.subset(:value=>'春分の日'))
+      assert_equal([[nil], [nil], [nil, nil, nil, nil, nil]], notes1.subset({:value=>'春分の日'}, false))
+
+      assert_equal([2456558, 2456559, 2456560], all.keys)
+      assert_equal({2456559=>"秋分の日"}, all.subset(:value=>'秋分の日').simplify[:value])
+    end
+
+    def test__holiday
+      date1 = When.when?('平成25.9.23')
+      date2 = When.when?('平成25.9.24')
+      notes1 = date1.notes("祝祭日")
+      assert_equal([[{:note=>"祝祭日", :value=>"秋分の日", :position=>"祝祭日"}]], notes1)
+      assert_equal({:note=>"祝祭日", :value=>"秋分の日", :position=>"祝祭日"}, notes1.simplify)
+      assert_equal(true, date1.is?({:note=>"祝祭日", :value=>"秋分の日"}))
+      assert_equal(true, date1.is?("祝祭日"))
+      assert_equal(true, date1.is?("秋分の日"))
+      assert_equal(false, date2.is?("秋分の日"))
+    end
+  end
+end
+

data/test/test/calendartypes.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.
@@ -53,5 +53,45 @@ module Test::CalendarTypes
       assert_equal([31, 0, 0], frame._number_to_coordinates(1948440+10631))
     end
   end
+
+  class SolarTerms < Test::Unit::TestCase
+
+    Sample = %w(2013-03-20 2013-06-21 2013-09-23 2013-12-22
+                2014-03-21 2014-06-21 2014-09-23 2014-12-22
+                2015-03-21 2015-06-22 2015-09-23 2015-12-22)
+
+    def test__term
+      note = When.CalendarNote('SolarTerms')
+      assert_equal('2014-03-20', note.term(When.when?('2014-3-1'), [0,30]).to_s)
+      When::TM::Clock.local_time = '+09:00'
+      assert_equal('2014-03-21', note.term(When.when?('2014-3-1'), [0,30]).to_s)
+    end
+
+    def test__each
+      When::TM::Clock.local_time = '+09:00'
+      note            = When.CalendarNote('SolarTerms')
+      note_with_event = When.CalendarNote('SolarTerms?event=term0/90')
+      today           = When.when?('2013-03-01')
+      last            = When.when?('2016-01-01')
+
+      sample = Sample.dup
+      note_with_event.each(today) do |date|
+        assert_equal(sample.shift, date.to_s)
+        break if sample.empty?
+      end
+
+      sample = Sample.dup
+      note_with_event.each(today...last) do |date|
+        assert_equal(sample.shift, date.to_s)
+      end
+      assert_equal(true, sample.empty?)
+
+      sample = Sample.dup
+      note.each(today...last, {:event=>'term0/90', :count_limit=>4}) do |date|
+        assert_equal(sample.shift, date.to_s)
+      end
+      assert_equal(Sample.length - 4, sample.length)
+    end
+  end
 end
 

data/test/test/coordinates.rb

@@ -341,6 +341,17 @@ module Test::Coordinates
       location = When.Resource("examples/sample.xml?lat=35&long=135")
       assert_equal( 7875.0, location.lat)
       assert_equal(30375.0, location.long)
+      assert_equal( '35.0000N', location.lat_s)
+      assert_equal('135.0000E', location.long_s)
+      if Object.const_defined?(:JSON)
+        location = When.Resource("examples/sample.json?lat=40")
+        assert_equal( 9000.0, location.lat)
+        assert_equal(31433.32625, location.long)
+        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"
+      end
     end
 
     def test__reference
@@ -378,7 +389,7 @@ module Test::Coordinates
       assert_equal(+135.9, When::Coordinates.to_deg("135.5400E", 'EW'))
       assert_equal(+135.9, When::Coordinates.to_deg("E135.5400", 'EW'))
       assert_equal("135.5400E", When::Coordinates.to_dms(+135.9, 'EW'))
-      assert_equal( "35.3935N", When::Coordinates.to_dms(+35.66, 'NS'))
+      assert_equal( "35.3936N", When::Coordinates.to_dms(+35.66, 'NS'))
     end
   end
 end

data/test/test/ephemeris.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 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.
@@ -54,74 +54,21 @@ module Test::Ephemeris
     end
   end
 
-  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
+  class Formula < Test::Unit::TestCase
+    def test__sunrise
 
-    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
+      today = '2014-3-4'
 
-      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
+      assert_raises(NoMethodError) { When.when?(today).sunrise }
 
-      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
+      location = When.Location('long=139.413012E&lat=35.412222N')
+      assert_equal(0, /2014-03-03T21:07/ =~ When.when?(today, {:location=>location}).sunrise.to_s)
+
+      When::Coordinates::Spatial.default_location = location
+      assert_equal(0, /2014-03-03T21:07/ =~ When.when?(today).sunrise.to_s)
+
+      When::TM::Clock.local_time = '+09:00'
+      assert_equal(0, /2014-03-04T06:07/ =~ When.when?(today).sunrise.to_s)
     end
   end
 end

data/test/test/icalendar.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.
@@ -736,7 +736,7 @@ module Test:V
         "1997-09-03T10:20:00-04:00",
         "1997-09-03T10:40:00-04:00",
       ]
-      event3.enum_for(When.when?('19970902T090000'), :forward, 30).each do |date|
+      event3.enum_for(When.when?('19970902T090000'), :forward, {:count_limit=>30}).each do |date|
         assert_equal(sample.shift, date.to_s)
       end
       assert_equal([], sample)
@@ -753,7 +753,7 @@ module Test:V
         "1997-09-04T10:20:00-04:00",
         "1997-09-04T10:00:00-04:00",
       ]
-      event3.enum_for(When.when?('19970904T170000'), :reverse, 10, {'1st'=>'DontCare'}).each do |date|
+      event3.enum_for(When.when?('19970904T170000'), {:direction=>:reverse, :count_limit=>10, '1st'=>'DontCare'}).each do |date|
         assert_equal(sample.shift, date.to_s)
       end
       assert_equal([], sample)

data/test/test/inspect.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 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/parts.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.
@@ -124,8 +124,9 @@ LOCALE
 
     def test__prefix
       date = When.when?('0594-09=12^Japanese')
-      assert_equal(["閏長月", When::BasicTypes::M17n], [date.name('Month').label.to_s, date.name('Month').label.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("Intercalary 9th Month", date.name('Month').translate('en_US'))
     end
@@ -479,10 +480,12 @@ LOCALE
       reverse_1_4  = When::Parts::GeometricComplex.new(1,4, true)
       reverse_2_3  = When::Parts::GeometricComplex.new(2,3, true)
       reverse_2_5  = When::Parts::GeometricComplex.new(2,5, true)
-      assert_equal("..", reverse_all.to_s)
       assert_equal("1..4", reverse_1_4.to_s)
       assert_equal("2..3", reverse_2_3.to_s)
-      assert_equal("..", (reverse_2_3 | range_2_3).to_s)
+      unless Float::INFINITY == Float::MAX
+        assert_equal("-Infinity..Infinity", reverse_all.to_s)
+        assert_equal("-Infinity..Infinity", (reverse_2_3 | range_2_3).to_s)
+      end
       assert_equal("1..2", (reverse_1_4 | range_2_5).to_s)
     end
   end

data/test/test/region/chinese.rb

@@ -157,5 +157,50 @@ module Test
       end
 #=end
     end
+
+    def test_daien_lunation
+      sample = [
+        2938, 2993, 2708, 2760, 2573, 2691, 2622, 
+        2626, 2637, 2523, 2551, 2637, 2625, 2886, 
+        2703, 2764, 2791, 2680, 2792, 2764, 2797, 
+        1402, 2626, 2380, 2807, 3003,   23, 2698]
+
+      %w(0765-02-01 0765-12-01 0768-09-01 0769-04-01 0769-07-01 0771-05-01 0772-04-01
+         0772-09-01 0774-06-01 0775-02-01 0776-03-01 0780-05-01 0781-09-01 0784-10=01
+         0786-03-01 0788-04-01 0791-02-01 0791-09-01 0792-05-01 0813-12-01 0816-03-01
+         0820-02-01 0820-03-01 0822-02-01 0835-04-01 0836-04-01 0841-11-01 0853-02-01).each do |ptn|
+        date = When.when?(ptn+ '^^ChineseTwin::大衍暦')
+        formula = date.frame.formula[-1]
+        m = When::Coordinates::Residue.mod(date.to_i+1) {|cn| formula.cn_to_time(cn)}
+        t = formula.cn_to_time(m[0]) + Rational(1,2)
+        assert_equal(sample.shift, (t - t.floor) * formula.denominator)
+      end
+    end
+
+    def test_solar_terms_for_chinese_true_lunation
+      date     = When.when?('1690-1-1^^JapaneseTwin::貞享暦(節月)')
+      formula = date.frame.formula[0]
+      class << formula
+        attr_reader :day_shift, :longitude_shift, :year_delta
+      end
+      assert_equal(["12S", Rational(-1,4), 2336118.19, 1.0e-06, 1684.0, 365.241696],
+        [formula.formula, formula.longitude_shift, formula.day_epoch, formula.year_delta, formula.year_epoch, formula.year_length.to_f])
+      m = When::Coordinates::Residue.mod(date.to_i+1) {|cn| formula.cn_to_time(cn)}
+      t = formula.cn_to_time(m[0]) + Rational(1,2)
+    # assert_equal(["1690-01-01", 2338355, 20278, [15.923047, 30.436807, 2338340.576953]],
+    #   [date.to_s, date.to_i, m[0], [m[1], m[2], t].map {|x| (x*1000000).round / 1000000.0}])
+
+      date     = When.when?('1801-1-1^^JapaneseTwin::寛政暦(節月)')
+      formula = date.frame.formula[0]
+      class << formula
+        attr_reader :day_epoch, :day_shift, :year_delta, :year_epoch, :year_length, :longitude_shift
+      end
+      assert_equal(["12S", Rational(-1,4), 2377390.607112, 1797.0, 365.242347071],
+        [formula.formula, formula.longitude_shift, formula.day_epoch, formula.year_epoch, formula.year_length.to_f])
+      m = When::Coordinates::Residue.mod(date.to_i+1) {|cn| formula.cn_to_time(cn)}
+      t = formula.cn_to_time(m[0]) + Rational(1,2)
+    # assert_equal(["1801-01-01", 2378897, 21610, [15.986637, 30.436862, 2378882.513363]],
+    #   [date.to_s, date.to_i, m[0], [m[1], m[2], t].map {|x| (x*1000000).round / 1000000.0}])
+    end
   end
 end