canvas_webex 0.4 → 0.6

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

@@ -22,11 +22,21 @@
         <tr>
             <td><%= f.blabel :site_name, "Site Name" %></td>
             <td>
-                <%= f.text_field :site_name, :autocomplete => false %><br>
-                <small class="help-text">
+                <%= f.text_field :site_name, :autocomplete => false %>
+                <div class="hint-text">
                     <%= t(:site_name_description, "Site name for your WebEx account,
                     if the url is \"https://school.webex.com\" then your site name is 'school'") %>
-                </small>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td><%= f.blabel :meting_password, "Meeting Password"%></td>
+            <td>
+                <%= f.password_field :meeting_password, :autocomplete => false%>
+                <div class="hint-text">
+                    <%= t(:meeting_password_description, 'Meeting password must adhere to WebEx password requirements') %>
+                </div>
+                <br>
             </td>
         </tr>
         </tbody>

data/lib/canvas/plugins/cisco_webex.rb

@@ -38,7 +38,7 @@ module Canvas
           :version => CanvasWebex::VERSION,
           :settings_partial => 'plugins/webex_settings',
           :validator => 'CiscoWebexValidator',
-          :encrypted_settings => [:password]
+          :encrypted_settings => [:password, :meeting_password]
         })
       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}
+        REQUIRED_KEYS = %w{webex_id password site_id site_name meeting_password}
 
         # Public: Validate setting input for this plugin.
         #

data/lib/canvas_webex.rb

@@ -21,27 +21,29 @@ require_dependency "canvas_webex/version"
 module CanvasWebex
   class ConnectionError < StandardError; end
 
-  # Public: Configure as a Canvas plugin
-  #
-  # Returns nothing.
-  def self.register
-    Rails.configuration.to_prepare do
-      view_path = File.join(File.dirname(__FILE__), '..', 'app', 'views')
-      unless ApplicationController.view_paths.include?(view_path)
-        ApplicationController.view_paths.unshift(view_path)
-      end
-
-      path = File.expand_path('../app/models', File.dirname(__FILE__))
-      ActiveSupport::Dependencies.autoload_paths << path unless ActiveSupport::Dependencies.autoload_paths.include? path
-
-      require_dependency File.expand_path('../app/models/cisco_webex_conference.rb', File.dirname(__FILE__))
-      require_dependency "canvas/plugins/validators/cisco_webex_validator"
-      require_dependency "canvas/plugins/cisco_webex"
-      require_dependency "canvas_webex/service"
-      require_dependency "canvas_webex/meeting"
-
-      Canvas::Plugins::CiscoWebex.new
+  configure_method = Proc.new do
+    view_path = File.join(File.dirname(__FILE__), '..', 'app', 'views')
+    unless ApplicationController.view_paths.include?(view_path)
+      ApplicationController.view_paths.unshift(view_path)
     end
+
+    path = File.expand_path('../app/models', File.dirname(__FILE__))
+    ActiveSupport::Dependencies.autoload_paths << path unless ActiveSupport::Dependencies.autoload_paths.include? path
+
+    require_dependency File.expand_path('../app/models/cisco_webex_conference.rb', File.dirname(__FILE__))
+    require_dependency "canvas/plugins/validators/cisco_webex_validator"
+    require_dependency "canvas/plugins/cisco_webex"
+    require_dependency "canvas_webex/service"
+    require_dependency "canvas_webex/meeting"
+
+    Canvas::Plugins::CiscoWebex.new
+  end
+
+  if CANVAS_RAILS2
+    Rails.configuration.to_prepare(&configure_method)
+  else
+    class Railtie < Rails::Railtie; end
+    Railtie.config.to_prepare(&configure_method)
   end
 
   # Public: Find the plugin configuration.
@@ -55,9 +57,6 @@ module CanvasWebex
   #
   # Returns a CiscoWwebex::Service.
   def self.client
-    @client ||= Service.new(*self.config.values_at(:webex_id, :password_dec, :site_id, :site_name, :partner_id))
+    Service.new(*self.config.values_at(:webex_id, :password_dec, :site_id, :site_name, :partner_id, :meeting_password_dec))
   end
-
 end
-
-CanvasWebex.register

data/lib/canvas_webex/service.rb

@@ -1,9 +1,10 @@
 module CanvasWebex
   class Service
-    attr_reader :webex_id, :password, :site_id, :site_name, :partner_id, :status
+    attr_reader :webex_id, :password, :site_id, :site_name, :partner_id, :status, :meeting_password
 
-    def initialize(webex_id, password, site_id, site_name, partner_id)
-      @webex_id, @password, @site_id, @site_name, @partner_id = [webex_id, password, site_id, site_name, partner_id]
+
+    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]
     end
 
     def list_summary_meetings
@@ -25,11 +26,17 @@ module CanvasWebex
     end
 
     def create_meeting(confName, options = {})
+
       body = xml_request do |xml|
         xml.bodyContent('xsi:type' =>'java:com.webex.service.binding.meeting.CreateMeeting'){
           xml.metaData{
             xml.confName confName
           }
+          if meeting_password != nil && meeting_password.strip != ''
+            xml.accessControl{
+              xml.meetingPassword meeting_password
+            }
+          end
           xml.schedule{
             xml.startDate
             xml.duration(options[:duration].to_i)
@@ -77,7 +84,12 @@ module CanvasWebex
           xml.meetingKey meeting_key
         }
       end
-      request(body)
+      begin
+        request(body)
+      rescue CanvasWebex::ConnectionError
+        nil
+      end
+
     end
 
     def list_recordings(meeting_key)
@@ -91,7 +103,11 @@ module CanvasWebex
           xml.returnSessionDetails 'true'
         }
       end
-      request(body)
+      begin
+        request(body)
+      rescue CanvasWebex::ConnectionError
+        nil
+      end
     end
 
     def list_time_zone(id, date)
@@ -134,7 +150,11 @@ module CanvasWebex
       http.use_ssl = true
       response = http.post('/WBXService/XMLService', body)
       xml = Nokogiri::XML(response.body).remove_namespaces!
-      xml.at_xpath('/message/header/response/result').try(:text) == 'SUCCESS' && xml.at_xpath('/message/body/bodyContent')
+      if xml.at_xpath('/message/header/response/result').try(:text) == 'SUCCESS'
+        xml.at_xpath('/message/body/bodyContent')
+      else
+        raise CanvasWebex::ConnectionError.new(xml.at_xpath('/message/header/response/reason').try(:text))
+      end
     end
 
   end

data/lib/canvas_webex/version.rb

@@ -17,6 +17,6 @@
 #
 
 module CanvasWebex
-  VERSION = "0.4"
+  VERSION = "0.6"
 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)}
+  let(:client) {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
   subject{CanvasWebex::Meeting.retrieve(123, client)}
 
   before(:each) do

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)}
+  subject {CanvasWebex::Service.new('proserv_instructure', 'foo', '123', 'instructure', nil, 'test')}
 
   describe 'api_calls' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_webex
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake