when_exe 0.3.2 → 0.3.3

data/test/examples/Residue.m17n

@@ -1,5 +1,5 @@
 BEGIN:B:M17N
-# Copyright (C) 2011 Takashi SUGA
+# Copyright (C) 20112-13 Takashi SUGA
 #
 # You may use and/or modify this file according to the license
 # described in the LICENSE.txt file included in this archive.
@@ -23,7 +23,8 @@ BEGIN:B:M17N
       REMAINDER:5
     END:CO:RESIDUE
     BEGIN:CO:RESIDUE
-      LABEL:[Sunday,日曜日]
+      LABEL;ALTID=1;LANGUAGE=en:Sunday
+      LABEL;ALTID=1;LANGUAGE=ja:日曜日
       REMAINDER:6
     END:CO:RESIDUE
   END:CO:RESIDUE

data/test/examples/Spatial.m17n

@@ -1,10 +1,10 @@
 BEGIN:B:M17N
-# Copyright (C) 2011 Takashi SUGA
+# Copyright (C) 2011-2013 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/]
+  NAMESPACE:[ja=http://ja.wikipedia.org/wiki/]
+  NAMESPACE;ALTID=1;PREFIX=en:http://en.wikipedia.org/wiki/
   LOCALE:[=en:, ja=ja:, alias]
   NAMES:[Locations]
 

data/test/examples/USA-DST.ics

@@ -1,61 +1,61 @@
 BEGIN:VCALENDAR
-# Copyright (C) 2011 Takashi SUGA
+# Copyright (C) 2011-2013 Takashi SUGA
 #
 # You may use and/or modify this file according to the license
 # described in the LICENSE.txt file included in this archive.
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
 BEGIN:VTIMEZONE
-TZID:America/#{C}
+TZID:America/#{C:Chicago}
 LAST-MODIFIED:20050809T050000Z
 BEGIN:DAYLIGHT
 DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T#{SZ}0000Z
-TZOFFSETFROM:-#{S}00
-TZOFFSETTO:-#{D}00
-TZNAME:#{Z}DT
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T#{SZ:08}0000Z
+TZOFFSETFROM:-#{S:06}00
+TZOFFSETTO:-#{D:05}00
+TZNAME:#{Z:C}DT
 END:DAYLIGHT
 BEGIN:STANDARD
 DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T#{DZ}0000Z
-TZOFFSETFROM:-#{D}00
-TZOFFSETTO:-#{S}00
-TZNAME:#{Z}ST
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T#{DZ:07}0000Z
+TZOFFSETFROM:-#{D:05}00
+TZOFFSETTO:-#{S:06}00
+TZNAME:#{Z:C}ST
 END:STANDARD
 BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19750223T020000
-TZOFFSETFROM:-#{S}00
-TZOFFSETTO:-#{D}00
-TZNAME:#{Z}DT
+TZOFFSETFROM:-#{S:06}00
+TZOFFSETTO:-#{D:05}00
+TZNAME:#{Z:C}DT
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T#{SZ}0000Z
-TZOFFSETFROM:-#{S}00
-TZOFFSETTO:-#{D}00
-TZNAME:#{Z}DT
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T#{SZ:08}0000Z
+TZOFFSETFROM:-#{S:06}00
+TZOFFSETTO:-#{D:05}00
+TZNAME:#{Z:C}DT
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T#{SZ}0000Z
-TZOFFSETFROM:-#{S}00
-TZOFFSETTO:-#{D}00
-TZNAME:#{Z}DT
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T#{SZ:08}0000Z
+TZOFFSETFROM:-#{S:06}00
+TZOFFSETTO:-#{D:05}00
+TZNAME:#{Z:C}DT
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-TZOFFSETFROM:-#{S}00
-TZOFFSETTO:-#{D}00
-TZNAME:#{Z}DT
+TZOFFSETFROM:-#{S:06}00
+TZOFFSETTO:-#{D:05}00
+TZNAME:#{Z:C}DT
 END:DAYLIGHT
 BEGIN:STANDARD
 DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-TZOFFSETFROM:-#{D}00
-TZOFFSETTO:-#{S}00
-TZNAME:#{Z}ST
+TZOFFSETFROM:-#{D:05}00
+TZOFFSETTO:-#{S:06}00
+TZNAME:#{Z:C}ST
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

data/test/examples/today.rb

@@ -18,7 +18,7 @@ date = today
 pp [date.to_s, date.strftime('%D'), date.frame.iri, date.to_time.to_s]
 puts
 
-['Julian', 'ChineseLuniSolar?timezone=9&intercalary_span=3', 'TabularIslamic', 'Jewish', 'LongCount'].each do |calendar|
+['Julian', 'ChineseLuniSolar?time_basis=+09&intercalary_span=3', 'TabularIslamic', 'Jewish', 'LongCount'].each do |calendar|
   date = Calendar(calendar) ^ today
   pp [date.to_s,  date.frame.iri]
 end

data/test/test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- 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.
@@ -40,9 +40,10 @@ require './test/tmreference'
 require './test/tmposition'
 require './test/calendartypes'
 require './test/inspect'
-require './test/googlecalendar'
+#require './test/googlecalendar'
 require './test/region/m17n'
 require './test/region/residue'
+require './test/region/civil'
 require './test/region/japanese'
 require './test/region/chinese'
 require './test/region/tibetan'
@@ -52,3 +53,4 @@ require './test/region/iran'
 require './test/region/mayan'
 require './test/region/jewish'
 require './test/region/french'
+require './test/region/geologicalage'

data/test/test/basictypes.rb

@@ -36,17 +36,39 @@ module Test
          ["--04-12",                 [ 0, "1985-04-12"]],     #  3 d) 上位省略表記 ある年の特定の月日 拡張形式
          ["--04",                    [-1, "1985-04"   ]],     #  3 e) 上位省略表記 ある年の特定の月 基本形式
          ["---12",                   [ 0, "1985-04-12"]],     #  3 f) 上位省略表記 ある月の特定の日 基本形式
-         ["+0019850412",             [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 基本形式
-         ["+001985-04-12",           [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 拡張形式
-         ["+001985-04",              [-1, "1985-04"   ]],     #  4 b) 拡大表記 特定の月 基本形式
-         ["+001985",                 [-2, "1985"      ]],     #  4 c) 拡大表記 特定の年 基本形式
-         ["+0019",                   [-4, "1900"      ]],     #  4 d) 拡大表記 特定の百年代 基本形式
+         ["+019850412",              [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 基本形式
+         ["+01985-04-12",            [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 拡張形式
+         ["+01985-04",               [-1, "1985-04"   ]],     #  4 b) 拡大表記 特定の月 基本形式
+         ["+01985",                  [-2, "1985"      ]],     #  4 c) 拡大表記 特定の年 基本形式
+         ["+019",                    [-4, "1900"      ]],     #  4 d) 拡大表記 特定の百年代 基本形式
         ].each do |sample|
           date = When.when?(sample[0], {:abbr=>[1985,4,12]})
           assert_equal(sample[1], [date.precision, date.to_s])
         end
       end
 
+      def test__x0301_5_2_1_4
+        [                                                     # 5.2.1.4 暦日付 拡大表記(Abbr 指定なし)
+         ["-019850412",              [ 0, "-01985-04-12"]],   #  4 a) 拡大表記 特定の日 基本形式
+         ["+019850412",              [ 0,   "1985-04-12"]],   #  4 a) 拡大表記 特定の日 基本形式
+         ["-01985-04-12",            [ 0, "-01985-04-12"]],   #  4 a) 拡大表記 特定の日 拡張形式
+         ["+01985-04-12",            [ 0,   "1985-04-12"]],   #  4 a) 拡大表記 特定の日 拡張形式
+         ["-01985-04",               [-1, "-01985-04"   ]],   #  4 b) 拡大表記 特定の月 基本形式
+         ["+01985-04",               [-1,   "1985-04"   ]],   #  4 b) 拡大表記 特定の月 基本形式
+         ["-01985",                  [-2, "-01985"      ]],   #  4 c) 拡大表記 特定の年 基本形式
+         ["+01985",                  [-2,   "1985"      ]],   #  4 c) 拡大表記 特定の年 基本形式
+         ["-0190",                   [-2, "-00190"      ]],   #  4 d) 拡大表記 特定の年 基本形式
+         ["+0190",                   [-2,   "0190"      ]],   #  4 d) 拡大表記 特定の年 基本形式
+         ["-019",                    [-4, "-01900"      ]],   #  4 d) 拡大表記 特定の百年代 基本形式
+         ["+019",                    [-4,   "1900"      ]],   #  4 d) 拡大表記 特定の百年代 基本形式
+         ["-119",                    [-4, "-11900"      ]],   #  4 d) 拡大表記 特定の百年代 基本形式
+         ["+119",                    [-4, "+11900"      ]],   #  4 d) 拡大表記 特定の百年代 基本形式
+        ].each do |sample|
+          date = When.when?(sample[0])
+          assert_equal(sample[1], [date.precision, date.to_s])
+        end
+      end
+
       def test__x0301_5_2_2
         [                                                     # 5.2.2 年間通算日
          ["1985102",                 [ 0, "1985-04-12"]],     #  1 完全表記 基本形式
@@ -54,8 +76,8 @@ module Test
          ["85102",                   [ 0, "1985-04-12"]],     #  2 a) 上位省略表記 ある百年代の特定の年日 基本形式
          ["85-102",                  [ 0, "1985-04-12"]],     #  2 a) 上位省略表記 ある百年代の特定の年日 拡張形式
          ["-102",                    [ 0, "1985-04-12"]],     #  2 b) 上位省略表記 ある年の特定の日 基本形式
-         ["+001985102",              [ 0, "1985-04-12"]],     #  3 a) 拡大表記 特定の日 基本形式
-         ["+001985-102",             [ 0, "1985-04-12"]],     #  3 a) 拡大表記 特定の日 拡張形式
+         ["+01985102",               [ 0, "1985-04-12"]],     #  3 a) 拡大表記 特定の日 基本形式
+         ["+01985-102",              [ 0, "1985-04-12"]],     #  3 a) 拡大表記 特定の日 拡張形式
         ].each do |sample|
           date = When.when?(sample[0], {:abbr=>[1985,4,12]})
           assert_equal(sample[1], [date.precision, date.to_s])
@@ -80,10 +102,10 @@ module Test
          ["-W15-5",                  [ 0, "1985-04-12"]],     #  3 e) 上位省略表記 ある年の週日 拡張形式
          ["-W15",       [ 0, "1985-04-08...1985-04-15"]],     #  3 f) 上位省略表記 ある年の週 基本形式
          ["-W-5",                    [ 0, "1985-04-12"]],     #  3 g) 上位省略表記 ある週の日 基本形式
-         ["+001985W155",             [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 基本形式
-         ["+001985-W15-5",           [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 拡張形式
-         ["+001985W15", [ 0, "1985-04-08...1985-04-15"]],     #  4 b) 拡大表記 特定の週 基本形式
-         ["+001985-W15",[ 0, "1985-04-08...1985-04-15"]],     #  4 c) 拡大表記 特定の週 拡張形式
+         ["+01985W155",              [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 基本形式
+         ["+01985-W15-5",            [ 0, "1985-04-12"]],     #  4 a) 拡大表記 特定の日 拡張形式
+         ["+01985W15",  [ 0, "1985-04-08...1985-04-15"]],     #  4 b) 拡大表記 特定の週 基本形式
+         ["+01985-W15", [ 0, "1985-04-08...1985-04-15"]],     #  4 c) 拡大表記 特定の週 拡張形式
         ].each do |sample|
           date = When.when?(sample[0], {:abbr=>[1985,15,5]})
           assert_equal(sample[1], [date.precision, date.to_s])
@@ -339,9 +361,9 @@ LOCALE
       end
 
       def test__label
-        assert_equal("Getsuyou", Term2.label)
-        assert_equal(String, Term2.label.class)
-        assert_equal("Monday", Term3.label)
+        assert_equal("Getsuyou", Term2.label.to_s)
+        assert_equal(When::BasicTypes::M17n, Term2.label.class)
+        assert_equal("Monday", Term3.label.to_s)
       end
     end
 
@@ -354,7 +376,10 @@ LOCALE
 
   module RS
     class Identifier < Unit::TestCase
-      def test_nothing
+      def test__forward
+        name   = When.Residue('Monday').label
+        monday = When::RS::Identifier.new(name)
+        assert_equal("月曜日", monday / 'ja')
       end
     end
   end

data/test/test/coordinates.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.
@@ -52,7 +52,7 @@ module Test::Coordinates
         assert_equal(sample[1], (r6 & date3).to_s)
       end
 
-      kanshi = When.Resource("_co:Residue?divisor=60&YEAR=4&DAY=11")
+      kanshi = When.Resource("_co:Residue?divisor=60&year=4&day=11")
       date   = When.when?("19820606T021540+0900^^Julian")
       assert_equal("1982-07-27T02:15:40+09:00", (date & kanshi.to('day')).to_s)
       assert_equal("1985-06-06T02:15:40+09:00", (date & kanshi.to('year')[1]).to_s)
@@ -133,7 +133,7 @@ module Test::Coordinates
 
       assert_equal(2426467, (date2+When::Duration('P30Y')).to_i)
       sample = [
-        ["Japan64(1931).05.05", false],
+        ["ModernJapanese64(1931).05.05", false],
         ["S06(1931).05.05", true]
       ]
       ((date2+When::Duration('P30Y')).scan(When.Resource('ModernJapanese', '_e:'))).each do |d|
@@ -344,10 +344,15 @@ module Test::Coordinates
     end
 
     def test__reference
-      location = When.Resource("_co:Spatial?label=Kyoto&long=136&lat=30&ref=http%3A%2F%2f")
+      location = When.Resource("_co:Spatial?label=Kyoto&long=136&lat=30&ref=(http://)")
       assert_equal("http://", location.ref)
     end
 
+    def test__surface_radius
+      location = When.Resource("_co:Spatial?label=Kyoto&long=136&lat=30&ref=(http://)")
+      assert_equal(6378.14, location.surface_radius)
+    end
+
     def test__spatial_m17n
       ['_co:IndianCities', 'examples/Spatial.m17n'].each do |iri|
         samples = IndianCities.dup

data/test/test/icalendar.rb

@@ -81,6 +81,18 @@ module Test:V
       assert_equal(["2010-05-04T+09:00", 0], [date.to_s, date.precision])
       assert_equal([true,false], [d0504,d0505].map {|v| event.include?(v)})
     end
+
+    def test__rfc_update
+      sample = ["Children's_Day_(Japan)", 'Children"s_Day_(Japan)', "Children's_Day_(Japan)"]
+      When::TM::Clock.local_time = When.Clock("+0900")
+      ["JapanHolidays.ics", "JapanHolidays.ics?Escape=^'", "JapanHolidaysRFC6350.ics"].each do |ics|
+        cal = When.Resource('examples/' + ics)
+        cal = cal.intersection({'summary'=>/Children['"]s_Day_\(Japan\)/})
+        cal.each(When.when?('20100101')...When.when?('20110101')) do |date|
+          assert_equal(sample.shift, date.events[0].summary / 'en')
+        end
+      end
+    end
   end
 
   class Event < Test::Unit::TestCase
@@ -149,7 +161,7 @@ module Test:V
     end
 
     def test__ignored_invalid_date
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       assert_equal("2007-03-30T09:00:00-04:00", When.when?('TZID=America/New_York:2007-03-30T09:00:00').to_s)
       sample = [
         "2007-01-15T09:00:00-05:00",
@@ -190,7 +202,7 @@ module Test:V
     end
 
     def test__multiple_BYxxx_rule  # See RFC 5545 [Page 45]
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
 
       sample = [
         "1997-04-13T01:30:00-04:00",
@@ -489,7 +501,7 @@ module Test:V
 
   class TimezoneProperty < Test::Unit::TestCase
     def test__tz_change
-      ic = When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      ic = When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       tz = When::V::Timezone["America/New_York"]
       gc = When.Resource('_c:Gregorian')
       [
@@ -582,7 +594,7 @@ module Test:V
     end
 
     def test__tzname
-      ic   = When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      ic   = When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       date = When.when?('20110126T250000EST')
       assert_equal(["2011-01-27T01:00:00-05:00", "Thu Jan 27 01:00:00 -0500 2011", "EST"],
                    [date.to_s, date.strftime('%+'), date.clk_time.frame.tzname[0]])
@@ -607,16 +619,14 @@ module Test:V
 
   class Timezone < Test::Unit::TestCase
     def test__neighbor_event_date
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       tz = When::V::Timezone["America/New_York"]
-      eval('class When::V::Timezone ; public :_neighbor_event_date ; end')
-      assert_equal("1997-04-06T02:00:00-05:00", tz._neighbor_event_date(When.when?("19970510")).to_s)
-      assert_equal("1997-10-26T02:00:00-04:00", tz._neighbor_event_date(When.when?("19971010")).to_s)
-      eval('class When::V::Timezone ; private :_neighbor_event_date ; end')
+      assert_equal("1997-04-06T02:00:00-05:00", tz.send(:_neighbor_event_date, When.when?("19970510").universal_time).to_s)
+      assert_equal("1997-10-26T02:00:00-04:00", tz.send(:_neighbor_event_date, When.when?("19971010").universal_time).to_s)
     end
 
     def test__current_period
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       tz = When::V::Timezone["America/New_York"]
       assert_equal("1997-04-06T02:00:00-05:00...1997-10-26T02:00:00-04:00", tz.current_period(When.when?("19970510")).to_s)
       assert_equal("1997-04-06T02:00:00-05:00...1997-10-26T02:00:00-04:00", tz.current_period(When.when?("19971010")).to_s)
@@ -634,7 +644,7 @@ module Test:V
   class Event
 
     def test__each_1
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       cal = When.Resource("examples/Test.ics")
 
       event1 = When.Resource("examples/Test.ics::event1-ID")
@@ -667,7 +677,7 @@ module Test:V
     end
 
     def test__each_2
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       cal = When.Resource("examples/Test.ics")
 
       event2 = cal["event2-ID"]
@@ -690,7 +700,7 @@ module Test:V
     end
 
     def test__each_3
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       cal = When.Resource("examples/Test.ics")
 
       event3 = cal["event3-ID"]
@@ -760,7 +770,7 @@ module Test:V
     end
 
     def test__each_4
-      When.Resource("examples/USA-DST.ics?!C=New_York&!Z=E&!D=04&!DZ=06&!S=05&!SZ=07")
+      When.Resource("examples/USA-DST.ics?C=New_York&Z=E&D=04&DZ=06&S=05&SZ=07")
       cal = When.Resource("examples/Test.ics")
 
       event4 = cal["event4-ID"]

data/test/test/inspect.rb

@@ -19,8 +19,10 @@ module Test
       assert_equal(["月曜です 1%", "It is Monday 1%"],
         ['ja_JP', 'en_US'].map {|c| (form % [term1, term2, When::Coordinates::Pair.new(1,-2)]).translate(c)})
 
-      assert_equal("2:", "%d:" % When::Coordinates::Pair.new(1,1))
-      assert_equal("1=", When.m17n("%d:") % When::Coordinates::Pair.new(1,1))
+      pair11 = When::Coordinates::Pair.new(1,1)
+      assert_equal("2:", "%d:" % pair11)
+      assert_equal("2=", "%d=" % pair11)
+      assert_equal("1=", When.m17n("%d:") % pair11)
 
       date = When.when?('2011-02-28T12:34:56+09:00')
       assert_equal(["February", {""=>"February", "ja"=>"2月"}], [date.name(-1).to_s, date.name(-1).names])
@@ -70,7 +72,7 @@ module Test
     end
 
     def test__coordinates
-      date = When.when?('2012.3=16T12:34:56', {:frame=>When::CalendarTypes::ChineseLuniSolar.new({'timezone'=>9})})
+      date = When.when?('2012.3=16T12:34:56', {:frame=>When::CalendarTypes::ChineseLuniSolar.new({'time_basis'=>'+09:00'})})
       assert_equal(2012, date.year  )
       assert_equal(When::Coordinates::Pair.new(3,1), date.month)
       assert_equal(  16, date.day   )

data/test/test/parts.rb

@@ -124,14 +124,23 @@ LOCALE
 
     def test__prefix
       date = When.when?('0594-09=12^Japanese')
-      assert_equal(["閏長月", String], [date.name('Month').label, date.name('Month').label.class])
+      assert_equal(["閏長月", When::BasicTypes::M17n], [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("閏長月", date.name('Month').translate('日本語'))
       assert_equal("Intercalary 9th Month", date.name('Month').translate('en_US'))
     end
+
+    def test__split
+      assert_equal([''        ], When::Parts::Locale._split(''))
+      assert_equal(['3.14'    ], When::Parts::Locale._split('3.14'))
+      assert_equal(['3.14', ''], When::Parts::Locale._split('3.14,'))
+      assert_equal(['', '3.14'], When::Parts::Locale._split(',3.14'))
+      assert_equal(['3.14', ' "3.14,159"'], When::Parts::Locale._split('3.14, "3.14,159"'))
+      assert_equal(['3.14', ' "3.14\\"159"'], When::Parts::Locale._split('3.14, "3.14\\"159"'))
+    end
   end
 
-  class IRI < Test::Unit::TestCase
+  class Resource < Test::Unit::TestCase
     def test_nothing
     end
   end