canvas_webex 0.12 → 0.13

data/app/models/cisco_webex_conference.rb

@@ -20,18 +20,6 @@ class CiscoWebexConference < WebConference
 
   after_save :format_scheduled_date
 
-  user_setting_field :webex_service, {
-    name: -> { t('webex_service_setting', 'Service') },
-    description: -> { t('webex_service_setting_description', 'Service') },
-    type: :select,
-    visible: true,
-    location: 'userSettings',
-    options: [
-      {value: 'meeting',  name: -> { t('webex_meeting_center', 'Meeting Center') }},
-      {value: 'training', name:  -> { t('webex_training_center', 'Training Center') }}
-    ]
-  }
-
   user_setting_field :scheduled_date, {
     name: -> { t('scheduled_date_setting', 'Scheduled Date') },
     description: -> { t('scheduled_date_setting_description', 'Scheduled Date') },
@@ -58,8 +46,7 @@ class CiscoWebexConference < WebConference
       options = {
         duration: self.duration || 0,
         emails: settings[:external_emails].nil? ? [] : settings[:external_emails].strip.split(';'),
-        time_zone: user.time_zone,
-        service: settings[:webex_service]
+        time_zone: user.time_zone
       }
       options[:scheduled_date] = scheduled_date.in_time_zone(user.time_zone) if scheduled_date.present?
       webex_session = CanvasWebex::WebexSession.create(self.title, options)
@@ -162,7 +149,7 @@ class CiscoWebexConference < WebConference
   # Returns the meeting object, or nil if the meeting is ended
   def meeting
     @meeting ||= if self.conference_key
-                   case settings[:webex_service]
+                   case CanvasWebex.client.webex_service
                      when 'meeting'
                        CanvasWebex::Meeting.retrieve(self.conference_key)
                      when 'training'

data/app/views/plugins/_webex_settings.html.erb

@@ -1,6 +1,15 @@
 <% fields_for :settings, OpenObject.new(settings) do |f| %>
     <table class="formtable" style="width: 500px;">
         <tbody>
+        <tr>
+           <td><%= f.blabel :webex_service, t('webex_service_setting', 'Service')  %></td>
+           <td>
+             <%= f.select :webex_service, [[t('webex_meeting_center', 'Meeting Center'), 'meeting'],
+                                                                        [t('webex_training_center', 'Training Center'), 'training']] %>
+             <div class="hint-text">
+               <%= t(:sevrice_selector_change, "Changing this option will immediately terminate all current meetings of other service types") %>
+            </div>
+          </td>
         <tr>
             <td><%= f.blabel :webex_id, :en => "WebEx ID" %></td>
             <td>

data/lib/canvas/plugins/cisco_webex.rb

@@ -37,6 +37,9 @@ module Canvas
           :author_website => 'http://instructure.com',
           :version => CanvasWebex::VERSION,
           :settings_partial => 'plugins/webex_settings',
+          :settings => {
+              :webex_service => nil
+          },
           :validator => 'CiscoWebexValidator',
           :encrypted_settings => [:password, :meeting_password]
         })
@@ -44,4 +47,4 @@ module Canvas
 
     end
   end
-end
+end

data/lib/canvas/plugins/validators/cisco_webex_validator.rb

@@ -21,7 +21,7 @@ module Canvas
     module Validators
       class CiscoWebexValidator
         # Public: An array of allowed plugin settings.
-        REQUIRED_KEYS = %w{webex_id password site_id site_name meeting_password}
+        REQUIRED_KEYS = %w{webex_service webex_id password site_id site_name meeting_password}
 
         # Public: Validate setting input for this plugin.
         #

data/lib/canvas_webex.rb

@@ -59,6 +59,6 @@ module CanvasWebex
   #
   # Returns a CiscoWwebex::Service.
   def self.client
-    Service.new(*self.config.values_at(:webex_id, :password_dec, :site_id, :site_name, :partner_id, :meeting_password_dec))
+    Service.new(*self.config.values_at(:webex_service, :webex_id, :password_dec, :site_id, :site_name, :partner_id, :meeting_password_dec))
   end
 end

data/lib/canvas_webex/meeting.rb

@@ -55,4 +55,4 @@ module CanvasWebex
     end
 
   end
-end
+end

data/lib/canvas_webex/service.rb

@@ -1,11 +1,12 @@
 module CanvasWebex
   class Service
 
-    attr_reader :webex_id, :password, :site_id, :site_name, :partner_id, :status, :meeting_password
+    attr_reader :webex_service, :webex_id, :password, :site_id, :site_name, :partner_id, :status, :meeting_password
 
 
-    def initialize(webex_id, password, site_id, site_name, partner_id, meeting_password)
-      @webex_id, @password, @site_id, @site_name, @partner_id, @meeting_password = [webex_id, password, site_id, site_name, partner_id, meeting_password]
+    def initialize(webex_service, webex_id, password, site_id, site_name, partner_id, meeting_password)
+      @webex_service, @webex_id, @password, @site_id, @site_name, @partner_id, @meeting_password =
+        [webex_service, webex_id, password, site_id, site_name, partner_id, meeting_password]
     end
 
     def list_summary_meetings

data/lib/canvas_webex/training.rb

@@ -52,4 +52,4 @@ module CanvasWebex
     end
 
   end
-end
+end

data/lib/canvas_webex/version.rb

@@ -17,6 +17,6 @@
 #
 
 module CanvasWebex
-  VERSION = "0.12"
+  VERSION = "0.13"
 end
 

data/lib/canvas_webex/webex_session.rb

@@ -19,7 +19,7 @@ module CanvasWebex
   class WebexSession
 
     def self.create(meeting_name, options = {}, client = CanvasWebex.client)
-      case options[:service]
+      case client.webex_service
         when 'meeting'
           CanvasWebex::Meeting.create(meeting_name, options, client)
         when 'training'
@@ -75,4 +75,4 @@ module CanvasWebex
     end
 
   end
-end
+end

data/spec/lib/canvas_webex/meeting_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CanvasWebex::Meeting do
-  let(:client) {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
+  let(:client) {CanvasWebex::Service.new('meeting', 'proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
   subject{CanvasWebex::Meeting.retrieve(123, client)}
 
   before(:each) do
@@ -28,4 +28,4 @@ describe CanvasWebex::Meeting do
     subject.status.should == "NOT_INPROGRESS"
   end
 
-end
+end

data/spec/lib/canvas_webex/service_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CanvasWebex::Service do
-  subject {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
+  subject {CanvasWebex::Service.new('training', 'proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
 
   describe 'api_calls' do
 
@@ -50,4 +50,4 @@ describe CanvasWebex::Service do
   end
 
 
-end
+end

data/spec/lib/canvas_webex/training_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CanvasWebex::Training do
-  let(:client) {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
+  let(:client) {CanvasWebex::Service.new('training', 'proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
   subject{CanvasWebex::Training.retrieve(123, client)}
 
   before(:each) do
@@ -24,4 +24,4 @@ describe CanvasWebex::Training do
     subject.status.should == "NOT_INPROGRESS"
   end
 
-end
+end

data/spec/lib/canvas_webex/webex_session_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CanvasWebex::WebexSession do
-  let(:client) {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
+  let(:client) {CanvasWebex::Service.new('meeting', 'proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
 
   it 'parses a cisco timestamp' do
     stub_call('list_timezones')
@@ -9,4 +9,4 @@ describe CanvasWebex::WebexSession do
     ts.to_s.should == '2006-01-26T21:00:00-08:00'
   end
 
-end
+end

data/spec/models/cisco_webex_conference_spec.rb

@@ -36,4 +36,4 @@ describe CiscoWebexConference do
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_webex
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake