d2l_sdk 0.1.13 → 0.1.15

data/lib/d2l_sdk/logging.rb

@@ -11,17 +11,19 @@ require_relative 'requests'
 def get_all_logs(date_range_start, date_range_end, search = '', log_level = '',
                  logger_assembly = '', user_id = 0, message_group_id = 0,
                  include_traces = nil, org_unit_id = 0, bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/logging/"
-    path += "?dateRangeStart=#{date_range_start}"
-    path += "&dateRangeEnd=#{date_range_end}"
-    path += "&search=#{search}" if search != ''
-    path += "&logLevel=#{log_level}" if log_level != ''
-    path += "&loggerAssembly=#{logger_assembly}" if logger_assembly != ''
-    path += "&userId=#{user_id}" if user_id != 0
-    path += "&messageGroupId=#{message_group_id}" if message_group_id != 0
-    path += "&includeTraces=#{include_traces}" unless include_traces.nil?
-    path += "&orgUnitId=#{org_unit_id}" if org_unit_id != 0
-    path += "&bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/logging/?"
+    params = []
+    params << "dateRangeStart=#{date_range_start}"
+    params << "dateRangeEnd=#{date_range_end}"
+    params << "search=#{search}" if search != ''
+    params << "logLevel=#{log_level}" if log_level != ''
+    params << "loggerAssembly=#{logger_assembly}" if logger_assembly != ''
+    params << "userId=#{user_id}" if user_id != 0
+    params << "messageGroupId=#{message_group_id}" if message_group_id != 0
+    params << "includeTraces=#{include_traces}" unless include_traces.nil?
+    params << "orgUnitId=#{org_unit_id}" if org_unit_id != 0
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     ap path
     _get(path)
     # returns paged result set of Message data blocks
@@ -34,16 +36,18 @@ def get_all_message_group_logs(date_range_start, date_range_end, search = '',
                                log_level = '', logger_assembly = '', user_id = 0,
                                message_group_id = 0, org_unit_id = 0,
                                bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/logging/grouped/"
-    path += "?dateRangeStart=#{date_range_start}"
-    path += "&dateRangeEnd=#{date_range_end}"
-    path += "&search=#{search}" if search != ''
-    path += "&logLevel=#{log_level}" if log_level != ''
-    path += "&loggerAssembly=#{logger_assembly}" if logger_assembly != ''
-    path += "&userId=#{user_id}" if user_id != 0
-    path += "&messageGroupId=#{message_group_id}" if message_group_id != 0
-    path += "&orgUnitId=#{org_unit_id}" if org_unit_id != 0
-    path += "&bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/logging/grouped/?"
+    params = []
+    params << "dateRangeStart=#{date_range_start}"
+    params << "dateRangeEnd=#{date_range_end}"
+    params << "search=#{search}" if search != ''
+    params << "logLevel=#{log_level}" if log_level != ''
+    params << "loggerAssembly=#{logger_assembly}" if logger_assembly != ''
+    params << "userId=#{user_id}" if user_id != 0
+    params << "messageGroupId=#{message_group_id}" if message_group_id != 0
+    params << "orgUnitId=#{org_unit_id}" if org_unit_id != 0
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     _get(path)
     # returns paged result set of MessageGroupSummary data blocks
 end

data/lib/d2l_sdk/org_unit.rb

@@ -35,11 +35,13 @@ end
 
 def get_properties_of_all_org_units(org_unit_type = '', org_unit_code = '', org_unit_name = '',
                                     bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/"
-    path += "?orgUnitType=#{org_unit_type}" if org_unit_type != ''
-    path += "?orgUnitCode=#{org_unit_code}" if org_unit_code != ''
-    path += "?orgUnitName=#{org_unit_name}" if org_unit_name != ''
-    path += "?bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/?"
+    params = []
+    params << "orgUnitType=#{org_unit_type}" if org_unit_type != ''
+    params << "orgUnitCode=#{org_unit_code}" if org_unit_code != ''
+    params << "orgUnitName=#{org_unit_name}" if org_unit_name != ''
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     _get(path)
     # ONLY RETRIEVES FIRST 100 after bookmark
     # returns: paged result of OrgUnitProperties blocks
@@ -62,11 +64,13 @@ end
 # return: JSON array of childless org units.
 def get_all_childless_org_units(org_unit_type = '', org_unit_code = '', org_unit_name = '',
                                 bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/childless/"
-    path += "?orgUnitType=#{org_unit_type}" if org_unit_type != ''
-    path += "?orgUnitCode=#{org_unit_code}" if org_unit_code != ''
-    path += "?orgUnitName=#{org_unit_name}" if org_unit_name != ''
-    path += "?bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/childless/?"
+    params = []
+    params << "orgUnitType=#{org_unit_type}" if org_unit_type != ''
+    params << "orgUnitCode=#{org_unit_code}" if org_unit_code != ''
+    params << "orgUnitName=#{org_unit_name}" if org_unit_name != ''
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     _get(path)
     # ONLY RETRIEVES FIRST 100
 end
@@ -136,9 +140,11 @@ end
 #
 # return: JSON array of org unit descendants (paged)
 def get_paged_org_unit_descendants(org_unit_id, ou_type_id = 0, bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/#{org_unit_id}/descendants/paged/"
-    path += "?ouTypeId=#{ou_type_id}" if ou_type_id != 0
-    path += "?bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/orgstructure/#{org_unit_id}/descendants/paged/?"
+    params = []
+    params << "ouTypeId=#{ou_type_id}" if ou_type_id != 0
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     _get(path)
     # return paged json of org_unit descendants
 end

data/lib/d2l_sdk/user.rb

@@ -74,10 +74,12 @@ end
 #
 # Returns: JSON of all users matching the parameters given.
 def get_users(org_defined_id = '', username = '', bookmark = '')
-    path = "/d2l/api/lp/#{$lp_ver}/users/"
-    path += "?orgDefinedId=#{org_defined_id}" if org_defined_id != ''
-    path += "?userName=#{username}" if username != ''
-    path += "?bookmark=#{bookmark}" if bookmark != ''
+    path = "/d2l/api/lp/#{$lp_ver}/users/?"
+    params = []
+    params << "orgDefinedId=#{org_defined_id}" if org_defined_id != ''
+    params << "userName=#{username}" if username != ''
+    params << "bookmark=#{bookmark}" if bookmark != ''
+    path = path + params.join('&')
     _get(path)
     # If- username is defined, this RETURNS a single UserData JSON block
     # else if- org_defined_id is defined, this returns a UserData JSON array

data/lib/d2l_sdk/version.rb

@@ -1,3 +1,3 @@
 module D2lSdk
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: d2l_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Andrew Kulpa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,11 +160,14 @@ files:
 - bin/console
 - bin/setup
 - d2l_sdk.gemspec
-- example_scripts/add_to_201708.rb
-- example_scripts/enroll_users.rb
-- example_scripts/find_201708_courses.rb
+- example_scripts/adjusted_courses.txt
 - example_scripts/fix_201708_courses.rb
 - example_scripts/update_enddates.rb
+- example_tests/multithread_test.rb
+- example_tests/test3.rb
+- example_tests/testCSV.rb
+- example_tests/test_course_search.rb
+- example_tests/unit_tests.rb
 - lib/d2l_sdk.rb
 - lib/d2l_sdk/auth.rb
 - lib/d2l_sdk/calendar.rb
@@ -231,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple Ruby Gem to utilize the Valence/D2L API

data/example_scripts/add_to_201708.rb

@@ -1,15 +0,0 @@
-require_relative "lib/d2l_sdk"
-
-file = "NoSemester.out"
-# get all courses coded as 201708 but not in a semester
-courses = [] # fill this array with course ID's stored in the referenced file.
-File.readlines(file).each{ |line| courses.push(line.chomp) unless line.chomp.empty? }
-
-semester_201708_id = "111723" # Fall '17 semester recieved through line of code above
-courses_done = 0
-courses.each do |course_id| # for each of these 201708 courses
-  # print out progress thus far
-  puts "Progress: #{courses_done}/#{courses.length} (#{(courses_done / courses.length).round(2)}%)" if courses_done % 10 == 0
-  add_parent_to_org_unit(semester_201708_id, course_id) # add the semester as the parent
-  courses_done += 1
-end

data/example_scripts/enroll_users.rb

@@ -1,22 +0,0 @@
-require "d2l_sdk"
-
-semester = 201708
-starnum = 32835
-sect_code = create_section_code(starnum, semester)
-section = get_section_by_section_code(x)
-org_unit_id = section["Identifier"]
-
-# user_ids is each D2L user ID for each student
-# user["Identifier"]
-user_ids = []
-role_id = 104
-
-
-user_ids.each do |user_id|
-      enrollments_data = {
-            'OrgUnitId' => org_unit_id.to_s, # String
-            'UserId' => user_id.to_s, # String
-            'RoleId' => role_id.to_s, # String
-      }
-end
-create_user_enrollment(course_enrollment_data)

data/example_scripts/find_201708_courses.rb

@@ -1,16 +0,0 @@
-require_relative "lib/d2l_sdk"
-
-courses = get_courses_by_code(201708) # get all courses coded as 201708
-courses_done = 0
-courses.each do |course| # for each of these 201708 courses
-  # print out progress thus far
-  puts "Progress: #{courses_done}/#{courses.length} (#{(courses_done/courses.length).to_i})" if courses_done % 10 == 0
-  course_id = course["Identifier"] # get their identifier
-  course_data = get_course_by_id(course_id)
-  if course_data["Semester"] == nil
-    open('NoSemester.out', 'a') do |file|
-        file << "#{course_id}\n"
-    end
-  end
-  courses_done += 1
-end