calendar-assistant 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a2b95396339756f78030efdc8bab6106b47f9c09f5363d9a7097736fa2e10a
-  data.tar.gz: b2ce18e6aceeae81a41975bd9126901aede98b272023d625ef1fe63b59c27264
+  metadata.gz: 39a771f697de78e8be9e8189021c20f33e73cabbd6df2266d9961b030fb37f23
+  data.tar.gz: 3237fc5462cc02428052aa17ade6b3e3d01b3e2f566583f2c1ad12ca0f47cce8
 SHA512:
-  metadata.gz: 07b2596d086f9d0a7e87545e22ed287488c53935de4cc5e56b6e3578bd7265b1f2bdd14f974f717b0809e404c86fc95100c106664240aac86e812dfd4845cab7
-  data.tar.gz: e7bb29fb7dfe084cd30ddb5b339722e6204fa460c895c3c4e67f289cc78e69e321e80c645aa415ce96e90313e7f87cc90cd9a32f39093bc06cfe56c13c330ec4
+  metadata.gz: 769547047722afdd06a38385e2dba228879483bf4e77cff6beae29243d69ddf6b7c1c5195263a9570b5cc4c9992a228de228fb110580ae8f0745bdaaed110981
+  data.tar.gz: d14e5743b960ebebabdf10afbbba97b5f501351f961c6327ee8971ebea7990dc65c5fccf230cb818915d9325c7e6f0869279cf3fc105161abffe9d1ef3ca0e26

data/lib/calendar_assistant/cli_helpers.rb

@@ -189,6 +189,7 @@ class CalendarAssistant
           attributes << "self" if event.self? && !event.private?
           attributes << "1:1" if event.one_on_one?
           attributes << "awaiting" if event.awaiting?
+          attributes << "tentative" if event.tentative?
         end
 
         attributes << event.visibility if event.explicit_visibility?

data/lib/calendar_assistant/event.rb

@@ -33,7 +33,14 @@ class CalendarAssistant
     LOCATION_EVENT_REGEX = /^#{CalendarAssistant::EMOJI_WORLDMAP}/
 
     #
-    #  methods
+    #  class methods
+    #
+    def self.duration_in_seconds start_time, end_time
+      (end_time.to_datetime - start_time.to_datetime).days.to_i
+    end
+
+    #
+    #  instance methods
     #
     def update **args
       update!(**args)
@@ -80,6 +87,10 @@ class CalendarAssistant
       response_status == CalendarAssistant::Event::Response::NEEDS_ACTION
     end
 
+    def tentative?
+      response_status == CalendarAssistant::Event::Response::TENTATIVE
+    end
+
     def self?
       response_status == CalendarAssistant::Event::Response::SELF
     end
@@ -161,13 +172,18 @@ class CalendarAssistant
         return "#{days}d"
       end
 
-      p = ActiveSupport::Duration.build(end_time - start_time).parts
+      p = ActiveSupport::Duration.build(duration_in_seconds).parts
       s = []
       s << "#{p[:hours]}h" if p.has_key?(:hours)
       s << "#{p[:minutes]}m" if p.has_key?(:minutes)
       s.join(" ")
     end
 
+
+    def duration_in_seconds
+      Event.duration_in_seconds start_time, end_time
+    end
+
     def human_attendees
       return nil if attendees.nil?
       attendees.select { |a| ! a.resource }

data/lib/calendar_assistant/event_repository.rb

@@ -51,8 +51,8 @@ class CalendarAssistant
 
     def available_block start_time, end_time
       e = Google::Apis::CalendarV3::Event.new(
-        start: Google::Apis::CalendarV3::EventDateTime.new(date_time: start_time.in_time_zone(calendar.time_zone)),
-        end: Google::Apis::CalendarV3::EventDateTime.new(date_time: end_time.in_time_zone(calendar.time_zone)),
+        start: Google::Apis::CalendarV3::EventDateTime.new(date_time: start_time.in_time_zone(calendar.time_zone).to_datetime),
+        end: Google::Apis::CalendarV3::EventDateTime.new(date_time: end_time.in_time_zone(calendar.time_zone).to_datetime),
         summary: "available"
       )
       CalendarAssistant::Event.new e

data/lib/calendar_assistant/event_set.rb

@@ -76,14 +76,14 @@ class CalendarAssistant
               next if Time.before_business_hours?(e.end_time.to_time)
               next if Time.after_business_hours?(e.start_time.to_time)
 
-              if (e.start_time - start_time).days.to_i >= length
+              if Event.duration_in_seconds(start_time, e.start_time) >= length
                 avail_time[date] << event_repository.available_block(start_time, e.start_time)
               end
               start_time = [e.end_time, start_time].max
               break if ! start_time.during_business_hours?
             end
 
-            if (end_time - start_time).days.to_i >= length
+            if Event.duration_in_seconds(start_time, end_time) >= length
               avail_time[date] << event_repository.available_block(start_time, end_time)
             end
 
@@ -94,7 +94,7 @@ class CalendarAssistant
         end
       end
 
-      def intersection other
+      def intersection other, length: 1
         set = new({})
         set.ensure_keys(events.keys + other.events.keys)
         set.events.keys.each do |date|
@@ -106,7 +106,9 @@ class CalendarAssistant
                  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
-                set.events[date] << event_repository.available_block(start_time, end_time)
+                if Event.duration_in_seconds(start_time, end_time) >= length
+                  set.events[date] << event_repository.available_block(start_time, end_time)
+                end
               end
             end
           end

data/lib/calendar_assistant/scheduler.rb

@@ -36,7 +36,7 @@ class CalendarAssistant
         length = ChronicDuration.parse(ca.config.setting(Config::Keys::Settings::MEETING_LENGTH))
         ca.in_env do
           set_avail = event_set.available_blocks(length: length)
-          avail = avail ? avail.intersection(set_avail) : set_avail
+          avail = avail ? avail.intersection(set_avail, length: length) : set_avail
         end
       end
       avail

data/lib/calendar_assistant/version.rb

@@ -1,3 +1,3 @@
 class CalendarAssistant
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calendar-assistant
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client