adobe_connect_api 0.0.70.alpha → 0.1

data/lib/adobe_connect_api.rb

@@ -50,9 +50,21 @@ class AdobeConnectAPI
     @sessionid
   end
 
+  def pointconfig=(pointconfig)
+    if pointconfig == nil
+      pointconfig = YAML::load_file("#{root_directory}/config/config.breeze.yml")[environment]
+    else
+      @pointconfig = pointconfig
+    end
+  end
+
   #The URL is the base URL of the Connect-Server, without the trailing slash
   def initialize (url = nil, environment, root_directory)
-    @pointconfig = YAML::load_file("#{root_directory}/config/config.breeze.yml")[environment]
+    begin
+      @pointconfig = YAML::load_file("#{root_directory}/config/config.breeze.yml")[environment]
+    rescue
+       # should not occur except when running tests
+    end
     if (url == nil)
       @url = @pointconfig["url"]
     else
@@ -166,10 +178,7 @@ class AdobeConnectAPI
 
   def get_my_meetings_folder(email)
     # NOTE: this id does not change unless we set up AC new
-    # tree_id = 14
-    # since we migrated to the new hardware, the tree_id changed
-    # i.e. sco-id of the user content folder, see: https://collab-test.switch.ch/api/xml?action=sco-shortcuts
-    tree_id = 11
+    tree_id = 14
 
     filter = AdobeConnectApi::FilterDefinition.new
     filter["name"] == email
@@ -211,9 +220,18 @@ class AdobeConnectAPI
     return res.body
   end
 
-  # TODO KG: test
+  #action=group-membership-update&group-id=integer&principal-id=integer&is-member=boolean
+  def group_membership_update(group_id, principal_id, is_member)
+    res = query("group-membership-update", 
+      "group-id" => group_id, 
+      "principal-id" => principal_id, 
+      "is-member" => is_member)
+
+    return res.body
+  end
+
   def update_meeting(sco_id, description, language)
-    "action = sco-update&sco-id=&description=&lang="
+    # "action = sco-update&sco-id=&description=&lang="
     res = query("sco-update", 
       "sco-id" => sco_id, 
       "description" => description,
@@ -223,17 +241,9 @@ class AdobeConnectAPI
   end
 
 
-  # TODO KG: test statistic functions
 
-  #action=group-membership-update&group-id=integer&principal-id=integer&is-member=boolean
-  def group_membership_update(group_id, principal_id, is_member)
-    res = query("group-membership-update", 
-      "group-id" => group_id, 
-      "principal-id" => principal_id, 
-      "is-member" => is_member)
 
-    return res.body
-  end
+  ### STATISTIC FUNCTIONS (NOTE: NOT YET TESTED) ###
 
   # e.g. acl-field-update&acl-id=13117741&field-id=meeting-passcode&value=12345
   def set_passcode(acl_id, passcode)

data/lib/adobe_connect_api/filter_definition.rb

@@ -4,7 +4,6 @@
 # filter["sco-id"].greater_than 25
 # filter["date-created"] <= Time.now
 
-# TODO KG: rename to AdobeConnectAPI since the class is also named API
 class AdobeConnectApi::FilterDefinition
   attr_accessor :rows
   attr_accessor :start

data/lib/adobe_connect_api/version.rb

@@ -1,3 +1,3 @@
 module AdobeConnectApi
-  VERSION = "0.0.70.alpha"
+  VERSION = "0.1"
 end

data/spec/adobe_connect_api_spec.rb

@@ -11,6 +11,8 @@ E_MAIL = 'testuser@switch.ch'
 FIRST_NAME = 'Test'
 LAST_NAME = 'User'
 
+E_MAIL_2 = 'testuser2@switch.ch'
+
 # API return values
 STATUS_OK = 'ok'
 NO_DATA = 'no-data'
@@ -21,7 +23,7 @@ CODE_DUPLICATE = 'duplicate'
 describe AdobeConnectAPI do
 
   before(:each) do
-    @interactconfig = YAML::load_file("./config/config.breeze.yml")[ENV["RAILS_ENV"]]
+    @interactconfig = YAML::load_file('./config/config.breeze.yml')[ENV["RAILS_ENV"]]
     url = @interactconfig['url']
 
     # open AdobeConnectAPI (use URL from config file)
@@ -70,6 +72,7 @@ describe AdobeConnectAPI do
 
     it 'should return the id of my-meetings folder' do
       folder = @acs.get_my_meetings_folder(@interactconfig['test_user'])
+      puts folder
       @acs.get_folder_id(folder).to_i.should_not be 0
     end
 
@@ -99,12 +102,18 @@ describe AdobeConnectAPI do
       password = @interactconfig['password']
       @acs.login(login, password)
 
-      # delete the user if it already exists
+      # delete the users if they already exist
       filter = AdobeConnectApi::FilterDefinition.new
       filter["email"] == E_MAIL
       principal = @acs.get_principal(filter)
       sco_id = @acs.get_principal_id(principal)
       @acs.delete_user(sco_id) unless sco_id.nil?
+
+      filter2 = AdobeConnectApi::FilterDefinition.new
+      filter2["email"] == E_MAIL_2
+      principal2 = @acs.get_principal(filter2)
+      sco_id2 = @acs.get_principal_id(principal2)
+      @acs.delete_user(sco_id2) unless sco_id2.nil?
     end
 
     it 'should be able to create a user' do
@@ -117,6 +126,23 @@ describe AdobeConnectAPI do
       # should return the sco-id of the new user
       @acs.get_principal_id(res).to_i.should_not be 0
     end
+
+    it 'should be able to update the group membership' do
+      # get id of the authors group
+      filter_authors = AdobeConnectApi::FilterDefinition.new
+      filter_authors["type"] == "authors"
+      res = @acs.get_principal(filter_authors)
+      authors_group_id = @acs.get_principal_id(res)
+      authors_group_id.to_i.should_not be 0
+
+      # create user
+      password = @interactconfig['generic_user_password']
+      res = @acs.create_user(E_MAIL_2, E_MAIL_2, password, FIRST_NAME, LAST_NAME)
+      sco_id = @acs.get_principal_id(res)
+
+      @acs.group_membership_update(authors_group_id, sco_id, true).should include(STATUS_OK)
+    end
+
   end
 
 
@@ -176,6 +202,11 @@ describe AdobeConnectAPI do
       @acs.get_sco_id(res).should eq @sco_id
     end
 
+    it 'should update the meeting attributes' do
+      res = @acs.update_meeting(@sco_id, 'description', 'en')
+      @acs.get_status_code(res).should match STATUS_OK
+    end
+
   end
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: adobe_connect_api
 version: !ruby/object:Gem::Version
-  version: 0.0.70.alpha
-  prerelease: 7
+  version: '0.1'
+  prerelease: 
 platform: ruby
 authors:
 - Christian Rohrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -81,9 +81,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25