when_exe 0.4.6 → 0.5.0

data/lib/when_exe/events.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-    Copyright (C) 2015-2016 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.
@@ -1160,9 +1160,9 @@ module When
                             edge_included(first, range.send(method), :to_f))
                end
              end
-           elsif @index.key?(SPATIAL)
-             list << @index[SPATIAL][options['location']]
-           end
+          elsif @index.key?(SPATIAL)
+            list << @index[SPATIAL][options['location']]
+          end
         end
 
         # グラフ
@@ -1440,7 +1440,7 @@ module When
         when /(out|no)\s*header\s*(\((\d+)\))?/i
           @limit = $3.to_i if $3
           csv_row_vs_label([])
-          open(source,'r') do |io|
+          ::URI.send(:open, source,'r') do |io|
             CSV.parse(io.read) do |row|
               yield(row)
               break if @limit && @events.size >= @limit
@@ -1448,7 +1448,7 @@ module When
           end
         when /header\s*(\((\d+)\))?/i
           @limit = $2.to_i if $2
-          open(source,'r') do |io|
+          ::URI.send(:open, source,'r') do |io|
             CSV.parse(io.read) do |row|
               if @row_vs_label
                 yield(row)
@@ -1478,7 +1478,7 @@ module When
           @limit = $3.to_i if $3
           rexp = Regexp.compile($1)
           csv_row_vs_label([])
-          open(source, 'r') do |file|
+          ::URI.send(:open, source, 'r') do |file|
             file.read.gsub(/[\r\n]/,'').scan(rexp) do
               yield((1...$~.size).to_a.map {|i| $~[i]})
             end

data/lib/when_exe/google_api.rb

@@ -1,6 +1,6 @@
 # -*- 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.
 =end
@@ -8,7 +8,8 @@
 #
 # GoogleAPI の Calendar API v3 への対応
 #
-#   see {Google Calendar API Reference https://developers.google.com/google-apps/calendar/v3/reference/}
+#   see {Ruby Quickstart https://developers.google.com/calendar/quickstart/ruby}
+#   see {Simple REST client for version V3 of the Calendar API https://googleapis.dev/ruby/google-apis-calendar_v3/v0.1.0/}
 #
 module When::GoogleAPI
 
@@ -17,15 +18,9 @@ module When::GoogleAPI
   #
   class Calendar
 
-    # APIClient のインスタンス
-    #
-    # @return [Google::APIClient]
-    #
-    attr_reader :client
-
     # Calendar API のインスタンス
     #
-    # @return [Google::APIClient::API]
+    # @return [Google::Apis::CalendarV3::CalendarService]
     #
     attr_reader :service
 
@@ -45,24 +40,19 @@ module When::GoogleAPI
       #
       # GoogleAPI の Calendar を生成する
       #
-      # @param [Google::APIClient] client
-      # @param [Google::APIClient::API] service
+      # @param [Google::Apis::CalendarV3::CalendarService] service
       # @param [String] calendar_id
       #
-      def list(client, service, calendar_id)
+      def list(service, calendar_id)
         events = []
-        result = client.execute({:api_method => service.events.list,
-                                 :parameters => {'calendarId' => calendar_id}})
+        result = service.list_events(calendar_id)
         loop do
-          events += result.data.items.map {|event| event.to_hash}
-          page_token = result.data.next_page_token
+          events += result.items.map {|event| event.to_h}
+          page_token = result.next_page_token
           break unless page_token
-          result = client.execute({:api_method => service.events.list,
-                                   :parameters => {'calendarId' => calendar_id,
-                                                   'pageToken'  => page_token}})
+          result = service.list_events(calendar_id, page_token: page_token)
         end
         calendar = new(events)
-        calendar.instance_variable_set(:@client, client)
         calendar.instance_variable_set(:@service, service)
         calendar.instance_variable_set(:@calendar_id, calendar_id)
         calendar
@@ -87,7 +77,7 @@ module When::GoogleAPI
     #
     def initialize(events)
       @events = events.map {|event|
-        next nil unless event['status'] == 'confirmed'
+        next nil unless event[:status] == 'confirmed'
         When::V::Event.new(event)
       }.compact
     end
@@ -114,15 +104,18 @@ class When::V::Event
       iprops = {}
       gprops.each_pair do |key, value|
         case key
-        when 'summary'
-          iprops['summary'] = value
-        when 'start', 'end'
+        when :start, :end
           date  = 'VALUE=DATE'
-          date += '-TIME' if value.key?('dateTime')
-          date += ';TZID=' + value['timeZone'] if value.key?('timeZone')
-          date += ':' + (value['date'] || value['dateTime'])
-          iprops['dt' + key] = date
-        when 'recurrence'
+          if value.key?(:date)
+            date += ':' + value[:date].strftime('%Y%m%d')
+          else
+            date += '-TIME'
+            date += ':' + value[:date_time].strftime('%Y%m%dT%H%M%S')
+            date += value[:date_time].strftime('%z') unless value[:time_zone]
+          end
+          date.sub!(':', ";TZID=#{value[:time_zone]}:") if value.key?(:time_zone)
+          iprops['dt' + key.to_s] = date
+        when :recurrence
           value.map do |line|
             tag, rule = line.split(':', 2)
             tag.downcase!
@@ -132,8 +125,10 @@ class When::V::Event
               iprops[tag] = rule
             end
           end
-        when 'iCalUID'
+        when :i_cal_uid
           iprops['uid'] = value
+        when Symbol
+          iprops[key.to_s] = value
         end
       end
       iprops
@@ -144,7 +139,7 @@ class When::V::Event
 
   # Hash からの属性読み込み
   def _parse_from_code(options)
-    if options.key?('start')
+    if options.key?(:start)
       @google_api_props = options
       options = self.class.gcal2ical(options)
     end

data/lib/when_exe/icalendar.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.
 =end
@@ -574,7 +574,7 @@ module When::V
       #
       # @return [When::TM::IntervalLength]
       def default_until
-        @default_until ||= 1000*When::TM::Duration::YEAR
+        @default_until ||= 1000*(When::TM::Duration::YEAR / When::TM::Duration::DAY)
       end
 
       # ISO8601へ埋め込まれた指定に対応する iterator を生成する
@@ -1047,13 +1047,13 @@ module When::V
       super
 
       @child.each do |prop|
-        @dtstart = prop.dtstart if (@dtstart==nil || prop.dtstart < @dtstart)
+        @dtstart = prop.dtstart if (@dtstart.nil? || prop.dtstart < @dtstart)
         @dtstop  = prop.dtstop  unless (prop.dtstop.kind_of?(When::TimeValue) &&
                                         @dtstop.kind_of?(When::TimeValue)     &&
                                         prop.dtstop <= @dtstop)
         [prop.tzoffsetfrom, prop.tzoffsetto].each do |tz|
-          @daylight = tz if (@daylight==nil || tz.universal_time < @daylight.universal_time)
-          @standard = tz if (@standard==nil || tz.universal_time > @standard.universal_time)
+          @daylight = tz if (@daylight.nil? || tz.universal_time < @daylight.universal_time)
+          @standard = tz if (@standard.nil? || tz.universal_time > @standard.universal_time)
         end
       end
       @tz_difference = @standard.universal_time - @daylight.universal_time
@@ -1107,7 +1107,7 @@ module When::V
         date = prop.enum_for(current_time, direction, 1).succ
         if (date)
           diff = (date.universal_time - current_time).abs
-          if (minimum == nil || minimum > diff)
+          if (minimum.nil? || minimum > diff)
             event   = date 
             minimum = diff
           end
@@ -1402,7 +1402,7 @@ module When::V
         if (dtstart && dtstart.has_time?)
           ['HOUR', 'MINUTE', 'SECOND'].each do |part|
             by_part = 'BY' + part
-            if (rule[by_part]==nil && freq_index && freq_index < PostFreqIndex[by_part])
+            if (rule[by_part].nil? && freq_index && freq_index < PostFreqIndex[by_part])
               base = dtstart[PostFreqIndex[by_part]]
               rule[by_part] = Logic.const_get(part.capitalize).new(by_part, base) unless (base == 0)
             end
@@ -1604,7 +1604,7 @@ module When::V
               nth, spec, period = ord
               shift = (period[PostFreqIndex[@by_part]] != 0)
               raise ArgumentError, "n*e+/-s format not permitted" if (nth || shift) && @freq_index >= When::DAY
-              if (nth==nil || nth>0)
+              if (nth.nil? || nth>0)
                 enum = @ref.enum_for(lower_bound, :forward, {:event=>spec})
               else
                 enum = @ref.enum_for(higher_bound, :reverse, {:event=>spec})

data/lib/when_exe/inspect.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.
 =end
@@ -75,7 +75,7 @@ module When
     # @return [String] to_h 結果を JSON文字列化したもの
     #
     def to_json(options={})
-      options[:method] = :to_m17n unless options.key?(:method)
+      options[:method] = :to_m17n unless options.respond_to?(:key?) && options.key?(:method)
       JSON.dump(to_h(options))
     end
 
@@ -603,7 +603,7 @@ module When
         form_options[:method] = :to_m17n unless form_options.key?(:method)
         persistence = options.delete(:persistence) if options.kind_of?(Hash)
         retrieved   = When::CalendarNote::NotesContainer.retrieve(persistence, self.to_i)
-        return retrieved unless retrieved == false
+        return retrieved if retrieved
         When::CalendarNote::NotesContainer.register(_m17n_form(_notes(options), form_options), persistence, self.to_i)
       end
 

data/lib/when_exe/linkeddata.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014-2016 Takashi SUGA
+  Copyright (C) 2014-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
@@ -379,6 +379,7 @@ module When
     # namespace を prefix にコンパクト化する
     #
     def compact_namespace_to_prefix(source, prefixes, context=nil)
+      return source.map {|element| compact_namespace_to_prefix(element, prefixes, context)} if source.kind_of?(Array)
       return source unless prefixes
       prefixes.each_pair do |key, value|
         Array(value).each do |namespace|
@@ -574,7 +575,14 @@ module When
           value =_value_str(note[:note], note[:value])
         end
         id    = compact_namespace_to_prefix(value, options[:prefixes], context)
-        hash[compact_namespace_to_prefix(_note_str(note[:note]), options[:prefixes], context)] = (id == value && id !~ /:\/\//) ? id : {'@id'=>id}
+        if id.kind_of?(Array)
+          (0...id.length).each do |i|
+            id[i] = {'@id'=>id[i]} unless id[i] == value[i] && id[i] !~ /:\/\//
+          end
+        else
+          id = {'@id'=>id} unless id == value && id !~ /:\/\//
+        end
+        hash[compact_namespace_to_prefix(_note_str(note[:note]), options[:prefixes], context)] = id
       end
       hash
     end

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
@@ -370,7 +370,7 @@ module When
         contents = nil
         begin
           OpenURI
-          source   = open(path, 'r'+mode, {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE})
+          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

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
@@ -313,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 ||=[]
@@ -352,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)

data/lib/when_exe/parts/geometric_complex.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
@@ -266,7 +266,7 @@ module When::Parts
     #
     # @return [When::Parts::GeometricComplex]
     #
-    def +(duration)
+    def -(duration)
       self.class.new(@node.map {|node|
         new_node     = node.dup
         new_node[0] -= duration

data/lib/when_exe/parts/resource.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.
 =end
@@ -558,7 +558,7 @@ module When::Parts
           raise IOError, path + ': not ready' unless real_path
           args  = [real_path, "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r']
           args << {:ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE} if real_path =~ /\Ahttps:/
-          open(*args) do |file|
+          URI.send(:open,*args) do |file|
             resource = file.read
             case resource[0..5].upcase
             when 'BEGIN:'

data/lib/when_exe/parts/timezone.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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.
 =end
@@ -152,28 +152,16 @@ module When::Parts
       @identifier = identifier
       id, query   = identifier.split('?', 2)
       @timezone   = TZInfo::Timezone.get(id.sub(/\(.+?\)\z/,''))
-      unless TZInfo::TimeOrDateTime.method_defined?(:_to_datetime)
-        if TZInfo::RubyCoreSupport.respond_to?(:datetime_new)
-          TZInfo::TimeOrDateTime.class_eval %Q{
-            alias :_to_datetime :to_datetime
-            ::Rational
-            def to_datetime
-              unless @datetime
-                u = usec
-                s = u == 0 ? sec : Rational(sec * 1000000 + u, 1000000)
-                @datetime = TZInfo::RubyCoreSupport.datetime_new(year, mon, mday, hour, min, s, 0, Date::GREGORIAN)
-              end
-              @datetime
-            end
-          }
-        else
-          TZInfo::TimeOrDateTime.class_eval %Q{
-            alias :_to_datetime :to_datetime
-            def to_datetime
-              @datetime ||= DateTime.new(year, mon, mday, hour, min, sec, 0, Date::GREGORIAN)
-            end
-          }
-        end
+      unless TZInfo::Timezone.method_defined?(:period_for)
+         TZInfo::Timezone.class_eval %Q{
+          def period_for(time)
+            period_for_utc(Time.at(time).getutc)
+          end
+        }
+        TZInfo::TimezonePeriod.class_eval %Q{
+          alias :starts_at :utc_start
+          alias :ends_at   :utc_end
+        }
       end
       dst, std  = _offsets(Time.now.to_i)
       options   = query ? Hash[*(query.split('&').map {|item| item.split('=',2)}.flatten)] : {}
@@ -204,11 +192,11 @@ module When::Parts
         offsets = _offsets((time/When::TM::Duration::SECOND).floor)
         offsets.each do |offset|
           clocks[offset] ||= When::TM::Clock.new(options.merge({:zone=>offset, :tz_prop=>self}))
-          return clocks[offsets[0]] if @timezone.period_for_utc(
-            (frame.to_universal_time(cal_date, clk_time, clocks[offset])/When::TM::Duration::SECOND).floor).dst?
+          time_for_offset = frame.to_universal_time(cal_date, clk_time, clocks[offset])
+          return clocks[offsets[0]] if @timezone.period_for(Time.at((time_for_offset/When::TM::Duration::SECOND).floor)).dst?
         end
       end
-      offset = @timezone.period_for_utc((time/When::TM::Duration::SECOND).floor).utc_total_offset
+      offset = @timezone.period_for(Time.at((time/When::TM::Duration::SECOND).floor)).utc_total_offset
       clocks[offset] || When::TM::Clock.new(options.merge({:zone=>offset, :tz_prop=>self}))
     end
 
@@ -220,9 +208,9 @@ module When::Parts
     private
 
     def _offsets(time)
-      now    = @timezone.period_for_utc(time)
-      past   = @timezone.period_for_utc(now.utc_start-1) if now.utc_start
-      future = @timezone.period_for_utc(now.utc_end)     if now.utc_end
+      now    = @timezone.period_for(Time.at(time))
+      past   = @timezone.period_for(Time.at(now.starts_at.to_time.to_i-1)) if now.starts_at
+      future = @timezone.period_for(        now.ends_at  .to_time        ) if now.ends_at
       std    = now.utc_offset
       dst    = now.utc_total_offset
       [past, future].each do |period|

data/lib/when_exe/region/balinese.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
@@ -135,7 +135,7 @@ module When
     BalineseLuniSolar = [self, [
       "locale:[=en:, ja=ja:, zh=zh:, alias]",
       "period:[BalineseLuniSolar=, バリ・サカ暦=, 峇里陰陽曆=]",
-      ["[SE=, サカ暦=, 塞種紀元=, alias:Balinese_Saka_Era]1887-07<13", '@CE', "1965-07<13^BalineseLuniSolar1965",
+      ["[SE=, サカ暦=, 塞種紀元=, alias:Balinese_Saka_Era]1888-10-01", '@CE', "1966-10-01^BalineseLuniSolar1965",
 							 "1971-07-04^BalineseLuniSolar1971",
 							 "1993-07-08^BalineseLuniSolar1993",
 							 "1999-06<10^BalineseLuniSolar2000",
@@ -198,7 +198,9 @@ module When
                                                                     +1.5 => intercalary_month[3]}, # 閏黒分
                                                           :shift=>+8})
 
-        @origin_of_MSC = 0
+        @origin_of_MSC ||= 0
+
+        @label ||= 'Balinese::BalineseLuniSolar'
 
         @tabular = CyclicTableBased.new({
           'indices'    => [month_index, When::Coordinates::DefaultDayIndex],