when_exe 0.3.5 → 0.3.6

data/lib/when_exe/parts/resource.rb

@@ -18,6 +18,23 @@ module When::Parts
     # @private
     LabelProperty = nil
 
+    # @private
+    ConstTypes = {
+      'Terms'   => ['BasicTypes::M17n', '%s',     '_m:%s%s'      ],
+      'Era'     => ['TM::CalendarEra',  '%s',     '_e:%s%s'      ],
+      'Residue' => ['Coordinates',      '%s',     '_co:%s%s'     ],
+      'Week'    => ['CalendarNote',     '%sWeek', '_n:%sWeek%s'  ],
+      'Note'    => ['CalendarNote',     '%s',     '_n:%s%s'      ],
+      'Notes'   => ['CalendarNote',     '%s',     '_n:%s/Notes%s'],
+      nil       => ['CalendarTypes',    '%s',     '_c:%s%s'      ]
+    }
+
+    # @private
+    ConstList = []
+
+    # private
+    IRIHeader = /^[_a-z\d]+:[^:]/i
+
     # @private
     class ContentLine
 
@@ -155,6 +172,26 @@ module When::Parts
         @root_dir ||= When::RootDir
       end
 
+      #
+      # 略称を iri に変換する
+      #
+      # @param [String or Symbol] abbreviation 略称
+      #
+      # @return [String] iri or nil
+      #
+      # @private
+      def _abbreviation_to_iri(abbreviation, abbreviation_types=ConstTypes)
+        abbreviation_types[:pattern] ||= /^([A-Z].*?)(#{abbreviation_types.keys.compact.join('|')})?(\?.+|::.+)?$/
+        abbreviation =~ abbreviation_types[:pattern]
+        return nil unless $1
+        klass, name, iri = abbreviation_types[$2]
+        if klass.kind_of?(String)
+          klass = klass.split('::').inject(When) {|k,n| k.const_get(n)}
+          abbreviation_types[$2][0] = klass
+        end
+        klass.const_defined?(name % $1) ? iri % [$1,$3] : nil
+      end
+
       # @private
       attr_reader :_prefix, :_prefix_values, :_prefix_index
       private     :_prefix, :_prefix_values, :_prefix_index
@@ -162,8 +199,9 @@ module When::Parts
       # 初期化
       #
       # @param [Hash] options 以下の通り
-      # @option options [String] :base_uri Base URI for When_exe Resources (Default When::SourceURI)
-      # @option options [String] :root_dir Root Directory for When_exe Resources Cash data (Default When::RootDir)
+      # @option options [String]  :base_uri Base URI for When_exe Resources (Default When::SourceURI)
+      # @option options [String]  :root_dir Root Directory for When_exe Resources Cash data (Default When::RootDir)
+      # @option options [Boolean] :leave_const If true, leave Constants of When module defined
       #
       # @return [void]
       #
@@ -196,6 +234,13 @@ module When::Parts
         @root_dir       = options[:root_dir] || When::RootDir
         @_prefix_values = @_prefix.values.sort.reverse
         @_prefix_index  = @_prefix.invert
+        unless options[:leave_const] || ConstList.empty?
+          ConstList.delete_if do |constant|
+            When.send(:remove_const, constant) if When.const_defined?(constant)
+            true
+          end
+          When._define_common_calendar_types
+        end
       end
 
       # 設定情報を取得する
@@ -219,16 +264,20 @@ module When::Parts
       def _instance(iri, namespace=nil)
         _setup_ unless @_pool
 
-        # 配列は個別に処理
-        return iri.map {|e| _instance(e, namespace)} if iri.kind_of?(Array)
+        case iri
+        when Array    ; return iri.map {|e| _instance(e, namespace)}                  # 配列は個別に処理
+        when Resource ; return iri                                                    # 登録済みはそのまま
+        when String   ;                                                               # 解析処理へ
+        else          ; raise ArgumentError, "can't convert #{iri.class} to String"   # 例外
+        end
 
-        # 文字列以外はそのまま返す
-        return iri unless iri.instance_of?(String)
+        # 内部文字列化
+        iri = When::EncodingConversion.to_internal_encoding(iri)
 
         # 階層がある場合は、階層をたどる
         iri = Resource._decode(iri)
         iri = $1 while iri =~ /^\((.*)\)$/
-        iri = namespace + iri if namespace && iri !~ /^[_a-z\d]+:[^:]/i
+        iri = namespace + iri if namespace && iri !~ IRIHeader
         root, *leaves= Resource._encode(iri).split(/::/)
         if leaves.size > 0
           return leaves.inject(_instance(Resource._decode(root))) {|obj,leaf| obj[Resource._decode(leaf)]}
@@ -278,9 +327,9 @@ module When::Parts
       def _parse(line, type=nil)
         return line unless line.kind_of?(String)
         line.sub!(/\s#.*$/, '')
-        return Locale._split($1) if type && /^#{type}:(.+)$/i =~ line
+        return When::Locale._split($1) if type && /^#{type}:(.+)$/i =~ line
         tokens = line.scan(/((?:[^\\:]|\\.)+)(?::(?!\z))?|:/).flatten
-        return Locale._split(line) unless tokens.size > 1 && /^(\*)?([A-Z][-A-Z_]{0,255})(?:;(.+))?$/i =~ tokens[0]
+        return When::Locale._split(line) unless tokens.size > 1 && /^(\*)?([A-Z][-A-Z_]{0,255})(?:;(.+))?$/i =~ tokens[0]
         marked, key, property = $~[1..3]
         values = tokens[1..-1]
         value  = values.join(':') unless values == [nil]
@@ -410,7 +459,7 @@ module When::Parts
 
         # external Resource
         begin
-          object = When::Parts::Locale.send(:wikipedia_object, path, {:query=>query})
+          object = When::Locale.send(:wikipedia_object, path, {:query=>query})
           return object if object
           OpenURI
           args  = [path, "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r']
@@ -442,10 +491,10 @@ module When::Parts
       def _class(path)
         list = [When]
         path[Resource.base_uri.length..-1].split(/\//).each do |mod|
-          if list[0].const_defined?(mod)
+          if list[0].kind_of?(Module) && list[0].const_defined?(mod)
             list.unshift(list[0].const_get(mod))
           else
-            return nil unless (list[0] == When::V)
+            return nil unless list[0] == When::V
             list.unshift(When::V::Root)
             return list
           end
@@ -866,8 +915,8 @@ module When::Parts
       options.each_pair do |key,value|
         unless (key =~ /^options$|^\.|^[A-Z]/)
           case "#{key}"
-          when 'namespace' ; value = Locale._namespace(value)
-          when 'locale'    ; value = Locale._locale(value)
+          when 'namespace' ; value = When::Locale._namespace(value)
+          when 'locale'    ; value = When::Locale._locale(value)
           end
           instance_variable_set("@#{key}", value)
         end
@@ -896,10 +945,10 @@ module When::Parts
           if content.attribute['altid']
             options[key][content.attribute['prefix'].object] = content.object
           else
-            options[key] = options[key].update(Locale._namespace(value))
+            options[key] = options[key].update(When::Locale._namespace(value))
           end
         when 'locale'
-          options[key] = Locale._locale(value)
+          options[key] = When::Locale._locale(value)
         else
           _parse_altid(properties, content)
           key_list << key unless key_list.include?(key)

data/lib/when_exe/region/armenian.rb

@@ -0,0 +1,56 @@
+# -*- 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 When
+
+  class BasicTypes::M17n
+
+    Armenian = [self, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Armenian=]",
+      "[Armenian=en:Armenian_calendar, アルメニア暦=]",
+
+      [self,
+        "names:[Month=, 月=ja:%%<月_(暦)>]",
+        "[nawasard= ]",
+        "[hoṙi=     ]",
+        "[sahmi=    ]",
+        "[trē=      ]",
+        "[kʿałocʿ=  ]",
+        "[aracʿ=    ]",
+        "[mehekan=  ]",
+        "[areg=     ]",
+        "[ahekan=   ]",
+        "[mareri=   ]",
+        "[margacʿ=  ]",
+        "[hroticʿ=  ]",
+        "[epagomenê=]"
+      ]
+    ]]
+  end
+
+  module CalendarTypes
+
+    #
+    # Armenian Calendar
+    #
+    Armenian =  [CyclicTableBased, {
+      'label'         => 'Armenian::Armenian',
+      'origin_of_LSC' => 1922868,
+      'origin_of_MSC' =>       1,
+      'epoch_in_CE'   =>     552,
+      'indices'       => [
+        When.Index('Armenian::Month', {:unit =>13}),
+        When::Coordinates::DefaultDayIndex
+      ],
+      'rule_table' => {
+        'T' => {'Rule'  =>[365]},
+        365 => {'Length'=>[30]*12+[5]}
+      }
+    }]
+  end
+end

data/lib/when_exe/region/bahai.rb

@@ -8,10 +8,9 @@
 module When
   class BasicTypes::M17n
 
-    BahaiTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/, ar=http://ar.wikipedia.org/wiki/]",
+    Bahai = [self, [
       "locale:[=en:, ar=ar:, alias=en:]",
-      "names:[BahaiTerms=]",
+      "names:[Bahai=]",
       "[Bahai=en:Bah%C3%A1%27%C3%AD_calendar, ja:バハーイー暦=ja:%%<バハーイー教>]",
 
       # %0s は“閏”の表記を抑制する指定となっている
@@ -41,16 +40,19 @@ module When
     ]]
   end
 
+  class CalendarNote
+    Bahai = [['Bahai::YearName'], ['_m:Bahai::Month'], ['Common::Week']]
+  end
+
   module Coordinates
 
     # Bahai years
     Bahai = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/, ar=http://ar.wikipedia.org/wiki/]",
       "locale:[=en:, ar=ar:, alias=en:]",
       "names:[Bahai]",
 
       [Residue,
-        "label:[YearName]", "divisor:19", "year:0", "format:[%1$s(%3$d)]",
+        "label:[YearName]", "divisor:19", "year:0", "format:[%1$s(%3$d)=]",
         [Residue, "label:[Alif=,   ألف=,   A=            ]", "remainder:  0"],
         [Residue, "label:[Bá=,     باء=,   B=            ]", "remainder:  1"],
         [Residue, "label:[Ab=,     أب=,    Father=       ]", "remainder:  2"],
@@ -112,28 +114,26 @@ module When
       # オブジェクトの正規化
       #
       def _normalize(args=[], options={})
-        @label ||= When.Resource('_m:BahaiTerms::Bahai')
+        @label   ||= 'Bahai::Bahai'
 
         @indices ||= [
-          When::Coordinates::Index.new({:unit =>19}),
-          When::Coordinates::Index.new({:unit =>19}),
-          When::Coordinates::Index.new({:trunk=>When.Resource('_m:BahaiTerms::Month::*'),
-                                        :branch=>{+1=>When.Resource('_m:BahaiTerms::Month::*')[19]}}),
+          When.Index({:unit =>19}),
+          When.Index({:unit =>19}),
+          When.Index('Bahai::Month', {:branch=>{+1=>When.Resource('_m:Bahai::Month::*')[19]}}),
           When::Coordinates::DefaultDayIndex
         ]
-        @index_of_MSC  ||= 2
         @origin_of_MSC ||= -1844 + 19*19
         @rule_table    ||= {
           365 => {'Length'=>[19] * 18 + [4, 19], 'IDs'=>ID},
           366 => {'Length'=>[19] * 18 + [5, 19], 'IDs'=>ID}
         }
-        @note ||= 'BahaiNotes'
+        @note ||= 'Bahai'
 
         super
 
         @engine ||= @location ?
           When::Ephemeris::Formula.new({:formula=>'1S', :location=>@location}) :
-          When.Calendar('Gregorian') 
+          When::Gregorian
 
         case @engine
         when When::Ephemeris::Formula; instance_eval('class << self; alias :_sdn_ :ephemeris_equinox; end')

data/lib/when_exe/region/balinese.rb

@@ -8,12 +8,11 @@
 module When
   class BasicTypes::M17n
 
-    BalineseTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Balinese = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[BalineseTerms=]",
+      "names:[Balinese=]",
       "[BalineseLuniSolar=, バリ・サカ暦=]",
-      "[Tenganan=, テンガナン暦=]",
+      "[Tenganan, テンガナン暦=]",
 
       [self,
         "names:[IntercalaryMonth=en:Intercalation, 閏月]",
@@ -90,40 +89,40 @@ module When
       # 2日週
       # @return [When::BasicTypes::M17n]
       def dwiwara
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Dwiwara'][Dwiwara[@remainder % 35]]
+        When.CalendarNote('Balinese/Notes')['day']['Dwiwara'][Dwiwara[@remainder % 35]]
       end
 
       # 4日週
       # @return [When::BasicTypes::M17n]
       def tjaturwara
         index = (@remainder + 137) % 210
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Tjaturwara'][index >= 208 ? 2 : (index-1) % 4]
+        When.CalendarNote('Balinese/Notes')['day']['Tjaturwara'][index >= 208 ? 2 : (index-1) % 4]
       end
 
       # 8日週
       # @return [When::BasicTypes::M17n]
       def astawara
         index = (@remainder + 137) % 210
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Astawara'][index >= 208 ? 6 : (index-1) % 8]
+        When.CalendarNote('Balinese/Notes')['day']['Astawara'][index >= 208 ? 6 : (index-1) % 8]
       end
 
       # 9日週
       # @return [When::BasicTypes::M17n]
       def sangawara
         index = @remainder - 3
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Sangawara'][index < 0 ? 0 : index % 9]
+        When.CalendarNote('Balinese/Notes')['day']['Sangawara'][index < 0 ? 0 : index % 9]
       end
 
       # 10日週
       # @return [When::BasicTypes::M17n]
       def dasawara
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Dasawara'][Dasawara[@remainder % 35]]
+        When.CalendarNote('Balinese/Notes')['day']['Dasawara'][Dasawara[@remainder % 35]]
       end
 
       # Watek
       # @return [When::BasicTypes::M17n]
       def watek
-        When.CalendarNote('BalineseNote/NoteObjects')['day']['Watek'][Watek[@remainder % 35]]
+        When.CalendarNote('Balinese/Notes')['day']['Watek'][Watek[@remainder % 35]]
       end
     end
   end
@@ -134,13 +133,12 @@ module When
     # バリのサカ暦
     #
     BalineseLuniSolar = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[BalineseLuniSolar=, バリ・サカ暦=]",
       ["[SE=, サカ暦=, alias:Balinese_Saka_Era]1887-07<13", "Calendar Epoch", "1965-07<13^BalineseLuniSolar1965",
                                                             "1971-07-04^BalineseLuniSolar1971",
                                                             "1993-07-08^BalineseLuniSolar1993",
-                                                            "2000-06<10^BalineseLuniSolar2000",
+                                                            "1999-06<10^BalineseLuniSolar2000",
                                                             "2003-07<14^BalineseLuniSolar2003", '+Infinity']
     ]]
   end
@@ -192,19 +190,18 @@ module When
       #
       def _normalize(args=[], options={})
 
-        intercalary_month = When.Resource('_m:BalineseTerms::IntercalaryMonth::*')
-        intercalary_day   = When.Resource('_m:BalineseTerms::IntercalaryDay::*')
-        month_index = Coordinates::Index.new({:branch=>{ 0   => intercalary_month[0],  #   白分
-                                                        +0.5 => intercalary_month[1],  #   黒分
-                                                        +1   => intercalary_month[2],  # 閏白分
-                                                        +1.5 => intercalary_month[3]}, # 閏黒分
-                                              :trunk=>When.Resource('_m:BalineseTerms::HinduMonth::*'),
-                                              :shift=>+8})
+        intercalary_month = When.Resource('_m:Balinese::IntercalaryMonth::*')
+        intercalary_day   = When.Resource('_m:Balinese::IntercalaryDay::*')
+        month_index = When.Index('Balinese::HinduMonth', {:branch=>{ 0   => intercalary_month[0],  #   白分
+                                                                    +0.5 => intercalary_month[1],  #   黒分
+                                                                    +1   => intercalary_month[2],  # 閏白分
+                                                                    +1.5 => intercalary_month[3]}, # 閏黒分
+                                                          :shift=>+8})
 
         @origin_of_MSC = 0
 
         @tabular = CyclicTableBased.new({
-          'indices'    => [month_index, Coordinates::Index.new],
+          'indices'    => [month_index, When::Coordinates::DefaultDayIndex],
           'rule_table' => @rule_table
         })
 
@@ -218,9 +215,9 @@ module When
            'lunation_length' => '945/32'
         })]
 
-        @indices    = [month_index, Coordinates::Index.new({:branch=>{-2=>intercalary_day[0]}})]
+        @indices    = [month_index, When.Index({:branch=>{-2=>intercalary_day[0]}})]
 
-        @note       = When.CalendarNote(@note || 'BalineseNote')
+        @note       = When.CalendarNote(@note || 'Balinese')
         super
       end
     end
@@ -277,18 +274,20 @@ module When
     # Tenganan Calendar
     #
     Tenganan = [CyclicTableBased, {
-      'label' => When.Resource('_m:BalineseTerms::Tenganan'),
+      'label'         => 'Balinese::Tenganan',
       'origin_of_LSC' =>  1095 * 1573 - 381,
       'origin_of_MSC' =>  1,
+      'note'          => [['_m:Calendar::Month'],
+                          ['_n:Balinese/Notes::day::Triwara', '_n:Balinese/Notes::day::Pantjawara']],
       'indices' => [
-         When::Coordinates::Index.new({:trunk=>When.Resource('_m:BalineseTerms::TengananMonth::*')}),
+         When.Index('Balinese::TengananMonth'),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table' => {
-        'T'  => {'Rule'  =>[360, 379, 356]},
+        'T'  => {'Rule'  =>[360, 383, 352]},
         360  => {'Length'=>[30] * 12},
-        379  => {'Length'=>[30] * 6 + [26] * 2 + [30] * 4 + [27]},
-        356  => {'Length'=>[30] * 6 + [28] * 2 + [30] * 4 }
+        383  => {'Length'=>[30] * 6 + [26] * 2 + [30] * 4 + [27]},
+        352  => {'Length'=>[30] * 6 + [28] * 2 + [30] * 4 }
       }
     }]
   end
@@ -296,10 +295,9 @@ module When
   #
   # バリ暦の暦注
   #
-  class CalendarNote::BalineseNote < CalendarNote
+  class CalendarNote::Balinese < CalendarNote
 
-    NoteObjects = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Notes = [When::BasicTypes::M17n, [
       "locale:[=en:, ja=ja:, alias]",
       "names:[Balinese]",
 
@@ -567,18 +565,18 @@ module When
     # When::Coordinates::Residue へ処理を委譲する暦注
     #
     # @private
-    When.CalendarNote('BalineseNote/NoteObjects')['day::*'].each do |cood|
+    When.CalendarNote('Balinese/Notes')['day::*'].each do |cood|
       case cood
       when Coordinates::Residue
         module_eval %Q{
           def #{cood.label.to_s.downcase}(date, parameter=nil)
-            When.CalendarNote('BalineseNote/NoteObjects')['day']['#{cood.label.to_s}'] % date
+            When.CalendarNote('Balinese/Notes')['day']['#{cood.label.to_s}'] % date
           end
         }
       when BasicTypes::M17n
         module_eval %Q{
           def #{cood.to_s.downcase}(date, parameter=nil)
-            (When.CalendarNote('BalineseNote/NoteObjects')['day']['Wuku'] % date).#{cood.to_s.downcase}
+            (When.CalendarNote('Balinese/Notes')['day']['Wuku'] % date).#{cood.to_s.downcase}
           end
         }
       end
@@ -608,7 +606,7 @@ module When
       thiti     = [d * 1 - 1]
       thiti[0] += 15 unless [0,1,nil].include?(m * 0)
       thiti << (thiti[0] + 1) % 30 if d * 0 == -2
-      table = When.CalendarNote('BalineseNote/NoteObjects')['day']['Hari']
+      table = When.CalendarNote('Balinese/Notes')['day']['Hari']
       thiti.map {|t| table[t / 15][t % 15]}.join('/')
     end