when_exe 0.3.5 → 0.3.6

data/lib/when_exe/timestandard.rb

@@ -376,8 +376,8 @@ module When::TimeStandard
     #
     def _normalize_time_basis
 
-      @_time_basis ||= @time_basis || (@location ? @location.long / When::Coordinates::Spatial::DEGREE * 240 : When.utc)
-      @_time_basis   = When::Parts::Locale._split(@_time_basis) if @_time_basis.kind_of?(String)
+      @_time_basis ||= @time_basis || (@location ? @location.long / When::Coordinates::Spatial::DEGREE * 240 : When::UTC)
+      @_time_basis   = When::Locale._split(@_time_basis) if @_time_basis.kind_of?(String)
       @_time_basis   = [@_time_basis] unless @_time_basis.kind_of?(Array)
       @_time_basis   = @_time_basis.map {|clock| When.Clock(clock)}
       @_time_basis_offset = @_time_basis.map {|clock| -clock.universal_time / When::TM::Duration::DAY}
@@ -385,9 +385,9 @@ module When::TimeStandard
       @time_basis = @_time_basis[0] if @time_basis
 
       if @_time_basis[0].time_standard.kind_of?(LocalApparentTime)
-        class << self; include ApparentTimeBasis ; end
+        extend ApparentTimeBasis
       else
-        class << self; include FixedTimeBasis    ; end
+        extend FixedTimeBasis
       end
     end
   end

data/lib/when_exe/tmobjects.rb

@@ -1299,9 +1299,7 @@ module When::TM
         else   ; @duration   = nil
         end
       end
-      unless @duration
-        class << self; include NoDuration; end
-      end
+      extend NoDuration unless @duration
     end
 
     # 加減算共通処理

data/lib/when_exe/tmposition.rb

@@ -191,10 +191,10 @@ module When::TM
       #
       # @return [When::TM::CalDate, When::TM::DateAndTime]
       #
-      def tm_position(options={})
+      def tm_pos(options={})
         When.Calendar(options[:frame] || 'Gregorian').jul_trans(self, options)
       end
-      alias :to_tm_position :tm_position
+      alias :to_tm_pos :tm_pos
     end
 
     include When
@@ -275,6 +275,7 @@ module When::TM
       # @option options [String] :tz 時法の指定(時間帯を指定する場合 :clock の替わりに用いることができる)
       # @option options [Array<Numeric>] :abbr ISO8601上位省略形式のためのデフォルト日付(省略時 指定なし)
       # @option options [Integer] :extra_year_digits ISO8601拡大表記のための年の構成要素拡大桁数(省略時 1桁)
+      # @option options [Integer] :ordinal_date_digits ISO8601拡大表記の年内通日の桁数(省略時 3桁)
       # @option options [String] :wkst ISO8601週日形式のための暦週開始曜日(省略時 'MO')
       # @option options [Integer] :precision 生成するオブジェクトの分解能
       # @option options [When::TimeStandard::TimeStandard] :time_standard 時刻系の指定(省略時 When::TimeStandard::UnversalTime)
@@ -440,7 +441,7 @@ module When::TM
         clock = Clock.get_clock_option(query)
         main[:clock] = clock if clock
         [:indeterminated_position, :frame, :events, :precision,
-         :era_name, :era, :abbr, :extra_year_digits, :wkst, :time_standard, :location].each do |key|
+         :era_name, :era, :abbr, :extra_year_digits, :ordinal_date_digits, :wkst, :time_standard, :location].each do |key|
           main[key] = query.delete(key) if (query.key?(key))
         end
         long = query.delete(:long)
@@ -509,7 +510,7 @@ module When::TM
         when :week
           position = ((position  + PeriodDuration.new(4, DAY)) & (Residue.day_of_week(options[:wkst]) << 1)) +
                      PeriodDuration.new((w[0]-1)*7 + (w[1]||1)-1, DAY)
-          position = When::Parts::GeometricComplex.new(position...(position+DurationP1W)) unless w[1]
+          position = When::Parts::GeometricComplex.new(position...(position+P1W)) unless w[1]
         end
         return position
       end
@@ -634,7 +635,7 @@ module When::TM
     #
     # @return [::DateTime]
     #
-    def to_date_time(option={:frame=>When.utc}, start=_default_start)
+    def to_date_time(option={:frame=>When::UTC}, start=_default_start)
       return JulianDate.dynamical_time(dynamical_time, option).to_date_time unless time_standard.rate_of_clock == 1.0
       raise TypeError, "Clock not assigned" unless clock
       Rational
@@ -738,7 +739,7 @@ module When::TM
     def prev
       @precision==When::DAY ? _force_euqal_day(-1) : self-period
     rescue RangeError
-      (When.Calendar('Gregorian') ^ self) - period
+      (When::Gregorian ^ self) - period
     end
 
     # 次の日時
@@ -750,7 +751,7 @@ module When::TM
     def succ
       @precision==When::DAY ? _force_euqal_day(+1) : self+period
     rescue RangeError
-      (When.Calendar('Gregorian') ^ self) + period
+      (When::Gregorian ^ self) + period
     end
     alias :next :succ
 
@@ -1000,11 +1001,11 @@ module When::TM
         when date.to_i == jdn
           return date
         when date.to_i > jdn
-          next_date = date - When::DurationP1D
-          date = (date.to_i == next_date.to_i) ? date - When::DurationP1D * 2 : next_date
+          next_date = date - When::P1D
+          date = (date.to_i == next_date.to_i) ? date - When::P1D * 2 : next_date
         when date.to_i < jdn
-          next_date = date + When::DurationP1D
-          date = (date.to_i == next_date.to_i) ? date + When::DurationP1D * 2 : next_date
+          next_date = date + When::P1D
+          date = (date.to_i == next_date.to_i) ? date + When::P1D * 2 : next_date
         end
         raise RangeError, "can't find target date: #{self} -> #{jdn}" if done.key?(date.to_i)
         done[date.to_i] = true
@@ -1076,7 +1077,7 @@ module When::TM
         options[:frame] = Clock.get_clock_option(options)
         case time
         when Numeric
-          options[:frame] ||= When.utc unless time.kind_of?(Integer)
+          options[:frame] ||= When::UTC unless time.kind_of?(Integer)
           universal_time     = (2*time - (2*JulianDate::JD19700101-1)) * Duration::DAY.to_i / 2.0
         when ClockTime
           options[:frame] ||= time.clock

data/lib/when_exe/tmreference.rb

@@ -188,7 +188,7 @@ module When::TM
       cal_options.delete(:era)
       unless rate_of_clock == jdt.time_standard.rate_of_clock
         cal_options.delete(:time_standard)
-        cal_options[:clock] = @time_basis || When.utc
+        cal_options[:clock] = @time_basis || When::UTC
         jdt = JulianDate.dynamical_time(jdt.dynamical_time, {:time_standard=>time_standard})
       end
 
@@ -244,7 +244,7 @@ module When::TM
     #
     # @return [Numeric] Universal Time
     #
-    def to_universal_time(cal_date, clk_time, clock=When.utc)
+    def to_universal_time(cal_date, clk_time, clock=When::UTC)
       time     = clk_time.dup
       time[0] += _coordinates_to_number(*_decode(cal_date))
       clock.to_universal_time(time) - When::TM::JulianDate::JD19700101 * When::TM::Duration::DAY
@@ -290,6 +290,7 @@ module When::TM
       @indices  ||= DefaultDateIndices
       _normalize_spatial
       _normalize_time_basis
+      _default_index_of_MSC
       _normalize_temporal
       @reference_frame ||= []
     end
@@ -371,7 +372,7 @@ module When::TM
       def _local_time
         case @local_time
         when Array  ; @local_time
-        when nil    ; @local_time = [false, When.utc]
+        when nil    ; @local_time = [false, When::UTC]
         when String ; @local_time = [true,  When::Parts::Timezone[@local_time] ||
                                             When::V::Timezone[@local_time]     ||
                                             When.Clock(@local_time)]
@@ -530,7 +531,7 @@ module When::TM
     # @return [When::TM::ClockTime]
     #
     def utc_trans(u_time)
-      return When.utc.to_clk_time(self.to_universal_time(u_time.clk_time))
+      return When::UTC.to_clk_time(self.to_universal_time(u_time.clk_time))
     end
     alias :utcTrans :utc_trans
 
@@ -541,7 +542,7 @@ module When::TM
     # @return [When::TM::ClockTime]
     #
     def clk_trans(clk_time)
-      return self.to_clk_time(When.utc.to_universal_time(u_time.clk_time))
+      return self.to_clk_time(When::UTC.to_universal_time(u_time.clk_time))
     end
     alias :clkTrans :clk_trans
 
@@ -717,7 +718,7 @@ module When::TM
       @indices ||= DefaultTimeIndices
 
       # note
-      @note    ||= 'JulianDayNotes'
+      @note    ||= 'JulianDay'
 
       # normalize spatial module
       _normalize_spatial
@@ -735,7 +736,7 @@ module When::TM
       @time_standard   = When.Resource(@time_standard||'UniversalTime', '_t:') unless @time_standard.kind_of?(When::TimeStandard)
 
       # utc_reference
-      @utc_reference ||= @zone ? ClockTime.new(@zone.to_s, {:frame=>When.utc}) : Clock.local_time
+      @utc_reference ||= @zone ? ClockTime.new(@zone.to_s, {:frame=>When::UTC}) : Clock.local_time
 
       # reference_time & origin_of_LSC
       case @reference_time
@@ -782,7 +783,7 @@ module When::TM
     # @return [When::TM::DateAndTime] (When::TM::BasicTypes::DateTimeはまちがい)
     #
     def transform_coord(c_value)
-      When.Resource('_c:Gregorian').jul_trans(JulianDate.universal_time(c_value.universal_time, {:frame=>When.utc}))
+      When::Gregorian.jul_trans(JulianDate.universal_time(c_value.universal_time, {:frame=>When::UTC}))
     end
     alias :transformCoord :transform_coord
 
@@ -987,7 +988,7 @@ module When::TM
         args    = args.dup
         options = (args[-1].kind_of?(Hash)) ? args.pop.dup : {}
         key, epoch, reverse = options.delete(:label) || args
-        key = When::Parts::Locale.ideographic_unification(key)
+        key = When::Locale.ideographic_unification(key)
         if key.kind_of?(String)
           key, *parents = key.split(/::/).reverse
         else
@@ -1535,7 +1536,7 @@ module When::TM
       @epoch    ||= epochs
       @epoch[0] ||= '-Infinity'
       @epoch[1] ||= '+Infinity'
-      term_options[:options][:frame] ||= When.Resource('_c:Gregorian')
+      term_options[:options][:frame] ||= When::Gregorian
       epoch = ''
       @epoch = @epoch.map {|e|
         case e

data/lib/when_exe/version.rb

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

data/link_to_online_documents

@@ -1,4 +1,4 @@
 See online documents.
- wiki: http://www2u.biglobe.ne.jp/~suchowan/u/wiki.cgi?Calendar%2FWhen%2FRuby
- yard: http://www2u.biglobe.ne.jp/~suchowan/when_exe/
- demo: http://hosi.org:3000
+ wiki: http://www2u.biglobe.ne.jp/~suchowan/when_exe_wiki.html
+ yard: http://rubydoc.info/gems/when_exe/0.3.5/frames
+ demo: http://hosi.org

data/test/examples/Residue.m17n

@@ -6,7 +6,7 @@ BEGIN:B:M17N
   NAMESPACE:[en=http://en.wikipedia.org/wiki/,
              ja=http://ja.wikipedia.org/wiki/]
   LOCALE:[=en:, ja=ja:, alias]
-  NAMES:[ResidueTerms]
+  NAMES:[Residue]
 
   BEGIN:CO:RESIDUE
     LABEL:[Week, 週]

data/test/examples/Terms.m17n

@@ -6,7 +6,7 @@ BEGIN:B:M17n
   NAMESPACE:[en=http://en.wikipedia.org/wiki/,
              ja=http://ja.wikipedia.org/wiki/]
   LOCALE:[=en:, ja=ja:, alias]
-  NAMES:[CalendarTerms=]
+  NAMES:[Calendar=]
 
   [Calendars_and_Eras=, 暦法と紀元=]
 

data/test/test.rb

@@ -45,7 +45,7 @@ require './test/inspect'
 require './test/googlecalendar'
 require './test/region/m17n'
 require './test/region/residue'
-require './test/region/civil'
+require './test/region/christian'
 require './test/region/japanese'
 require './test/region/chinese'
 require './test/region/vietnamese'
@@ -57,4 +57,5 @@ require './test/region/mayan'
 require './test/region/jewish'
 require './test/region/french'
 require './test/region/coptic'
+require './test/region/yerm'
 require './test/region/geologicalage'

data/test/test/basictypes.rb

@@ -110,6 +110,22 @@ module Test
           date = When.when?(sample[0], {:abbr=>[1985,15,5]})
           assert_equal(sample[1], [date.precision, date.to_s])
         end
+
+        result = []
+        (1900...1928).each do |year|
+          date = ::Date.new(year, 1, 1) - 7
+          14.times do
+            gdate     = When.TemporalPosition(date.year, date.month, date.day)
+            strdate   = date.strftime('%G-W%V-%u')
+            strgdate  = gdate.strftime('%G-W%V-%u')
+            w1date    = When::WeekDate ^ date
+            w2date    = When.when?(strdate, {:frame=>When::WeekDate})
+            strw1date = w1date.strftime
+            strw2date = w2date.strftime
+            result << [[strdate, strgdate, strw1date, strw2date].uniq.size, date.jd == w1date.to_i, date.jd == w2date.to_i]
+          end
+        end
+        assert_equal([[1, true, true]], result.uniq)
       end
 
       def test__x0301_5_2_4
@@ -123,7 +139,7 @@ module Test
       end
 
       def test__x0301_5_3_1
-        When::TM::Clock.local_time = When.utc
+        When::TM::Clock.local_time = When::UTC
 
         [                                                             # 5.3.1 地方時の時刻
          ["T232050",                [ 3, "T23:20:50"          ]],     #  1 完全表記 基本形式
@@ -352,7 +368,7 @@ ISO, jwiki=http://ja.wikipedia.org/wiki/, ewiki=http://en.wikipedia.org/wiki/
 NS
 =jwiki:, en=ewiki:
 LOCALE
-      Term3 = When.Resource('_co:CommonResidue::Week::Monday::Monday')
+      Term3 = When.Resource('_co:Common::Week::Monday::Monday')
 
       def test__code_space
         assert_equal('zip', Term1.codeSpace)

data/test/test/calendarnote.rb

@@ -8,7 +8,7 @@
 
 module Test::CalendarNote
 
-  class Notes < Test::Unit::TestCase
+  class NotesContainer < Test::Unit::TestCase
 
     def test__lunar_phases
       assert_equal([[{:note=>"月相", :value=>"朔(-233/3040)", :position=>"中段"}]],

data/test/test/calendartypes.rb

@@ -10,7 +10,7 @@ module Test::CalendarTypes
 
   class UTC < Test::Unit::TestCase
     def test__utc
-      assert_equal("+00:00", When.utc.tzname[0].to_s)
+      assert_equal("+00:00", When::UTC.tzname[0].to_s)
     end
   end
 

data/test/test/coordinates.rb

@@ -150,16 +150,16 @@ module Test::Coordinates
       sample =[
         ["明治", "http://ja.wikipedia.org/wiki/%E6%98%8E%E6%B2%BB"],
         ["Meiji", "http://en.wikipedia.org/wiki/Meiji_period"],
-        ["M", ""],
+        ["M", "http://ja.wikipedia.org/wiki/%E6%98%8E%E6%B2%BB"],
         ["大正", "http://ja.wikipedia.org/wiki/%E5%A4%A7%E6%AD%A3"],
         ["Taishō", "http://en.wikipedia.org/wiki/Taish%C5%8D_period"],
-        ["T", ""],
+        ["T", "http://ja.wikipedia.org/wiki/%E5%A4%A7%E6%AD%A3"],
         ["昭和", "http://ja.wikipedia.org/wiki/%E6%98%AD%E5%92%8C"],
         ["Shōwa", "http://en.wikipedia.org/wiki/Sh%C5%8Dwa_period"],
-        ["S", ""],
+        ["S", "http://ja.wikipedia.org/wiki/%E6%98%AD%E5%92%8C"],
         ["平成", "http://ja.wikipedia.org/wiki/%E5%B9%B3%E6%88%90"],
         ["Heisei", "http://en.wikipedia.org/wiki/Heisei_period"],
-        ["H", ""]
+        ["H", "http://ja.wikipedia.org/wiki/%E5%B9%B3%E6%88%90"]
       ]
       ['明治', '大正', '昭和', '平成'].each do |nengo|
          era = When::era(nengo)
@@ -194,7 +194,7 @@ module Test::Coordinates
   # 空間位置
   #
   class Spatial < Test::Unit::TestCase
-    IndianCities = [
+    Indian = [
       ["CentralIndia",
        "インド中部",
        "http://en.wikipedia.org/wiki/CentralIndia",
@@ -365,8 +365,8 @@ module Test::Coordinates
     end
 
     def test__spatial_m17n
-      ['_co:IndianCities', 'examples/Spatial.m17n'].each do |iri|
-        samples = IndianCities.dup
+      ['_co:Indian', 'examples/Spatial.m17n'].each do |iri|
+        samples = Indian.dup
         assert_equal(samples.size, When.Resource(iri).child.size)
         When.Resource(iri).child.each do |obj|
           name   = obj.label

data/test/test/parts.rb

@@ -75,11 +75,6 @@ module Test::Parts
     end
   end
 
-  class SnapShot < Test::Unit::TestCase
-    def test_nothing
-    end
-  end
-
   class Locale < Test::Unit::TestCase
     Term1 = When.m17n('Tokyo', 'zip')
     Term2 = When.m17n(<<LABEL, <<NS, <<LOCALE)
@@ -92,7 +87,7 @@ ISO, jwiki=http://ja.wikipedia.org/wiki/, ewiki=http://en.wikipedia.org/wiki/
 NS
 =jwiki:, en=ewiki:
 LOCALE
-    Term3 = When.Resource('_co:CommonResidue::Week::Monday::Monday')
+    Term3 = When.Resource('_co:Common::Week::Monday::Monday')
 
     def test__locale
       assert_equal("Tokyo", Term1.translate('en_US'))
@@ -128,16 +123,16 @@ LOCALE
       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'))
+      assert_equal("Intercalary Month 9", 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"'))
+      assert_equal([''        ], When::Locale._split(''))
+      assert_equal(['3.14'    ], When::Locale._split('3.14'))
+      assert_equal(['3.14', ''], When::Locale._split('3.14,'))
+      assert_equal(['', '3.14'], When::Locale._split(',3.14'))
+      assert_equal(['3.14', ' "3.14,159"'], When::Locale._split('3.14, "3.14,159"'))
+      assert_equal(['3.14', ' "3.14\\"159"'], When::Locale._split('3.14, "3.14\\"159"'))
     end
   end
 

data/test/test/region/christian.rb

@@ -0,0 +1,245 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2012-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 ChristianVariation < Test::Unit::TestCase
+
+    def verify_built_in_date(calendar, start, length)
+      date = Date.new(start, 1, 1)
+      diff = {}
+      while date.year < start + length
+        cal_date = [date.year, date.month, date.day]
+        cal_jdn  = date.jd
+        fdate = When.TemporalPosition(date.year, date.month, date.day, {:frame=>calendar})
+        rdate = calendar ^ cal_jdn
+        [fdate, rdate].each do |tdate|
+          [[cal_date, tdate.cal_date], [cal_jdn, tdate.to_i]].each do |verify|
+            unless verify.uniq.size == 1
+              diff[cal_date] ||= []
+              diff[cal_date] << verify[1]
+            end
+          end
+        end
+        date = yield(date)
+      end
+      diff
+    end
+
+    def test__verify_to_built_in_date
+
+      sample = [{}, {}, {}, {}, {}, {[2900, 1, 1]=>[2780263, [2900, 1, 2]]}]
+
+      %w(Gregorian RevisedJulian).each do |name|
+        calendar = When.Calendar(name)
+        assert_equal(sample.shift, verify_built_in_date(calendar, 1900,  8) {|date| date  +    1})
+        assert_equal(sample.shift, verify_built_in_date(calendar, 2000,400) {|date| date >>    1})
+        assert_equal(sample.shift, verify_built_in_date(calendar, 2400,900) {|date| date >> 1200})
+      end
+    end
+
+    def test__gregorian_date
+
+      calendar = When.Calendar('Gregorian')
+
+      dates = [When.when?('1900-02-28', {:frame=>calendar})]
+      9.times do
+        dates << dates.last + When::P1Y * 100
+      end
+      assert_equal([2415079, 2451603, 2488128, 2524652, 2561176,
+                    2597700, 2634225, 2670749, 2707273, 2743797], dates.map {|date| date.to_i})
+      assert_equal(%w(1900-02-28 2000-02-28 2100-02-28 2200-02-28 2300-02-28
+                      2400-02-28 2500-02-28 2600-02-28 2700-02-28 2800-02-28), dates.map {|date| (calendar ^ date.to_i).to_s})
+      assert_equal([28, 29, 28, 28, 28, 29, 28, 28, 28, 29], dates.map {|date| date.length(When::MONTH)})
+
+      dates = [When.when?('1900-03-01', {:frame=>calendar})]
+      9.times do
+        dates << dates.last + When::P1Y * 100
+      end
+      assert_equal([2415080, 2451605, 2488129, 2524653, 2561177,
+                    2597702, 2634226, 2670750, 2707274, 2743799], dates.map {|date| date.to_i})
+      assert_equal(%w(1900-03-01 2000-03-01 2100-03-01 2200-03-01 2300-03-01
+                      2400-03-01 2500-03-01 2600-03-01 2700-03-01 2800-03-01), dates.map {|date| (calendar ^ date.to_i).to_s})
+      assert_equal([1], dates.map {|date| calendar._century_from_jdn(date.to_i) - calendar._century_from_jdn(date.to_i-1)}.uniq)
+    end
+
+    def test__revised_julian_date
+
+      calendar = When.Calendar('RevisedJulian')
+
+      dates = [When.when?('1900-02-28', {:frame=>calendar})]
+      9.times do
+        dates << dates.last + When::P1Y * 100
+      end
+      assert_equal([2415079, 2451603, 2488128, 2524652, 2561176,
+                    2597700, 2634225, 2670749, 2707273, 2743797], dates.map {|date| date.to_i})
+      assert_equal(%w(1900-02-28 2000-02-28 2100-02-28 2200-02-28 2300-02-28
+                      2400-02-28 2500-02-28 2600-02-28 2700-02-28 2800-02-28), dates.map {|date| (calendar ^ date.to_i).to_s})
+      assert_equal([28, 29, 28, 28, 28, 29, 28, 28, 28, 28], dates.map {|date| date.length(When::MONTH)})
+
+      dates = [When.when?('1900-03-01', {:frame=>calendar})]
+      9.times do
+        dates << dates.last + When::P1Y * 100
+      end
+      assert_equal([2415080, 2451605, 2488129, 2524653, 2561177,
+                    2597702, 2634226, 2670750, 2707274, 2743798], dates.map {|date| date.to_i})
+      assert_equal(%w(1900-03-01 2000-03-01 2100-03-01 2200-03-01 2300-03-01
+                      2400-03-01 2500-03-01 2600-03-01 2700-03-01 2800-03-01), dates.map {|date| (calendar ^ date.to_i).to_s})
+      assert_equal([1], dates.map {|date| calendar._century_from_jdn(date.to_i) - calendar._century_from_jdn(date.to_i-1)}.uniq)
+    end
+  end
+
+  class Swedish < Test::Unit::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 < Test::Unit::TestCase
+    def test__border
+      frame = When.Calendar('Civil?reform=1752-9-14&border=0-3-25(1753)0-1-1')
+      assert_equal("1641=03-24", (frame ^ When.when?('1642-4-3')  ).to_s)
+      assert_equal("1642-03-25", (frame ^ When.when?('1642-4-4')  ).to_s)
+      assert_equal("1752-12-31", (frame ^ When.when?('1752-12-31')).to_s)
+      assert_equal("1753-01-01", (frame ^ When.when?('1753-1-1')  ).to_s)
+      assert_equal("1753-03-24", (frame ^ When.when?('1753-3-24') ).to_s)
+      assert_equal("1753-03-25", (frame ^ When.when?('1753-3-25') ).to_s)
+    end
+
+    def test__reform_inc
+      sample = %w(
+        1582-09-30 1582-10-01 1582-10-02 1582-10-03 1582-10-04 1582-10-15 1582-10-16 1582-10-17
+        1582-10-18 1582-10-19 1582-10-20 1582-10-21 1582-10-22 1582-10-23 1582-10-24 1582-10-25
+        1582-10-26 1582-10-27 1582-10-28 1582-10-29 1582-10-30 1582-10-31 1582-11-01 1582-11-02
+        1582-11-03)
+      date = When.when?('1582-9-30', :frame=>'Civil?reform=1582-10-15')
+      25.times do
+        assert_equal(sample.shift, date.to_s)
+        date = date + When::P1D
+      end
+    end
+
+    def test__reform_dec
+      sample = %w(
+        1582-11-01 1582-10-31 1582-10-30 1582-10-29 1582-10-28 1582-10-27 1582-10-26 1582-10-25
+        1582-10-24 1582-10-23 1582-10-22 1582-10-21 1582-10-20 1582-10-19 1582-10-18 1582-10-17
+        1582-10-16 1582-10-15 1582-10-04 1582-10-03 1582-10-02 1582-10-01 1582-09-30 1582-09-29
+        1582-09-28)
+      date = When.when?('1582-11-01', :frame=>'Civil?reform=1582-10-15')
+      25.times do
+        assert_equal(sample.shift, date.to_s)
+        date = date - When::P1D
+      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(
+        [[1752,
+         [[3,
+          ["*", 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, "*", "*", "*", "*"]]],
+         [[4,
+          ["*", "*", "*", "*", 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, "*", "*"]]],
+         [[5,
+          ["*", "*", "*", "*", "*", "*", 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, "*", "*", "*", "*", "*", "*"]]],
+         [[6,
+          ["*", "*", 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, "*", "*", "*", "*"]]],
+         [[7,
+          ["*", "*", "*", "*", 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, "*"]]],
+         [[8,
+          ["*", "*", "*", "*", "*", "*", "*", 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, "*", "*", "*", "*", "*"]]],
+         [[9,
+          ["*", "*", "*", 1, 2, 14, 15, 16],
+          ["*", 17, 18, 19, 20, 21, 22, 23],
+          ["*", 24, 25, 26, 27, 28, 29, 30]]],
+         [[10,
+          ["*", 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, "*", "*", "*", "*"]]],
+         [[11,
+          ["*", "*", "*", "*", 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, "*", "*"]]],
+         [[12,
+          ["*", "*", "*", "*", "*", "*", 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, "*", "*", "*", "*", "*", "*"]]]]],
+        date.year_included('Sunday') {|d,b|
+          case b
+          when When::YEAR  ; d[When::YEAR]
+          when When::MONTH ; d[When::MONTH]
+          when When::DAY   ; d[When::DAY]
+          else       ; '*'
+         end
+        }
+      )
+    end
+  end
+end