ruby-jss 1.6.0b1 → 2.0.0a10

data/lib/{jss/api_object → jamf/api/classic/api_objects}/user.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,7 +24,7 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   #####################################
   ### Module Variables
@@ -41,16 +41,16 @@ module JSS
   ###
   ### A User in the JSS.
   ###
-  ### @see JSS::APIObject
+  ### @see Jamf::APIObject
   ###
-  class User < JSS::APIObject
+  class User < Jamf::APIObject
 
     #####################################
     ### Mix-Ins
     #####################################
-    include JSS::Creatable
-    include JSS::Updatable
-    include JSS::Extendable
+    include Jamf::Creatable
+    include Jamf::Updatable
+    include Jamf::Extendable
 
     #####################################
     ### Class Methods
@@ -71,10 +71,10 @@ module JSS
     RSRC_OBJECT_KEY = :user
 
     ### This class lets us seach for users
-    SEARCH_CLASS = JSS::AdvancedUserSearch
+    SEARCH_CLASS = Jamf::AdvancedUserSearch
 
     ### This is the class for relevant Extension Attributes
-    EXT_ATTRIB_CLASS = JSS::UserExtensionAttribute
+    EXT_ATTRIB_CLASS = Jamf::UserExtensionAttribute
 
     # the object type for this object in
     # the object history table.
@@ -158,16 +158,16 @@ module JSS
     #####################################
 
     ###
-    ### See JSS::APIObject#initialize
+    ### See Jamf::APIObject#initialize
     ###
-    def initialize (args = {})
+    def initialize(**args)
       super
 
       @full_name = @init_data[:full_name]
       @email = @init_data[:email]
       @phone_number = @init_data[:phone_number]
       @position = @init_data[:position]
-      @ldap_server = JSS::APIObject.get_name @init_data[:ldap_server]
+      @ldap_server = Jamf::APIObject.get_name @init_data[:ldap_server]
       @ldap_server_id = @init_data[:ldap_server][:id] unless @init_data[:ldap_server].nil?
       @sites = @init_data[:sites] ? @init_data[:sites]  : []
 
@@ -216,9 +216,9 @@ module JSS
 
     ###
     def ldap_server= (new_val)
-      raise JSS::InvalidDataError, "No LDAP server in the JSS named #{new_val}" unless JSS::LDAPServer.all_names(api: @api).include? new_val
+      raise Jamf::InvalidDataError, "No LDAP server in the JSS named #{new_val}" unless Jamf::LdapServer.all_names(cnx: @cnx).include? new_val
       @ldap_server = new_val
-      @ldap_server_id = JSS::LDAPServer.valid_id @ldap_server
+      @ldap_server_id = Jamf::LdapServer.valid_id @ldap_server
       @need_to_update = true
     end
 
@@ -231,7 +231,7 @@ module JSS
     ###
     def add_site (site)
       return nil if @sites.map{|s| s[:name]}.include? site
-      raise JSS::InvalidDataError, "No site in the JSS named #{site}" unless JSS::Site.all_names(api: @api).include? site
+      raise Jamf::InvalidDataError, "No site in the JSS named #{site}" unless Jamf::Site.all_names(cnx: @cnx).include? site
       @sites << {:name => site}
       @need_to_update = true
     end
@@ -275,7 +275,7 @@ module JSS
       return @grp_array if @grp_array
 
       @grp_array = []
-      raw_xml = @api.get_rsrc "/users/id/#{@id}", :xml
+      raw_xml = @cnx.c_get "/users/id/#{@id}", :xml
       xmlroot = REXML::Document.new(raw_xml).root
       xml_grps = xmlroot.elements['user_groups']
 
@@ -297,7 +297,7 @@ module JSS
     private
 
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       user = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
 
       user.add_element('name').text = @name
@@ -309,7 +309,7 @@ module JSS
       ldap = user.add_element('ldap_server')
       ldap.add_element('id').text = @ldap_server_id
 
-      user << JSS::Site.xml_list(@sites)
+      user << Jamf::Site.xml_list(@sites)
 
       user << ext_attr_xml if unsaved_eas?
 

data/lib/{jss/api_object/extension_attribute → jamf/api/classic/api_objects}/user_extension_attribute.rb

@@ -1,4 +1,4 @@
-# Copyright 2020 Pixar
+# Copyright 2022 Pixar
 
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")
 #    with the following modification; you may not use this file except in
@@ -20,17 +20,17 @@
 #    KIND, either express or implied. See the Apache License for the specific
 #    language governing permissions and limitations under the Apache License.
 
-module JSS
+module Jamf
 
   # Classes
   #####################################
 
   # A User extension attribute as defined in the JSS
   #
-  # @see JSS::ExtensionAttribute
-  # @see JSS::APIObject
+  # @see Jamf::ExtensionAttribute
+  # @see Jamf::APIObject
   #
-  class UserExtensionAttribute < JSS::ExtensionAttribute
+  class UserExtensionAttribute < Jamf::ExtensionAttribute
 
     # Class Constants
     #####################################
@@ -46,10 +46,10 @@ module JSS
     RSRC_OBJECT_KEY = :user_extension_attribute
 
     # these ext attribs are related to these kinds of objects
-    TARGET_CLASS = JSS::User
+    TARGET_CLASS = Jamf::User
 
     # A criterion that will return all members of the TARGET_CLASS
-    ALL_TARGETS_CRITERION = JSS::Criteriable::Criterion.new(and_or: 'and', name: 'Username', search_type: 'like', value: '')
+    ALL_TARGETS_CRITERION = Jamf::Criteriable::Criterion.new(and_or: 'and', name: 'Username', search_type: 'like', value: '')
 
     # the object type for this object in
     # the object history table.
@@ -59,19 +59,19 @@ module JSS
     # Public Instance Methods
     #####################################
 
-    # @see JSS::ExtensionAttribute#input_type=
+    # @see Jamf::ExtensionAttribute#input_type=
     #
     def input_type=(new_val)
-      raise JSS::InvalidDataError, "User Extension Attribute input_type cannot be '#{INPUT_TYPE_SCRIPT}'" if new_val == INPUT_TYPE_SCRIPT
-      raise JSS::InvalidDataError, "User Extension Attribute input_type cannot be '#{INPUT_TYPE_LDAP}'" if new_val == INPUT_TYPE_LDAP
+      raise Jamf::InvalidDataError, "User Extension Attribute input_type cannot be '#{INPUT_TYPE_SCRIPT}'" if new_val == INPUT_TYPE_SCRIPT
+      raise Jamf::InvalidDataError, "User Extension Attribute input_type cannot be '#{INPUT_TYPE_LDAP}'" if new_val == INPUT_TYPE_LDAP
 
       super
     end # end input_type
 
-    # @see JSS::ExtensionAttribute#web_display=
+    # @see Jamf::ExtensionAttribute#web_display=
     #
     def web_display=(_new_val)
-      raise JSS::UnsupportedError, 'User Extension Attributes web_display cannot be set'
+      raise Jamf::UnsupportedError, 'User Extension Attributes web_display cannot be set'
     end
 
   end # class ExtAttrib

data/lib/{jss/api_object/group → jamf/api/classic/api_objects}/user_group.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,7 +24,7 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   #####################################
   ### Module Constants
@@ -45,13 +45,13 @@ module JSS
   ###
   ### A Mobile Device group in the JSS
   ###
-  ### See also the parent class JSS::Group
+  ### See also the parent class Jamf::Group
   ###
-  ### @see JSS::APIObject
+  ### @see Jamf::APIObject
   ###
-  ### @see JSS::Group
+  ### @see Jamf::Group
   ###
-  class UserGroup < JSS::Group
+  class UserGroup < Jamf::Group
 
     #####################################
     ### Mix-Ins
@@ -73,7 +73,7 @@ module JSS
     RSRC_OBJECT_KEY = :user_group
 
     ### this allows the parent Group class to do things right
-    MEMBER_CLASS = JSS::User
+    MEMBER_CLASS = Jamf::User
 
     # the XML element for immediate member additions via PUT
     ADD_MEMBERS_ELEMENT = 'user_additions'.freeze

data/lib/{jss/api_object → jamf/api/classic/api_objects}/vpp_account.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,16 +24,16 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # A VPP account defined in the JSS
   #
-  class VPPAccount < JSS::APIObject
+  class VPPAccount < Jamf::APIObject
 
     # Mix-Ins
     #####################################
-    include JSS::Updatable
-    include JSS::Sitable
+    include Jamf::Updatable
+    include Jamf::Sitable
 
     # Class Constants
     #####################################
@@ -93,14 +93,14 @@ module JSS
     # Constructor
     #####################################
 
-    # See JSS::APIObject#initialize
+    # See Jamf::APIObject#initialize
     #
-    def initialize(args = {})
+    def initialize(**args)
       super
       @contact = @init_data[:contact]
       @service_token = @init_data[:service_token]
       @account_name = @init_data[:account_name]
-      @expiration_date = @init_data[:expiration_date].to_s.empty? ? nil : Time.parse(@init_data[:expiration_date])
+      @expiration_date = @init_data[:expiration_date].to_s.empty? ? nil : Jamf.parse_time(@init_data[:expiration_date])
       @location_name = @init_data[:location_name]
       @country = @init_data[:country]
       @apple_id = @init_data[:apple_id]
@@ -119,7 +119,7 @@ module JSS
     def contact=(new_val = @contact)
       return if new_val == @contact
 
-      @contact = JSS::Validate.non_empty_string new_val, 'Contact must be a non-empty String'
+      @contact = Jamf::Validate.non_empty_string new_val, 'Contact must be a non-empty String'
       @need_to_update = true
     end
 
@@ -130,7 +130,7 @@ module JSS
     def country=(new_val = @country)
       return if new_val == @country
 
-      @country = JSS::Validate.app_store_country_code new_val
+      @country = Jamf::Validate.app_store_country_code new_val
       @need_to_update = true
     end
 
@@ -141,7 +141,7 @@ module JSS
     def apple_id=(new_val = @apple_id)
       return if new_val == @apple_id
 
-      @apple_id = JSS::Validate.email_address new_val
+      @apple_id = Jamf::Validate.email_address new_val
       @need_to_update = true
     end
 
@@ -152,7 +152,7 @@ module JSS
     def populate_catalog_from_vpp_content=(new_val = @populate_catalog_from_vpp_content)
       return if new_val == @populate_catalog_from_vpp_content
 
-      @populate_catalog_from_vpp_content = JSS::Validate.boolean new_val
+      @populate_catalog_from_vpp_content = Jamf::Validate.boolean new_val
       @need_to_update = true
     end
 
@@ -163,7 +163,7 @@ module JSS
     def notify_disassociation=(new_val = @notify_disassociation)
       return if new_val == @notify_disassociation
 
-      @notify_disassociation = JSS::Validate.boolean new_val
+      @notify_disassociation = Jamf::Validate.boolean new_val
       @need_to_update = true
     end
 
@@ -174,7 +174,7 @@ module JSS
     def auto_register_managed_users=(new_val = @auto_register_managed_users)
       return if new_val == @auto_register_managed_users
 
-      @auto_register_managed_users = JSS::Validate.boolean new_val
+      @auto_register_managed_users = Jamf::Validate.boolean new_val
       @need_to_update = true
     end
 
@@ -189,7 +189,7 @@ module JSS
     # Most classes will redefine this method.
     #
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       tmpl = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
       tmpl.add_element('name').text = @name
       tmpl.add_element('contact').text = @contact

data/lib/{jss/api_object → jamf/api/classic/api_objects}/vppable.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,7 +24,7 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # A mix-in module to handleVPP-related data in API objects that can be
   # assigned via VPP.
@@ -37,7 +37,7 @@ module JSS
   # to ordinary scope.
   #
   # To use this module, merely `include VPPable` when defining your
-  # subclass of JSS::APIObject
+  # subclass of Jamf::APIObject
   #
   # classes doing so MUST call {#add_vpp_xml(xmldoc)} in their {#rest_xml} method
   #
@@ -223,7 +223,7 @@ module JSS
     def assign_vpp_device_based_licenses=(new_val)
       return if new_val == @assign_vpp_device_based_licenses
 
-      @assign_vpp_device_based_licenses = JSS::Validate.boolean new_val
+      @assign_vpp_device_based_licenses = Jamf::Validate.boolean new_val
       @need_to_update = true
     end
     alias vpp_device_based= assign_vpp_device_based_licenses=
@@ -233,7 +233,7 @@ module JSS
     def vpp_admin_account_name
       return unless @vpp_admin_account_id.is_a? Integer
 
-      JSS::VPPAccount.map_all_ids_to(:name)[@vpp_admin_account_id]
+      Jamf::VPPAccount.map_all_ids_to(:name)[@vpp_admin_account_id]
     end
     alias vpp_account_name vpp_admin_account_name
 

data/lib/{jss/api_object/webhook.rb → jamf/api/classic/api_objects/web_hook.rb}

@@ -1,4 +1,4 @@
-# Copyright 2020 Pixar
+# Copyright 2022 Pixar
 #
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")
 #    with the following modification; you may not use this file except in
@@ -23,7 +23,7 @@
 #
 
 #
-module JSS
+module Jamf
 
   # Classes
   ###################################
@@ -31,12 +31,12 @@ module JSS
   #
   # A webhook as defined in JamfPro.
   #
-  class WebHook < JSS::APIObject
+  class WebHook < Jamf::APIObject
 
     # Mix-Ins
     ###################################
-    include JSS::Creatable
-    include JSS::Updatable
+    include Jamf::Creatable
+    include Jamf::Updatable
 
     # Class Methods
     ###################################
@@ -106,7 +106,7 @@ module JSS
     # Constructor
     ###################################
 
-    # See JSS::APIObject#initialize
+    # See Jamf::APIObject#initialize
     def initialize(**args)
       super
 
@@ -136,8 +136,8 @@ module JSS
     def enabled=(new_val)
       return nil if new_val == @enabled
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "enabled must be boolean 'true' or 'false'" unless \
-        JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, "enabled must be boolean 'true' or 'false'" unless \
+        Jamf::TRUE_FALSE.include? new_val
       @enabled = new_val
       @need_to_update = true
     end
@@ -152,7 +152,7 @@ module JSS
       return nil if new_val == @url
       # handy - from http://stackoverflow.com/questions/1805761/check-if-url-is-valid-ruby#1805788
       url_ok = new_val =~ /\A#{URI.regexp(%w(http https))}\z/
-      raise JSS::InvalidDataError, 'New value is not a valid http(s) url' unless url_ok && url_ok.zero?
+      raise Jamf::InvalidDataError, 'New value is not a valid http(s) url' unless url_ok && url_ok.zero?
       @url = new_val
       @need_to_update = true
     end
@@ -166,7 +166,7 @@ module JSS
     #
     def content_type=(new_val)
       return nil if new_val == @content_type
-      raise JSS::InvalidDataError, "content_type must be one of :#{CONTENT_TYPES.keys.join ', :'}" unless \
+      raise Jamf::InvalidDataError, "content_type must be one of :#{CONTENT_TYPES.keys.join ', :'}" unless \
         CONTENT_TYPES.keys.include? new_val
       @content_type = new_val
       @need_to_update = true
@@ -181,7 +181,7 @@ module JSS
     #
     def event=(new_val)
       return nil if new_val == @event
-      raise JSS::InvalidDataError, 'Unknown webhook event' unless EVENTS.include? new_val
+      raise Jamf::InvalidDataError, 'Unknown webhook event' unless EVENTS.include? new_val
       @event = new_val
       @need_to_update = true
     end
@@ -194,7 +194,7 @@ module JSS
     # @return [void]
     #
     def enable
-      raise JSS::NoSuchItemError, 'Save the webhook before enabling it' unless @in_jss
+      raise Jamf::NoSuchItemError, 'Save the webhook before enabling it' unless @in_jss
       self.enabled = true
       save
     end
@@ -204,7 +204,7 @@ module JSS
     # @return [void]
     #
     def disable
-      raise JSS::NoSuchItemError, 'Save the webhook before disabling it' unless @in_jss
+      raise Jamf::NoSuchItemError, 'Save the webhook before disabling it' unless @in_jss
       self.enabled = false
       save
     end
@@ -224,7 +224,7 @@ module JSS
     #
     def rest_xml
       validate_before_save
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       webhook = doc.add_element 'webhook'
       webhook.add_element('name').text = @name
       webhook.add_element('enabled').text = @enabled
@@ -236,7 +236,7 @@ module JSS
 
     def validate_before_save
       raise 'url must be a valid http(s) URL String' unless @url.is_a? String
-      raise 'event must be a valid event name from JSS::WebHook::EVENTS' unless EVENTS.include? @event
+      raise 'event must be a valid event name from Jamf::WebHook::EVENTS' unless EVENTS.include? @event
     end
 
   end # class department

data/lib/{jss/api_object → jamf/api/classic/base_classes}/advanced_search.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,7 +24,7 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # Module Variables
   #####################################
@@ -40,7 +40,7 @@ module JSS
   #
   # Subclasses must define:
   # * the constant RESULT_CLASS which is the JSS Module class of
-  #   the item returned by the search, e.g. JSS::Computer
+  #   the item returned by the search, e.g. Jamf::Computer
   # * the constant RESULT_ID_FIELDS, which is an Array of Symbols
   #   that come from the API in the search_results along with the
   #   symbolized display fields.
@@ -48,19 +48,19 @@ module JSS
   #   whatever display fields have been defined.
   #
   #
-  # @see JSS::AdvancedComputerSearch
-  # @see JSS::AdvancedMobileDeviceSearch
-  # @see JSS::AdvancedUserSearch
-  # @see JSS::APIObject
+  # @see Jamf::AdvancedComputerSearch
+  # @see Jamf::AdvancedMobileDeviceSearch
+  # @see Jamf::AdvancedUserSearch
+  # @see Jamf::APIObject
   #
-  class AdvancedSearch < JSS::APIObject
+  class AdvancedSearch < Jamf::APIObject
 
     # Mix-Ins
     #####################################
-    include JSS::Creatable
-    include JSS::Updatable
-    include JSS::Criteriable
-    include JSS::Sitable
+    include Jamf::Creatable
+    include Jamf::Updatable
+    include Jamf::Criteriable
+    include Jamf::Sitable
 
 
     # Class Constants
@@ -143,14 +143,14 @@ module JSS
     #
     # @see APIObject#initialize
     #
-    def initialize(args = {})
-      super args
+    def initialize(**args)
+      super
 
       # @init_data now has the raw data
       # so fill in our attributes or set defaults
 
       @sql_text = @init_data[:sql_text]
-      @site = JSS::APIObject.get_name(@init_data[:site])
+      @site = Jamf::APIObject.get_name(@init_data[:site])
 
       @display_fields = @init_data[:display_fields] ? @init_data[:display_fields].map { |f| f[:name] } : []
 
@@ -186,14 +186,14 @@ module JSS
     # @return [Integer] the id of the newly created search
     #
     def create(get_results = false)
-      raise JSS::InvalidDataError, 'JSS::Criteriable::Criteria instance required' unless @criteria.is_a? JSS::Criteriable::Criteria
-      raise JSS::InvalidDataError, 'display_fields must be an Array.' unless @display_fields.is_a? Array
+      raise Jamf::InvalidDataError, 'Jamf::Criteriable::Criteria instance required' unless @criteria.is_a? Jamf::Criteriable::Criteria
+      raise Jamf::InvalidDataError, 'display_fields must be an Array.' unless @display_fields.is_a? Array
 
-      orig_timeout = @api.cnx.options[:timeout]
-      @api.timeout = 1800
+      orig_timeout = @cnx.cnx.options[:timeout]
+      @cnx.timeout = 1800
       super()
       requery_search_results if get_results
-      @api.timeout = orig_timeout
+      @cnx.timeout = orig_timeout
 
       @id # remember to return the id
     end
@@ -207,11 +207,11 @@ module JSS
     # @return [Integer] the id of the updated search
     #
     def update(get_results = false)
-      orig_timeout = @api.cnx.options[:timeout]
-      @api.timeout = 1800
+      orig_timeout = @cnx.cnx.options[:timeout]
+      @cnx.timeout = 1800
       super()
       requery_search_results if get_results
-      @api.timeout = orig_timeout
+      @cnx.timeout = orig_timeout
 
       @id # remember to return the id
     end
@@ -219,10 +219,10 @@ module JSS
     # Wrapper/alias for both create and update
     def save(get_results = false)
       if @in_jss
-        raise JSS::UnsupportedError, 'Updating this object in the JSS is currently not supported by ruby-jss' unless updatable?
+        raise Jamf::UnsupportedError, 'Updating this object in the JSS is currently not supported by ruby-jss' unless updatable?
         update get_results
       else
-        raise JSS::UnsupportedError, 'Creating this object in the JSS is currently not supported by ruby-jss' unless creatable?
+        raise Jamf::UnsupportedError, 'Creating this object in the JSS is currently not supported by ruby-jss' unless creatable?
         create get_results
       end
     end
@@ -235,17 +235,17 @@ module JSS
     # @return [Array<Hash>] the new search results
     #
     def requery_search_results
-      orig_open_timeout = @api.cnx.options[:open_timeout]
-      orig_timeout = @api.cnx.options[:timeout]
-      @api.timeout = 1800
-      @api.open_timeout = 1800
+      orig_open_timeout = @cnx.cnx.options[:open_timeout]
+      orig_timeout = @cnx.cnx.options[:timeout]
+      @cnx.timeout = 1800
+      @cnx.open_timeout = 1800
       begin
         requery = self.class.fetch(id: @id)
         @search_results = requery.search_results
         @result_display_keys = requery.result_display_keys
       ensure
-        @api.timeout = orig_timeout
-        @api.open_timeout = orig_open_timeout
+        @cnx.timeout = orig_timeout
+        @cnx.open_timeout = orig_open_timeout
       end
     end
 
@@ -255,7 +255,7 @@ module JSS
     # @param new_val[Array<String>] the new field names
     #
     def display_fields=(new_val)
-      raise JSS::InvalidDataError, 'display_fields must be an Array.' unless new_val.is_a? Array
+      raise Jamf::InvalidDataError, 'display_fields must be an Array.' unless new_val.is_a? Array
       return if new_val.sort == @display_fields.sort
       @display_fields = new_val
       @need_to_update = true
@@ -283,12 +283,12 @@ module JSS
     # Web UI does (e.g. group memberships, applications, receipts, etc)
     #
     def export(output_file, format = :csv, overwrite = false)
-      raise JSS::InvalidDataError, "Export format must be one of: :#{EXPORT_FORMATS.join ', :'}" unless EXPORT_FORMATS.include? format
+      raise Jamf::InvalidDataError, "Export format must be one of: :#{EXPORT_FORMATS.join ', :'}" unless EXPORT_FORMATS.include? format
 
       out = Pathname.new output_file
 
       unless overwrite
-        raise JSS::AlreadyExistsError, "The output file already exists: #{out}" if out.exist?
+        raise Jamf::AlreadyExistsError, "The output file already exists: #{out}" if out.exist?
       end
 
       case format
@@ -348,7 +348,7 @@ module JSS
     # end
 
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       acs = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
       acs.add_element('name').text = @name
       acs.add_element('sort_1').text = @sort_1 if @sort_1
@@ -365,8 +365,4 @@ module JSS
 
   end # class AdvancedSearch
 
-end # module JSS
-
-require 'jss/api_object/advanced_search/advanced_computer_search'
-require 'jss/api_object/advanced_search/advanced_mobile_device_search'
-require 'jss/api_object/advanced_search/advanced_user_search'
+end # module Jamf