when_exe 0.3.1 → 0.3.2

data/lib/when_exe/version.rb

@@ -6,5 +6,5 @@
 =end
 
 module When
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/test/icalendar.rb

@@ -222,13 +222,13 @@ module Test:V
 
       sample = [
         "1997-10-26T01:30:00-04:00",
-        "1997-10-26T02:30:00-04:00",
+        "1997-10-26T01:30:00-05:00", # * 02:30:00-04:00
         "1997-10-26T02:30:00-05:00",
         "1997-10-26T03:30:00-05:00",
         "1998-10-25T01:30:00-04:00",
       ]
       When::V::Event.new({
-                'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;BYHOUR=1,2,2=,3;BYMINUTE=30',
+                'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;BYHOUR=1,1=,2,3;BYMINUTE=30', # *
                 'dtstart' => 'TZID=America/New_York:19971026T013000'
       }).each do |date|
         assert_equal(sample.shift, date.to_s)
@@ -241,7 +241,7 @@ module Test:V
         "1998-10-18T01:30:00-04:00",
       ]
       When::V::Event.new({
-                'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-2SU;BYHOUR=1,2,2=;BYMINUTE=30',
+                'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-2SU;BYHOUR=1,1=,2;BYMINUTE=30', # *
                 'dtstart' => 'TZID=America/New_York:19971019T013000'
       }).each do |date|
         assert_equal(sample.shift, date.to_s)
@@ -267,7 +267,7 @@ module Test:V
 
         sample = [
           "1997-04-06T01:30:00-06:00",
-          "1997-04-06T02:30:00-06:00", # "1997-04-06T03:30:00-05:00", - TODO !!
+          "1997-04-06T03:30:00-05:00", # TODO !!
           "1997-04-06T04:30:00-05:00",
           "1998-04-05T01:30:00-06:00",
         ]
@@ -281,13 +281,13 @@ module Test:V
 
         sample = [
           "1997-10-26T01:30:00-05:00",
-        # "1997-10-26T02:30:00-05:00", - TODO !!
+          "1997-10-26T01:30:00-06:00", # * - TODO !!
           "1997-10-26T02:30:00-06:00",
           "1997-10-26T03:30:00-06:00",
           "1998-10-25T01:30:00-05:00",
         ]
         When::V::Event.new({
-                  'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;BYHOUR=1,2,2=,3;BYMINUTE=30',
+                  'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;BYHOUR=1,1=,2,3;BYMINUTE=30', # *
                   'dtstart' => 'TZID=America/Chicago:19971026T013000'
         }).each do |date|
           assert_equal(sample.shift, date.to_s)
@@ -299,7 +299,7 @@ module Test:V
           "1998-10-18T01:30:00-05:00",
         ]
         When::V::Event.new({
-                  'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-2SU;BYHOUR=1,2,2=;BYMINUTE=30',
+                  'rrule'   => 'FREQ=YEARLY;BYMONTH=10;BYDAY=-2SU;BYHOUR=1,1=,2;BYMINUTE=30', # *
                   'dtstart' => 'TZID=America/Chicago:19971019T013000'
         }).each do |date|
           assert_equal(sample.shift, date.to_s)
@@ -496,12 +496,12 @@ module Test:V
        ["1997-04-06T01:59:59",  "1997-04-06T01:59:59-05:00"],
        ["1997-04-06T02:00:00",  "1997-04-06T02:00:00-04:00"],
        ["1997-04-06T03:00:00",  "1997-04-06T03:00:00-04:00"],
-       ["1997-10-26T01:59:00",  "1997-10-26T01:59:00-04:00"],
-       ["1997-10-26T02:00:00",  "1997-10-26T02:00:00-04:00"],
-       ["1997-10-26T02:59:59",  "1997-10-26T02:59:59-04:00"],
-       ["1997-10-26T02=00:00",  "1997-10-26T02:00:00-05:00"],
-       ["1997-10-26T02=59:59",  "1997-10-26T02:59:59-05:00"],
-       ["1997-10-26T03:00:00",  "1997-10-26T03:00:00-05:00"]
+       ["1997-10-26T00:59:00",  "1997-10-26T00:59:00-04:00"], # *
+       ["1997-10-26T01:00:00",  "1997-10-26T01:00:00-04:00"], # *
+       ["1997-10-26T01:59:59",  "1997-10-26T01:59:59-04:00"], # *
+       ["1997-10-26T01=00:00",  "1997-10-26T01:00:00-05:00"], # *
+       ["1997-10-26T01=59:59",  "1997-10-26T01:59:59-05:00"], # *
+       ["1997-10-26T02:00:00",  "1997-10-26T02:00:00-05:00"]  # *
       ].each do |sample|
         assert_equal(sample[1], When.when?(sample[0], {:clock=>tz}).to_s)
       end
@@ -511,11 +511,11 @@ module Test:V
        ["19970406T015959-0500", "1997-04-06T01:59:59-05:00"],
        ["19970406T020000-0500", "1997-04-06T03:00:00-04:00"],
        ["19970406T030000-0500", "1997-04-06T04:00:00-04:00"],
-       ["19971026T015959-0400", "1997-10-26T01:59:59-04:00"],
-       ["19971026T020000-0400", "1997-10-26T02:00:00-04:00"],
-       ["19971026T025959-0400", "1997-10-26T02:59:59-04:00"],
-       ["19971026T030000-0400", "1997-10-26T02:00:00-05:00"],
-       ["19971026T040000-0400", "1997-10-26T03:00:00-05:00"],
+       ["19971026T005959-0400", "1997-10-26T00:59:59-04:00"], # *
+       ["19971026T010000-0400", "1997-10-26T01:00:00-04:00"], # *
+       ["19971026T015959-0400", "1997-10-26T01:59:59-04:00"], # *
+       ["19971026T020000-0400", "1997-10-26T01:00:00-05:00"], # *
+       ["19971026T030000-0400", "1997-10-26T02:00:00-05:00"]  # *
       ].each do |sample|
         sdate = When.when?(sample[0])
         ddate = gc.jul_trans(sdate, {:clock=>tz})
@@ -532,11 +532,11 @@ module Test:V
          ["19970406T015959-0600", "1997-04-06T01:59:59-06:00"],
          ["19970406T020000-0600", "1997-04-06T03:00:00-05:00"],
          ["19970406T030000-0600", "1997-04-06T04:00:00-05:00"],
-         ["19971026T015959-0500", "1997-10-26T01:59:59-05:00"],
-         ["19971026T020000-0500", "1997-10-26T02:00:00-05:00"],
-         ["19971026T025959-0500", "1997-10-26T02:59:59-05:00"],
-         ["19971026T030000-0500", "1997-10-26T02:00:00-06:00"],
-         ["19971026T040000-0500", "1997-10-26T03:00:00-06:00"],
+         ["19971026T005959-0500", "1997-10-26T00:59:59-05:00"], # *
+         ["19971026T010000-0500", "1997-10-26T01:00:00-05:00"], # *
+         ["19971026T015959-0500", "1997-10-26T01:59:59-05:00"], # *
+         ["19971026T020000-0500", "1997-10-26T01:00:00-06:00"], # *
+         ["19971026T030000-0500", "1997-10-26T02:00:00-06:00"], # *
         ].each do |sample|
           sdate = When.when?(sample[0])
           ddate = gc.jul_trans(sdate, {:clock=>tz})
@@ -547,12 +547,12 @@ module Test:V
          ["1997-04-06T01:59:59",  "1997-04-06T01:59:59-06:00"],
          ["1997-04-06T02:00:00",  "1997-04-06T02:00:00-05:00"], 
          ["1997-04-06T03:00:00",  "1997-04-06T03:00:00-05:00"],
-         ["1997-10-26T01:59:00",  "1997-10-26T01:59:00-05:00"],
-         ["1997-10-26T02:00:00",  "1997-10-26T02:00:00-06:00"], # "1997-10-26T02:00:00-05:00" - TODO !!
-         ["1997-10-26T02:59:59",  "1997-10-26T02:59:59-06:00"], # "1997-10-26T02:59:59-05:00" - TODO !!
-         ["1997-10-26T02=00:00",  "1997-10-26T02:00:00-06:00"],
-         ["1997-10-26T02=59:59",  "1997-10-26T02:59:59-06:00"],
-         ["1997-10-26T03:00:00",  "1997-10-26T03:00:00-06:00"]
+         ["1997-10-26T00:59:00",  "1997-10-26T00:59:00-05:00"], # *
+         ["1997-10-26T01:00:00",  "1997-10-26T01:00:00-05:00"], # * # "1997-10-26T02:00:00-05:00" - TODO !!
+         ["1997-10-26T01:59:59",  "1997-10-26T01:59:59-05:00"], # * # "1997-10-26T02:59:59-05:00" - TODO !!
+         ["1997-10-26T01=00:00",  "1997-10-26T01:00:00-06:00"], # *
+         ["1997-10-26T01=59:59",  "1997-10-26T01:59:59-06:00"], # *
+         ["1997-10-26T02:00:00",  "1997-10-26T02:00:00-06:00"]  # *
         ].each do |sample|
           assert_equal(sample[1], When.when?(sample[0], {:clock=>tz}).to_s)
         end

data/test/test/region/m17n.rb

@@ -136,17 +136,17 @@ module Test
 
        ['明治7.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2405651, :cal_date=>[7, 5, 7],
-          :notes=>[[{:note=>"干支",  :value=>"庚午(6)", :position=>"共通"}],
+          :notes=>[[{:note=>"干支",  :value=>"甲戌(10)", :position=>"共通"}],
                    [{:note=>"月名",  :value=>"May",     :position=>"月建"}],
                    [{:note=>"干支",  :value=>"甲子(0)", :position=>"共通"},
-                    {:note=>"六曜",  :value=>"大安",    :position=>"民間"}]]}],
+                    {:note=>"六曜",  :value=>"赤口",    :position=>"民間"}]]}],
 
        ['明治17.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2409304, :cal_date=>[17, 5, 7],
-          :notes=>[[{:note=>"干支",  :value=>"庚辰(16)", :position=>"共通"}],
+          :notes=>[[{:note=>"干支",  :value=>"甲申(20)", :position=>"共通"}],
                    [{:note=>"月名",  :value=>"May",      :position=>"月建"}],
                    [{:note=>"干支",  :value=>"丁巳(53)", :position=>"共通"},
-                    {:note=>"六曜",  :value=>"友引",     :position=>"民間"}]]}],
+                    {:note=>"六曜",  :value=>"先負",     :position=>"民間"}]]}],
 
        ['CE-2010.06.08T12:00:00+09:00',
          {:calendar=>["_e:Common::BCE", 1, true], :sdn=>987064, :cal_date=>[-2011, 6, 8],

data/test/test/tmobjects.rb

@@ -242,10 +242,19 @@ module Test::TM
        duration = When::TM::Duration.dhms(1,2,3,4.4)
        stop  = start + duration
        assert_equal((RUBY_VERSION.to_f<1.9 ? 93784.4 : 93784), stop-start)
+       assert_raise(TypeError) {
+         ::Date.today + duration
+       }
        require 'when_exe/core/duration'
        stop  = start + duration
        assert_equal(93784.4, stop-start)
 
+       now_date = DateTime.now
+       duration = When::TM::Duration.hour(8)
+       assert_equal(Rational(1,128), (now_date + duration * 3 / 128   ) - now_date)
+       assert_equal(Rational(1,3),   (now_date + duration    ) - now_date)
+       assert_equal(Rational(1,1),   (now_date + duration * 3) - now_date)
+
        stop  = start + When.Duration('P1DT2H3M4S')
        assert_equal(93784, stop-start)
 

data/test/test/tmposition.rb

@@ -190,10 +190,10 @@ LIST
 
         obj4 = When.when?("1997-10-26T00:00:00", {:clock=>tz})
         [["PT1H", "1997-10-26T01:00:00-04:00"],
-         ["PT2H", "1997-10-26T02:00:00-04:00"],
+         ["PT2H", "1997-10-26T02:00:00-05:00"], # *
          ["PT3H", "1997-10-26T03:00:00-05:00"],
          [1 * When::TM::Duration::HOUR, "1997-10-26T01:00:00-04:00"],
-         [2 * When::TM::Duration::HOUR, "1997-10-26T02:00:00-04:00"],
+         [2 * When::TM::Duration::HOUR, "1997-10-26T01:00:00-05:00"], # *
          [3 * When::TM::Duration::HOUR, "1997-10-26T02:00:00-05:00"]].each do |sample|
           assert_equal(sample[1], (obj4 + When::Duration(sample[0])).to_s)
         end
@@ -208,7 +208,7 @@ LIST
          ["PT2H", "1997-10-26T02:00:00-05:00"], #  "1997-10-26T02:00:00-04:00" - TODO !!
          ["PT3H", "1997-10-26T03:00:00-05:00"],
          [1 * When::TM::Duration::HOUR, "1997-10-26T01:00:00-04:00"],
-         [2 * When::TM::Duration::HOUR, "1997-10-26T02:00:00-04:00"],
+         [2 * When::TM::Duration::HOUR, "1997-10-26T01:00:00-05:00"], # *
          [3 * When::TM::Duration::HOUR, "1997-10-26T02:00:00-05:00"]].each do |sample|
           assert_equal(sample[1], (obj4 + When::Duration(sample[0])).to_s)
         end

data/when_exe.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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 and RFC 5545. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future.}
+  s.description = %q{This library supports ISO 8601, ISO 19108 and RFC 5545. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future. Please see also the differences of ticket files from http://www.asahi-net.or.jp/~dd6t-sg/date/when_exe_rev.0.3.1beta.zip to http://www.asahi-net.or.jp/~dd6t-sg/date/when_exe_rev.0.3.2beta.zip.}
 
   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.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000Z
+date: 2013-10-08 00:00:00.000000000Z
 dependencies: []
 description: This library supports ISO 8601, ISO 19108 and RFC 5545. This version
   is a beta version and in the evaluation stage. So, its APIs may be changed in future.
+  Please see also the differences of ticket files from http://www.asahi-net.or.jp/~dd6t-sg/date/when_exe_rev.0.3.1beta.zip
+  to http://www.asahi-net.or.jp/~dd6t-sg/date/when_exe_rev.0.3.2beta.zip.
 email:
 - suchowan@box.email.ne.jp
 executables: