ragoon 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd57a4e5bfe0f3990157e545b0d687d1317cfe1
-  data.tar.gz: d70d933b70be5da6ddb0e73ab00b1797f51722c1
+  metadata.gz: 37f399478c7454f731afd71d4999580936ea1b53
+  data.tar.gz: 12cdf219b8815923988dc421e4de9a8f0b88c795
 SHA512:
-  metadata.gz: e02b0db90f76d94ef930431d51a8700b2070e2d91c3b997b90c87ee8b57a0e31810e83f78fa89c908b7e50dc467f76a2c2a135e4daebeaf097c17fd7cfdc735e
-  data.tar.gz: 4b78c29e494335076b8a8d22cdf5fbbca9bd5e54720f99921b73b46a4acf399db8a1686303f5966ae76afb60c96cdf7743f547521a45085f66bebc508c902cc1
+  metadata.gz: fdb2a9f426a97151430fb75635bcf7f8526c87633d333b92c72313939e9fcf113513702afc52d51c7ec7490d989411f3fef9e2e52aab56ac08c71f5dcc60c4a0
+  data.tar.gz: 24a2d356115daa93f0a9c4d5f739b25485bf41fead815d3327a333a617555d37938ff7280358138f09305077af45cb8c19410586b9301b1ec0e20492e9b6c4ed

data/Gemfile

@@ -1,3 +1,9 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'webmock'
+  gem 'vcr'
+end
+

data/lib/ragoon/services.rb

@@ -35,4 +35,19 @@ class Ragoon::Services
     "#{endpoint.scheme}://#{endpoint.host}#{endpoint.path}"
   end
 
+  def parse_time(str)
+    return nil if str.nil?
+    Time.parse(str).localtime
+  end
+
+  def to_date_str(time)
+    return nil if time.nil?
+    time.localtime.strftime('%F')
+  end
+
+  def to_datetime_str(time)
+    return nil if time.nil?
+    time.utc.strftime('%FT%TZ')
+  end
+
 end

data/lib/ragoon/services/schedule.rb

@@ -1,4 +1,6 @@
 class Ragoon::Services::Schedule < Ragoon::Services
+  XML_NS = 'http://schemas.cybozu.co.jp/schedule/2008'
+
   def schedule_get_events(options = {})
     action_name = 'ScheduleGetEvents'
 
@@ -7,19 +9,29 @@ class Ragoon::Services::Schedule < Ragoon::Services
     body_node = Ragoon::XML.create_node(action_name)
     parameter_node = Ragoon::XML.create_node(
       'parameters',
-      start:           options[:start].strftime('%FT%T'),
-      end:             options[:end].strftime('%FT%T'),
-      start_for_daily: options[:start].localtime.strftime('%F'),
-      end_for_daily:   options[:end].localtime.strftime('%F'),
+      start:           to_datetime_str(options[:start]),
+      end:             to_datetime_str(options[:end]),
+      start_for_daily: to_date_str(options[:start]),
+      end_for_daily:   to_date_str(options[:end]),
     )
     body_node.add_child(parameter_node)
 
     client.request(action_name, body_node)
 
-    events = client.result_set.xpath('//schedule_event').
-             find_all { |ev| ev[:event_type] != 'banner' }.map do |event|
-      parse_event(event)
-    end
+    events_by_type = client.result_set.xpath('//schedule_event')
+      .group_by {|ev| ev[:event_type] }
+
+    # events_by_type['banner'] does not include results
+    [
+      (events_by_type['normal'] || []).map {|event|
+        parse_event(event)
+      },
+      (events_by_type['repeat'] || []).map {|event|
+        expand_repeat_event_periods(event, options[:start], options[:end]).map {|period|
+          parse_event(event, period)
+        }
+      }
+    ].flatten.sort_by { |e| e[:start_at] }
   end
 
   def schedule_add_event(options = {})
@@ -46,10 +58,7 @@ class Ragoon::Services::Schedule < Ragoon::Services
     )
     parameter_node.add_child(schedule_event_node)
 
-    members_node = Ragoon::XML.create_node(
-      'members',
-      xmlns: 'http://schemas.cybozu.co.jp/schedule/2008'
-    )
+    members_node = Ragoon::XML.create_node('members', xmlns: XML_NS)
     schedule_event_node.add_child(members_node)
     if options[:users]
       options[:users].each do |user|
@@ -60,22 +69,19 @@ class Ragoon::Services::Schedule < Ragoon::Services
       end
     end
 
-    when_node = Ragoon::XML.create_node(
-      'when',
-      xmlns: 'http://schemas.cybozu.co.jp/schedule/2008'
-    )
+    when_node = Ragoon::XML.create_node('when', xmlns: XML_NS)
     date_node =
       if options[:allday]
         Ragoon::XML.create_node(
           'date',
-          start: options[:start_at].strftime('%F'),
-          end:   options[:end_at].strftime('%F')
+          start: to_date_str(options[:start_at]),
+          end:   to_date_str(options[:end_at])
         )
       else
         Ragoon::XML.create_node(
           'datetime',
-          start: options[:start_at].utc.strftime('%FT%T'),
-          end:   options[:end_at].utc.strftime('%FT%T')
+          start: to_datetime_str(options[:start_at]),
+          end:   to_datetime_str(options[:end_at])
         )
       end
     when_node.add_child(date_node)
@@ -89,8 +95,9 @@ class Ragoon::Services::Schedule < Ragoon::Services
     }.first
   end
 
-  def parse_event(event)
-    period = start_and_end(event)
+  def parse_event(event, period = nil)
+    period = start_and_end(event) if period.nil?
+
     {
       id:         event[:id],
       url:        event_url(event[:id]),
@@ -102,6 +109,7 @@ class Ragoon::Services::Schedule < Ragoon::Services
       users:      users_info(event),
       private:    !(event[:public_type] == 'public'),
       allday:     event[:allday] == 'true',
+      event_type: event[:event_type],
     }
   end
 
@@ -110,14 +118,14 @@ class Ragoon::Services::Schedule < Ragoon::Services
   end
 
   def facility_names(event)
-    event.xpath('ev:members', ev: "http://schemas.cybozu.co.jp/schedule/2008").
-      children.map { |c| c.xpath('ev:facility', ev: "http://schemas.cybozu.co.jp/schedule/2008").first }.
+    event.xpath('ev:members', ev: XML_NS).
+      children.map { |c| c.xpath('ev:facility', ev: XML_NS).first }.
       compact.map { |n| n[:name] }
   end
 
   def users_info(event)
-    event.xpath('ev:members', ev: "http://schemas.cybozu.co.jp/schedule/2008").
-      children.map { |c| c.xpath('ev:user', ev: "http://schemas.cybozu.co.jp/schedule/2008").first }.
+    event.xpath('ev:members', ev: XML_NS).
+      children.map { |c| c.xpath('ev:user', ev: XML_NS).first }.
       compact.map do |n|
         {
           id: n[:id].to_i,
@@ -129,28 +137,21 @@ class Ragoon::Services::Schedule < Ragoon::Services
   def start_and_end(event)
     start_at = nil
     end_at   = nil
+    timezone = event[:timezone]
+    end_timezone = event[:end_timezone] || event[:timezone]
 
     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
-        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
-        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
+      period = event.xpath('ev:when/ev:datetime', ev: XML_NS).first
+      unless period.nil?
+        start_at = parse_event_time(period[:start], timezone)
+        end_at = parse_event_time(period[:end], end_timezone)
+      end
+
+    else
+      period = event.xpath('ev:when/ev:date', ev: XML_NS).first
+      unless period.nil?
+        start_at = parse_event_time(period[:start], timezone)
+        end_at = parse_event_time(period[:end] + " 23:59:59", end_timezone)
       end
     end
 
@@ -160,8 +161,16 @@ class Ragoon::Services::Schedule < Ragoon::Services
     }
   end
 
-  def parse_event_time(time)
-    Time.parse(time).localtime.to_s
+  def parse_event_time(time, timezone = ENV['TZ'], now = Time.now)
+    return nil if time.nil?
+
+    begin
+      old_timezone = ENV['TZ']
+      ENV['TZ'] = timezone
+      Time.parse(time, now).localtime.to_s
+    ensure
+      ENV['TZ'] = old_timezone
+    end
   end
 
   def default_options(action_name)
@@ -172,4 +181,72 @@ class Ragoon::Services::Schedule < Ragoon::Services
       {}
     end
   end
+
+  private
+
+  def expand_repeat_event_periods(event, start_at, end_at)
+    timezone = event[:timezone]
+    end_timezone = event[:end_timezone] || event[:timezone]
+
+    periods = []
+
+    event.xpath('ev:repeat_info/ev:condition', ev: XML_NS).each do |cond|
+      exclusive_dates = event.xpath('ev:repeat_info/ev:exclusive_datetimes/ev:exclusive_datetime',
+                                    ev: XML_NS).map do |exclusive_date|
+        Date.parse(exclusive_date[:start])
+      end
+
+      dates = expand_dates(start_at.to_date, end_at.to_date, cond, exclusive_dates)
+
+      periods = dates.map do |date|
+        {
+          start_at: parse_event_time(cond[:start_time], timezone, date.to_time),
+          end_at: parse_event_time(cond[:end_time], end_timezone, date.to_time)
+        }
+      end
+    end
+
+    periods
+  end
+
+  def expand_dates(start_date, end_date, cond, exclusive_dates)
+    (start_date..end_date).select {|date|
+      next false if exclusive_dates.include?(date)
+
+      case cond[:type]
+      when 'day' # everyday
+        next true
+
+      when 'week' # everyweek
+        next date.wday == cond[:week].to_i
+
+      when 'weekday'
+        next (1..5).include?(date.wday)
+
+      when '1stweek'
+        next nth_weekday_of_month(date) == 1 && date.wday == cond[:week].to_i
+
+      when '2ndweek'
+        next nth_weekday_of_month(date) == 2 && date.wday == cond[:week].to_i
+
+      when '3rdweek'
+        next nth_weekday_of_month(date) == 3 && date.wday == cond[:week].to_i
+
+      when '4thweek'
+        next nth_weekday_of_month(date) == 4 && date.wday == cond[:week].to_i
+
+      when 'lastweek'
+        next date.month != date.next_day(7).month &&
+          date.wday == cond[:week].to_i
+
+      when 'month'
+        next date.day == cond[:day].to_i
+
+      end
+    }
+  end
+
+  def nth_weekday_of_month(date)
+    (date.day + 6) / 7
+  end
 end

data/lib/ragoon/services/workflow.rb

@@ -14,7 +14,7 @@ class Ragoon::Services::Workflow < Ragoon::Services
     options[:request_form_id] = request_form_id
     [ :start_request_date, :end_request_date,
       :start_approval_date, :end_approval_date ].each do |key|
-      options[key] = to_datetime(options[key]) if options.has_key?(key)
+      options[key] = to_datetime_str(options[key]) if options.has_key?(key)
     end
 
     body_node = Ragoon::XML.create_node(action_name)
@@ -119,8 +119,8 @@ class Ragoon::Services::Workflow < Ragoon::Services
     body_node = Ragoon::XML.create_node(action_name)
 
     attributes = {}
-    attributes['start'] = to_datetime(start_date) unless start_date.nil?
-    attributes['end'] = to_datetime(end_date) unless end_date.nil?
+    attributes['start'] = to_datetime_str(start_date) unless start_date.nil?
+    attributes['end'] = to_datetime_str(end_date) unless end_date.nil?
     parameter_node = Ragoon::XML.create_node('parameters', attributes)
     body_node.add_child(parameter_node)
 
@@ -209,12 +209,4 @@ class Ragoon::Services::Workflow < Ragoon::Services
     }
   end
 
-  def parse_time(time)
-    Time.parse(time).localtime
-  end
-
-  def to_datetime(str)
-    str.utc.strftime('%FT%TZ')
-  end
-
 end

data/lib/ragoon/version.rb

@@ -1,3 +1,3 @@
 module Ragoon
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragoon
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client