d2l_sdk 0.1.10 → 0.1.11

data/d2l_sdk.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'd2l_sdk/version'

data/lib/d2l_sdk/auth.rb

@@ -85,7 +85,7 @@ end
 def _get_string(path, http_method)
     timestamp = Time.now.to_i
     signature = format_signature(path, http_method, timestamp)
-    unless path.include? "/auth/api/token"
+    if !path.include? "/auth/api/token"
       build_authenticated_uri_query_string(signature, timestamp)
     else
       # build authenticated query string not using typical schema

data/lib/d2l_sdk/calendar.rb

@@ -30,9 +30,9 @@ end
 # REVIEW: Retrieve the calling user’s calendar events, within a
 #       number of org units (see query parameter)
 # RETURNS: An ObjectListPage JSON block containing a list of EventDataInfo JSON data blocks.
-def get_current_user_calendar_events_by_org_units(association = nil, event_type = nil,
-                                                  org_unit_ids_csv, start_date_time,
-                                                  end_date_time)
+def get_current_user_calendar_events_by_org_units(org_unit_ids_csv, start_date_time,
+                                                  end_date_time, association = nil,
+                                                  event_type = nil)
   path = "/d2l/api/le/#{$le_ver}/calendar/events/myEvents/"
   path += "?orgUnitIdsCSV=#{org_unit_ids_csv}"
   path += "&startDateTime=#{start_date_time}"
@@ -44,8 +44,8 @@ end
 
 # REVIEW: Retrieve the calling user’s events for a particular org unit.
 # RETURNS: An ObjectListPage JSON block containing a list of EventDataInfo JSON data blocks.
-def get_current_user_events_by_org_unit(association = nil, event_type = nil,
-                                        start_date_time, end_date_time)
+def get_current_user_events_by_org_unit(start_date_time, end_date_time,
+                                        association = nil, event_type = nil)
   path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/events/myEvents/"
   path += "&startDateTime=#{start_date_time}"
   path += "&endDateTime=#{end_date_time}"
@@ -56,8 +56,8 @@ end
 
 # REVIEW: Retrieve a count of calling user’s calendar events, within a number of org units
 # RETURNS: An ObjectListPage JSON block containing a list of EventCountInfo JSON data blocks.
-def get_calendar_event_count(association = nil, event_type = nil, org_unit_ids_csv,
-                             start_date_time, end_date_time)
+def get_calendar_event_count(org_unit_ids_csv, start_date_time, end_date_time,
+                             association = nil, event_type = nil)
   path = "/d2l/api/le/#{$le_ver}/calendar/events/myEvents/itemCounts/"
   path += "?orgUnitIdsCSV=#{org_unit_ids_csv}"
   path += "&startDateTime=#{start_date_time}"
@@ -70,8 +70,8 @@ end
 # REVIEW: Retrieve a count of calling user’s calendar events, within the
 #       provided org unit context.
 # RETURNS: An EventCountInfo JSON data block.
-def get_org_unit_calendar_event_count(association = nil, event_type = nil,
-                                      start_date_time, end_date_time)
+def get_org_unit_calendar_event_count(start_date_time, end_date_time,
+                                      association = nil, event_type = nil)
   path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/events/myEvents/itemCounts/"
   path += "?startDateTime=#{start_date_time}"
   path += "&endDateTime=#{end_date_time}"
@@ -177,7 +177,7 @@ end
 def create_event(org_unit_id, event_data)
   # POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/event/
   path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/event/"
-  payload = { #Calendar.EventDataInfo
+  payload = { # Calendar.EventDataInfo
     "Title" => "",
     "Description" => "",
     "StartDateTime" => nil, # UTCDateTime || nil
@@ -214,7 +214,6 @@ def create_event(org_unit_id, event_data)
   }.merge!(event_data)
   check_calendar_event_data_validity(payload) # NOTE: Test later
   _post(path, payload)
-
 end
 
 # REVIEW: Create Schema checker; Check that this payload conforms to it.
@@ -224,7 +223,7 @@ end
 def update_event(org_unit_id, event_id, event_data)
   # PUT /d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/event/#{event_id}
   path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/calendar/event/#{event_id}"
-  payload = { #Calendar.EventDataInfo
+  payload = { # Calendar.EventDataInfo
     "Title" => "",
     "Description" => "",
     "StartDateTime" => nil, # UTCDateTime || nil

data/lib/d2l_sdk/config.rb

@@ -1,4 +1,4 @@
-#Is this the production environment?
+# Is this the production environment?
 require 'json'
 @production = true
 @debug = true
@@ -8,49 +8,49 @@ config_file_name = 'd2l_config.json'
 if File.exist?(config_file_name)
   config_file = File.read(config_file_name)
   config = JSON.parse(config_file)
-  puts "[+] Configuration Variables:" if @debug
-  puts "[-] hostname: #{config["hostname"]}" if @debug
-  $hostname = config["hostname"]
-  puts "[-] user_id: #{config["user_id"]}" if @debug
-  $user_id = config["user_id"]
-  puts "[-] user_key: #{config["user_key"]}" if @debug
-  $user_key = config["user_key"]
-  puts "[-] app_id: #{config["app_id"]}" if @debug
-  $app_id = config["app_id"]
-  puts "[-] app_key: #{config["app_key"]}" if @debug
-  $app_key = config["app_key"]
+  puts '[+] Configuration Variables:' if @debug
+  puts "[-] hostname: #{config['hostname']}" if @debug
+  $hostname = config['hostname']
+  puts "[-] user_id: #{config['user_id']}" if @debug
+  $user_id = config['user_id']
+  puts "[-] user_key: #{config['user_key']}" if @debug
+  $user_key = config['user_key']
+  puts "[-] app_id: #{config['app_id']}" if @debug
+  $app_id = config['app_id']
+  puts "[-] app_key: #{config['app_key']}" if @debug
+  $app_key = config['app_key']
 # else if a configuration file doesnt exist, create one and load the config vars!
 else
   puts "[!] No file by the name 'd2l_config.json' found!"
   puts "[-] Initializing 'd2l_config.json' in current directory..\n"\
        "    Please enter the following information..."
   # host of D2L server
-  print "hostname: "
-  $hostname = gets.chomp.gsub(/'|\"|https:\/\/|http:\/\/|/,'').strip
+  print 'hostname: '
+  $hostname = gets.chomp.gsub(/'|\"|https:\/\/|http:\/\/|/, '').strip
   # api-user id
-  print "user_id: "
-  $user_id = gets.chomp.gsub(/'|\"/,'').strip
+  print 'user_id: '
+  $user_id = gets.chomp.gsub(/'|\"/, '').strip
   # api-user key
-  print "user_key: "
-  $user_key = gets.chomp.gsub(/'|\"/,'').strip
+  print 'user_key: '
+  $user_key = gets.chomp.gsub(/'|\"/, '').strip
   # app id (received from apitesttool)
-  print "app_id: "
-  $app_id = gets.chomp.gsub(/'|\"/,'').strip
+  print 'app_id: '
+  $app_id = gets.chomp.gsub(/'|\"/, '').strip
   # app key (same as app id retrieval)
-  print "app_key: "
-  $app_key = gets.chomp.gsub(/'|\"/,'').strip
+  print 'app_key: '
+  $app_key = gets.chomp.gsub(/'|\"/, '').strip
 
   config_hash = {
-    "hostname" => $hostname,
-    "user_id" => $user_id,
-    "user_key" => $user_key,
-    "app_id" => $app_id,
-    "app_key" => $app_key
+    'hostname' => $hostname,
+    'user_id' => $user_id,
+    'user_key' => $user_key,
+    'app_id' => $app_id,
+    'app_key' => $app_key
   }
   json = JSON.pretty_generate(config_hash)
   puts json if @debug
-  #puts JSON.parse(json)["hostname"] if @debug
-  config = File.new("d2l_config.json","w")
+  # puts JSON.parse(json)["hostname"] if @debug
+  config = File.new('d2l_config.json', 'w')
   config.puts(json)
   config.close
 end

data/lib/d2l_sdk/config_variables.rb

@@ -11,7 +11,7 @@ require_relative 'auth'
 
 # Retrieve the definitions for all the configuration variables the
 # user has access to view.
-def get_all_config_var_definitions(search='', bookmark='')
+def get_all_config_var_definitions(search = '', bookmark = '')
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/definitions/"
   path += "?search=#{search}" if search != ''
   path += "?bookmark=#{bookmark}" if bookmark != ''
@@ -32,14 +32,14 @@ end
 # NOTE: These provide access to the values assigned to configuration
 #       variables in the running back-end service.
 
-#Retrieve the value summary for a configuration variable.
+# Retrieve the value summary for a configuration variable.
 def get_config_var_values(variable_id)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values"
   _get(path)
   # returns Values JSON data block
 end
 
-#Retrieve the current org value for a configuration variable.
+# Retrieve the current org value for a configuration variable.
 def get_config_var_current_org_value(variable_id)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/org"
   _get(path)
@@ -47,7 +47,7 @@ def get_config_var_current_org_value(variable_id)
 end
 
 # Retrieve all the org unit override values for a configuration variable.
-def get_all_config_var_org_unit_override_values(variable_id, bookmark='')
+def get_all_config_var_org_unit_override_values(variable_id, bookmark = '')
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/orgUnits/"
   path += "?bookmark=#{bookmark}" if bookmark != ''
   _get(path)
@@ -70,7 +70,7 @@ def get_config_var_org_unit_effective_value(variable_id, org_unit_id)
 end
 
 # Retrieve all the role override values for a configuration variable.
-def get_all_config_var_org_unit_role_override_values(variable_id, bookmark='')
+def get_all_config_var_org_unit_role_override_values(variable_id, bookmark = '')
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/roles/"
   path += "?bookmark=#{bookmark}" if bookmark != ''
   _get(path)
@@ -90,45 +90,33 @@ end
 # REVIEW: Set a new org value for a configuration variable.
 def set_config_var_org_value(variable_id, org_value)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/org"
-  if org_value.is_a? String || org_value.nil?
-    payload = {"OrgValue" => org_value}
-    _put(path, payload)
-  else
-    raise ArgumentError, "Argument 'org_value' is not a String or nil"
-  end
+  raise(ArgumentError, "Argument 'org_value' is not a String or nil") unless org_value.is_a?(String) || org_value.nil?
+  payload = { 'OrgValue' => org_value }
+  _put(path, payload)
 end
 
 # REVIEW: Set a new org unit override value for a configuration variable.
 def set_config_var_override_value(variable_id, org_unit_id, org_unit_value)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/orgUnits/#{org_unit_id}"
-  if org_unit_value.is_a? String || org_unit_value.nil?
-    payload = {"OrgUnitValue" => org_unit_value}
-    _put(path, payload)
-  else
-    raise ArgumentError, "Argument 'org_unit_value' is not a String or nil"
-  end
+  raise(ArgumentError, "Argument 'org_unit_value' is not a String or nil") unless org_unit_value.is_a?(String) || org_unit_value.nil?
+  payload = { 'OrgUnitValue' => org_unit_value }
+  _put(path, payload)
 end
 
 # REVIEW: Set a new role override value for a configuration variable.
 def set_config_var_role_value(variable_id, role_id, role_value)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/roles/#{role_id}"
-  if role_value.is_a? String || role_value.nil?
-    payload = {"RoleValue" => role_value}
-    _put(path, payload)
-  else
-    raise ArgumentError, "Argument 'role_value' is not a String or nil"
-  end
+  raise(ArgumentError, "Argument 'role_value' is not a String or nil") unless role_value.is_a? String || role_value.nil?
+  payload = { 'RoleValue' => role_value }
+  _put(path, payload)
 end
 
 # REVIEW: Set a new system value for a configuration variable.
 def set_config_var_system_value(variable_id, system_value)
   path = "/d2l/api/lp/#{$lp_ver}/configVariables/#{variable_id}/values/system"
-  if system_value.is_a?(String) || system_value.nil?
-    payload = {"SystemValue" => system_value}
-    _put(path, payload)
-  else
-    raise ArgumentError, "Argument 'system_value' is not a String or nil"
-  end
+  raise(ArgumentError, "Argument 'system_value' is not a String or nil") unless system_value.is_a?(String) || system_value.nil?
+  payload = { 'SystemValue' => system_value }
+  _put(path, payload)
 end
 
 ########################
@@ -139,9 +127,9 @@ end
 
 # NOTE: UNSTABLE!!!
 # TODO: UNSTABLE!!! --Restore the default resolution strategy for an org unit configuration variable.
-def restore_default_org_unit_config_var_resolution(variable_id)
+def restore_default_org_unit_config_var_resolution(variable_id); end
   # DELETE /d2l/api/lp/(version)/configVariables/(variableId)/resolver
-end
+
 
 # NOTE: UNSTABLE!!!
 # REVIEW: Retrieve the resolution strategy for an org unit configuration variable.
@@ -152,9 +140,9 @@ end
 
 # NOTE: UNSTABLE!!!
 # TODO: UNSTABLE!!! --Update the resolution strategy for an org unit configuration variable.
-def update_org_unit_config_var_resolution(resolver_value)
+def update_org_unit_config_var_resolution(resolver_value); end
   # PUT /d2l/api/lp/(version)/configVariables/(variableId)/resolver
-end
+
 
 ################################################################################
 ###############################     TOOLS    ###################################
@@ -193,7 +181,7 @@ def check_and_create_update_status_payload(update_status)
   if update_status != true && update_status != false
     raise ArgumentError, 'update_status is not a boolean'
   end
-  payload = {"Status" => update_status} # Tools.UpdateStatus JSON data block
+  payload = { 'Status' => update_status } # Tools.UpdateStatus JSON data block
   payload
 end
 
@@ -262,11 +250,11 @@ def update_org_unit_level_tool_info(org_unit_id, tool_id, org_unit_information)
   path = "/d2l/api/lp/#{$lp_ver}/tools/orgUnits/#{org_unit_id}/#{tool_id}"
   payload =
   {
-    "ToolId" => "", # <string:D2LID>
-    "DisplayName" => "",   # <string> ## added with LP v1.6 API
-    "OrgUnitId" => 0, # D2LID:number
-    "Status" => false, # boolean
-    "CustomNavbarName" => "" # <string>
+    'ToolId' => '', # <string:D2LID>
+    'DisplayName' => '', # <string> ## added with LP v1.6 API
+    'OrgUnitId' => 0, # D2LID:number
+    'Status' => false, # boolean
+    'CustomNavbarName' => '' # <string>
   }.merge!(org_unit_information)
   check_org_unit_information_validity(payload) # NOTE: Check this later.
   _put(path, payload)

data/lib/d2l_sdk/course.rb

@@ -1,5 +1,6 @@
 require_relative 'requests'
 require 'json-schema'
+require 'mime/types'
 
 ########################
 # ACTIONS:##############
@@ -10,7 +11,7 @@ require 'json-schema'
 # Then, a delete http method is executed using this path, deleting the course.
 def delete_course_by_id(org_unit_id)
     path = "/d2l/api/lp/#{$lp_ver}/courses/#{org_unit_id}" # setup user path
-    #ap path
+    # ap path
     _delete(path)
     puts '[+] Course data deleted successfully'.green
 end
@@ -33,9 +34,8 @@ def get_course_by_id(org_unit_id)
     # returns: JSON object of the course
 end
 
-
 def get_course_image(org_unit_id, width = 0, height = 0)
-  path = "/d2l/api/lp/#{lp_ver}/courses/#{org_unit_id}/image"
+  path = "/d2l/api/lp/#{$lp_ver}/courses/#{org_unit_id}/image"
   if width > 0 && height > 0
     path += "?width=#{width}"
     path += "&height=#{height}"
@@ -68,7 +68,6 @@ def check_course_data_validity(course_data)
     JSON::Validator.validate!(schema, course_data, validate_schema: true)
 end
 
-
 # Creates the course based upon a merged result of the argument course_data
 # and a preformatted payload. This is then passed as a new payload in the
 # +_post+ method in order to create the defined course.
@@ -82,23 +81,24 @@ def create_course_data(course_data)
     # Define a valid, empty payload and merge! with the user_data. Print it.
     # can be an issue if more than one course template associated with
     # a course and the last course template parent to a course cannot be deleted
-    payload = { 'Name' => '', # String
-                'Code' => 'off_SEMESTERCODE_STARNUM', # String
-                'Path' => '', # String
-                'CourseTemplateId' => 99_989, # number: D2L_ID
-                'SemesterId' => nil, # number: D2L_ID  | nil
-                'StartDate' => nil, # String: UTCDateTime | nil
-                'EndDate' => nil, # String: UTCDateTime | nil
-                'LocaleId' => nil, # number: D2L_ID | nil
-                'ForceLocale' => false, # bool
-                'ShowAddressBook' => false # bool
-              }.merge!(course_data)
+    payload = {
+        'Name' => '', # String
+        'Code' => 'off_SEMESTERCODE_STARNUM', # String
+        'Path' => '', # String
+        'CourseTemplateId' => 99_989, # number: D2L_ID
+        'SemesterId' => nil, # number: D2L_ID  | nil
+        'StartDate' => nil, # String: UTCDateTime | nil
+        'EndDate' => nil, # String: UTCDateTime | nil
+        'LocaleId' => nil, # number: D2L_ID | nil
+        'ForceLocale' => false, # bool
+        'ShowAddressBook' => false # bool
+    }.merge!(course_data)
     check_course_data_validity(payload)
     # ap payload
     # requires: CreateCourseOffering JSON block
     path = "/d2l/api/lp/#{$lp_ver}/courses/"
     _post(path, payload)
-    #puts '[+] Course creation completed successfully'.green
+    # puts '[+] Course creation completed successfully'.green
 end
 
 # Checks whether the updated course data conforms to the valence api for the
@@ -112,9 +112,9 @@ def check_updated_course_data_validity(course_data)
         'properties' => {
             'Name' => { 'type' => 'string' },
             'Code' => { 'type' => 'string' },
-            'StartDate' => { 'type' => ['string', "null"] },
-            'EndDate' => { 'type' => ['string', "null"] },
-            'IsActive' => { 'type' => "boolean" },
+            'StartDate' => { 'type' => %w(string null) },
+            'EndDate' => { 'type' => %w(string null) },
+            'IsActive' => { 'type' => 'boolean' }
         }
     }
     JSON::Validator.validate!(schema, course_data, validate_schema: true)
@@ -127,12 +127,13 @@ end
 # Utilize the second argument and perform a PUT action to replace the old data
 def update_course_data(course_id, new_data)
     # Define a valid, empty payload and merge! with the new data.
-    payload = { 'Name' => '', # String
-                'Code' => 'off_SEMESTERCODE_STARNUM', # String
-                'StartDate' => nil, # String: UTCDateTime | nil
-                'EndDate' => nil, # String: UTCDateTime | nil
-                'IsActive' => false # bool
-              }.merge!(new_data)
+    payload = {
+      'Name' => '', # String
+      'Code' => 'off_SEMESTERCODE_STARNUM', # String
+      'StartDate' => nil, # String: UTCDateTime | nil
+      'EndDate' => nil, # String: UTCDateTime | nil
+      'IsActive' => false # bool
+    }.merge!(new_data)
     check_updated_course_data_validity(payload)
     # ap payload
     # Define a path referencing the courses path
@@ -145,8 +146,13 @@ def update_course_data(course_id, new_data)
     # Provide feedback that the update was successful
 end
 
-# TODO: Update the course image for a course offering.
-def update_course_image(org_unit_id, image_file)
+# REVIEW: Update the course image for a course offering.
+def update_course_image(org_unit_id, image_file_path)
+  path = "/d2l/api/lp/#{$lp_ver}/courses/#{org_unit_id}/image"
+  # (SCHEMA) Make sure file isnt > 2MB
+  raise ArgumentError, "File referrenced by 'image_file_path' must be less than 1000KB." if File.size(image_file_path) > 2_000_000
+  raise ArgumentError, "File referrenced by 'image_file_path' is not a valid image." if MIME::Types.type_for(image_file_path).first.media_type.downcase.casecmp("image").zero?
+  _image_upload(path, image_file_path, "PUT")
   # PUT /d2l/api/lp/(version)/courses/(orgUnitId)/image
 end
 
@@ -178,13 +184,13 @@ def check_create_copy_job_request_validity(create_copy_job_request)
         'properties' => {
             'SourceOrgUnitId' => { 'type' => 'integer' },
             'Components' => {
-                'type' => ['array', "null"],
+                'type' => %w(array null),
                 'items' =>
                   {
-                      'type' => "string"
+                      'type' => 'string'
                   }
             },
-            'CallbackUrl' => { 'type' => ['string', 'null'] }
+            'CallbackUrl' => { 'type' => %w(string null) }
         }
     }
     JSON::Validator.validate!(schema, create_copy_job_request, validate_schema: true)
@@ -192,7 +198,7 @@ end
 
 # simple schema check to assure the course component is an actual course component
 # returns: boolean
-def is_course_component(key)
+def course_component?(key)
   valid_components = %w(AttendanceRegisters Glossary News Checklists
                         Grades QuestionLibrary Competencies GradesSettings
                         Quizzes Content Groups ReleaseConditions CourseFiles
@@ -216,19 +222,17 @@ def create_new_copy_job_request(org_unit_id, create_copy_job_request)
   # Check each one of the components to see if they are valid Component types
   payload["Components"].each do |component|
     # If one of the components is not valid, cancel the CopyJobRequest operation
-    if(!is_course_component(key))
-      puts "'#{component}' specified is not a valid Copy Job Request component"
-      puts "Please retry with a valid course component such as 'Dropbox' or 'Grades'"
-      break
-    end
+    next if course_component?(key)
+    puts "'#{component}' specified is not a valid Copy Job Request component"
+    puts "Please retry with a valid course component such as 'Dropbox' or 'Grades'"
+    break
   end
   path = "/d2l/api/le/#{$le_ver}/import/#{org_unit_id}/copy/"
   _post(path, payload)
   # Returns CreateCopyJobResponse JSON block
 end
 
-# NOTE: UNSTABLE!!!!
-# TODO: --UNSTABLE-- Retrieve the list of logs for course copy jobs.
+# TODO: UNSTABLE!!!! Retrieve the list of logs for course copy jobs.
 # Query Params:
 # --OPTIONAL--
 # -bookmark : string
@@ -263,13 +267,14 @@ def get_course_import_job_request_logs(org_unit_id, job_token, bookmark = '')
   # returns PAGED RESULT of ImportCourseLog JSON blocks following bookmark param
 end
 
-# TODO: Create a new course import job request.
-# INPUT: simple file upload process
-def create_course_import_request(org_unit_id, callback_url = '')
-    #path = "/d2l/le/#{le_ver}/import/#{org_unit_id}/imports/"
-    #path += "?callbackUrl=#{callback_url}" if callback_url != ''
-    #_post(path, payload)
-    #_upload(path, json, file, 'POST', 'file', filename)
+# REVIEW: Create a new course import job request.
+# INPUT: simple file upload process -- using "course package" as the uploaded file
+def create_course_import_request(org_unit_id, file_path, callback_url = '')
+    path = "/d2l/le/#{le_ver}/import/#{org_unit_id}/imports/"
+    path += "?callbackUrl=#{callback_url}" if callback_url != ''
+    # TODO: (SCHEMA) Find out WTH a 'course package' entails as far as standards.
+    _course_package_upload(path, file_path, "POST")
+    # RETURNS: Parsed CreateImportJobResponse JSON block.
 end
 
 ################################################################################
@@ -304,10 +309,11 @@ def get_courses_by_code(org_unit_code)
   all_courses = get_all_courses
   courses = []
   all_courses.each do |course|
-    courses.push(course) if course["Code"].downcase.include? "#{org_unit_code}".downcase
+    courses.push(course) if course["Code"].downcase.include? org_unit_code.to_s.downcase
   end
   courses
 end
+
 # Retrieves all courses that have a particular string (org_unit_name) within
 # their names. This is done by first defining that none are found yet and then
 # searching through all course  for ones that do have a particular string within
@@ -352,7 +358,7 @@ def get_courses_by_property_by_regex(property, regex)
     courses_results = []
     results = get_all_courses
     results.each do |x|
-        courses_results.push(x) if (x[property] =~ regex) != nil
+        courses_results.push(x) unless (x[property] =~ regex).nil?
     end
     courses_results
     # returns array of all matching courses in JSON format.