when_exe 0.4.4 → 0.4.5

data/lib/when_exe/icalendar.rb

@@ -528,6 +528,17 @@ module When::V
                   'resources', 'rdate']]
     # Classes   = [V::Root, V::Alarm]
 
+    RegisteredNotes = {
+      'term'      => 'SolarTerms',
+      'phase'     => 'LunarPhases',
+      'easter'    => 'Christian',
+      'christmas' => 'Christian'
+    }
+
+    RegisteredNoteMethods = /\A(#{RegisteredNotes.keys.sort.reverse.join('|')})/
+
+    DayOfWeek =  %w(SU MO TU WE TH FR SA)
+
     class << self
       include When::Parts::Resource::Pool
 
@@ -565,6 +576,101 @@ module When::V
       def default_until
         @default_until ||= 1000*When::TM::Duration::YEAR
       end
+
+      # ISO8601へ埋め込まれた指定に対応する iterator を生成する
+      #
+      # @param [When::TM::TemporalPosition] base            イベントの始点
+      # @param [When::TM::Duration]         duration        イベントの期間
+      # @param [Hash]                       delayed_options 遅延適用するオブジェクト変換オプション
+      #
+      # @return [When::Parts::Enumerator]
+      #
+      def iterator_for_ISO8601(base, duration, delayed_options)
+        duration.to_s =~ /\A-?P(\d+)([YM])\z/
+        event_options = {'rrule'=>
+          case $2
+          when 'Y' ; {'FREQ'=>'YEARLY',  'INTERVAL'=>$1.to_i}
+          when 'M' ; {'FREQ'=>'MONTHLY', 'INTERVAL'=>$1.to_i}
+          else     ; duration ? {'FREQ'=>duration.set_repeat(false).abs} : {'FREQ'=>'YEARLY'}
+          end
+        }
+        residue_options = delayed_options[:residue]
+        if residue_options
+          event_options['rrule'].update(_byyear(residue_options)) if residue_options[0]
+          event_options['rrule'].update(_byday(residue_options )) if residue_options[2]
+          delayed_options.delete(:residue)
+        end
+        if base.precision == When::MONTH && event_options['rrule']['FREQ'] == 'YEARLY'
+          event_options['rrule'].update({'BYMONTH'=>base[When::MONTH]})
+          base = base.floor if event_options['rrule']['BYMONTHDAY']
+        end
+        case base
+        when When::TM::TemporalPosition ; event_options.update({'dtstart'  =>base})
+        else                            ; event_options.update({'dtstart'  =>base.first,
+                                                                'duration' =>base.last-base.first})
+        end
+        event_options['duration']  = delayed_options.delete(:duration) if delayed_options[:duration]
+        behavior_options           = {'1st'=>delayed_options.delete(:first) || "don't care"}
+        behavior_options[:delayed] = delayed_options unless delayed_options.empty?
+        behavior_options[:direction] = :reverse if duration && duration.sign < 0
+        return new(event_options).enum_for(event_options['dtstart'], behavior_options)
+      end
+
+      private
+
+      # オブジェクト変換オプションの遅延適用のBYYEAR要素
+      #
+      def _byyear(options)
+        {'BYYEAR'=>_to_ical_hash(When.Residue(options.delete(0)), 'year', 4)}
+      end
+
+      # オブジェクト変換オプションの遅延適用のBYDAY要素
+      #
+      def _byday(options)
+        operation = options.delete(2)
+        return {'BYDAY'=>_to_ical_hash(operation, 'day', 11)} if operation.kind_of?(When::Coordinates::Residue)
+
+        residues = []
+        result   = {}
+        byday    = {}
+
+        # イベント、日付
+        operation.split('&').each do |element|
+          element.strip!
+          case element
+          when RegisteredNoteMethods ; byday.update({nil=>element})
+          when /\A(.+?)#(.+)\z/      ; byday.update({$1=>$2})
+          when /\A[-+,\d]+\z/        ; result['BYMONTHDAY'] = element
+          else                       ; residues << element
+          end
+        end
+ 
+        # 剰余類
+        unless residues.empty?
+          residue = residues.join('&')
+          if residue =~ /\A[-+]?\d*(MO|TU|WE|TH|FR|SA|SU)\z/
+            result['BYWEEKDAY'] = residue
+          else
+            resource = When.Residue(residue)
+            if resource
+              byday.update(_to_ical_hash(resource, 'day', 11))
+            else
+              result['BYWEEKDAY'] = residue
+            end
+          end
+        end
+
+        result['BYDAY'] = byday unless byday.empty?
+        return result
+      end
+
+      # 剰余のハッシュ化
+      def _to_ical_hash(residue, unit, offset)
+        operation = ''
+        operation << "#{residue.carry < 0 ? residue.carry : residue.carry+1}*" if residue.shifted
+        operation << "#{(residue.remainder-offset+residue.units[unit]) % residue.divisor}"
+        {residue.divisor=>operation}
+      end
     end
 
     # SUMMARY Property
@@ -1065,6 +1171,7 @@ module When::V
         @options = When::Parts::Enumerator._options(args)
         @exdate  = @options.delete(:exdate)
         @exevent = @options.delete(:exevent)
+        @delayed = @options.delete(:delayed)
         @parent, @rule, @dtstart, @duration, *rest = args
         @dtstart = When.when?(@dtstart)
         @rule    = self.class._decode_rule(@rule, @dtstart) if (@rule.kind_of?(String))
@@ -1267,7 +1374,7 @@ module When::V
               position = rule[(by_part == 'BYYEAR') ? 'YEARPOS' : 'DAYPOS'][ref]
               start    = rule[(by_part == 'BYYEAR') ? 'YEARST'  : 'DAYST' ][ref]
               rule[by_part][ref] = ((ref.to_i==0) ? Logic::Enumerator :
-                                                    Logic::Residue).new(by_part, list, position, ref, start)
+                                                    Logic::Residue).new(by_part, list, position, ref, start, dtstart)
             end
           end
         end
@@ -1457,7 +1564,7 @@ module When::V
           end
 
           # @private
-          def initialize(by_part, list, position, ref, start)
+          def initialize(by_part, list, position, ref, start, dtstart)
             @by_part = by_part
             divisor  = When::Coordinates::Pair._en_number(ref)
             @list    = list.split(/,/).map {|w|
@@ -1519,9 +1626,19 @@ module When::V
           end
 
           # @private
-          def initialize(by_part, list, position, ref, start)
+          def initialize(by_part, list, position, ref, start, dtstart)
             @by_part = by_part
-            @ref     = When.Resource(ref, '_n:')
+            @ref =
+              if ref
+                When.Resource(ref, '_n:')
+              else
+                method = list[/\A[^-+\d]+/]
+                if dtstart.frame.note.respond_to?(method)
+                  dtstart.frame.note
+                else
+                  When.Resource(When::V::Event::RegisteredNotes[method], '_n:')
+                end
+              end
             @start   = start
             @list    = list.split(/,/).map {|w|
               raise ArgumentError, "The #{by_part} rule format error" unless w =~ /\A(([-+]?\d+)\*)?(.+?)([-+]\d+)?\z/

data/lib/when_exe/linkeddata.rb

@@ -40,12 +40,19 @@ module When
       'latitude'        => "Coordinates/Spatial#latitude-instance_method",
       'altitide'        => "Coordinates/Spatial#latitude-instance_method",
       'event'           => "CalendarNote#event-instance_method",
+      'note'            => "CalendarNote/NoteElement",
+      'id'              => "Events/Event#id-instance_method",
+      'group'           => "Events/Event#group-instance_method",
+      'start'           => "Events/Range#start-instance_method",
+      'until'           => "Events/Range#until-instance_method",
+      'west'            => "Coordinates/Spatial/Range#west-instance_method",
+      'east'            => "Coordinates/Spatial/Range#east-instance_method",
+      'south'           => "Coordinates/Spatial/Range#south-instance_method",
+      'north'           => "Coordinates/Spatial/Range#north-instance_method",
+      'bottom'          => "Coordinates/Spatial/Range#bottom-instance_method",
+      'top'             => "Coordinates/Spatial/Range#top-instance_method"
     }
 
-    XSD  = 'http://www.w3.org/2001/XMLSchema'
-    RDFS = 'http://www.w3.org/2000/01/rdf-schema#'
-    RDF  = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-
     #
     # @private
     #
@@ -85,8 +92,9 @@ module When
       def schema(iri=nil)
         ts = base_uri.sub(/When\/$/, 'ts#')
         hash =
-          {'@context'=>{'ts' => ts},
-           '@graph'  => Schema.keys.map {|id| {'@id'=>'ts:'+id, 'ts:reference'=>{'@id'=>DocRoot + Schema[id]}}}
+          {'@context'=>{'rdf'=>When::Namespace::RDF, 'ts' => ts},
+           '@graph'  => Schema.keys.map {|id| {'@id'=>'ts:'+id, 'rdf:type'=>{'@id'=>'rdf:Property'},
+                                               'ts:reference'=>{'@id'=>DocRoot + Schema[id]}}}
           }
         bless(hash, iri || ts[0..-2])
       end
@@ -117,7 +125,7 @@ module When
           JSON.generate(jsonld_hash)
         else
           array = JSON::LD::API.toRdf(jsonld_hash)
-          graph = ::RDF::Graph.new << array
+          graph = RDF::Graph.new << array
           args  = [writer]
           args << {:prefixes=>prefixes} if prefixes
           graph.dump(*args)
@@ -162,13 +170,13 @@ module When
       def namespace_prefixes(*resources)
         base = base_uri.sub(/When\/$/, '')
         resources.inject({
-          'xsd'  => [XSD],
-          'rdf'  => [RDF],
-          'rdfs' => [RDFS],
-          'owl'  => ['http://www.w3.org/2002/07/owl#'],
-          'dc'   => ['http://purl.org/dc/elements/1.1/'],
-          'dcq'  => ['http://purl.org/dc/terms/'],
-          'dct'  => ['http://purl.org/dc/dcmitype/'],
+          'xsd'  => [When::Namespace::XSD ],
+          'rdf'  => [When::Namespace::RDF ],
+          'rdfs' => [When::Namespace::RDFS],
+          'owl'  => [When::Namespace::OWL ],
+          'dc'   => [When::Namespace::DC  ],
+          'dcq'  => [When::Namespace::DCQ ],
+          'dct'  => [When::Namespace::DCT ],
         # 'tp'   => [base + 'tp/'],
           'ts'   => [base + 'ts#']
         }) {|namespace, resource|
@@ -315,6 +323,8 @@ module When
         hash[key] = value if /^@/ =~ key.to_s
       end
       hash[RDF + 'type'] = {'@id'=>base + 'ts/' + self.class.to_s.gsub(/::/, '/')}
+      hash[RDFS + 'subPropertyOf'] = {'@id'=>base + 'ts#note'} if kind_of?(When::CalendarNote::NoteElement) ||
+                                                                  kind_of?(When::Parts::Resource) && /\/notes\// =~ iri && !leaf?
       if options[:context]
         options[:prefixes] ||= When::Parts::Resource.namespace_prefixes
         context = hash['@context'] || {}
@@ -371,9 +381,10 @@ module When
     def compact_namespace_to_prefix(source, prefixes, context=nil)
       return source unless prefixes
       prefixes.each_pair do |key, value|
-        Array(value).each do |prefix|
-          start = source.index(prefix)
-          body  = source[prefix.length..-1]
+        Array(value).each do |namespace|
+          namespace = namespace.sub(/([a-z0-9])\z/i, '\1#')
+          start     = source.index(namespace)
+          body      = source[namespace.length..-1]
           return key + ':' + body if start == 0 && body !~ /[:#\/]/
         end
       end
@@ -459,7 +470,7 @@ module When
     #
     def to_uri_linkeddata(*args)
       date, frame = _to_uri(to_s(*args)).split('^^', 2)
-      frame += '_' if frame =~ /\d\z/
+      frame += '_' if /\d\z/ =~ frame
       date = "#{frame}(#{date})" if frame
       When::Parts::Resource.base_uri.sub(/When\/$/, 'tp/') + date
     end

data/lib/when_exe/locales/akt.rb

@@ -147,6 +147,35 @@ module When
     # @private
     IAST_K_keys = transliteration_keys(IAST_K)
 
+    # @private
+    NumAlter1 = [['〇','零'], [/[壱壹]/,'一'], [/[弐貳]/,'二'], [/[弎参參]/,'三'], ['肆','四'],
+                 ['伍','五'], ['陸','六'], ['柒','七'], ['捌','八'], ['玖','九'], ['拾','十'],
+                 ['廿', '二十'], [/[卅丗]/, '三十'], ['卌', '四十'],
+                 ['佰', '百'], ['仟', '千'], ['萬', '万'], ['秭', '𥝱']]
+
+    # @private
+    NumAlter2 = [['零〇','０'], ['一壱壹','１'], ['二弐貳','２'], ['三弎参參','３'], ['四肆','４'],
+                 ['五伍','５'], ['六陸','６'], ['七柒','７'], ['八捌','８'], ['九玖','９']]
+
+    # @private
+    Numbers  = %w(零 一 二 三 四 五 六 七 八 九 十 百 千 万 億 兆 京 垓 𥝱
+                  穣 溝 澗 正 載 極 恒河沙 阿僧祇 那由他 不可思議 無量大数)
+
+    # @private
+    NumRExp1 = /#{Numbers[10..12].reverse.map {|num| "(?:(.*)#{num})"}.join('?')}?(.*)/
+
+    # public
+    NumRExp3 = /([#{Numbers[0..12].join('')}廿卅丗卌]+)/
+
+    # @private
+    NumRExp4 = /#{Numbers[13..-1].reverse.map {|num| "(?:(.*)#{num})"}.join('?')}?(.*)/
+
+    # @private
+    NumMap   = Hash[*(Numbers[0..9].zip((0..9).to_a)).flatten]
+
+    # @private
+    DigitMap = [1,1,1,0]
+
     #
     # Convert AKT string to katakana scripts
     #
@@ -173,5 +202,39 @@ module When
         gsub(/([rm])y/, '\1uy'),
         locale)
     end
+ 
+    #
+    # Convert kanji scripts to numeric
+    #
+    def self.k2a_digits(figures, force_alter=false)
+      if force_alter
+        figures = figures.dup
+        NumAlter1.each {|alter| figures.gsub!(*alter)}
+      end
+      sum = 0
+      NumRExp4 =~ figures
+      $~.to_a[1..-1].each do |wide_match|
+        if NumRExp1 =~ wide_match
+          $~.to_a[1..-1].each_with_index do |match,digit|
+            sum *= 10
+            sum += (NumMap[match] || DigitMap[digit]) if match
+          end
+        else
+          sum *= 10000
+        end
+      end
+      sum
+    end
+
+    #
+    # Convert zenkaku figures to numeric
+    #
+    def self.z2h_digits(figures, force_alter=false)
+      if force_alter
+        figures = figures.dup
+        NumAlter2.each {|alter| figures.tr!(*alter)}
+      end
+      figures.tr('０１２３４５６７８９', '0123456789').to_i
+    end
   end
 end

data/lib/when_exe/locales/locale.rb

@@ -63,6 +63,10 @@ module When
     # @private
     Link = /<li class="interlanguage-link interwiki-(.+?)"><a href="\/\/(.+?)\.wikipedia\.org\/wiki\/(.+?)" title="(.+?) – /
 
+    # NUL for Escape
+    # @private
+    NUL = 0.chr
+
     class << self
 
       # Wikipedia の連続的な参照を抑制するための遅延時間/秒
@@ -134,6 +138,29 @@ module When
         source
       end
 
+      # 暦要素を含む文字列を Hash に分解する
+      #
+      # @param [String] date_time 暦要素を含む文字列
+      # @param [String or Hash] format 分解する書式
+      # @param [String] locale 言語指定
+      #
+      # @return [Hash] 暦要素を分解格納した Hash
+      #
+      def _to_date_time_hash(date_time, format, locale=nil)
+        if locale
+          format    = format.kind_of?(String) ?
+                        translate(format, locale) :
+                        _hash_value(format, locale)
+          unless locale == 'en'
+            regexp, hash = _trans_table(locale)
+            date_time    = date_time.gsub(regexp) {|match| hash[match]}
+          end
+        end
+        ::DateTime._strptime(date_time, format)
+      rescue NameError
+        raise "Please require standard library 'Date' or 'DateTime'"
+      end
+
       # 包摂リストに登録されている文字を包摂する
       #
       # @param [When::Locale] source 文字を包摂しようとする国際化文字列
@@ -243,20 +270,27 @@ module When
         }
       end
 
-      # locale 指定を解析して Hash の値を取り出す
+      # locale 指定を解析して key の値を取り出す
       # @private
-      def _hash_value(hash, locale, defaults=['', 'en'])
+      def _hash_key(hash, locale, defaults=['', 'en'])
         locale = locale.sub(/\..*/, '')
-        return hash[locale] if hash[locale]
-        return _hash_value(hash, _alias[locale], defaults) if _alias[locale]
-        language = locale.sub(/-.*/, '')
-        return hash[language] if hash[language]
+        return locale if hash.key?(locale)
+        return _hash_key(hash, _alias[locale], defaults) if _alias.key?(locale)
+        language = locale.sub(/[-_].*/, '')
+        return language if hash.key?(language)
         defaults.each do |default|
-          return hash[default] if hash[default]
+          return default if hash.key?(default)
         end
         return nil
       end
 
+      # locale 指定を解析して Hash の値を取り出す
+      # @private
+      def _hash_value(hash, locale, defaults=['', 'en'])
+        key = _hash_key(hash, locale, defaults)
+        key ? hash[key] : nil
+      end
+
       # 漢字の包摂パターン
       # @private
       def _unification
@@ -269,7 +303,7 @@ module When
         access_key = access_key.split(/\//).map {|key| key =~ /\A[0-9]+\z/ ? key.to_i : key}
         locale = locale.sub(/\..*/, '')
         [locale, locale.sub(/-.*/, '')].each do |loc|
-          symbol = ('Locale_' + loc.sub(/-/,'_')).to_sym
+          symbol = ('Locale_' + loc.gsub(/-/,'_')).to_sym
           return {locale=>access_key.inject(const_get(symbol)) {|hash, key| hash = hash[key]}} if const_defined?(symbol)
         end
         return nil
@@ -283,7 +317,7 @@ module When
       # @private
       def _dbpedia(source)
         return nil unless Ref =~ source
-        return "http://#{$1=='en' ? '' : $1+'.'}dbpedia.org/resource/#{URI.decode($2)}"
+        return "http://#{$1=='en' ? '' : $1+'.'}dbpedia.org/resource/#{CGI.unescape($2)}"
       end
 
       private
@@ -309,7 +343,7 @@ module When
       # wikipedia の読み込み
       def _wikipedia_object(path, locale, file, query, interval, options)
         # 採取済みデータ
-        title = URI.decode(file.gsub('_', ' '))
+        title = CGI.unescape(file.gsub('_', ' '))
         mode  = "".respond_to?(:force_encoding) ? ':utf-8' : ''
         dir   = When::Parts::Resource.root_dir + '/data/wikipedia/' + locale
         FileUtils.mkdir_p(dir) unless FileTest.exist?(dir)
@@ -391,6 +425,21 @@ module When
         object._pool['..'] += '?' + query if query
         object
       end
+
+      # 月名と週名の翻訳テーブル
+      def _trans_table(locale)
+        return @trans_table[locale] if @trans_table && @trans_table[locale]
+        hash = Hash[*(%w(_m:Calendar::Month::* _m:Calendar::Abbr_Month::*
+                         _co:Common::Week::* _co:Common::Abbr_Day::*).inject([]) {|list, iri|
+          list.concat(When.Resource(iri).map {|resource|
+            label = resource.kind_of?(When::BasicTypes::M17n) ? resource : resource.label
+            [label.translate(locale), label.translate('en')]
+          })
+        }.sort_by {|pair| -(pair.first.length*100+pair.last.length)}).flatten]
+        regexp = /#{hash.keys.sort_by {|key| -key.length}.join('|')}/
+        @trans_table       ||= {}
+        @trans_table[locale] = [regexp, hash]
+      end
     end
 
     # ローケール指定時の文字列
@@ -785,7 +834,7 @@ module When
     # encode URI from patterns %%(...) or %.(...) and replace space to '_'
     def _encode(source)
       source.gsub(' ','_').gsub(/%.<.+?>/) { |match|
-        URI.encode(match[3..-2]).gsub('%', match[1..1])
+        CGI.escape(match[3..-2]).gsub('%', match[1..1])
       }
     end
   end