kaltura-client 3.3.0 → 14.15.0

data/test/access_control_service_test.rb

@@ -30,39 +30,62 @@ require 'uri'
 
 class AccessControlServiceTest < Test::Unit::TestCase
 
-	# this test create a access control object and reset the restrictions using and empty array.
+	# this test create a access control object and reset the rules using and empty array.
 	should "be able to send empty array to the api and reset the values" do
 
 		# cleaning up the list
-		access_control = Kaltura::KalturaAccessControl.new
-		access_control.name = "kaltura_test"
-		access_control.is_default = Kaltura::KalturaNullableBoolean::FALSE_VALUE
 
-		access_control.restrictions = []
+		country_uk = Kaltura::KalturaStringValue.new
+		country_uk.value = 'UK'
+
+		country_lk = Kaltura::KalturaStringValue.new
+		country_lk.value = 'LK'
+		
+		country_condition = Kaltura::KalturaCountryCondition.new
+		country_condition.values = []
+		country_condition.values << country_uk
+		country_condition.values << country_lk
+		
+		country_rule = Kaltura::KalturaRule.new
+		country_rule.actions = []
+		country_rule.actions << Kaltura::KalturaAccessControlBlockAction.new
+		country_rule.conditions = []
+		country_rule.conditions << country_condition
 
-		restriction1 = Kaltura::KalturaCountryRestriction.new
-		restriction1.country_restriction_type = Kaltura::KalturaCountryRestrictionType::RESTRICT_COUNTRY_LIST
-		restriction1.country_list = 'UK,LK'
-		access_control.restrictions << restriction1
+		site = Kaltura::KalturaStringValue.new
+		site.value = 'http://www.kaltura.com'
+		
+		site_condition = Kaltura::KalturaSiteCondition.new
+		site_condition.values = []
+		site_condition.values << site
+		
+		site_rule = Kaltura::KalturaRule.new
+		site_rule.actions = []
+		site_rule.actions << Kaltura::KalturaAccessControlBlockAction.new
+		site_rule.conditions = []
+		site_rule.conditions << site_condition
 
-		restriction2 = Kaltura::KalturaSiteRestriction.new
-		restriction2.site_restriction_type = Kaltura::KalturaSiteRestrictionType::RESTRICT_SITE_LIST
-		restriction2.site_list = 'http://www.kaltura.com'
-		access_control.restrictions << restriction2
+		access_control = Kaltura::KalturaAccessControlProfile.new
+		access_control.name = "kaltura_test_accesscontrolservicetest_" + Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
+		access_control.is_default = Kaltura::KalturaNullableBoolean::FALSE_VALUE
 
-		created_access_control = @client.access_control_service.add(access_control)
+		access_control.rules = []
+		access_control.rules << country_rule
+		access_control.rules << site_rule
+		
+		created_access_control = @client.access_control_profile_service.add(access_control)
 
 		assert_not_nil created_access_control.id
-		assert_equal created_access_control.restrictions.size, 2
+		assert_equal created_access_control.rules.size, 2
 
 		# edited access control
-		edited_access_control = Kaltura::KalturaAccessControl.new
+		edited_access_control = Kaltura::KalturaAccessControlProfile.new
 		edited_access_control.name = access_control.name
-		edited_access_control.restrictions = []
+		edited_access_control.rules = []
 
-		updated_access_control = @client.access_control_service.update(created_access_control.id, edited_access_control)
+		updated_access_control = @client.access_control_profile_service.update(created_access_control.id, edited_access_control)
 
-		assert_equal updated_access_control.restrictions, nil
-		assert_nil @client.access_control_service.delete(updated_access_control.id)
+		assert_equal updated_access_control.rules, nil
+		assert_nil @client.access_control_profile_service.delete(updated_access_control.id)
 	end
 end

data/test/base_entry_service_test.rb

@@ -10,7 +10,6 @@
 #
 # Copyright (C) 2006-2011	Kaltura Inc.
 #
-# This program 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, either version 3 of the
 # License, or (at your option) any later version.
@@ -28,13 +27,13 @@
 require 'test_helper'
 
 class BaseEntryServiceTest < Test::Unit::TestCase
-	
+
 	# this test uploads a file to kaltura and creates an entry using the uploaded file.
 	should "upload a file and create an entry" do
-			
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" + Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
@@ -43,65 +42,58 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
-		
 		assert_nil @client.base_entry_service.delete(created_entry.id)
 	 end
-		
 	# this test creates an entry and retrieves the list of entries and count from kaltura by setting a filter.
 	should "get the base entry list" do
-		
+
 		# cleaning up the list
 		base_entry_filter = Kaltura::KalturaBaseEntryFilter.new
-		base_entry_filter.name_multi_like_or = "kaltura_test"
+		base_entry_filter.name_multi_like_or = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		filter_pager = Kaltura::KalturaFilterPager.new
 		base_entry_list = @client.base_entry_service.list(base_entry_filter, filter_pager)
 		base_entry_list.objects.each do |obj|
 			@client.base_entry_service.delete(obj.id) rescue nil
 		end	if base_entry_list.objects
-		
+
 		unique_id = (0...8).map { (97 + rand(26)).chr }.join
-			
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		base_entry.tags = unique_id
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
 		assert_not_nil upload_token.id
 		upload_token = @client.upload_token_service.upload(upload_token.id, media_file)
-
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
-
 		base_entry_filter = Kaltura::KalturaBaseEntryFilter.new
 		base_entry_filter.tags_like = unique_id
 		base_entry_filter.status_in = (0...8).to_a.join(",")
 		filter_pager = Kaltura::KalturaFilterPager.new
 		base_entry_list = @client.base_entry_service.list(base_entry_filter, filter_pager)
-		
 		assert_equal 1, base_entry_list.total_count
-		
-		count = @client.base_entry_service.count(base_entry_filter)		 
+
+		count = @client.base_entry_service.count(base_entry_filter)
 		assert_equal 1, count
-					
 		assert_nil @client.base_entry_service.delete(created_entry.id)
 	end
-	
+
 	# this test creates an entry and retrieves it back using the id.
 	should "get the base entry" do
-		
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
@@ -110,25 +102,25 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
 
 		base_entry = @client.base_entry_service.get(created_entry.id)
-		
+
 		assert_not_nil base_entry
 		assert_instance_of Kaltura::KalturaMediaEntry, base_entry
 		assert_equal base_entry.id, created_entry.id
 		assert_nil @client.base_entry_service.delete(base_entry.id)
 	end
-	
+
 	# this test creates couple of entries and retrieves them back using the ids
 	should "get the base entries using the ids" do
-		
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
@@ -137,14 +129,14 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry1 = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry1.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry1.id, resource)
 
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
@@ -153,32 +145,32 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry2 = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry2.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry2.id, resource)
-		
+
 		base_entry_list = @client.base_entry_service.get_by_ids("#{created_entry1.id},#{created_entry2.id}")
-		
+
 		assert_not_nil base_entry_list
 		assert_instance_of Array, base_entry_list
-		assert_equal base_entry_list.count, 2					
+		assert_equal base_entry_list.count, 2
 		assert_nil @client.base_entry_service.delete(created_entry1.id)
 		assert_nil @client.base_entry_service.delete(created_entry2.id)
 	end
-	
+
 	# this test tries toretrieve an entry with invalid id.
 	should "throw an error for invalid base entry id" do
-		
+
 		assert_raise Kaltura::KalturaAPIError do
 			@client.base_entry_service.get("invalid_base_entry_id")
 		end
-		
-	end		
-	
+
+	end
+
 	# this test creates an entry and updates the metadata of it.
 	should "update the base entry metadata" do
-		
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
 		base_entry.name = "kaltura test"
@@ -190,7 +182,7 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
@@ -199,21 +191,20 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 		base_entry.name = "kaltura test updated"
 		base_entry.description = "kaltura test description"
 		base_entry_updated = @client.base_entry_service.update(created_entry.id, base_entry)
-		
+
 		assert_not_nil base_entry_updated
 		assert_instance_of Kaltura::KalturaBaseEntry, base_entry_updated
 		assert_equal base_entry_updated.name, "kaltura test updated"
 		assert_equal base_entry_updated.description, "kaltura test description"
-		
 		assert_nil @client.base_entry_service.delete(base_entry_updated.id)
 	end
-	
+
 	# this test creates an entry and updates it's thumbnail.
 	should "upload a thumbnail for the base entry " do
-	
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
 
 		upload_token = @client.upload_token_service.add()
@@ -222,69 +213,68 @@ class BaseEntryServiceTest < Test::Unit::TestCase
 
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
 
 		img_file = File.open("test/media/test.png")
-					
+
 		updated_entry = @client.base_entry_service.update_thumbnail_jpeg(created_entry.id, img_file)
-		
-		assert_not_nil updated_entry.thumbnail_url		 
+
+		assert_not_nil updated_entry.thumbnail_url
 		assert_not_equal updated_entry.thumbnail_url, created_entry.thumbnail_url
 		assert_nil @client.base_entry_service.delete(updated_entry.id)
 	end
-	
+
 	# this test creates an entry and set it's moderation flags.
 	should "set the moderation flags" do
-	
+
 		base_entry = Kaltura::KalturaBaseEntry.new
 		base_entry.type = Kaltura::KalturaEntryType::MEDIA_CLIP
-		base_entry.name = "kaltura_test"
+		base_entry.name = "kaltura_test_baseentryservicetest_" +  Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
 		media_file = File.open("test/media/test.mov")
-	
+
 		upload_token = @client.upload_token_service.add()
 		assert_not_nil upload_token.id
 		upload_token = @client.upload_token_service.upload(upload_token.id, media_file)
-	
+
 		created_entry = @client.base_entry_service.add(base_entry)
 		assert_not_nil created_entry.id
-		
+
 		resource = Kaltura::KalturaUploadedFileTokenResource.new
 		resource.token = upload_token.id
 		@client.media_service.add_content(created_entry.id, resource)
-	
-		# first list the flags. should be empty			
+
+		# first list the flags. should be empty
 		moderation_flag_list = @client.base_entry_service.list_flags(created_entry.id)
-		
+
 		assert_equal moderation_flag_list.total_count, 0
-	
+
 		# add a new flag for moderate
 		flag = Kaltura::KalturaModerationFlag.new
 		flag.flagged_entry_id = created_entry.id
 		flag.flag_type = Kaltura::KalturaModerationFlagType::SEXUAL_CONTENT
 		flag = @client.base_entry_service.flag(flag)
-		
+
 		# list the flags, should be 1
 		moderation_flag_list = @client.base_entry_service.list_flags(created_entry.id)
-		
+
 		assert_equal moderation_flag_list.total_count, 1
 		assert_equal moderation_flag_list.objects[0].status, Kaltura::KalturaModerationFlagStatus::PENDING
-		
+
 		# approve the flags
 		@client.base_entry_service.approve(created_entry.id)
-		
+
 		# list the flags, should be empty
 		moderation_flag_list = @client.base_entry_service.list_flags(created_entry.id)
-		
+
 		assert_equal moderation_flag_list.total_count, 0
-			
+
 			# get the entry and check the moderation status
 		created_entry = @client.base_entry_service.get(created_entry.id)
-		
+
 		assert_equal created_entry.moderation_status, Kaltura::KalturaEntryModerationStatus::APPROVED
-		
 		assert_nil @client.base_entry_service.delete(created_entry.id)
 	end
 

data/test/configuration_test.rb

@@ -40,7 +40,7 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_raise NoMethodError do
       base_entry = Kaltura::KalturaBaseEntry.new
       base_entry.type = Kaltura::KalturaEntryType::DOCUMENT
-      base_entry.name = "kaltura_test"
+      base_entry.name = "kaltura_test_configurationtest_" + Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
       pdf_file = File.open("test/media/test.pdf")
       pdf_token = @client.invalid_service.upload(pdf_file)
     end
@@ -138,7 +138,7 @@ class ConfigurationTest < Test::Unit::TestCase
       
       base_entry = Kaltura::KalturaBaseEntry.new
       base_entry.type = Kaltura::KalturaEntryType::DOCUMENT
-      base_entry.name = "kaltura_test"
+      base_entry.name = "kaltura_test_configurationtest_" + Time.now.getutc.strftime("%d/%m/%Y %H:%M:%S:%L")
       pdf_file = File.open("test/media/test.pdf")
       
       
@@ -148,36 +148,4 @@ class ConfigurationTest < Test::Unit::TestCase
       assert_not_nil created_entry.id
       assert_nil @client.base_entry_service.delete(created_entry.id)
    end
-  
-  # this test is to validate the timeout configuration setting.
-  should "time out the request" do
-    
-    config = YAML.load_file("kaltura.yml")
-        
-    partner_id = config["test"]["partner_id"]
-    service_url = config["test"]["service_url"]
-    administrator_secret = config["test"]["administrator_secret"]
-    timeout = 0
-
-    config = Kaltura::KalturaConfiguration.new()
-    config.service_url = service_url
-    config.logger = Logger.new(STDOUT)
-    config.timeout = timeout
-    
-    exception = assert_raise Kaltura::KalturaAPIError do
-      @client = Kaltura::KalturaClient.new( config )
-      session = @client.session_service.start( administrator_secret, '', Kaltura::KalturaSessionType::ADMIN, partner_id)
-      
-      @client.ks = session
-      
-      media_entry = Kaltura::KalturaMediaEntry.new
-      media_entry.name = "kaltura_test1"
-      media_entry.media_type = Kaltura::KalturaMediaType::VIDEO
-      video_file = File.open("test/media/test.wmv")
-  
-      video_token = @client.media_service.upload(video_file)
-    end
-    
-    assert_equal exception.message, 'Request Timeout'
-  end
 end