ragoon 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f07fa624fd62e33fc625835cc4b507ecd00d4e
-  data.tar.gz: 8c376442c62d18c84573c1fa7d89c9e3b7f3723c
+  metadata.gz: b68e19f10c0d94b8449fc5343a2a6e494192a95c
+  data.tar.gz: a1a42d79bf60a34ff1092b4d12e1bd58eee7a683
 SHA512:
-  metadata.gz: 53ae410eaf56828e0fe9aa008e98afb1b3de8acb50b8e00299f20781db28d3a32b4ef10db7efdb63c9c99325ed29b5b0257a889cde2faf5901ea75980369d19c
-  data.tar.gz: dea2dae2bb521261331c0a856062db7ad2bce21acb91d779ca30681cbb56948d429078f04f4b1472a5a5d74417154810eb956226534094a51bab32d28628f665
+  metadata.gz: 4b7cfb9605a801b1444d1b4d4faadee8612ba0c4d911091b6b47833a251d5deb85cb57dca93aa9c31c5519a2e1ca143e96bdce59d5e746b200d86f21021eba29
+  data.tar.gz: f8afef1240b59df88a49a976eac2a57a0ce4811ce0e4c7ee32f6d07282012caa19cdfc8fcf2ba4e10a6c06385e9b7655d8a18b4fd965332bcf50951a1d207cf3

data/README.md

@@ -11,9 +11,9 @@ service = Ragoon::Services::Schedule.new
 events = service.schedule_get_event
 
 => [
-  {:title=>"予定あり", :period=>"13:00〜14:00", :facility=>""},
-  {:title=>"セクションMTG", :period=>"15:00〜15:30", :facility=>["会議室"]},
-  {:title=>"予定あり", :period=>"終日", :facility=>""}
+  {:title=>"予定あり", :period=>"13:00〜14:00", :plan=>"作業", :facility=>""},
+  {:title=>"セクションMTG", :period=>"15:00〜15:30", :plan=>"社内MTG", :facility=>["会議室"]},
+  {:title=>"予定あり", :period=>"終日", :plan=>"", :facility=>""}
 ]
 
 ```

data/lib/ragoon/services/schedule.rb

@@ -37,16 +37,32 @@ class Ragoon::Services::Schedule < Ragoon::Services
     if event[:allday] == 'true'
       '終日'
     else
-      period = event.children.xpath('ev:datetime', ev: "http://schemas.cybozu.co.jp/schedule/2008").first
+      case event[:event_type]
+      when 'normal'
+        period = event.children.xpath('ev:datetime', ev: "http://schemas.cybozu.co.jp/schedule/2008").first
+        return '' if period.nil?
+        start_time = parse_event_time(period[:start])
+        end_time = event[:start_only] == 'true' ? '' : parse_event_time(period[:end])
+      when 'repeat'
+        repeat_info = event.xpath('ev:repeat_info', ev: 'http://schemas.cybozu.co.jp/schedule/2008').first
+        return '' if repeat_info.nil?
+        period = repeat_info.xpath('ev:condition', ev: 'http://schemas.cybozu.co.jp/schedule/2008').first
+        return '' if period.nil?
+        start_time = parse_event_time(period[:start_time])
+        end_time = event[:start_only] == 'true' ? '' : parse_event_time(period[:end_time])
+      else
+        return ''
+      end
 
-      return '' if period.nil?
-
-      start_time = Time.parse(period[:start]).localtime.strftime('%R')
-      end_time = event[:start_only] == 'true' ? '' : Time.parse(period[:end]).localtime.strftime('%R')
       "#{start_time}〜#{end_time}"
     end
   end
 
+
+  def parse_event_time(time)
+    Time.parse(time).localtime.strftime('%R')
+  end
+
   def default_options(action_name)
     case action_name
     when 'ScheduleGetEvents'

data/lib/ragoon/version.rb

@@ -1,3 +1,3 @@
 module Ragoon
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ragoon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - SHIOYA, Hiromu