adobe_connect 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f10609ce437b1c0c43be9f4660134cc315b5f47
-  data.tar.gz: 8a4191eec96d7ab654496f749545ed9d4cde53a3
+  metadata.gz: b51f450d38f07e066522f7036692cab38bf18365
+  data.tar.gz: f71f7c0a1d552ec0989e2c44ba310bed4f71fbf7
 SHA512:
-  metadata.gz: 519de098a13587cb8dd829f62e347b1d2d25ce7f7e685930d3cb9195208f5da180c200fff48ec018c35a703b8bb8051563e6c7188eb550472f418086384dc0fd
-  data.tar.gz: 6ffd8828024399bc9cacd77501cbad18b90393944fbe8619a6eaf3303e3e3df80e68718d689b25131b352c1ec5320fcfad8a80bee75a029bb9923a020d99d52e
+  metadata.gz: 7fdc59e0fd25edb71ce1f30639a35d4c7fbb077f0d4b0f75f068273eb4a80683e5ed998dd40dbf37c0906db60c6663ca8bdb315a99f7616d75b8d355864edad6
+  data.tar.gz: 51115a9fbd728b1ce3c831555529cfdcf2eaba9cb9ddf38f403a7a4e748822883ff5e9183590df04c0e6195e49dfc95f5647f689be883cbdbacc09a9fb51de30

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+before_install:
+ - gem update bundler
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/adobe_connect.gemspec

@@ -6,8 +6,8 @@ require 'adobe_connect/version'
 Gem::Specification.new do |gem|
   gem.name          = 'adobe_connect'
   gem.version       = AdobeConnect::VERSION
-  gem.authors       = ['Zach Pendleton']
-  gem.email         = ['zachpendleton@gmail.com']
+  gem.authors       = ['Zach Pendleton', 'Isaiah Fischer', 'Leon Miller-Out']
+  gem.email         = ['zachpendleton@gmail.com', 'isaiah@singlebrook.com', 'leon@singlebrook.com']
   gem.description   = %q{An API wrapper for interacting with Adobe Connect services.}
   gem.summary       = %q{An API wrapper for Adobe Connect services.}
   gem.license       = 'MIT'

data/lib/adobe_connect/group.rb

@@ -81,9 +81,12 @@ module AdobeConnect
     end
 
     def self.load_from_xml(g)
+      desc = g.at_xpath('//description')
+      desc = desc.children unless desc.nil?
+      desc = desc.text unless desc.nil?
       self.new({
           :name => g.at_xpath('//name').children.text,
-          :description => g.at_xpath('//description').try(:children).try(:text),
+          :description => desc,
           :id => g.attr('principal-id')
         })
     end

data/lib/adobe_connect/meeting_folder.rb

@@ -49,9 +49,14 @@ module AdobeConnect
     # Returns a string of the sco ID of the folder
     def self.my_meetings_folder_id(service = AdobeConnect::Service.new)
       response = service.sco_shortcuts({})
-      response.at_xpath('//shortcuts').children.select{|s|
+      folder = response.at_xpath('//shortcuts').children.select{|s|
         s.attr('type') == 'my-meetings'
-      }[0].attr('sco-id')
+      }[0]
+      if folder.nil?
+        nil
+      else
+        folder.attr('sco-id')
+      end
     end
   end
 end

data/lib/adobe_connect/version.rb

@@ -1,4 +1,4 @@
 module AdobeConnect
   # Public: Current Gem version.
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/fixtures/folder_my_meetings_failure.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<results>
+  <status code="ok"/>
+  <shortcuts>
+    <sco sco-id="25915" type="user-meetings" tree-id="4930292">
+      <domain-name>http://example.com</domain-name>
+    </sco>
+    <sco sco-id="25916" type="user-courses" tree-id="4930293">
+      <domain-name>http://example.com</domain-name>
+    </sco>
+  </shortcuts>
+</results>

data/test/fixtures/folder_my_meetings_success.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<results>
+  <status code="ok"/>
+  <shortcuts>
+    <sco sco-id="25915" type="my-meetings" tree-id="4930292">
+      <domain-name>http://example.com</domain-name>
+    </sco>
+    <sco sco-id="25916" type="user-courses" tree-id="4930293">
+      <domain-name>http://example.com</domain-name>
+    </sco>
+  </shortcuts>
+</results>

data/test/lib/adobe_connect/meeting_folder_test.rb

@@ -11,6 +11,9 @@ class AdobeConnectMeetingFolderTest < AdobeConnectTestCase
   FOLDER_SUCCESS  = File.read(File.expand_path('../../fixtures/folder_success.xml', File.dirname(__FILE__)))
   FOLDER_CONTENTS = File.read(File.expand_path('../../fixtures/folder_contents.xml', File.dirname(__FILE__)))
 
+  MY_MEETINGS_SUCCESS = File.read(File.expand_path('../../fixtures/folder_my_meetings_success.xml', File.dirname(__FILE__)))
+  MY_MEETINGS_FAILURE = File.read(File.expand_path('../../fixtures/folder_my_meetings_failure.xml', File.dirname(__FILE__)))
+
   def setup
     @folder = AdobeConnect::MeetingFolder.new('1', 'test folder', '/test-meeting/')
   end
@@ -54,4 +57,30 @@ class AdobeConnectMeetingFolderTest < AdobeConnectTestCase
 
     assert_equal @folder.contents.xpath('//sco').length, 10
   end
+
+  def test_my_meetings_folder_id_handles_when_no_my_meetings_folder_is_present
+    ac_response = mock_ac_response(MY_MEETINGS_FAILURE)
+
+    AdobeConnect::Service.any_instance.
+      expects(:request).
+      with('sco-shortcuts', {}).
+      returns(ac_response)
+
+    folder_id = AdobeConnect::MeetingFolder.my_meetings_folder_id
+
+    assert_equal folder_id, nil
+  end
+
+  def test_my_meetings_folder_id_returns_id_when_present
+    ac_response = mock_ac_response(MY_MEETINGS_SUCCESS)
+
+    AdobeConnect::Service.any_instance.
+      expects(:request).
+      with('sco-shortcuts', {}).
+      returns(ac_response)
+
+    folder_id = AdobeConnect::MeetingFolder.my_meetings_folder_id
+
+    assert_equal folder_id, '25915'
+  end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: adobe_connect
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Zach Pendleton
+- Isaiah Fischer
+- Leon Miller-Out
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +147,8 @@ dependencies:
 description: An API wrapper for interacting with Adobe Connect services.
 email:
 - zachpendleton@gmail.com
+- isaiah@singlebrook.com
+- leon@singlebrook.com
 executables:
 - adobe_connect_console
 extensions: []
@@ -176,6 +180,8 @@ files:
 - test/fixtures/acl_field_save_success.xml
 - test/fixtures/acl_field_update_success.xml
 - test/fixtures/folder_contents.xml
+- test/fixtures/folder_my_meetings_failure.xml
+- test/fixtures/folder_my_meetings_success.xml
 - test/fixtures/folder_success.xml
 - test/fixtures/generic_success.xml
 - test/fixtures/group_is_member.xml
@@ -231,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: An API wrapper for Adobe Connect services.
@@ -240,6 +246,8 @@ test_files:
 - test/fixtures/acl_field_save_success.xml
 - test/fixtures/acl_field_update_success.xml
 - test/fixtures/folder_contents.xml
+- test/fixtures/folder_my_meetings_failure.xml
+- test/fixtures/folder_my_meetings_success.xml
 - test/fixtures/folder_success.xml
 - test/fixtures/generic_success.xml
 - test/fixtures/group_is_member.xml