when_exe 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b40bf07a801ef6ae19fa3821c5768cda89f95e7e
-  data.tar.gz: acafb3787334e8a37dca4d7429489b6d390ed17a
+SHA256:
+  metadata.gz: e033cac66a5dfbe35abf7e1ded44ddd7775c8cb6c523d9942261e863b45be2ea
+  data.tar.gz: 445721eaa7db250aa97e4e95c12f173195cd229119fc60ff7c77dec0b8dba195
 SHA512:
-  metadata.gz: c4be4641f8831f194acab492a26170ebe4f54fb00f5c98dd1dfc5982f88ea3bea077a6ce5778f5691f02a3b8d95e9538826191ebcd88235490d967a3a6efda44
-  data.tar.gz: e4d27604acb85c99db321ec99bfc04b456f99656439aecfcd9534e54ae6fb1e6ab844673a2b10d8369a3b0f18968bb9ffc6faa9be1136ffa202d360b559c462f
+  metadata.gz: 33cf89beed3b1194a9eeb47ad6b7f58fc1feebedabb2353e72a906ad4888b8ea4d6f6edb3abdb872f197df55aca0cf84899e6c5c52aedb4c244559fcb1919011
+  data.tar.gz: b05ba8ebd6b49ba2b70e15dd3a84b877765f45a1f0afd654b6ed27cc755d809b37a6cb583e762a74ebd9c688219755cf086dfbf56ba95e14c5e13f3b9318ce24

data/LICENSE.ja.txt

@@ -1,25 +1,12 @@
-    When.exe: A multicultural and multilingualized calendar library
+The MIT License (MIT)
 
-本プログラムの著作権は須賀隆 <suchowan@box.email.ne.jp> にあります。
+Copyright (c) 2011 Takashi SUGA <suchowan@box.email.ne.jp>.
 
-本プログラムは，下記の条件で使用できます．
+以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソフトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱うことを無償で許可します。
+これには、ソフトウェアの複製を使用、複写、変更、結合、掲載、頒布、サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手に同じことを許可する権利も無制限に含まれます。
 
-  1. 必ず、著作権表示や免責事項を含めて、制限なく自由に複製できます．
+上記の著作権表示および本許諾表示を、ソフトウェアのすべての複製または重要な部分に記載するものとします。
 
-  2. 以下の条件のいずれかを満たす時に本プログラムを自由に変更できます．
-
-     (a) 変更した本プログラムを自分だけで使う．
-
-     (b) その他の変更条件を作者と書面により合意する．
-
-  3. 本プログラム，変更した本プログラム及び本プログラムから生成した実行形式は，
-     作者との書面による合意がなければ配布できません．
-
-  4. 他のプログラムとの併合はいかなる目的であれ自由です．
-
-  5. 本プログラムへの入力となるデータおよび本プログラムからの出力の権利は
-     本プログラムの作者ではなく，それぞれの入出力を生成した人に属します．
-
-  6. 本プログラムは無保証です．作者は本プログラムをサポートする意志はありますが，
-     プログラム自身のバグあるいは本プログラムの実行などから発生するいかなる損害に
-     対しても責任を持ちません．
+ソフトウェアは「現状のまま」で、明示であるか暗黙であるかを問わず、何らの保証もなく提供されます。
+ここでいう保証とは、商品性、特定の目的への適合性、および権利非侵害についての保証も含みますが、それに限定されるものではありません。
+作者または著作権者は、契約行為、不法行為、またはそれ以外であろうと、ソフトウェアに起因または関連し、あるいはソフトウェアの使用またはその他の扱いによって生じる一切の請求、損害、その他の義務について何らの責任も負わないものとします。

data/LICENSE.txt

@@ -1,31 +1,9 @@
-      When.exe: A multicultural and multilingualized calendar library
+The MIT License (MIT)
 
-This library is copyrighted free software by Takashi SUGA <suchowan@box.email.ne.jp>.
+Copyright (c) 2011 Takashi SUGA <suchowan@box.email.ne.jp>.
 
-You can use and/or modify the software under the conditions below:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  1. You may make verbatim copies of the software without restriction, provided
-     that you duplicate all of the original copyright notices and associated
-     disclaimers.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in your private domain.
-
-       b) make other written arrangements with the author.
-
-  3. You cannot distribute the software with/without modification or
-     derived executable binary form without written arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software.
-
-  5. The data supplied as input to or produced as output from the software
-     do not automatically fall under the copyright of the software,
-     but belong to whomever generated them.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,7 +3,7 @@ when_exe - A multicultural and multilingualized calendar library
 
 [![Gem Version](https://badge.fury.io/rb/when_exe.svg)](http://badge.fury.io/rb/when_exe)
 
-[when_exe](http://rubygems.org/gems/when_exe) is a multicultural and multilingualized calendar library based on [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601), [ISO 19108](http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=26013), [RFC 5545(iCalendar)](http://tools.ietf.org/html/rfc5545) and [RFC6350](http://tools.ietf.org/html/rfc6350). [JSON-LD](http://www.w3.org/TR/json-ld/) formats for TemporalPosition and TemporalReferenceSystem are available.
+[when_exe](http://rubygems.org/gems/when_exe) is a multicultural and multilingualized calendar library based on [ISO 8601:2004](https://en.wikipedia.org/wiki/ISO_8601), [ISO 19108](http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=26013), [RFC 5545(iCalendar)](http://tools.ietf.org/html/rfc5545) and [RFC6350](http://tools.ietf.org/html/rfc6350). [JSON-LD](http://www.w3.org/TR/json-ld/) formats for TemporalPosition and TemporalReferenceSystem are available.
 
 [<img alt='Architecture' title='display this figure at actual size' src='https://raw.githubusercontent.com/suchowan/when_exe/f7bb8b51259f0c1653c6c37b3ce20bd2a6ab7914/architecture.png' width='637' height='408'/>](https://raw.githubusercontent.com/suchowan/when_exe/f7bb8b51259f0c1653c6c37b3ce20bd2a6ab7914/architecture.png)
 
@@ -44,9 +44,9 @@ For further detail, please refer to the [when_exe Wiki](http://www2u.biglobe.ne.
 License
 -------
 
-This beta version's license is limited. Please see [LICENSE.txt](https://github.com/suchowan/when_exe/blob/master/LICENSE.txt) for details.
+This beta version's license is the MIT license. Please see [LICENSE.txt](https://github.com/suchowan/when_exe/blob/master/LICENSE.txt).
 
-Data sets [TemporalPositionDataSet](http://hosi.org/tp.rdf) and [TemporalReferenceSystemDataSet](http://hosi.org/When.rdf) should be used according to [CC-BY-ND](http://creativecommons.org/licenses/by-nd/4.0/) license.
+Data sets [TemporalPositionDataSet](http://hosi.org/tp.rdf) and [TemporalReferenceSystemDataSet](http://hosi.org/When.rdf) should be used according to [CC-BY](http://creativecommons.org/licenses/by/4.0/) license.
 
 
 Source Code
@@ -142,34 +142,18 @@ Example Usage
     #  retrieve JSON, JSON-LD, Turtle response from http://hosi.org:3000 (when_exe demonstration web server)
     # (Notation3, RDF/XML, N-Triples and XML formats are also available.)
     require 'open-uri'
-    open('http://hosi.org:3000/Date/2014-04-20.json') do |json|
+    URI.open('http://hosi.org:3000/Date/2014-04-20.json') do |json|
       puts json.read #=> newlines and blanks are inserted for readability.
        # {"frame"    : "http://hosi.org/When/CalendarTypes/Gregorian",
        #  "precision": 0,
        #  "location" : "http://hosi.org/When/Coordinates/Spatial?long=139.4441E&lat=35.3916N&alt=0.0",
        #  "sdn"      : 2456768,
        #  "calendar" : ["http://hosi.org/When/CalendarTypes/Gregorian"],
-       #  "notes"    : [[{"note":"Month","value":"April"}],
-       #                [{"note":"Week","value":"Sunday(6)"}]],
-       #  "clock"    : "Asia/Tokyo+09:00",
-       #  "clk_time" : [2456768,0,0,0],
-       #  "dynamical": 1397919667.184082,
-       #  "universal": 1397919600.0,
-       #  "cal_date" : [2014,4,20]}
-    end
-    
-    open('http://hosi.org/tp/2014-04-20.json') do |json| # redirected from http://hosi.org to http://hosi.org:3000
-      puts json.read #=> newlines and blanks are inserted for readability.
-       # {"frame"    : "http://hosi.org/When/CalendarTypes/Gregorian",
-       #  "precision": 0,
-       #  "sdn"      : 2456768,
-       #  "calendar" : ["http://hosi.org/When/CalendarTypes/Gregorian"],
-       #  "notes"    : [[{"note":"Month","value":"April"}],
-       #               [{"note":"Week","value":"Sunday(6)"}]],
+       # <..snip..>
        #  "cal_date" : [2014,4,20]}
     end
     
-    open('http://hosi.org/tp/2014-04-20.jsonld') do |jsonld| # redirected from http://hosi.org to http://hosi.org:3000
+    URI.open('http://hosi.org/tp/2014-04-20.jsonld') do |jsonld| # redirected from http://hosi.org to http://hosi.org:3000
       puts jsonld.read #=> newlines and blanks are inserted for readability.
        # {"@context":
        #    {"xsd" :"http://www.w3.org/2001/XMLSchema",
@@ -196,7 +180,7 @@ Example Usage
        # }
     end
     
-    open('http://hosi.org/tp/2014-04-20.ttl') do |ttl| # redirected from http://hosi.org to http://hosi.org:3000
+    URI.open('http://hosi.org/tp/2014-04-20.ttl') do |ttl| # redirected from http://hosi.org to http://hosi.org:3000
       puts ttl.read
        # @prefix Week: <http://hosi.org/When/Coordinates/Common::Week::> .
        # @prefix day: <http://hosi.org/When/CalendarNote/Christian/Notes::day::> .
@@ -216,7 +200,7 @@ Example Usage
        #    ts:sdn 2456768 .
     end
     
-    open('http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge.ttl') do |ttl| # redirected from http://hosi.org to http://hosi.org:3000
+    URI.open('http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge.ttl') do |ttl| # redirected from http://hosi.org to http://hosi.org:3000
       puts ttl.read
        # @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
        # @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -224,23 +208,24 @@ Example Usage
        # @prefix xsd: <http://www.w3.org/2001/XMLSchema> .
        # 
        # <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge> a <http://hosi.org/ts/When/TM/OrdinalReferenceSystem>;
-       #    rdfs:member <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::冥王代>,
-       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::始生代>,
-       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代>,
-       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::顕生代> .
+       #    rdfs:member <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Hadean>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Proterozoic>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Phanerozoic> .
        # 
-       # <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::冥王代> a <http://hosi.org/ts/When/TM/OrdinalEra>;
-       #    ts:begin "-4600000000";
-       #    ts:end "-4000000000";
-       #    ts:label <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::冥王代::冥王代> .
+       # <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean> a <http://hosi.org/ts/When/TM/OrdinalEra>;
+       #    ts:begin "-4000000000";
+       #    ts:end "-2500000000";
+       #    ts:label <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Archean>;
+       #    rdfs:member <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Eoarchean>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Paleoarchean>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Mesoarchean>,
+       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Neoarchean> .
        # 
-       # <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代> a <http://hosi.org/ts/When/TM/OrdinalEra>;
-       #    ts:begin "-2500000000";
-       #    ts:end "-542000000";
-       #    ts:label <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代::原生代>;
-       #    rdfs:member <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代::前期>,
-       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代::中期>,
-       #      <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::原生代::後期> .
+       # <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Eoarchean> a <http://hosi.org/ts/When/TM/OrdinalEra>;
+       #    ts:begin "-4000000000";
+       #    ts:end "-3600000000";
+       #    ts:label <http://hosi.org/When/TM/OrdinalReferenceSystem/GeologicalAge::Archean::Eoarchean::Eoarchean> .
        # <..snip..>
     end
     
@@ -249,7 +234,7 @@ Example Usage
     #  https://rubygems.org/gems/sparql is required for this section's operations.
     #  Please install sparql before operation.
     
-    require 'sparql'
+    require 'sparql/client'
     PREFIXES = When::Parts::Resource.namespace_prefixes(
       '_co:Common', '_co:Common?V=0618', '_m:Calendar', '_m:Japanese', '_n:Japanese/Notes')
     
@@ -295,42 +280,3 @@ Example Usage
     p When.when?('TZID=America/New_York:1997-10-26T02:30') #=> 1997-10-26T02:30-05:00
     p When.when?('TZID=America/New_York:1997-10-26T03:30') #=> 1997-10-26T03:30-05:00
     
-    #
-    # Google Calendar ------------------------------
-    #  https://rubygems.org/gems/google-api-client is required for this section's operations.
-    #  Please install google-api-client and add authorization file 'google-api.yaml' before operation.
-    
-    require 'google/api_client'
-    require "yaml"
-    oauth_yaml = YAML.load_file('google-api.yaml')
-    client = Google::APIClient.new(:application_name => "when_exe",
-                                   :application_version => When::VERSION)
-    client.authorization.client_id = oauth_yaml["client_id"]
-    client.authorization.client_secret = oauth_yaml["client_secret"]
-    client.authorization.scope = oauth_yaml["scope"]
-    client.authorization.refresh_token = oauth_yaml["refresh_token"]
-    client.authorization.access_token = oauth_yaml["access_token"]
-    service = client.discovered_api('calendar', 'v3')
-    calendar = When::GoogleAPI::Calendar.list(client, service,
-                     'en.japanese#holiday@group.v.calendar.google.com')
-    calendar.enum_for(When.when?('20150101/1231')).each do |date|
-      p [date, date.events[0].summary] #=>
-    # [2015-01-01, "New Year's Day"]
-    # [2015-01-12, "Coming of Age Day"]
-    # [2015-02-11, "National Foundation Day"]
-    # [2015-03-21, "Spring Equinox"]
-    # [2015-04-29, "Shōwa Day"]
-    # [2015-05-03, "Constitution Memorial Day"]
-    # [2015-05-04, "Greenery Day"]
-    # [2015-05-05, "Children's Day"]
-    # [2015-05-06, "Constitution Memorial Day observed"]
-    # [2015-07-20, "Sea Day"]
-    # [2015-09-21, "Respect for the Aged Day"]
-    # [2015-09-22, "Bridge Public holiday"]
-    # [2015-09-23, "Autumn Equinox"]
-    # [2015-10-12, "Sports Day"]
-    # [2015-11-03, "Culture Day"]
-    # [2015-11-23, "Labor Thanksgiving Day"]
-    # [2015-12-23, "Emperor's Birthday"]
-    end
-

data/bin/.pryrc

@@ -0,0 +1,9 @@
+require 'pp'
+require 'date'
+require 'when_exe'
+require 'when_exe/core/extension'
+require 'when_exe/mini_application'
+include When
+Pry.hooks.add_hook :after_read, :hack_encoding do |str, _|
+  str.force_encoding STDIN.external_encoding 
+end

data/bin/make_ttl.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014 Takashi SUGA
+  Copyright (C) 2014-2019 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -24,7 +24,8 @@ File.open(config['file'], 'w') do |file|
   CONTEXT.each_pair do |key, value|
     file.puts "@prefix #{key}: <#{value}> ."
   end
-  (when?(config['begin'])..when?(config['end'])).each do |date|
+  (config['begin'].to_i..config['end'].to_i).each do |year|
+    date = when?("#{year}^^#{year < 1873 ? 'Japanese' : 'Gregorian?note=Japanese'}")
     graph = RDF::Graph.new <<
       JSON::LD::API.toRdf(date.rdf_graph(
         {'@context'=>CONTEXT, :prefixes=>PREFIXES, :included=>true, :include=>true}))

data/bin/make_ttl.rb.config

@@ -1,6 +1,6 @@
-{"begin"    :    "593^^Japanese",
- "end"      :   "1872^^Japanese",
- "file"     :   "japanese.ttl",
+{"begin"    :    "593",
+ "end"      :   "2051",
+ "file"     :   "notes_data_japan.ttl",
  "resource" :   [
    "_co:Common",
    "_co:Common?V=0618",

data/lib/when_exe.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2019 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
@@ -19,11 +19,12 @@ begin
 rescue LoadError, NoMethodError
 end
 
-autoload :URI,       'uri'
+autoload :CGI,       'cgi'
 autoload :OpenURI,   'open-uri'
 autoload :OpenSSL,   'openssl'
 autoload :FileUtils, 'fileutils'
 autoload :REXML,     'rexml/document'
+autoload :CSV,       'csv'
 autoload :Mutex,     'thread' unless Object.const_defined?(:Mutex)
 
 #
@@ -60,6 +61,8 @@ module When
     # @option options [Numeric]                     :wikipedia_interval    Wikipedia の連続的な参照を抑制するための遅延時間/秒
     # @option options [Array<String>]               :order                 CalendarEra の検索順序        ([ IRI of When::TM::CalendarEra ])
     # @option options [Hash{String=>Array, String}] :format                strftime で用いる記号の定義   ({ 記号=>[ 書式,項目名 ] or 記号列 })
+    # @option options [false, nil]                  :table_off             高精度テーブル使用の指定 - 使用する
+    # @option options [true]                        :table_off             高精度テーブル使用の指定 - 使用しない
     # @option options [Array<Array>]                :leap_seconds          閏秒の挿入記録                ([ [JD, TAI-UTC, (MJD, OFFSET)] ])
     # @option options [String]                      :base_uri              Base URI for When_exe Resources (Default When::SourceURI)
     # @option options [Hash<String=>String>]        :additional_namespaces User defined namespaces (Default {})
@@ -89,6 +92,7 @@ module When
       TM::Calendar._setup_
       TM::Clock._setup_(options[:local])
       TM::TemporalPosition._setup_(options[:format])
+      CalendarNote::LuniSolarPositions._setup_(options[:table_off])
       V::Event._setup_(options[:until])
       V::Timezone._setup_
       Parts::Timezone._setup_
@@ -108,6 +112,7 @@ module When
       update(TM::CalendarEra._setup_info).
       update(TM::Clock._setup_info).
       update(TM::TemporalPosition._setup_info).
+      update(CalendarNote::LuniSolarPositions._setup_info).
       update(V::Event._setup_info).
       update(TimeStandard._setup_info)
     end
@@ -157,6 +162,7 @@ module When
 
   require 'when_exe/locales/locale'
   require 'when_exe/locales/autoload'
+  require 'when_exe/namespace'
   require 'when_exe/parts/enumerator'
   require 'when_exe/parts/resource'
   require 'when_exe/parts/geometric_complex'
@@ -165,11 +171,13 @@ module When
   require 'when_exe/basictypes'
   require 'when_exe/ephemeris'
   require 'when_exe/coordinates'
+  require 'when_exe/spatial'
   require 'when_exe/icalendar'
   require 'when_exe/google_api'
   require 'when_exe/tmobjects'
   require 'when_exe/timestandard'
   require 'when_exe/tmposition'
+  require 'when_exe/tmptypes'
   require 'when_exe/tmreference'
   require 'when_exe/calendartypes'
   require 'when_exe/calendarnote'
@@ -228,6 +236,14 @@ module When
   # eucJP encoding
   EUCJP = '.eucJP'
 
+  module Events
+    autoload :TS,                      'when_exe/events'
+    autoload :DataSets,                'when_exe/events'
+    autoload :DataSet,                 'when_exe/events'
+    autoload :Event,                   'when_exe/events'
+    autoload :Range,                   'when_exe/events'
+  end
+
   class BasicTypes::M17n
     autoload :Japanese,                'when_exe/region/japanese'
     autoload :JapaneseHoliday,         'when_exe/region/japanese'
@@ -244,6 +260,7 @@ module When
     autoload :Iranian,                 'when_exe/region/iranian'
     autoload :Bahai,                   'when_exe/region/bahai'
     autoload :Islamic,                 'when_exe/region/islamic'
+    autoload :SaudiArabia,             'when_exe/region/saudi_arabian'
     autoload :Jewish,                  'when_exe/region/jewish'
     autoload :AncientOrient,           'when_exe/region/babylonian'
     autoload :Armenian,                'when_exe/region/armenian'
@@ -272,6 +289,20 @@ module When
     autoload :IAST,                    'when_exe/locales/iast'
     autoload :IASTR,                   'when_exe/locales/iast'
     autoload :AKT,                     'when_exe/locales/akt'
+    autoload :NumRExp3,                'when_exe/locales/akt'
+
+    sb = (When::Parts::Resource._instance('_co:Common::干支::*') +
+          When::Parts::Resource._instance('_co:Common::干::*')   +
+          When::Parts::Resource._instance('_co:Common::支::*')).map {|r| r.label.to_s}.join('|')
+    DigitParser    = [[:NumRExp3]]
+    TimeParser     = [[/閏(\d+)時/, 'T\1='], [/(\d+)時/, 'T\1:'], [/(\d+)分/, '\1:'], [/(\d+)秒/, '\1']]
+    DateParser     = [[/(#{sb})/, '{1\1}', true], [/([^\d])\{/, '\11{', true],
+                      [/元年/, '1-'], [/(\d+|\})[年|載|歳]/, '\1-'], [/閏(\d+)月/, '\1='], [/(\d+)月/, '\1-'],
+                      [/(\d+)日/, '\1']]
+    EasternParser  = DigitParser + DateParser + TimeParser
+    JapaneseParser = [[/\A(\d+)/, '日本\1']] + EasternParser
+    KoreanParser   = [[/\A(\d+)/, '朝鮮\1']] + EasternParser
+    ChineseParser  = [[/\A(\d+)/, '中国\1']] + EasternParser
   end
 
   module CalendarTypes
@@ -294,6 +325,8 @@ module When
     autoload :IndianNationalSolar,     'when_exe/region/indian'
     autoload :Nanakshahi,              'when_exe/region/indian'
     autoload :RevisedBengali,          'when_exe/region/indian'
+    autoload :VikramSambatSolar,       'when_exe/region/indian'
+    autoload :VikramSamvatSolar,       'when_exe/region/indian'
     autoload :HinduLuniSolar,          'when_exe/region/indian'
     autoload :HinduSolar,              'when_exe/region/indian'
     autoload :Jalali,                  'when_exe/region/iranian'
@@ -309,6 +342,7 @@ module When
     autoload :Bahai,                   'when_exe/region/bahai'
     autoload :TabularIslamic,          'when_exe/region/islamic'
     autoload :EphemerisBasedIslamic,   'when_exe/region/islamic'
+    autoload :UmmalquraSolar,          'when_exe/region/saudi_arabian'
     autoload :Jewish,                  'when_exe/region/jewish'
     autoload :Hebrew,                  'when_exe/region/jewish'
     autoload :Armenian,                'when_exe/region/armenian'
@@ -360,6 +394,7 @@ module When
   end
 
   class CalendarNote
+    autoload :LuniSolarPositions,      'when_exe/ephemeris/notes'
     autoload :SolarTerms,              'when_exe/ephemeris/notes'
     autoload :LunarPhases,             'when_exe/ephemeris/notes'
     autoload :Ephemeris,               'when_exe/ephemeris/notes'
@@ -404,6 +439,7 @@ module When
     autoload :Russian,                 'when_exe/region/russian'
     autoload :Roman,                   'when_exe/region/roman'
     autoload :Mayan,                   'when_exe/region/mayan'
+    autoload :LocationTable,           'when_exe/region/location'
 
     # default index for day coordinate
     DefaultDayIndex = Index.new
@@ -497,7 +533,8 @@ module When
         ['[M=,alias:明=ja:%%<明治>]6.01.01', '@CR', '1873-01-01^Gregorian?note=Default'],
         ['[T=,alias:大=ja:%%<大正>]1.07.30', '@A',  '1912-07-30'],
         ['[S=,alias:昭=ja:%%<昭和>]1.12.25', '@A',  '1926-12-25'],
-        ['[H=,alias:平=ja:%%<平成>]1.01.08', '@A',  '1989-01-08']
+        ['[H=,alias:平=ja:%%<平成>]1.01.08', '@A',  '1989-01-08'],
+        ['[R=,alias:令=ja:%%<令和>]1.05.01', '@A',  '2019-05-01']
       ]]
     end
   end
@@ -528,7 +565,7 @@ module When
     when Array        ; begin options = TM::TemporalPosition._options(options) ; specification.map {|e| when?(e, options)} end
     when /\Atoday((\^|%5E){1,2}(.+))?\z/i ; today($3 ? {:frame=>$3}.update(options) : options)
     when /\Anow((\^|%5E){1,2}(.+))?\z/i   ; now(  $3 ? {:frame=>$3}.update(options) : options)
-    when /(JDN|MJD|SDN|CEP)(\z|\^|%5E)/i  ; TM::JulianDate.parse(specification, options)
+    when /(JDN|MJD|SDN|CEP|DTB)(\z|\^|%5E)/i  ; TM::JulianDate.parse(specification, options)
     when /[\n\r]+/    ; when?(specification.split(/[\n\r]+/), options)
     when String       ; TM::TemporalPosition._instance(EncodingConversion.to_internal_encoding(specification), options)
     when Numeric      ; TM::JulianDate.new(+specification, TM::TemporalPosition._options(options))
@@ -561,6 +598,40 @@ module When
   alias :tm_pos :TemporalPosition
   module_function :tm_pos
 
+  # 書式文字列に従った When::TM::TemporalPosition の生成
+  #
+  # @param [String] date_time 日時を表す文字列
+  # @param [String] format    その書式
+  # @param [Hash] options     暦法や時法などの指定
+  # @option options [String]       :locale   言語指定
+  # @option options [Object]       :その他   When::TM::TemporalPosition._instance に渡す
+  # @see When::TM::TemporalPosition._instance
+  #
+  # @return [When::TM::TemporalPosition]
+  # @raise [ArgumentError]
+  #   options[ :invalid ] が :raise で、日時が存在しない場合
+  #
+  # see {strptime}[link:http://docs.ruby-lang.org/ja/search/query:strptime/]
+  #
+  def strptime(date_time, format, options={})
+    h = When::Locale._to_date_time_hash(date_time, format, options[:locale])
+    frame = options[:frame] ? When.Calendar(options[:frame]) : When::Gregorian
+    abbr_y, abbr_m, abbr_d, = options[:abbr].kind_of?(When::TimeValue) ?
+      (frame ^ options[:abbr]).cal_date : options[:abbr]
+    args =  [h[:year] || abbr_y || ::Date.today.year]
+    args << (h[:mon]  || abbr_m || 1) if h[:hour] ||  h[:mon]
+    args << (h[:mday] || abbr_d || 1) if h[:hour] || (h[:mon] && h[:mday])
+    args <<  h[:hour] if h[:hour]
+    args <<  h[:min]  if h[:hour] && h[:min]
+    args <<  h[:sec]  if h[:hour] && h[:min] && h[:sec]
+    args << options.dup
+    args[-1].delete(:locale)
+    args[-1].delete(:abbr)
+    args[-1].update({:parse=>{:residue=>{frame.indices.length=>When.Residue((h[:wday]-1)%7)}}}) if h[:wday]
+    args[-1].update({:clock=>When::TM::Clock.to_hms(h[:offset])}) if h[:offset]
+    TM::TemporalPosition._temporal_position(*args)
+  end
+
   # 指定日時に対応する When::TM::TemporalPosition の生成
   # (When::TM::DateAndTime of specified Time)
   #
@@ -709,6 +780,20 @@ module When
     TM::CalendarEra._instance(*args)
   end
 
+  # When::TM::TemporalPosition または When::TM::CalendarEraの検索
+  #
+  # @param [Array<Object>] args when? または era にそのまま渡される
+  #
+  # @return [When::TM::TemporalPosition or When::TM::CalendarEra]
+  #
+  def date_or_era(*args)
+    begin
+      when?(*args)
+    rescue
+      era(*args).first
+    end
+  end
+
   # When::TM::Clock の生成/参照
   #
   # @param [When::Parts::Timezone::Base] clock なにもせず clock をそのまま返す
@@ -782,6 +867,17 @@ module When
     Parts::Resource._instance(iri)
   end
 
+
+  # 地名を空間座標化する
+  #
+  # @param [String] name 地名または座標
+  #
+  # @return [When::Coordinates::Spatial or When::Coordinates::Spatial::Range]
+  #
+  def where?(name)
+    When::Coordinates::Spatial::Range[name]
+  end
+
   # When::Coordinates::Border の生成/参照
   #
   # @param [String] border 年/日境界を表す文字列
@@ -879,7 +975,7 @@ module When
     locale = options.delete(:locale) || 'en'
     title  = EncodingConversion.to_internal_encoding(title)
     entry, query = title.split('?', 2)
-    url  = "http://#{locale}.wikipedia.org/wiki/#{URI.encode(entry).gsub(' ', '_')}"
+    url  = "https://#{locale}.wikipedia.org/wiki/#{CGI.escape(entry).gsub(' ', '_')}"
     Locale.send(:wikipedia_object, url, options) unless options.empty?
     url += '?' + query if query
     object = Parts::Resource._instance(url)