when_exe 0.4.6 → 0.5.0

data/test/test/basictypes.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -395,7 +395,7 @@ LOCALE
       def test__code_space
         assert_equal('zip', Term1.codeSpace)
         assert_equal("ISO", Term2.codeSpace)
-        assert_equal(nil, Term3.codeSpace)
+        assert_nil(Term3.codeSpace)
       end
 
       def test__label

data/test/test/calendarnote.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014 Takashi SUGA
+  Copyright (C) 2014-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -51,7 +51,7 @@ module MiniTest::CalendarNote
       assert_equal([[{:note=>"干支", :value=>"癸巳(29)", :position=>"共通"}],
                     [{:note=>"干支", :value=>"壬辰(28)", :position=>"共通"}]], notes1.subset(:note=>'干支'))
       assert_equal([[{:note=>"祝祭日", :value=>"秋分の日", :position=>"祝祭日"}]], notes1.subset(:value=>'秋分の日'))
-      assert_equal(nil, notes1.subset(:value=>'春分の日'))
+      assert_nil(notes1.subset(:value=>'春分の日'))
       assert_equal([[nil], [nil], [nil, nil, nil, nil, nil]], notes1.subset({:value=>'春分の日'}, false))
 
       assert_equal([2456558, 2456559, 2456560], all.keys)

data/test/test/coordinates.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.
@@ -175,10 +175,12 @@ module MiniTest::Coordinates
         ["Emperor_Taishō", "https://en.wikipedia.org/wiki/Emperor_Taish%C5%8D"],
         ["昭和天皇", "https://ja.wikipedia.org/wiki/%E6%98%AD%E5%92%8C%E5%A4%A9%E7%9A%87"],
         ["Emperor_Shōwa", "https://en.wikipedia.org/wiki/Emperor_Sh%C5%8Dwa"],
-        ["今上天皇", "https://ja.wikipedia.org/wiki/%E6%98%8E%E4%BB%81"],
-        ["Emperor_Kinjō", "https://en.wikipedia.org/wiki/Akihito"]
+        ["上皇明仁", "https://ja.wikipedia.org/wiki/%E4%B8%8A%E7%9A%87%E6%98%8E%E4%BB%81"],
+        ["Emperor_Emeritus_of_Japan", "https://en.wikipedia.org/wiki/Akihito"],
+        ["今上天皇", "https://ja.wikipedia.org/wiki/%E5%BE%B3%E4%BB%81"],
+        ["Emperor_Kinjō", "https://en.wikipedia.org/wiki/Naruhito"]
       ]
-      ['明治', '大正', '昭和', '平成'].each do |nengo|
+      ['明治', '大正', '昭和', '平成', '令和'].each do |nengo|
         name = When.when?(nengo + '06.01.01').query['name']
          ['ja', 'en'].each do |lang|
            assert_equal(sample.shift, [name.translate(lang), name.reference(lang)])

data/test/test/ephemeris.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2014 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -59,7 +59,7 @@ module MiniTest::Ephemeris
 
       assert_raises(NoMethodError) { When.when?('2012-11-15').sunrise }
 
-      assert_equal(nil, When.when?('2013-06-21T+09:00', :long=>135, :lat=>70).sunrise)
+      assert_nil(When.when?('2013-06-21T+09:00', :long=>135, :lat=>70).sunrise)
 
       if Object.const_defined?(:TZInfo)
         assert_equal(0, /2012-11-15T06:16/ =~ When.when?('2012-11-15', :tz=>'Asia/Tokyo').sunrise.to_s)

data/test/test/google_api.rb

@@ -1,56 +1,69 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2015 Takashi SUGA
+  Copyright (C) 2015-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.
+
+  Before running this script, please create "credentials.json" and "token.yaml" by 
+  running quickstart.rb according to the Quick Start description at the URL below, 
+  and place them in the same directory as test.rb.
+
+    https://developers.google.com/calendar/quickstart/ruby
+
 =end
 
 require 'fileutils'
-require 'yaml'
-require 'google/api_client' if FileTest.exist?('google-api.yaml')
+if FileTest.exist?("token.yaml")
+  require "google/apis/calendar_v3"
+  require "googleauth"
+  require "googleauth/stores/file_token_store"
+end
 
 module MiniTest
 
   class GoogleAPI < MiniTest::TestCase
 
     HOLIDAYS = [
-      ["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"                ]
+      ["2021-01-01", "New Year's Day"],
+      ["2021-01-11", "Coming of Age Day"],
+      ["2021-02-11", "National Foundation Day"],
+      ["2021-02-23", "Emperor's Birthday"],
+      ["2021-03-20", "Spring Equinox"],
+      ["2021-04-29", "Shōwa Day"],
+      ["2021-05-03", "Constitution Memorial Day"],
+      ["2021-05-04", "Greenery Day"],
+      ["2021-05-05", "Children's Day"],
+      ["2021-07-22", "Sea Day"],
+      ["2021-07-23", "Sports Day"],
+      ["2021-08-08", "Mountain Day"],
+      ["2021-08-09", "Day off for Mountain Day"],
+      ["2021-09-20", "Respect for the Aged Day"],
+      ["2021-09-23", "Autumn Equinox"],
+      ["2021-11-03", "Culture Day"],
+      ["2021-11-23", "Labor Thanksgiving Day"]
     ]
 
-    if FileTest.exist?('google-api.yaml')
+    def authorize
+      client_id = Google::Auth::ClientId.from_file "credentials.json"
+      scope = Google::Apis::CalendarV3::AUTH_CALENDAR_READONLY
+      token_store = Google::Auth::Stores::FileTokenStore.new file: "token.yaml"
+      authorizer = Google::Auth::UserAuthorizer.new client_id, scope, token_store
+      authorizer.get_credentials "default"
+    end
+
+    if FileTest.exist?("token.yaml")
 
       def test__enum_for
-        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,
+        service = Google::Apis::CalendarV3::CalendarService.new
+        service.client_options.application_name = "Google Calendar API Ruby Test"
+        service.authorization = authorize
+
+        calendar = When::GoogleAPI::Calendar.list(service,
                          'en.japanese#holiday@group.v.calendar.google.com')
         assert_equal(calendar.calendar_id, 'en.japanese#holiday@group.v.calendar.google.com')
         holidays = HOLIDAYS.dup
-        calendar.enum_for(When.when?('20150101/1231')).each do |date|
+        calendar.enum_for(When.when?('20210101/1231')).each do |date|
           assert_equal(holidays.shift, [date.to_s, date.events[0].summary])
         end
         assert_equal([], holidays)

data/test/test/inspect.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -37,7 +37,7 @@ module MiniTest
       clock = When.Clock('+09:00')
       #pp clock.to_s
       assert_equal("+09:00", clock.label.to_s)
-      assert_equal(nil, clock.referenceEvent)
+      assert_nil(clock.referenceEvent)
       assert_equal("T00+09:00", clock.referenceTime.to_s)
       assert_equal("T*15:00:00Z", clock.utcReference.to_s)
     end

data/test/test/parts.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -96,8 +96,8 @@ LOCALE
     end
 
     def test__reference
-      assert_equal(nil, Term1.reference('ja_JP'))
-      assert_equal(nil, Term1.reference('en_US'))
+      assert_nil(Term1.reference('ja_JP'))
+      assert_nil(Term1.reference('en_US'))
       assert_equal("https://ja.wikipedia.org/wiki/Getsuyou", Term2.reference('ja_JP'))
       assert_equal("https://en.wikipedia.org/wiki/Monday", Term2.reference('en_US'))
       assert_equal("https://ja.wikipedia.org/wiki/%E6%9C%88%E6%9B%9C%E6%97%A5", Term3.reference('ja_JP'))
@@ -164,14 +164,14 @@ LOCALE
 
       sample  = [false, false, false, false, false]
       complex = When::Parts::GeometricComplex.new(false)
-      assert_equal(nil, complex.exclude_end?)
+      assert_nil(complex.exclude_end?)
       (1..5).each do |i|
         assert_equal(sample.shift, complex.include?(i))
       end
 
       sample  = [true, true, true, true, true]
       complex = When::Parts::GeometricComplex.new(true)
-      assert_equal(nil, complex.exclude_end?)
+      assert_nil(complex.exclude_end?)
       (1..5).each do |i|
         assert_equal(sample.shift, complex.include?(i))
       end

data/test/test/region/christian.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2014 Takashi SUGA
+  Copyright (C) 2012-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.
@@ -212,12 +212,12 @@ module MiniTest
           ["*", 17, 18, 19, 20, 21, 22, 23],
           ["*", 24, 25, 26, 27, 28, 29, 30],
           ["*", 31, "*", "*", "*", "*", "*", "*"]]]]],
-        date.year_included('Sunday') {|d,b|
-          case b
-          when When::YEAR  ; d[When::YEAR]
-          when When::MONTH ; d[When::MONTH]
-          when When::DAY   ; d[When::DAY]
-          else       ; '*'
+         date.year_included('Sunday') {|d,b|
+           case b
+           when When::YEAR  ; d[When::YEAR]
+           when When::MONTH ; d[When::MONTH]
+           when When::DAY   ; d[When::DAY]
+           else       ; '*'
          end
         }
       )

data/test/test/region/indian.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2018 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -86,5 +86,18 @@ module MiniTest
       date = When.when? '1936-11%3C08-%5E%5eHinduLuniSolar?note=HinduNote&location=(_co:Indian::Chennai)&start_month=5&type=SBSA'
       assert_equal('1936-11<08-', date.to_s)
     end
+
+    def test_vikram_sambat
+      date = When.when? '1942.4.20'
+      mismatches = []
+      961.times do
+        sambat = (When::VikramSambatSolar ^ date).to_s
+        samvat = (When::VikramSamvatSolar ^ date).to_s
+        mismatches << [date.to_s, sambat, samvat] unless sambat == samvat
+        date += When::P1M
+      end
+      assert_equal([%w(1945-11-20 2002-08-06 2002-08-05)], mismatches)
+    end
+
   end
 end

data/test/test/region/islamic.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2014 Takashi SUGA
+  Copyright (C) 2011-2017 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -48,6 +48,16 @@ module MiniTest
           end
         end
       end
+
+      def test_ummalqura_solar
+        date = When.when? '2017.9.23'
+        assert_equal('1396-01-01', (When::UmmalquraSolar ^ date).to_s)
+        399.times do
+          date += When::P1Y
+          assert_equal([1,1], (When::UmmalquraSolar ^ date).cal_date[-2..-1])
+        end
+      end
+
     end
   end
 

data/test/test/region/japanese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2014 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -208,11 +208,11 @@ module MiniTest
     def test__eclipse
       date = When.when?('貞観4.2.1')
       assert_equal('夜日蝕七分', date.notes({:notes=>'日食'}).value)
-      assert_equal(nil, date.notes({:notes=>'日食', :solar_eclipse=>1}).value)
+      assert_nil(date.notes({:notes=>'日食', :solar_eclipse=>1}).value)
 
       date = When.when?('貞観4.2.15')
       assert_equal('(月蝕ニ分)', date.notes({:notes=>'月食'}).value)
-      assert_equal(nil, date.notes({:notes=>'月食', :lunar_eclipse=>3}).value)
+      assert_nil(date.notes({:notes=>'月食', :lunar_eclipse=>3}).value)
     end
 
     def test_japanese_lunisolar

data/test/test/region/m17n.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2020 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -171,7 +171,7 @@ module MiniTest
         date, verify = sample
         list = When.when?(date).to_h({:method=>:to_m17n, :locale=>verify[:locale], :prefix=>true})
         [:calendar, :cal_date, :sdn, :clk_time].each do |key|
-          assert_equal(verify[key], list[key])
+          assert_equal([verify[key]], [list[key]])
         end
         verify[:notes].each_index do |i|
           verify[:notes][i].each_index do |k|

data/test/test/region/reforms.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014 Takashi SUGA
+  Copyright (C) 2014-2017 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -103,7 +103,7 @@ module MiniTest
 
   class HankeHenry < MiniTest::TestCase
     def test_hanke_henry
-      assert_equal(When.when?('2012.1.1').to_i, When.when?('2012.1.1^^HankeHenry').to_i)
+      assert_equal(When.when?('2018.1.1').to_i, When.when?('2018.1.1^^HankeHenry').to_i)
       count = 0
       (2000...2400).each do |year|
         first = When.tm_pos(year, 1, 1)

data/test/test/tmposition.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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.
@@ -55,9 +55,9 @@ LIST
       assert_equal("2001-08-02..2001-09-10", When.when?("2001-08-02/09-10").to_s)
       assert_equal(364, When.when?('20130101/1230').count) if Enumerable.method_defined?(:count)
       assert_equal("1980-02-01", When.when?("800201", {:abbr=>1970}).to_s)
-      # assert_equal(nil, When.TemporalPosition(2011,2,29))
+      # assert_nil(When.TemporalPosition(2011,2,29))
       assert_equal('2011-03-01', When.TemporalPosition(2011,2,29).to_s)
-      assert_equal(nil, When.TemporalPosition(2011,2,29, {:invalid=>:check}))
+      assert_nil(When.TemporalPosition(2011,2,29, {:invalid=>:check}))
       assert_raises(ArgumentError) { When.TemporalPosition(2011,2,29, {:invalid=>:raise}) }
     end
 
@@ -65,7 +65,7 @@ LIST
       assert_equal('1950-08', When.strptime('1950 Aug', '%Y %B').to_s)
       assert_equal('1950-08-31', When.strptime('1950 Aug 31', '%Y %B %d').to_s)
       assert_equal('2015-01-06T09:18:24+09:00', When.strptime('Tue Jan 6  9:18:24 +09:00 2015', "%A %B %d %H:%M:%S %z %Y").to_s)
-      assert_equal('2016-01-07T09:18:24+09:00', When.strptime("木 1月 6  9:18:24 JST", "%A %B %d %H:%M:%S %z", {:locale=>'ja'}).to_s)
+      assert_equal('2021-01-07T09:18:24+09:00', When.strptime("木 1月 6  9:18:24 JST", "%A %B %d %H:%M:%S %z", {:locale=>'ja'}).to_s)
       assert_raises(ArgumentError) {When.strptime("Thu Jan 6  9:18:24 +09:00 2015", "%A %B %d %H:%M:%S %z %Y", {:invalid=>:raise})}
     end
 
@@ -156,7 +156,7 @@ LIST
       assert_equal('平成26(2014).08.21', When.tm_pos('平成', When.Residue('甲午'), 8, When.Residue('甲子')).to_s)
 
       assert_equal('2014-09-06', When.tm_pos(2014, 8, When.Residue('SA:6')).to_s)
-      assert_equal(nil, When.tm_pos(2014, 8, When.Residue('SA:6'), :invalid=>:check))
+      assert_nil(When.tm_pos(2014, 8, When.Residue('SA:6'), :invalid=>:check))
       assert_raises(ArgumentError) {When.tm_pos(2014, 8, When.Residue('SA:6'), :invalid=>:raise)}
     end
 
@@ -173,10 +173,10 @@ LIST
       assert_equal('2015-12-25', When.when?('2015-01-01{Christian#christmas}').to_s)
       assert_equal('2015-09-22T00:00+09:00', When.when?('2015-09-01{SolarTerms#term180-1&TU}T00:00+09:00').to_s)
       assert_equal('2015-05-06', When.when?('2015-05-{06&MO,TU,WE}').to_s)
-      assert_equal(nil, When.when?('2016-05-{06&MO,TU,WE}'))
+      assert_nil(When.when?('2016-05-{06&MO,TU,WE}'))
 
       assert_equal('2015-03-01', When.when?('2015-02-01{5SU}').to_s)
-      assert_equal(nil, When.when?('2015-02-{5SU}'))
+      assert_nil(When.when?('2015-02-{5SU}'))
       assert_equal('2015-02-22', When.when?('2015-02-{-SU}').to_s)
 
       it = When.when?('R/2015-09-01{SolarTerms#term180-1&TU}T00:00+09:00')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: when_exe
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Takashi SUGA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies: []
 description: A multicultural and multilingualized calendar library based on ISO 8601,
   ISO 19108, RFC 5545(iCalendar) and RFC6350. JSON-LD formats for TemporalPosition
@@ -216,6 +216,7 @@ files:
 - lib/when_exe/region/roman.rb
 - lib/when_exe/region/russian.rb
 - lib/when_exe/region/ryukyu.rb
+- lib/when_exe/region/saudi_arabian.rb
 - lib/when_exe/region/shire.rb
 - lib/when_exe/region/symmetry.rb
 - lib/when_exe/region/thai.rb
@@ -343,7 +344,7 @@ files:
 homepage: http://www.asahi-net.or.jp/~dd6t-sg/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -358,11 +359,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A multicultural and multilingualized calendar library based on ISO 8601,
   ISO 19108, RFC 5545(iCalendar) and RFC6350
 test_files: []
-has_rdoc: