canvas_webex 0.7 → 0.8

data/app/models/cisco_webex_conference.rb

@@ -18,12 +18,23 @@
 
 class CiscoWebexConference < WebConference
 
+  after_save :format_scheduled_date
+
+  user_setting_field :scheduled_date, {
+    name: -> { t('scheduled_date_setting', 'Scheduled Date') },
+    description: -> { t('scheduled_date_setting_description', 'Scheduled Date') },
+    type: :date_picker,
+    visible: true,
+    default: '',
+    location: 'userSettings'
+  }
+
   user_setting_field :external_emails, {
-    name: ->{ t('external_emails_setting', 'External Emails') },
-    description: ->{ t('external_emails_setting_description', 'External emails') },
+    name: -> { t('external_emails_setting', 'External Emails') },
+    description: -> { t('external_emails_setting_description', 'External emails') },
     type: :text,
     visible: true,
-    default: "",
+    default: '',
     location: 'members'
   }
 
@@ -32,9 +43,12 @@ class CiscoWebexConference < WebConference
   # Returns a meeting.
   def initiate_conference
     unless self.conference_key.present?
-      options = {}
-      options[:duration] = self.duration || 999999
-      options[:emails] = settings[:external_emails].nil? ? [] : settings[:external_emails].strip.split(';')
+      options = {
+        duration: self.duration || 999999,
+        emails: settings[:external_emails].nil? ? [] : settings[:external_emails].strip.split(';'),
+        scheduled_date: scheduled_date.in_time_zone(user.time_zone),
+        time_zone: user.time_zone
+      }
       webex_meeting = CanvasWebex::Meeting.create(self.title, options)
       self.conference_key = webex_meeting.meeting_key
       save
@@ -49,7 +63,13 @@ class CiscoWebexConference < WebConference
     if self.started_at.nil?
       :created
     elsif meeting && self.ended_at.nil?
-      :active
+      if self.end_at && self.end_at > Time.now
+        :active
+      elsif self.end_at.nil?
+        :active
+      else
+        :closed
+      end
     else
       unless self.ended_at
         self.close
@@ -60,6 +80,13 @@ class CiscoWebexConference < WebConference
     end
   end
 
+  # Public: The schedule date of the conference
+  #
+  # Returns the scheduled date of the conference or nil if there isn't a scheduled date
+  def scheduled_date
+    @scheduled_date ||= user.time_zone.parse(settings[:scheduled_date]).utc unless settings[:scheduled_date].blank?
+  end
+
   # Public: Add an admin to the conference and create a meeting URL (required by WebConference).
   #
   # admin - The user to add to the conference as an admin.
@@ -101,6 +128,11 @@ class CiscoWebexConference < WebConference
     conference_status
   end
 
+  def as_json(options={})
+    format_scheduled_date
+    super(options)
+  end
+
   protected
 
   def webex_client
@@ -114,5 +146,13 @@ class CiscoWebexConference < WebConference
     self.conference_key && CanvasWebex::Meeting.retrieve(self.conference_key)
   end
 
+  def format_scheduled_date
+    if date = user.time_zone &&!user_settings[:scheduled_date].blank? && user_settings[:scheduled_date]
+      unless date =~ /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/
+        user_settings[:scheduled_date] = user.time_zone.parse(date).utc.iso8601
+        save
+      end
+    end
+  end
 
 end

data/lib/canvas_webex/service.rb

@@ -1,5 +1,6 @@
 module CanvasWebex
   class Service
+
     attr_reader :webex_id, :password, :site_id, :site_name, :partner_id, :status, :meeting_password
 
 
@@ -38,7 +39,12 @@ module CanvasWebex
             }
           end
           xml.schedule{
-            xml.startDate
+            if options[:scheduled_date]
+              xml.startDate options[:scheduled_date].in_time_zone('America/Los_Angeles').strftime("%m/%d/%Y %T") rescue nil
+              xml.timeZoneID 4
+            else
+              xml.startDate
+            end
             xml.duration(options[:duration].to_i)
           }
           if options[:emails]

data/lib/canvas_webex/version.rb

@@ -17,6 +17,6 @@
 #
 
 module CanvasWebex
-  VERSION = "0.7"
+  VERSION = "0.8"
 end
 

data/spec/models/cisco_webex_conference_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe CiscoWebexConference do
+  subject { CiscoWebexConference.new }
+
+  describe 'conference_status' do
+    it 'is created when there is no start date' do
+      subject.stub(:started_at) { nil }
+      subject.conference_status.should == :created
+    end
+
+    it 'is active when there is a start date, a meeting, and no end date' do
+      subject.stub(:started_at) { Time.now }
+      subject.stub(:meeting) { [1, 2, 3] }
+      subject.conference_status.should == :active
+    end
+
+    it 'is active when the end at is in the future' do
+      subject.stub(:started_at) { Time.now }
+      subject.stub(:meeting) { [1, 2, 3] }
+      subject.stub(:end_at) { Time.now + 1200 }
+      subject.conference_status.should == :active
+    end
+
+    it 'is closed when the end at is in the past' do
+      subject.stub(:started_at) { Time.now }
+      subject.stub(:meeting) { [1, 2, 3] }
+      subject.stub(:end_at) { Time.now - 1200 }
+      subject.conference_status.should == :closed
+    end
+
+    it 'is closed if there is no meeting' do
+      subject.stub(:started_at) { Time.now }
+      subject.stub(:meeting) { nil }
+      subject.conference_status.should == :closed
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,33 @@ require 'net/http'
 require 'webmock/rspec'
 require 'pry'
 
+class WebConference
+  def self.after_save(*args)
+  end
+
+  def self.user_setting_field(arg, arg2)
+  end
+
+  def started_at
+  end
+
+  def ended_at
+  end
+
+  def end_at
+  end
+
+  def end_at=(arg)
+  end
+
+  def save
+  end
+
+  def close
+  end
+end
+require 'models/cisco_webex_conference'
+
 WebMock.disable_net_connect!
 
 
@@ -20,7 +47,7 @@ end
 def stub_call(fixture_name, status = 200, request_body = nil)
   stub = stub_request(:post, "https://instructure.webex.com/WBXService/XMLService")
   stub = stub.with(body: request_body) if request_body
-  stub.to_return(status: status, body:fixture(fixture_name), headers:{
+  stub.to_return(status: status, body: fixture(fixture_name), headers: {
     :content_type => 'application/xml; charset=utf-8'})
 end
 
@@ -36,7 +63,7 @@ end
 
 class String
   def camelcase(first_letter = :upper)
-      return self if self !~ /_/ && self =~ /[A-Z]+.*/
-      split('_').map{|e| e.capitalize}.join
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map { |e| e.capitalize }.join
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_webex
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,6 +123,7 @@ files:
 - spec/fixtures/recording_list.xml
 - spec/lib/canvas_webex/meeting_spec.rb
 - spec/lib/canvas_webex/service_spec.rb
+- spec/models/cisco_webex_conference_spec.rb
 - spec/spec_helper.rb
 homepage: http://instructure.com
 licenses: []
@@ -159,5 +160,6 @@ test_files:
 - spec/fixtures/recording_list.xml
 - spec/lib/canvas_webex/meeting_spec.rb
 - spec/lib/canvas_webex/service_spec.rb
+- spec/models/cisco_webex_conference_spec.rb
 - spec/spec_helper.rb
 has_rdoc: