when_exe 0.4.2 → 0.5.0

data/lib/when_exe/locales/locale.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2021 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
@@ -28,7 +28,7 @@ module When
 
     # 省略時 Namespace
     DefaultNamespaces = Hash.new {|hash, key|
-      hash[key] = "http://#{key}.wikipedia.org/wiki/"
+      hash[key] = "https://#{key}.wikipedia.org/wiki/"
       }.update({
       'mailto' => false,
       'https'  => false,
@@ -57,12 +57,16 @@ module When
 
     # Wikipedia の URL の正規表現
     # @private
-    Ref  = /\Ahttp:\/\/(.+?)\.wikipedia\.org\/wiki\/([^#]+?)\z/
+    Ref  = /\Ahttps?:\/\/(.+?)\.wikipedia\.org\/wiki\/([^#]+?)\z/
 
     # Wikipedia の多言語リンクの正規表現
     # @private
     Link = /<li class="interlanguage-link interwiki-(.+?)"><a href="\/\/(.+?)\.wikipedia\.org\/wiki\/(.+?)" title="(.+?) – /
 
+    # NUL for Escape
+    # @private
+    NUL = 0.chr
+
     class << self
 
       # Wikipedia の連続的な参照を抑制するための遅延時間/秒
@@ -75,7 +79,7 @@ module When
       #
       # @param [Hash] options 下記の通り
       # @option options [Hash]    :alias              Locale の読み替えパターンを Hash で指定する。
-      # @option options [Hash]    :namespace_foramt   名前空間定義の省略時に名前空間生成に用いる書式
+      # @option options [Hash]    :namespace_format   名前空間定義の省略時に名前空間生成に用いる書式
       # @option options [Hash]    :unification        漢字の包摂パターンを Hash で指定する。
       # @option options [Numeric] :wikipedia_interval Wikipedia の連続的な参照を抑制するための遅延時間/秒
       #
@@ -85,7 +89,7 @@ module When
       #
       def _setup_(options={})
         @aliases            = options[:alias]            || DefaultAlias
-        @namespaces         = options[:namespace_foramt] || DefaultNamespaces
+        @namespaces         = options[:namespace_format] || DefaultNamespaces
         @unifications       = options[:unification]      || DefaultUnification
         @wikipedia_interval = options[:wikipedia_interval]
       end
@@ -96,7 +100,7 @@ module When
       #
       def _setup_info
         {:alias              => _alias,
-         :namespace_foramt   => _namespaces,
+         :namespace_format   => _namespaces,
          :unification        => _unification,
          :wikipedia_interval => @wikipedia_interval}
       end
@@ -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,12 +303,23 @@ 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
       end
 
+      # DBpedia IRI の取得
+      #
+      # @param [String] source もとの URI
+      #
+      # @return [String] DBpedia IRI
+      # @private
+      def _dbpedia(source)
+        return nil unless Ref =~ source
+        return "http://#{$1=='en' ? '' : $1+'.'}dbpedia.org/resource/#{CGI.unescape($2)}"
+      end
+
       private
 
       # Locale の読み替えパターン
@@ -298,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)
@@ -325,7 +370,7 @@ module When
         contents = nil
         begin
           OpenURI
-          source   = open(path, 'r'+mode)
+          source   = URI.send(:open, path, 'r'+mode, {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE})
           contents = source.read
         ensure
           @wikipedia_last_access = Time.now.to_f
@@ -343,7 +388,7 @@ module When
         }
         contents.scan(Link) do |link|
           word[:names][$2] = $4
-          word[:link ][$2] = "http://#{$2}.wikipedia.org/wiki/#{$3}"
+          word[:link ][$2] = "https://#{$2}.wikipedia.org/wiki/#{$3}"
         end
         object = When::BasicTypes::M17n.new(word)
 
@@ -380,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
 
     # ローケール指定時の文字列
@@ -438,6 +498,16 @@ module When
       return Locale._hash_value(@link, loc.sub('_', '-'))
     end
 
+    # 特定 locale に対応した DBpedia URI の取得
+    #
+    # @param [String] loc locale の指定
+    #
+    # @return [String] loc に対応した DBpedia URI
+    #
+    def dbpedia(loc='')
+      Locale._dbpedia(reference(loc))
+    end
+
     # 部分文字列
     #
     # @param [Range] range String#[] と同様の指定方法で範囲を指定する
@@ -764,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

data/lib/when_exe/locales/transliteration_table.rb

@@ -1,62 +1,62 @@
-# -*- 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
-  module Locale
-    class << self
-
-      #
-      # Generate Regexp for transliteration
-      #
-      # @param [Hash] hash transliteration table
-      #
-      # @return [Regexp] Regexp for transliteration
-      #
-      def transliteration_keys(hash)
-        Regexp.new((hash.keys.sort_by {|key| -key.length} + ['%.*?[A-Za-z]']).join('|'))
-      end
-
-      #
-      # Generate Hash of {locale=>Regexp} for transliteration
-      #
-      # @param [Hash] hash transliteration table hash
-      #
-      # @return [Hash{String=>Regexp}] Hash of {locale=>Regexp} for transliteration
-      #
-      def transliteration_keys_hash(hash)
-        Hash[*(hash.keys.map {|locale|
-              [locale, transliteration_keys(hash[locale])]
-            }).flatten]
-      end
-
-      alias :_method_missing :method_missing
-
-      #
-      # Registlation of conversion method
-      #
-      def method_missing(name, *args, &block)
-        table_name = name.to_s.upcase
-        return _method_missing(name, *args, &block) unless table_name !~ /_/ && const_defined?(table_name)
-        table_obj  = const_get(table_name)
-        default    = table_obj.keys.first
-        locale     = args[1] || default
-        const_set(table_name + '_keys', transliteration_keys_hash(table_obj)) unless const_defined?(table_name + '_keys')
-        return send(name, args[0], locale) if respond_to?(name)
-        instance_eval %Q{
-          def #{name}(string, locale='#{default}')
-            string.gsub(#{table_name}_keys[locale]) do |code|
-              #{table_name}[locale][code] || code
-            end
-          end
-        }
-        args[0].gsub(const_get("#{table_name}_keys")[locale]) do |code|
-          table_obj[locale][code] || code
-        end
-      end
-    end
-  end
-end
+# -*- 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
+  module Locale
+    class << self
+
+      #
+      # Generate Regexp for transliteration
+      #
+      # @param [Hash] hash transliteration table
+      #
+      # @return [Regexp] Regexp for transliteration
+      #
+      def transliteration_keys(hash)
+        Regexp.new((hash.keys.sort_by {|key| -key.length} + ['%.*?[A-Za-z]']).join('|'))
+      end
+
+      #
+      # Generate Hash of {locale=>Regexp} for transliteration
+      #
+      # @param [Hash] hash transliteration table hash
+      #
+      # @return [Hash{String=>Regexp}] Hash of {locale=>Regexp} for transliteration
+      #
+      def transliteration_keys_hash(hash)
+        Hash[*(hash.keys.map {|locale|
+              [locale, transliteration_keys(hash[locale])]
+            }).flatten]
+      end
+
+      alias :_method_missing :method_missing
+
+      #
+      # Registlation of conversion method
+      #
+      def method_missing(name, *args, &block)
+        table_name = name.to_s.upcase
+        return _method_missing(name, *args, &block) unless table_name !~ /_/ && const_defined?(table_name)
+        table_obj  = const_get(table_name)
+        default    = table_obj.keys.first
+        locale     = args[1] || default
+        const_set(table_name + '_keys', transliteration_keys_hash(table_obj)) unless const_defined?(table_name + '_keys')
+        return send(name, args[0], locale) if respond_to?(name)
+        instance_eval %Q{
+          def #{name}(string, locale='#{default}')
+            string.gsub(#{table_name}_keys[locale]) do |code|
+              #{table_name}[locale][code] || code
+            end
+          end
+        }
+        args[0].gsub(const_get("#{table_name}_keys")[locale]) do |code|
+          table_obj[locale][code] || code
+        end
+      end
+    end
+  end
+end

data/lib/when_exe/mini_application.rb

@@ -232,9 +232,6 @@ module When
       calendars[0] ||= When::Gregorian
       result = dates.map {|date|
         date = When.when?(date)
-        opts = {}
-        opts[:location] = date.location if date.location
-        opts[:clock   ] = date.clock    if date.respond_to?(:clock) && date.clock
         list = calendars.dup
         (0...calendars.size).to_a.reverse.each do |i|
           case list[i]
@@ -257,15 +254,13 @@ module When
 
         if methods.size == 0
           list.map {|calendar|
-             calendar.kind_of?(Class) ?
-             yield(calendar.new(date, opts.dup)) :
-             yield(calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts))
+            yield(date_for_calendar(calendar, date, options))
           }
         else
           list.map {|calendar|
-            date_for_calendar = calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts)
+            date_for_cal = date_for_calendar(calendar, date, options)
             methods.map {|method|
-              date_for_calendar.send(method[0].to_sym, method[1], &block)
+              date_for_cal.send(method[0].to_sym, method[1], &block)
             }
           }
         end
@@ -274,6 +269,17 @@ module When
       return result
     end
 
+    # 当該 Calendar or CalendarEra の TemporalPosition を生成
+    def date_for_calendar(calendar, date, options)
+      opts            = {}
+      opts[:location] = date.location if date.location
+      opts[:clock   ] = calendar.rate_of_clock == 1.0 ? options[:clock] :
+                                                        calendar.time_basis if date.respond_to?(:clock)
+      calendar.kind_of?(Class) ?
+        calendar.new(date, opts) :
+        calendar.^([calendar.rate_of_clock,date.time_standard.rate_of_clock].uniq == [1.0] ? date.to_i : date, opts)
+    end
+
     # JSONで通信するために Symbol を String に変換する
     def _to_string(source)
       case source

data/lib/when_exe/namespace.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2015 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
+  module Namespace
+
+    # XML Schema Definition
+    XSD  = 'http://www.w3.org/2001/XMLSchema'
+
+    # Resource Description Framework
+    RDF  = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+
+    # Resource Description Framework Schema
+    RDFS = 'http://www.w3.org/2000/01/rdf-schema#'
+
+    # RDF 1.1 Concepts and Abstract Syntax
+    RDFC = 'http://www.w3.org/TR/rdf11-concepts/#'
+
+    # Web Ontology Language
+    OWL  = 'http://www.w3.org/2002/07/owl#'
+
+    # Dublin Core
+    DC   = 'http://purl.org/dc/elements/1.1/'
+
+    # Dublin Core Terms
+    DCQ  = 'http://purl.org/dc/terms/'
+
+    # Dublin Core Types
+    DCT  = 'http://purl.org/dc/dcmitype/'
+
+    # Friend of a Friend
+    FOAF = 'http://xmlns.com/foaf/0.1/'
+
+    # RDF Site Summary
+    RSS  = 'http://purl.org/rss/1.0/'
+
+  end
+end

data/lib/when_exe/parts/enumerator.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2021 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
@@ -188,7 +188,7 @@ module When::Parts
     #   [ false - ない ]
     #
     def has_next?
-      return (@count_limit != 0) && (@current != nil)
+      return (@count_limit != 0) && !@current.nil?
     end
 
     #
@@ -238,7 +238,17 @@ module When::Parts
         @count += 1
         _exclude(@current) if @current
       end
-      return value
+      @delayed && value.respond_to?(:apply_delayed_options) ?
+        value.apply_delayed_options(@delayed)               :
+        value
+    end
+
+    # 終端要素は含む
+    #
+    # @return [Boolean]
+    #
+    def exclude_end
+      false
     end
 
     # オブジェクトの生成
@@ -262,6 +272,7 @@ module When::Parts
       @options = self.class._options(args)
       @exdate  = @options.delete(:exdate)
       @exevent = @options.delete(:exevent)
+      @delayed = @options.delete(:delayed)
       @parent, *rest = args
       _range(rest)
       _rewind
@@ -302,7 +313,7 @@ module When::Parts
         end
       end
       previous    = @processed._include?(value)
-      @processed |= value if previous == false
+      @processed |= value unless previous
       registered  = (previous==value) ? previous : value
       registered  = registered.first if registered.kind_of?(GeometricComplex)
       registered.events ||=[]
@@ -341,7 +352,7 @@ module When::Parts
       #   eql? はオーバーライドしない
       #
       def self._sort(list, direction)
-        list = list.sort
+        list = (0...list.size).to_a.map {|i| [list[i], i]}.sort.map {|e| e[0]}
         prev = nil
         list.delete_if do |x|
           if (x == prev)