canvas_connect 0.0.5 → 0.0.6

data/app/models/adobe_connect_conference.rb

@@ -22,7 +22,7 @@ class AdobeConnectConference < WebConference
   #
   # Returns a conference key string.
   def initiate_conference
-    unless @conference_key.present?
+    unless conference_key.present?
       create_meeting unless meeting_exists?
       save
     end
@@ -51,14 +51,16 @@ class AdobeConnectConference < WebConference
   # Returns a meeting URL string.
   def admin_join_url(admin, _ = nil)
     user = add_host(admin)
-    connect_settings = {
-      :username => user.username,
-      :password => user.password,
-      :domain   => CanvasConnect.config[:domain]
-    }
-    ac_service = AdobeConnect::Service.new(connect_settings)
-    ac_service.log_in
-    "#{meeting_url}?session=#{ac_session.session}"
+    settings = { :username => user.username, :password => user.password,
+      :domain => CanvasConnect.config[:domain] }
+
+    Rails.logger.info "USERNAME: #{user.username}"
+    Rails.logger.info "PASSWORD: #{user.password}"
+
+    service = AdobeConnect::Service.new(settings)
+    service.log_in
+
+    "#{meeting_url}?session=#{service.session}"
   end
 
   # Public: Add a participant to the conference and create a meeting URL.
@@ -82,12 +84,15 @@ class AdobeConnectConference < WebConference
   #
   # Returns an SCO-ID string.
   def find_conference_key
-    unless @conference_key.present?
-      response = connect_service.sco_by_url(:url_path => meeting_url_suffix)
-      @conference_key = response.body.xpath('//sco[@sco-id]').attr('sco-id').value
+    unless conference_key.present?
+      self.conference_key = meeting_folder.
+        contents.
+        xpath("//sco[name=#{meeting_name.inspect}]").
+        attr('sco-id').
+        value
     end
 
-    @conference_key
+    conference_key
   end
 
   # Internal: Register a participant as a host.
@@ -178,7 +183,6 @@ class AdobeConnectConference < WebConference
   end
 
   private
-
   # Internal: Create a unique meeting name from the course and conference IDs.
   #
   # Returns a meeting name string.
@@ -190,10 +194,13 @@ class AdobeConnectConference < WebConference
                   else
                     'Canvas'
                   end
+
     "#{course_code}: #{self.title} [#{self.id}]"
   end
 
   # Internal: Generate the base URL for the meeting.
+  #
+  # Returns a meeting string.
   def generate_meeting_url
     "#{config[:domain]}/#{meeting_url_suffix}"
   end

data/canvas_connect.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w{app lib}
 
   gem.add_dependency 'rake', '>= 0.9.6'
-  gem.add_dependency 'adobe_connect', '>= 0.0.6'
+  gem.add_dependency 'adobe_connect', '>= 0.0.7'
 end
 

data/lib/canvas_connect/version.rb

@@ -1,3 +1,3 @@
 module CanvasConnect
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Canvas Connect is an Adobe Connect plugin for the Instructure Canvas
   LMS. It allows teachers and administrators to create and launch Connect conferences
   directly from their courses.