ragoon 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b68e19f10c0d94b8449fc5343a2a6e494192a95c
-  data.tar.gz: a1a42d79bf60a34ff1092b4d12e1bd58eee7a683
+  metadata.gz: b5f0f567bf1708c30ea8ebeb9762c69b5bfd5ec9
+  data.tar.gz: b9bc20acee3e5315530833e3db82c82f2cc41a0e
 SHA512:
-  metadata.gz: 4b7cfb9605a801b1444d1b4d4faadee8612ba0c4d911091b6b47833a251d5deb85cb57dca93aa9c31c5519a2e1ca143e96bdce59d5e746b200d86f21021eba29
-  data.tar.gz: f8afef1240b59df88a49a976eac2a57a0ce4811ce0e4c7ee32f6d07282012caa19cdfc8fcf2ba4e10a6c06385e9b7655d8a18b4fd965332bcf50951a1d207cf3
+  metadata.gz: 87ebedd491389ebe292c770c4c178a4a41be1ee76acf078e2a6d2c3fc5b2f5773b52b6968fd0d9f60abe887f7f7f13444a4732680542f59337a51de52eeda6a4
+  data.tar.gz: d797d4f97b1d2213994655bd75fc767dc86e03b1765cf52ea72a6794d68a27e1077c08cb5f29d1dde31a8a6a699e0501c6dc834a41ef65672afd75e7174ea346

data/README.md

@@ -11,9 +11,9 @@ service = Ragoon::Services::Schedule.new
 events = service.schedule_get_event
 
 => [
-  {:title=>"予定あり", :period=>"13:00〜14:00", :plan=>"作業", :facility=>""},
-  {:title=>"セクションMTG", :period=>"15:00〜15:30", :plan=>"社内MTG", :facility=>["会議室"]},
-  {:title=>"予定あり", :period=>"終日", :plan=>"", :facility=>""}
+  {:title=>"セクションMTG", :start_at=>"2015-11-29 15:00:00 +0900", :end_at=>"2015-11-29 15:30:00 +0900", :plan=>"社内MTG", :facilities=>["会議室1"], :private=>true, :allday=>false},
+  {:title=>"エンジニア共有会", :start_at=>"2015-11-29 16:00:00 +0900", :end_at=>"2015-11-29 16:30:00 +0900" :plan=>"社内MTG", :facilities=>["会議室1", "会議室2"], :private=>true, :allday=>false},
+  {:title=>"監査対応", :start_at=>nil, :end_at=>nil, :plan=>"作業", :facilities=>[], :private=>false, :allday=>true}
 ]
 
 ```

data/lib/ragoon/services/schedule.rb

@@ -17,12 +17,15 @@ class Ragoon::Services::Schedule < Ragoon::Services
     client.request(action_name, body_node)
     events = client.result_set.xpath('//schedule_event').
              find_all { |ev| ev[:event_type] != 'banner' }.map do |event|
-      public_event = event[:public_type] == 'public'
+      period = start_and_end(event)
       {
-        title:    public_event ? event[:detail] : '予定あり',
-        period:   start_and_end(event),
-        plan:     public_event ? event[:plan] : '',
-        facility: public_event ? facility_names(event) : [],
+        title:      event[:detail],
+        start_at:   period[:start_at],
+        end_at:     period[:end_at],
+        plan:       event[:plan],
+        facilities: facility_names(event),
+        private:    !(event[:public_type] == 'public'),
+        allday:     event[:allday] == 'true',
       }
     end
   end
@@ -34,33 +37,41 @@ class Ragoon::Services::Schedule < Ragoon::Services
   end
 
   def start_and_end(event)
-    if event[:allday] == 'true'
-      '終日'
-    else
+    start_at = nil
+    end_at   = nil
+
+    unless event[:allday] == 'true'
       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])
+        unless period.nil?
+          start_at = parse_event_time(period[:start])
+          unless event[:start_only] == 'true'
+            end_at = parse_event_time(period[:end])
+          end
+        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 ''
+        unless repeat_info.nil?
+          period = repeat_info.xpath('ev:condition', ev: 'http://schemas.cybozu.co.jp/schedule/2008').first
+          unless period.nil?
+            start_at = parse_event_time(period[:start_time])
+            unless event[:start_only] == 'true'
+              end_at = parse_event_time(period[:end_time])
+            end
+          end
+        end
       end
-
-      "#{start_time}〜#{end_time}"
     end
-  end
 
+    {
+      start_at: start_at,
+      end_at:   end_at,
+    }
+  end
 
   def parse_event_time(time)
-    Time.parse(time).localtime.strftime('%R')
+    Time.parse(time).localtime.to_s
   end
 
   def default_options(action_name)

data/lib/ragoon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragoon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client