when_exe 0.3.8 → 0.3.9

data/lib/when_exe/region/world.rb

@@ -53,10 +53,10 @@ module When
           [DayOfWeek, "label:[Thursday,   木曜日, /date/day_names/4]", {'delta'=>7}],
           [DayOfWeek, "label:[Friday,     金曜日, /date/day_names/5]", {'delta'=>7}],
           [DayOfWeek, "label:[Saturday,   土曜日, /date/day_names/6]", {'delta'=>7}],
-          [DayOfWeek, "label:[Worldsday=, 週外日=]", {'delta'=>366}],
+          [DayOfWeek, "label:[Worldsday=en:The_World_Calendar#Features, 週外日=]", {'delta'=>366}],
         ],
 
-        "[Common_Week]"
+        "[Common_Week=]"
       ]
     ]]
 
@@ -159,7 +159,7 @@ module When
     #
     # World calendar based on Gregorian calendar
     #
-    World =  [YearLengthTableBased, {
+    World =  [SolarYearTableBased, {
       'label'   => 'World::World',
       'rule_table'       => {
         365  => {'Length'=>[31,30,30]*3 + [31,30,31]},

data/lib/when_exe/region/world_season.rb

@@ -60,7 +60,7 @@ module When
           [DayOfWeek, "label:[OutOfWeek=, 週外日=]", {'delta'=>366}]
         ],
 
-        "[Common_Week]"
+        "[Common_Week=]"
       ]
     ]]
 
@@ -72,7 +72,7 @@ module When
     #
     # WorldSeason calendar based on Gregorian calendar
     #
-    WorldSeason =  [YearLengthTableBased, {
+    WorldSeason =  [SolarYearTableBased, {
       'label'   => 'WorldSeason::WorldSeason',
       'indices' => [
           When.Index('WorldSeasonWeekNotes::month::Month', {:unit =>4}),

data/lib/when_exe/region/yerm.rb

@@ -54,17 +54,19 @@ module When
         when /\A(\d+)\((\d+)\z/                   ;       m, d = [        $1, $2]
         when /\A(\d+)\z/                          ;          d =              $1
 
+        when /\A(-?\d+)-(\d+)\)(\d+)\)(\d+)\z/    ; c, y, m, d = [$1, $4, $3, $2]
+
         when /\A(\d+)\)(\d+)\)(\d+)[-\)](-?\d+)\z/; c, y, m, d = [$4, $3, $2, $1]
         when /\A(\d+)\)(\d+)-(-?\d+)\z/           ; c, y, m, d = [$3, $2, $1    ]
         when /\A(\d+)-(-\d+)\z/                   ; c, y, m, d = [$2, $1        ]
         when /\A(-\d+)\z/                         ; c, y, m, d = [$1            ]
         when /\A(\d+)\)(\d+)\)(\d+)\z/            ;    y, m, d = [    $3, $2, $1]
         when /\A(\d+)\)(\d+)\z/                   ;       m, d = [        $2, $1]
-        else                                    ; c, y, m, d = [              ]
+        else                                      ; c, y, m, d = [              ]
         end
 
         ordered = [c, y, m, d]
-        ordered.pop until ordered.last
+        ordered.pop until ordered.last || ordered.empty?
         raise ArgumentError, "can't parse #{source}" if ordered.empty? || ordered.include?(nil)
         ordered.map {|n| n.to_s}.join('-')
       end

data/lib/when_exe/region/zoroastrian.rb

@@ -185,7 +185,7 @@ module When
     Fasli =  [{'Epoch'=>{
                  'ZRE'=>{'origin_of_MSC'=>1737},
                  'YZ' =>{'origin_of_MSC'=>-630}
-              }}, TableBasedWithSunset, {
+              }}, SolarYearTableBasedWithSunset, {
       'label'   => 'Zoroastrian::Fasli',
       'indices' => [
          When.Index('ZoroastrianNotes::month::Month', {:unit =>13}),

data/lib/when_exe/tmreference.rb

@@ -1355,9 +1355,133 @@ module When::TM
         end
     end
 
-    protected
+    private
 
-    # @private
+    # オブジェクトの正規化
+    def _normalize(args=[], options={})
+      # area, period
+      term_options = {:namespace=>@namespace, :locale=>@locale, :options=>options}
+      @area        = m17n(@area,   nil, nil, term_options) if @area.instance_of?(String)
+      @period      = m17n(@period, nil, nil, term_options) if @period.instance_of?(String)
+
+      # 暦年代の上下限
+      @lower_bound = {}
+      @upper_bound = {}
+
+      # other attributes
+      if @child && @child.length>0
+        _non_leaf_era(args, term_options)
+        _register_calendar_era unless _pool['..'].kind_of?(CalendarEra)
+        @child.each do |era|
+          era.send(:_register_calendar_era)
+        end
+      else
+        _set_leaf_era(args, term_options)
+        _normalize_leaf_era unless @epoch[0].indeterminated_position == When::TimeValue::Min
+      end
+    end
+
+    def _non_leaf_era(args, term_options)
+      @label = m17n(@label, nil, nil, term_options) if @label.instance_of?(String)
+      if @label
+        @label._pool['..']  = self # TODO ここを ||= にすると leaf? の判定がおかしくなる
+        @_pool[@label.to_s] = @label
+      end
+
+      # reference_date, reference_event & label
+      @reference_date    = @child[0].reference_date
+      @reference_event   = @child[0].reference_event
+      @epoch_year        = 0 # @child[0].epoch_year
+      @julian_reference  = @child[0].julian_reference
+
+      # options
+      @options ||= {}
+      @options.update({'area'=>@area, 'period'=>@period})
+
+      # epoch
+      @epoch = []
+      @child.each do |c|
+        c.epoch.each do |e|
+          @epoch << e unless e == @epoch[-1]
+        end
+      end
+    end
+
+    def _set_leaf_era(args, term_options)
+      # 変数の読み込み
+      reference_date, reference_event, *epochs = args
+
+      # reference_date & label
+      if reference_date
+        @reference_date = reference_date
+        @label        ||= m17n(@reference_date[/\A\[[^\]]+\]|^[^-+0-9]+/], nil, nil, term_options)
+      end
+      @label._pool['..'] ||= self
+      @_pool[@label.to_s]  = @label
+
+      # reference_event
+      @reference_event   = reference_event if reference_event
+      @reference_event ||= ""
+      @reference_event   = DefaultEvents[@reference_event] if DefaultEvents[@reference_event]
+      @reference_event   = m17n(@reference_event, nil, nil, term_options) if @reference_event.instance_of?(String)
+      @reference_event._pool['..'] ||= self
+      @_pool[@reference_event.to_s]  = @reference_event
+
+      # options
+      term_options[:options][:query] ||= {}
+      @options ||= {}
+      @options.update(term_options[:options][:query])
+      @options.update({'area'=>@area, 'period'=>@period})
+
+      # epoch
+      @epoch    ||= epochs
+      @epoch[0] ||= '-Infinity'
+      @epoch[1] ||= '+Infinity'
+      term_options[:options][:frame] ||= When::Gregorian
+      epoch = ''
+      @epoch = @epoch.map {|e|
+        case e
+        when ''
+          When.when?('+Infinity')
+        when String
+          d, f = e.split(/\^{1,2}/)
+          term_options[:options][:frame] = When.Resource(f, '_c:') if (f)
+          d.split(/;/).each do |v|
+            v.strip!
+            if (v =~ /\A[-+\d]|^Now$|^Unknown$|^[-+]Infinity\z/i)
+              epoch = v
+              break
+            end
+            k, c = v.split(/\s*[:=]\s*/, 2)
+            if (c.kind_of?(String))
+              code = m17n(c.gsub(/%2C/,','), nil, nil, term_options)
+              @_pool[code.to_s] ||= code
+              @options[k] = term_options[:options][:query][k] = @_pool[code.to_s]
+            else
+              @options.delete(k)
+              term_options[:options][:query].delete(k)
+            end
+          end
+          When.when?(epoch, @options.merge({:frame=>term_options[:options][:frame], :validate=>:epoch}))
+        else
+          e
+        end
+      }
+
+      # normalize for last era
+      last_era = _pool['..'].child[-1] if _pool['..'].kind_of?(CalendarEra)
+      if last_era
+        if last_era.epoch[0].indeterminated_position == When::TimeValue::Min
+          last_era.epoch[0].frame = @epoch[0].frame
+          last_era.epoch[1]       = @epoch[0]
+          last_era.send(:_normalize_leaf_era)
+        elsif last_era.epoch[-1].indeterminated_position == When::TimeValue::Max
+          last_era.epoch[-1] = @epoch[0]
+        end
+      end
+    end
+
+    # 先端の暦年代の正規化
     def _normalize_leaf_era
       # r_date and others
       case @reference_date
@@ -1435,7 +1559,7 @@ module When::TM
       end
     end
 
-    # @private
+    # 暦年代の検索表への登録
     def _register_calendar_era
       return unless @label.kind_of?(When::BasicTypes::M17n)
 
@@ -1488,11 +1612,11 @@ module When::TM
       end
 
       # インデクス登録
-      ((@area||{}).values + [nil]).each do |a|
+      (_expand_sharp((@area||{}).values) + [nil]).each do |a|
         self.class[a] ||= {}
-        ((@period||{}).values + [nil]).each do |p|
+        (_expand_sharp((@period||{}).values) + [nil]).each do |p|
           self.class[a][p] ||= {}
-          (@label.values + [nil]).each do |k|
+          (_expand_sharp(@label.values) + [nil]).each do |k|
             self.class[a][p][k] ||= {}
             [@epoch_year, nil].each do |e|
               self.class[a][p][k][e] ||= []
@@ -1503,130 +1627,18 @@ module When::TM
       end
     end
 
-    private
-
-    # オブジェクトの正規化
-    def _normalize(args=[], options={})
-      # area, period
-      term_options = {:namespace=>@namespace, :locale=>@locale, :options=>options}
-      @area        = m17n(@area,   nil, nil, term_options) if @area.instance_of?(String)
-      @period      = m17n(@period, nil, nil, term_options) if @period.instance_of?(String)
-
-      # 暦年代の上下限
-      @lower_bound = {}
-      @upper_bound = {}
-
-      # other attributes
-      if @child && @child.length>0
-        _non_leaf_era(args, term_options)
-        _register_calendar_era unless _pool['..'].kind_of?(CalendarEra)
-        @child.each do |era|
-          era._register_calendar_era
-        end
-      else
-        _set_leaf_era(args, term_options)
-        _normalize_leaf_era unless @epoch[0].indeterminated_position == When::TimeValue::Min
-      end
-    end
-
-    def _non_leaf_era(args, term_options)
-      @label = m17n(@label, nil, nil, term_options) if @label.instance_of?(String)
-      if @label
-        @label._pool['..']  = self # TODO ここを ||= にすると leaf? の判定がおかしくなる
-        @_pool[@label.to_s] = @label
-      end
-
-      # reference_date, reference_event & label
-      @reference_date    = @child[0].reference_date
-      @reference_event   = @child[0].reference_event
-      @epoch_year        = 0 # @child[0].epoch_year
-      @julian_reference  = @child[0].julian_reference
-
-      # options
-      @options ||= {}
-      @options.update({'area'=>@area, 'period'=>@period})
-
-      # epoch
-      @epoch = []
-      @child.each do |c|
-        c.epoch.each do |e|
-          @epoch << e unless e == @epoch[-1]
-        end
-      end
-    end
-
-    def _set_leaf_era(args, term_options)
-      # 変数の読み込み
-      reference_date, reference_event, *epochs = args
-
-      # reference_date & label
-      if reference_date
-        @reference_date = reference_date
-        @label        ||= m17n(@reference_date[/\A\[[^\]]+\]|^[^-+0-9]+/], nil, nil, term_options)
-      end
-      @label._pool['..'] ||= self
-      @_pool[@label.to_s]  = @label
-
-      # reference_event
-      @reference_event   = reference_event if reference_event
-      @reference_event ||= ""
-      @reference_event   = DefaultEvents[@reference_event] if DefaultEvents[@reference_event]
-      @reference_event   = m17n(@reference_event, nil, nil, term_options) if @reference_event.instance_of?(String)
-      @reference_event._pool['..'] ||= self
-      @_pool[@reference_event.to_s]  = @reference_event
-
-      # options
-      term_options[:options][:query] ||= {}
-      @options ||= {}
-      @options.update(term_options[:options][:query])
-      @options.update({'area'=>@area, 'period'=>@period})
-
-      # epoch
-      @epoch    ||= epochs
-      @epoch[0] ||= '-Infinity'
-      @epoch[1] ||= '+Infinity'
-      term_options[:options][:frame] ||= When::Gregorian
-      epoch = ''
-      @epoch = @epoch.map {|e|
-        case e
-        when ''
-          When.when?('+Infinity')
-        when String
-          d, f = e.split(/\^{1,2}/)
-          term_options[:options][:frame] = When.Resource(f, '_c:') if (f)
-          d.split(/;/).each do |v|
-            v.strip!
-            if (v =~ /\A[-+\d]|^Now$|^Unknown$|^[-+]Infinity\z/i)
-              epoch = v
-              break
-            end
-            k, c = v.split(/\s*[:=]\s*/, 2)
-            if (c.kind_of?(String))
-              code = m17n(c.gsub(/%2C/,','), nil, nil, term_options)
-              @_pool[code.to_s] ||= code
-              @options[k] = term_options[:options][:query][k] = @_pool[code.to_s]
-            else
-              @options.delete(k)
-              term_options[:options][:query].delete(k)
-            end
-          end
-          When.when?(epoch, @options.merge({:frame=>term_options[:options][:frame], :validate=>:epoch}))
+    # '#' つきの年号を '#'つきと'#'なしに展開する
+    # また <...> や (..) の '<','(' と '>',')' を取り去ったものも登録する
+    def _expand_sharp(list)
+      list.map {|name|
+        case name
+        when /\A[\(<](.+)[\)>]\z/, /\A(.+)\?\z/
+          [name, $1]
         else
-          e
+          parts = name.split('#', 2)
+          parts.size < 2 ? name : [name, parts.last]
         end
-      }
-
-      # normalize for last era
-      last_era = _pool['..'].child[-1] if _pool['..'].kind_of?(CalendarEra)
-      if last_era
-        if last_era.epoch[0].indeterminated_position == When::TimeValue::Min
-          last_era.epoch[0].frame = @epoch[0].frame
-          last_era.epoch[1]       = @epoch[0]
-          last_era._normalize_leaf_era
-        elsif last_era.epoch[-1].indeterminated_position == When::TimeValue::Max
-          last_era.epoch[-1] = @epoch[0]
-        end
-      end
+      }.flatten
     end
 
     # 配下のオブジェクトの前後関係の設定

data/lib/when_exe/version.rb

@@ -6,5 +6,5 @@
 =end
 
 module When
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/test/examples/Spatial.m17n

@@ -9,13 +9,13 @@ BEGIN:B:M17N
   NAMES:[Locations]
 
   BEGIN:CO:SPATIAL
-    LABEL:[CentralIndia, インド中部]
+    LABEL:[CentralIndia=, インド中部=]
     LONG: +82.5
     LAT:  N23.11
   END:CO:SPATIAL
 
   BEGIN:CO:SPATIAL
-    LABEL:[NorthIndia, インド北部]
+    LABEL:[NorthIndia=, インド北部]
     LONG: +82.5
     LAT:  +29.0
   END:CO:SPATIAL
@@ -171,7 +171,7 @@ BEGIN:B:M17N
   END:CO:SPATIAL
 
   BEGIN:CO:SPATIAL
-    LABEL:[Ujjain, ウッジャイン]
+    LABEL:[Ujjain, ウッジャイン=]
     LONG: +75.8
     LAT:  +23.2
   END:CO:SPATIAL

data/test/test.rb

@@ -61,11 +61,12 @@ require './test/region/balinese'
 require './test/region/thai'
 require './test/region/indian'
 require './test/region/iran'
-require './test/region/mayan'
+require './test/region/islamic'
 require './test/region/jewish'
 require './test/region/french'
 require './test/region/coptic'
 require './test/region/bahai'
+require './test/region/mayan'
 require './test/region/discordian'
 require './test/region/zoroastrian'
 require './test/region/yerm'

data/test/test/coordinates.rb

@@ -197,12 +197,12 @@ module MiniTest::Coordinates
     Indian = [
       ["CentralIndia",
        "インド中部",
-       "http://en.wikipedia.org/wiki/CentralIndia",
+       nil,
        23.15 + 1.0/30,
        82.5],
       ["NorthIndia",
        "インド北部",
-       "http://en.wikipedia.org/wiki/NorthIndia",
+       nil,
        29.0,
        82.5],
       ["Agra",

data/test/test/region/chinese.rb

@@ -143,7 +143,7 @@ module MiniTest
       assert_raises(ArgumentError) { When.when?('天保3(0563).10.01') }
 
       date = When.when?('始皇帝26*10.01')
-      assert_equal([1640641, 1640641, "始皇帝26(-220)*10.01", "十月"],
+      assert_equal([1640641, 1640641, "<始皇帝>26(-220)*10.01", "十月"],
                    [date.to_i, date.floor(When::YEAR).to_i, date.to_s, date.name('Month')])
 
       cc_221 = When.Resource('_c:Chinese_221')
@@ -223,7 +223,7 @@ module MiniTest
       assert_raises(ArgumentError) {When.when?('崇徳3.1.30', {'period'=>/後金/})}
       assert_equal("正徳16(1521).03.14",          When.TemporalPosition("正徳", 16, 3, 14, {"period"=>/明/}).to_s)
       assert_equal("正徳16(1521).03.14",          When.when?('正徳16.3.14', {'period'=>/明/}).to_s)
-      assert_equal("明::崇禎11(1638).01.30",      When.when?('崇禎11.1.30', {'period'=>/明/}).to_s)
+      assert_equal("中国::明::崇禎11(1638).01.30",When.when?('崇禎11.1.30', {'period'=>/明/}).to_s)
     end
   end
 end