calendar-assistant 0.9.0 → 0.14.0

data/lib/calendar_assistant/config.rb

@@ -3,9 +3,10 @@ class CalendarAssistant
   class Config
     autoload :TokenStore, "calendar_assistant/config/token_store"
 
-    class NoTokensAuthorized < CalendarAssistant::BaseException;
+    class NoTokensAuthorized < CalendarAssistant::BaseException
     end
-    class AccessingHashAsScalar < CalendarAssistant::BaseException;
+
+    class AccessingHashAsScalar < CalendarAssistant::BaseException
     end
 
     module Keys
@@ -57,16 +58,15 @@ class CalendarAssistant
 
     attr_reader :user_config, :options, :defaults
 
-    def initialize options: {},
+    def initialize(options: {},
                    user_config: {},
-                   defaults: DEFAULT_SETTINGS
-
+                   defaults: DEFAULT_SETTINGS)
       @defaults = defaults
       @options = options
       @user_config = user_config
     end
 
-    def in_env &block
+    def in_env(&block)
       # this is totally not thread-safe
       orig_b_o_d = BusinessTime::Config.beginning_of_workday
       orig_e_o_d = BusinessTime::Config.end_of_workday
@@ -98,7 +98,7 @@ class CalendarAssistant
       end
     end
 
-    def get keypath
+    def get(keypath)
       rval = Config.find_in_hash(user_config, keypath)
 
       if rval.is_a?(Hash)
@@ -108,7 +108,7 @@ class CalendarAssistant
       rval
     end
 
-    def set keypath, value
+    def set(keypath, value)
       Config.set_in_hash user_config, keypath, value
     end
 
@@ -116,7 +116,7 @@ class CalendarAssistant
     #  note that, despite the name, this method returns both options
     #  and settings
     #
-    def setting setting_name
+    def setting(setting_name)
       context = Config.find_in_hash(options, Keys::Options::CONTEXT)
       Config.find_in_hash(options, setting_name) ||
         Config.find_in_hash(user_config, [Keys::SETTINGS, context, setting_name]) ||
@@ -190,14 +190,14 @@ class CalendarAssistant
       a
     end
 
-    def self.find_in_hash hash, keypath
+    def self.find_in_hash(hash, keypath)
       split_keypath(keypath).inject(hash) do |current_val, key|
         break unless current_val.has_key?(key)
         current_val[key]
       end
     end
 
-    def self.set_in_hash hash, keypath, new_value
+    def self.set_in_hash(hash, keypath, new_value)
       *path_parts, key = *split_keypath(keypath)
 
       current_hash = path_parts.inject(hash) do |current_val, path|

data/lib/calendar_assistant/config/token_store.rb

@@ -3,20 +3,20 @@ class CalendarAssistant
     class TokenStore
       attr_reader :config
 
-      def initialize config
+      def initialize(config)
         @config = config
       end
 
-      def delete id
+      def delete(id)
         config.tokens.delete(id)
         config.persist!
       end
 
-      def load id
+      def load(id)
         config.tokens[id]
       end
 
-      def store id, token
+      def store(id, token)
         config.tokens[id] = token
         config.persist!
       end

data/lib/calendar_assistant/date_helpers.rb

@@ -1,6 +1,6 @@
 class CalendarAssistant
   module DateHelpers
-    def self.cast_dates attributes
+    def self.cast_dates(attributes)
       attributes.each_with_object({}) do |(key, value), object|
         if value.is_a?(Time) || value.is_a?(DateTime)
           object[key] = Google::Apis::CalendarV3::EventDateTime.new(date_time: value)
@@ -13,4 +13,3 @@ class CalendarAssistant
     end
   end
 end
-

data/lib/calendar_assistant/event.rb

@@ -29,49 +29,49 @@ class CalendarAssistant
     end
 
     PREDICATES = {
-        "response": %I[
-          accepted?
-          declined?
-          awaiting?
-          tentative?
-        ],
-        "temporal": %I[
-          all_day?
-          past?
-          current?
-          future?
-        ],
-        "visibility": %I[
-          private?
-          public?
-          explicitly_visible?
-          visible_guestlist?
-        ],
-        "attributes": %I[
-          location_event?
-          self?
-          one_on_one?
-          busy?
-          commitment?
-          recurring?
-          abandoned?
-          anyone_can_add_self?
-          attendees_omitted?
-          end_time_unspecified?
-          guests_can_invite_others?
-          guests_can_modify?
-          guests_can_see_other_guests?
-          private_copy?
-          locked?
-          needs_action?
-      ]
+      "response": %I[
+        accepted?
+        declined?
+        awaiting?
+        tentative?
+      ],
+      "temporal": %I[
+        all_day?
+        past?
+        current?
+        future?
+      ],
+      "visibility": %I[
+        private?
+        public?
+        explicitly_visible?
+        visible_guestlist?
+      ],
+      "attributes": %I[
+        location_event?
+        self?
+        one_on_one?
+        busy?
+        commitment?
+        recurring?
+        abandoned?
+        anyone_can_add_self?
+        attendees_omitted?
+        end_time_unspecified?
+        guests_can_invite_others?
+        guests_can_modify?
+        guests_can_see_other_guests?
+        private_copy?
+        locked?
+        needs_action?
+      ],
     }
 
     #
     #  class methods
     #
 
-    def self.location_event_prefix config
+    def self.location_event_prefix(config)
       icon = config[CalendarAssistant::Config::Keys::Settings::LOCATION_ICON]
       if nickname = config[CalendarAssistant::Config::Keys::Settings::NICKNAME]
         return "#{icon} #{nickname} @ "
@@ -87,13 +87,13 @@ class CalendarAssistant
       @config = config
     end
 
-    def update **args
+    def update(**args)
       update!(**args)
       self
     end
 
     def location_event?
-      !! summary.try(:starts_with?, Event.location_event_prefix(@config))
+      !!summary.try(:starts_with?, Event.location_event_prefix(@config))
     end
 
     def accepted?
@@ -167,15 +167,15 @@ class CalendarAssistant
 
     def other_human_attendees
       return nil if attendees.nil?
-      attendees.select { |a| ! a.resource  && ! a.self }
+      attendees.select { |a| !a.resource && !a.self }
     end
 
     def human_attendees
       return nil if attendees.nil?
-      attendees.select { |a| ! a.resource }
+      attendees.select { |a| !a.resource }
     end
 
-    def attendee id
+    def attendee(id)
       return nil if attendees.nil?
       attendees.find do |attendee|
         attendee.email == id
@@ -192,15 +192,19 @@ class CalendarAssistant
 
     def av_uri
       @av_uri ||= begin
-                    description_link = CalendarAssistant::StringHelpers.find_uri_for_domain(description, "zoom.us")
-                    return description_link if description_link
+        if conference_data && conference_data.conference_solution.name == "Zoom Meeting"
+          return conference_data.entry_points.detect{|d| d.entry_point_type == "video" }.uri
+        end
 
-                    location_link = CalendarAssistant::StringHelpers.find_uri_for_domain(location, "zoom.us")
-                    return location_link if location_link
+        description_link = CalendarAssistant::StringHelpers.find_uri_for_domain(description, "zoom.us")
+        return description_link if description_link
 
-                    return hangout_link if hangout_link
-                    nil
-                  end
+        location_link = CalendarAssistant::StringHelpers.find_uri_for_domain(location, "zoom.us")
+        return location_link if location_link
+
+        return hangout_link if hangout_link
+        nil
+      end
     end
   end
-end
+end

data/lib/calendar_assistant/event_repository.rb

@@ -1,6 +1,6 @@
 class CalendarAssistant
   class EventRepository
-    class CalendarNotFoundException < CalendarAssistant::BaseException;
+    class CalendarNotFoundException < CalendarAssistant::BaseException
     end
 
     attr_reader :calendar, :calendar_id, :config
@@ -15,45 +15,44 @@ class CalendarAssistant
       raise
     end
 
-    def in_tz &block
+    def in_tz(&block)
       CalendarAssistant.in_tz calendar.time_zone do
         yield
       end
     end
 
-    def find time_range, predicates: {}
+    def find(time_range, predicates: {})
       events = @service.list_events(@calendar_id,
-                                   time_min: time_range.first.iso8601,
-                                   time_max: time_range.last.iso8601,
-                                   order_by: "startTime",
-                                   single_events: true,
-                                   max_results: 2000,
-                                   )
+                                    time_min: time_range.first.iso8601,
+                                    time_max: time_range.last.iso8601,
+                                    order_by: "startTime",
+                                    single_events: true,
+                                    max_results: 2000)
       events = events.items.map { |e| CalendarAssistant::Event.new(e, config: config) }
 
       events = filter_by_predicates(events, predicates) unless predicates.empty?
       CalendarAssistant::EventSet.new self, events
     end
 
-    def new event_attributes
-      event = Google::Apis::CalendarV3::Event.new DateHelpers.cast_dates(event_attributes)
+    def new(event_attributes)
+      event = Google::Apis::CalendarV3::Event.new(**DateHelpers.cast_dates(event_attributes))
       event.visibility ||= config.event_visibility
       CalendarAssistant::Event.new(event, config: config)
     end
 
-    def create event_attributes
+    def create(event_attributes)
       new(event_attributes).tap do |event|
         @service.insert_event @calendar_id, event.__getobj__
       end
     end
 
-    def delete event
-      @service.delete_event @calendar_id,  event.id
+    def delete(event)
+      @service.delete_event @calendar_id, event.id
       event
     end
 
     def update(event, attributes)
-      event.update! DateHelpers.cast_dates(attributes)
+      event.update!(**DateHelpers.cast_dates(attributes))
       updated_event = @service.update_event @calendar_id, event.id, event
       CalendarAssistant::Event.new(updated_event, config: config)
     end

data/lib/calendar_assistant/event_repository_factory.rb

@@ -1,6 +1,6 @@
 class CalendarAssistant
   class EventRepositoryFactory
-    def self.new_event_repository service, calendar_id, config: CalendarAssistant::Config.new, type: :base
+    def self.new_event_repository(service, calendar_id, config: CalendarAssistant::Config.new, type: :base)
       klass = case type
               when :location
                 LocationEventRepository

data/lib/calendar_assistant/event_set.rb

@@ -7,7 +7,7 @@ class CalendarAssistant
   #  - it could be a bare Event
   #
   class EventSet
-    def self.new event_repository, events=nil
+    def self.new(event_repository, events = nil)
       if events.is_a?(EventSet::Hash)
         return EventSet::Hash.new event_repository, events.try(:events)
       end
@@ -23,17 +23,17 @@ class CalendarAssistant
     class Base
       attr_reader :event_repository, :events
 
-      def initialize event_repository, events
+      def initialize(event_repository, events)
         @event_repository = event_repository
         @events = events
       end
 
-      def == rhs
+      def ==(rhs)
         return false unless rhs.is_a?(self.class)
         self.event_repository == rhs.event_repository && self.events == rhs.events
       end
 
-      def new new_events
+      def new(new_events)
         EventSet.new self.event_repository, new_events
       end
 
@@ -45,28 +45,28 @@ class CalendarAssistant
     end
 
     class Hash < EventSet::Base
-      def ensure_keys keys, only: false
+      def ensure_keys(keys, only: false)
         keys.each do |key|
           events[key] = [] unless events.has_key?(key)
         end
         if only
           events.keys.each do |key|
-            if ! keys.include? key
+            if !keys.include? key
               events.delete(key)
             end
           end
         end
       end
 
-      def [] key
+      def [](key)
         events[key] ||= []
       end
 
-      def []= key, value
+      def []=(key, value)
         events[key] = value
       end
 
-      def available_blocks length: 1
+      def available_blocks(length: 1)
         event_repository.in_tz do
           dates = events.keys.sort
 
@@ -91,7 +91,7 @@ class CalendarAssistant
                 avail_time[date] << AvailableBlock.new(start: start_time, end: e.start_time)
               end
               start_time = [e.end_time, start_time].max
-              break if ! start_time.during_business_hours?
+              break if !start_time.during_business_hours?
             end
 
             if HasDuration.duration_in_seconds(start_time, end_time) >= length
@@ -105,18 +105,18 @@ class CalendarAssistant
         end
       end
 
-      def intersection other, length: 1
+      def intersection(other, length: 1)
         set = new({})
         set.ensure_keys(events.keys + other.events.keys)
         set.events.keys.each do |date|
           events[date].each do |event_a|
             other.events[date].each do |event_b|
               if event_a.contains?(event_b.start_time) ||
-                 event_a.contains?(event_b.end_time-1) ||
+                 event_a.contains?(event_b.end_time - 1) ||
                  event_b.contains?(event_a.start_time) ||
-                 event_b.contains?(event_a.end_time-1)
+                 event_b.contains?(event_a.end_time - 1)
                 start_time = [event_a.start_time, event_b.start_time].max
-                end_time   = [event_a.end_time,   event_b.end_time  ].min
+                end_time = [event_a.end_time, event_b.end_time].min
                 if HasDuration.duration_in_seconds(start_time, end_time) >= length
                   set.events[date] << AvailableBlock.new(start: start_time, end: end_time)
                 end

data/lib/calendar_assistant/extensions/google_apis_extensions.rb

@@ -21,7 +21,7 @@ class Google::Apis::CalendarV3::EventDateTime
     date_time.strftime "%Y-%m-%d %H:%M"
   end
 
-  def == rhs
+  def ==(rhs)
     if date
       return to_date == rhs.to_date
     end

data/lib/calendar_assistant/extensions/launchy_extensions.rb

@@ -12,9 +12,9 @@ require "launchy"
 #
 class CalendarAssistant
   class ZoomLaunchy < Launchy::Application::Browser
-    ZOOM_URI_REGEXP = %r(https?://\w+.zoom.us/j/(\d+))
+    ZOOM_URI_REGEXP = %r(https?://\w+.zoom.us/j/(\d+)(\?(.*))?)
 
-    def self.handles? uri
+    def self.handles?(uri)
       return true if ZOOM_URI_REGEXP.match(uri)
     end
 
@@ -26,13 +26,16 @@ class CalendarAssistant
       [find_executable("xdg-open")]
     end
 
-    def open uri, options={}
+    def open(uri, options = {})
       command = host_os_family.app_list(self).compact.first
       if command.nil?
         super uri, options
       else
-        confno = ZOOM_URI_REGEXP.match(uri)[1]
+        matches = ZOOM_URI_REGEXP.match(uri)
+        confno = matches[1]
+        params = matches[3]
         url = "zoommtg://zoom.us/join?confno=#{confno}"
+        url += "&#{params}" if params
         run command, [url]
       end
     end