canvas_connect 0.2 → 0.3

data/lib/canvas_connect.rb

@@ -24,25 +24,27 @@ module CanvasConnect
   class MeetingFolderError < StandardError; end
   class MeetingNotFound < StandardError; end
 
-  # Public: Configure as a Canvas plugin.
-  #
-  # Returns nothing.
-  def self.register
-    Rails.configuration.to_prepare do
-      view_path = File.expand_path('../app/views', File.dirname(__FILE__))
-      unless ApplicationController.view_paths.include?(view_path)
-        ApplicationController.view_paths.unshift(view_path)
-      end
+  configure_method = Proc.new do
+    view_path = File.expand_path('../app/views', File.dirname(__FILE__))
+    unless ApplicationController.view_paths.include?(view_path)
+      ApplicationController.view_paths.unshift(view_path)
+    end
 
-      ActiveSupport::Dependencies.autoload_paths << File.expand_path('../app/models', File.dirname(__FILE__))
+    ActiveSupport::Dependencies.autoload_paths << File.expand_path('../app/models', File.dirname(__FILE__))
 
-      require_dependency File.expand_path('../app/models/adobe_connect_conference.rb', File.dirname(__FILE__))
-      require_dependency "canvas/plugins/validators/adobe_connect_validator"
-      require_dependency "canvas/plugins/adobe_connect"
-      require_dependency "canvas_connect/meeting_archive"
+    require_dependency File.expand_path('../app/models/adobe_connect_conference.rb', File.dirname(__FILE__))
+    require_dependency "canvas/plugins/validators/adobe_connect_validator"
+    require_dependency "canvas/plugins/adobe_connect"
+    require_dependency "canvas_connect/meeting_archive"
 
-      Canvas::Plugins::AdobeConnect.new
-    end
+    Canvas::Plugins::AdobeConnect.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.
@@ -76,5 +78,3 @@ module CanvasConnect
     @client
   end
 end
-
-CanvasConnect.register

data/lib/canvas_connect/meeting_archive.rb

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Affero General Public License along
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+require 'active_support/core_ext/object'
+
 module CanvasConnect
   class MeetingArchive
     ATTRIBUTES = [:name, :url_path, :date_begin, :date_end, :date_modified, :duration, :date_created]
@@ -22,7 +24,7 @@ module CanvasConnect
 
     def self.retrieve(meeting_id, client = CanvasConnect.client)
       result = client.sco_contents(sco_id: meeting_id, filter_icon: 'archive')
-      Array(result.at_xpath('results/scos').try(:children)).map do |archive|
+      result.css('results scos').map do |archive|
         MeetingArchive.new(Nokogiri::XML(archive.to_xml))
       end
     end
@@ -42,7 +44,7 @@ module CanvasConnect
 
     def method_missing(meth, *args, &block)
       if ATTRIBUTES.include?(meth)
-        @attr_cache[meth] ||= @archive.at_xpath("//#{meth.to_s.dasherize}").try(:text)
+        @attr_cache[meth] ||= @archive.at_css("#{meth.to_s.dasherize}").try(:text)
       else
         super
       end

data/lib/canvas_connect/version.rb

@@ -1,3 +1,3 @@
 module CanvasConnect
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: canvas_connect
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
+  prerelease: 
 platform: ruby
 authors:
 - Zach Pendleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: adobe_connect
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,33 +65,30 @@ files:
 - lib/canvas_connect.rb
 - lib/canvas_connect/meeting_archive.rb
 - lib/canvas_connect/version.rb
-- spec_canvas/lib/canvas/plugins/validators/adobe_connect_validator_spec.rb
-- spec_canvas/lib/canvas_connect/meeting_archive_spec.rb
-- spec_canvas/lib/canvas_connect/response_spec.rb
-- spec_canvas/lib/canvas_connect/service_spec.rb
-- spec_canvas/models/adobe_connect_conference_spec.rb
 homepage: http://instructure.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - app
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Adobe Connect integration for Instructure Canvas (http://instructure.com).
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 44f5fe287ab3b420a5dfe8d086ecb2baf9f52204
-  data.tar.gz: 8d25e01e810dc848577605c98e6eb7f25e19ed73
-SHA512:
-  metadata.gz: 7df57750b292460c1d85d931d11dc4ba54d25e65a62dabec02df23568c1ae4d9aff473c2baef293a83e98352723492ba0373efa1d0abece052104ea9032b7d13
-  data.tar.gz: 0c045d467ec9046be597a6b3f6d6af6723bbd00c51bbf0727e639dd00ca35e5cb373c854bb2435e251a53f035bd572545a9184da8eb14ad742997221474ad0c2

data/spec_canvas/lib/canvas/plugins/validators/adobe_connect_validator_spec.rb

@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2012 Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../../../../spec/spec_helper')
-
-describe Canvas::Plugins::Validators::AdobeConnectValidator do
-  let(:plugin_setting) { mock }
-
-  subject { Canvas::Plugins::Validators::AdobeConnectValidator }
-
-  it 'should allow an empty hash' do
-    subject.validate({}, plugin_setting).should eql Hash.new
-  end
-
-  it 'should error on missing keys' do
-    plugin_setting.expects(:errors).returns(stub(:add_to_base => true))
-    subject.validate({:domain => 'example.com'}, plugin_setting).should be_false
-  end
-
-  it 'should pass if all keys exist' do
-    valid_keys = {
-      :domain => 'example.com',
-      :login => 'username',
-      :password => 'password',
-      :meeting_container => 'folder_name'
-    }
-
-    subject.validate(valid_keys, plugin_setting).should eql valid_keys
-  end
-end

data/spec_canvas/lib/canvas_connect/meeting_archive_spec.rb

@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2013 Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../../spec/spec_helper')
-
-describe CanvasConnect::Response do
-
-  describe CanvasConnect::MeetingArchive do
-
-    subject { CanvasConnect::MeetingArchive.retrieve(38230, nil).first }
-
-    before (:each) do
-      subject.should_receive(:archive) {
-        '<?xml version="1.0" encoding="utf-8"?>
-          <results>
-            <status code="ok"/>
-            <scos>
-              <sco sco-id="38230" source-sco-id="" folder-id="38223" type="content" icon="archive" display-seq="0" duration="0" is-folder="0">
-              <name>Test Recording</name>
-              <url-path>/p3u8rj0rvuj/</url-path>
-              <date-begin>2013-09-05T12:13:03.387-06:00</date-begin>
-              <date-end>2013-09-05T12:13:28.970-06:00</date-end>
-              <date-created>2013-09-05T12:13:03.387-06:00</date-created>
-              <date-modified>2013-09-05T12:13:29.727-06:00</date-modified>
-            </sco>
-          </scos>
-        </results>'
-      }
-    end
-
-    it "returns the name" do
-      subject.name.should == 'Test Recording'
-    end
-
-    it "returns the url_path" do
-      subject.url_path.should == '/p3u8rj0rvuj/'
-    end
-
-    it "returns the date_begin" do
-      subject.date_begin.should == '2013-09-05T12:13:03.387-06:00'
-    end
-
-    it "returns the date end" do
-      subject.date_end.should == '2013-09-05T12:13:28.970-06:00'
-    end
-
-    it "returns the date created" do
-      subject.date_created.should == '2013-09-05T12:13:03.387-06:00'
-    end
-
-    it "returns the date modified" do
-      subject.date_modified.should == '2013-09-05T12:13:29.727-06:00'
-    end
-
-  end
-end

data/spec_canvas/lib/canvas_connect/response_spec.rb

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2012 Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../../spec/spec_helper')
-
-describe CanvasConnect::Response do
-  let(:body) { '<?xml version="1.0"?><items><item>Item Name</item></items>' }
-  subject { CanvasConnect::Response.new(200, {}, body) }
-
-  it { should respond_to(:status) }
-  it { should respond_to(:headers) }
-  it { should respond_to(:body) }
-
-  its(:body) { should be_an_instance_of(Nokogiri::XML::Document) }
-
-  describe 'initialize' do
-    it 'should require a status' do
-      lambda { CanvasConnect::Response.new }.should raise_error(ArgumentError)
-    end
-
-    it 'should require headers' do
-      lambda { CanvasConnect::Response.new(200) }.should raise_error(ArgumentError)
-    end
-
-    it 'should require a body' do
-      lambda { CanvasConnect::Response.new(200, {}) }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe 'simple delegator' do
-    let(:body) { '<?xml version="1.0"?><items><item>Item Name</item></items>' }
-
-    it 'should delegate to body' do
-      subject.xpath('//item').text.should eql 'Item Name'
-    end
-  end
-end

data/spec_canvas/lib/canvas_connect/service_spec.rb

@@ -1,104 +0,0 @@
-#
-# Copyright (C) 2012 Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../../spec/spec_helper')
-
-describe CanvasConnect::Service do
-  subject { CanvasConnect::Service.new('username', 'password', 'http://connect.example.com') }
-
-  before(:each) do
-    subject.stubs(:session_key).returns('CookieValue')
-  end
-
-  let(:login_response) do
-    body = <<-END
-      <?xml version="1.0" encoding="utf-8"?>
-      <results>
-        <status code="ok" />
-      </results>
-    END
-
-    CanvasConnect::Response.new(200, {}, body)
-  end
-
-  let(:session_response) do
-    body = <<-END
-      <?xml version="1.0" encoding="utf-8"?>
-      <results>
-        <status code="ok" />
-        <common locale="en" time-zone-id="1" time-zone-java-id="America/Denver">
-          <cookie>CookieValue</cookie>
-          <date>2012-12-21T12:00:00Z</date>
-          <host>http://connect.example.com</host>
-          <local-host>SpecHost</local-host>
-          <admin-host>http://connect.example.com</admin-host>
-          <url>/api/xml?action=common-info&session=CookieValue</url>
-          <version>9.0.0.1</version>
-          <account account-id="1" />
-          <user user-id="1" type="user">
-            <name>Don Draper</name>
-            <login>don@sterlingcooperdraperpryce.com</login>
-          </user>
-        </common>
-        <reg-user>
-          <is-reg-user>false</is-reg-user>
-        </reg-user>
-      </results>
-    END
-
-    CanvasConnect::Response.new(200, {}, body)
-  end
-
-  it { should respond_to(:username) }
-  it { should respond_to(:domain) }
-  it { should respond_to(:is_authenticated) }
-
-  describe 'initialize' do
-    it 'should require a username' do
-      lambda { CanvasConnect::Service.new }.should raise_error(ArgumentError)
-    end
-
-    it 'should require a password' do
-      lambda { CanvasConnect::Service.new('username') }.should raise_error(ArgumentError)
-    end
-
-    it 'should require a domain' do
-      lambda { CanvasConnect::Service.new('username', 'password') }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe 'log in' do
-    it 'should authenticate the given user' do
-      subject.expects(:request).with('login', { :login => 'username', :password => 'password' }, true).returns(login_response)
-      subject.log_in
-      subject.should be_logged_in
-    end
-  end
-
-  describe 'method_missing' do
-    before(:each) do
-      Struct.new('FakeResponse', :status, :headers, :body)
-      @fake_response = Struct::FakeResponse.new(200, {}, '')
-    end
-
-    it 'should pass unknown methods onto the Adobe Connect API' do
-      subject.send(:client).expects(:get).with('http://connect.example.com/api/xml?action=fake-call', {'session' => 'CookieValue'}).returns(@fake_response)
-      subject.fake_call.should be_an_instance_of(CanvasConnect::Response)
-    end
-  end
-end

data/spec_canvas/models/adobe_connect_conference_spec.rb

@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2012 Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../spec/spec_helper')
-
-describe AdobeConnectConference do
-  CONNECT_CONFIG = {
-    :domain => 'http://connect.example.com',
-    :username => 'user',
-    :password => 'password',
-    :password_dec => 'password',
-    :meeting_container => 'canvas_meetings'
-  }
-
-  before(:each) do
-    @conference = AdobeConnectConference.new
-    @conference.stubs(:config).returns(CONNECT_CONFIG)
-  end
-
-  subject { AdobeConnectConference.new }
-
-  context 'with an admin participant' do
-    before(:each) do
-      @user = User.new(:name => 'Don Draper')
-      AdobeConnect::Service.stubs(:user_session).returns('CookieValue')
-      @conference.expects(:add_host).with(@user).returns(@user)
-    end
-
-    it 'should generate an admin url using unique format if stored' do
-      stored_url = 'canvas-mtg-ACCOUNT_ID-ID-CREATED_SECONDS'
-      @conference.settings[:meeting_url_id] = stored_url
-      @conference.admin_join_url(@user).should == "http://connect.example.com/#{stored_url}"
-    end
-
-    it 'should generate an admin url using legacy format' do
-      @conference.admin_join_url(@user).should == "http://connect.example.com/canvas-meeting-#{@conference.id}"
-    end
-  end
-end