ruby-jss 1.6.4 → 2.0.0b1

data/lib/{jss/api_object → jamf/api/classic/api_objects}/patch_title.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
 
   # An active Patch Software Title in the JSS.
   #
@@ -34,7 +34,7 @@ module JSS
   #
   # Patch versions for the title are available in the #versions read-only
   # attribute, a Hash of versions keyed by the version string. The values are
-  # JSS::PatchTitle::Version objects.
+  # Jamf::PatchTitle::Version objects.
   #
   # When creating/activating new Patch Titles, with .make, a unique name:, a
   # source: and a name_id: must be provided - the source must be the name or id
@@ -54,23 +54,23 @@ module JSS
   # versions. Reports called on the class or an instance default to :all
   # versions, and are slower to retrieve than a specific version,
   #
-  # @see JSS::APIObject
+  # @see Jamf::APIObject
   #
-  class PatchTitle < JSS::APIObject
+  class PatchTitle < Jamf::APIObject
 
-    include JSS::Sitable
-    include JSS::Categorizable
-    include JSS::Creatable
-    include JSS::Updatable
+    include Jamf::Sitable
+    include Jamf::Categorizable
+    include Jamf::Creatable
+    include Jamf::Updatable
 
     # TODO: remove this and adjust parsing when jamf fixes the JSON
     # Data map for PatchTitle XML data parsing cuz Borked JSON
-    # @see {JSS::XMLWorkaround} for details
+    # @see {Jamf::XMLWorkaround} for details
     USE_XML_WORKAROUND = {
       patch_software_title: {
         id: -1,
-        name: JSS::BLANK,
-        name_id: JSS::BLANK,
+        name: Jamf::BLANK,
+        name_id: Jamf::BLANK,
         source_id: -1,
         notifications: {
           email_notification: nil,
@@ -78,18 +78,18 @@ module JSS
         },
         category: {
           id: -1,
-          name: JSS::BLANK
+          name: Jamf::BLANK
         },
         site: {
           id: -1,
-          name: JSS::BLANK
+          name: Jamf::BLANK
         },
         versions: [
           {
-            software_version: JSS::BLANK,
+            software_version: Jamf::BLANK,
             package: {
               id: -1,
-              name: JSS::BLANK
+              name: Jamf::BLANK
             }
           }
         ]
@@ -98,23 +98,23 @@ module JSS
 
     # TODO: remove this and adjust parsing when jamf fixes the JSON
     # Data map for PatchReport XML data parsing cuz Borked JSON
-    # @see {JSS::XMLWorkaround} for details
+    # @see {Jamf::XMLWorkaround} for details
     PATCH_REPORT_DATA_MAP = {
       patch_report: {
-        name: JSS::BLANK,
+        name: Jamf::BLANK,
         patch_software_title_id: -1,
         total_computers: 0,
         total_versions: 0,
         versions: [
           {
-            software_version: JSS::BLANK,
+            software_version: Jamf::BLANK,
             computers: [
               {
                 id: -1,
-                name: JSS::BLANK,
-                mac_address: JSS::BLANK,
-                alt_mac_address: JSS::BLANK,
-                serial_number: JSS::BLANK
+                name: Jamf::BLANK,
+                mac_address: Jamf::BLANK,
+                alt_mac_address: Jamf::BLANK,
+                serial_number: Jamf::BLANK
               }
             ]
           }
@@ -170,8 +170,10 @@ module JSS
     # so here we turn it into an integer manually :-(
     # Ditto for source_id
     #
-    def self.all(refresh = false, source_id: nil, api: JSS.api)
-      data = super refresh, api: api
+    def self.all(refresh = false, source_id: nil, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      data = super refresh, cnx: cnx
       data.each do |info|
         info[:id] = info[:id].to_i
         info[:source_name_id] = "#{info[:source_id]}-#{info[:name_id]}"
@@ -185,16 +187,20 @@ module JSS
     # source_id: parameter, which limites the results to
     # patch titles with the specified source_id.
     #
-    def self.all_names(refresh = false, source_id: nil, api: JSS.api)
-      all(refresh, source_id: source_id, api: api).map { |i| i[:name] }
+    def self.all_names(refresh = false, source_id: nil, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      all(refresh, source_id: source_id, cnx: cnx).map { |i| i[:name] }
     end
 
     # The same as  @see APIObject.all_ids but also takes an optional
     # source_id: parameter, which limites the results to
     # patch titles with the specified source_id.
     #
-    def self.all_ids(refresh = false, source_id: nil, api: JSS.api)
-      all(refresh, source_id: source_id, api: api).map { |i| i[:id] }
+    def self.all_ids(refresh = false, source_id: nil, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      all(refresh, source_id: source_id, cnx: cnx).map { |i| i[:id] }
     end
 
     # Returns an Array of unique source_ids used by active Patches
@@ -207,19 +213,23 @@ module JSS
     #
     # @param refresh[Boolean] should the data be re-queried from the API?
     #
-    # @param api[JSS::APIConnection] an API connection to use for the query.
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use for the query.
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @return [Array<Integer>] the ids of the patch sources used in the JSS
     #
-    def self.all_source_ids(refresh = false, api: JSS.api)
-      all(refresh, api: api).map { |i| i[:source_id] }.sort.uniq
+    def self.all_source_ids(refresh = false, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      all(refresh, cnx: cnx).map { |i| i[:source_id] }.sort.uniq
     end
 
     # @return [Array<String>] all 'source_name_id' values for active patches
     #
-    def self.all_source_name_ids(refresh = false, api: JSS.api)
-      all(refresh, api: api).map { |i| i[:source_name_id] }
+    def self.all_source_name_ids(refresh = false, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      all(refresh, cnx: cnx).map { |i| i[:source_name_id] }
     end
 
     # Get a patch report for a softwaretitle, withouth fetching an instance.
@@ -243,19 +253,21 @@ module JSS
     #   Can be a string version number like '8.13.2' or :latest, :unknown,
     #   or :all. Defaults to :all
     #
-    # @param api[JSS::APIConnection] an API connection to use for the query.
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use for the query.
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @return [Hash] the patch report for the version(s) specified.
     #
-    def self.patch_report(title, version: :all, api: JSS.api)
-      title_id = valid_id title, api: api
-      raise JSS::NoSuchItemError, "No PatchTitle matches '#{title}'" unless title_id
+    def self.patch_report(title, version: :all, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      title_id = valid_id title, cnx: cnx
+      raise Jamf::NoSuchItemError, "No PatchTitle matches '#{title}'" unless title_id
 
       rsrc = patch_report_rsrc title_id, version
 
       # TODO: remove this and adjust parsing when jamf fixes the JSON
-      raw_report = XMLWorkaround.data_via_xml(rsrc, PATCH_REPORT_DATA_MAP, api)[:patch_report]
+      raw_report = XMLWorkaround.data_via_xml(rsrc, PATCH_REPORT_DATA_MAP, cnx)[:patch_report]
       report = {}
       report[:total_computers] = raw_report[:total_computers]
       report[:total_versions] = raw_report[:total_versions]
@@ -301,14 +313,14 @@ module JSS
     #
     def self.fetch(identifier = nil, **params)
       # default api
-      api = params[:api] ? params[:api] : JSS.api
+      api = params[:api] ? params[:api] : Jamf.cnx
 
       # source: and source_id: are considered the same, source_id: wins
       params[:source_id] ||= params[:source]
 
       # if given a source name, this converts it to an id
-      params[:source_id] = JSS::PatchInternalSource.valid_id params[:source_id]
-      params[:source_id] ||= JSS::PatchExternalSource.valid_id params[:source_id]
+      params[:source_id] = Jamf::PatchInternalSource.valid_id params[:source_id]
+      params[:source_id] ||= Jamf::PatchExternalSource.valid_id params[:source_id]
 
       # build a possible source_name_id
       params[:source_name_id] ||= "#{params[:source_id]}-#{params[:name_id]}"
@@ -324,17 +336,19 @@ module JSS
           map_all_ids_to(:name).invert[params[:name]]
         end
 
-      raise JSS::NoSuchItemError, "No matching #{name} found" unless id
+      raise Jamf::NoSuchItemError, "No matching #{name} found" unless id
 
-      super id: id, api: api
+      super id: id, cnx: cnx
     end
 
     # Override the {APIObject.valid_id}, since patch sources are so non-standard
     # Accept id, source_name_id, or name.
     # Note name may not be unique, and if not, ymmv
     #
-    def self.valid_id(ident, refresh = false, api: JSS.api)
-      id = all_ids(refresh, api: api).include?(ident) ? ident : nil
+    def self.valid_id(ident, refresh = false, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      id = all_ids(refresh, cnx: cnx).include?(ident) ? ident : nil
       id ||= map_all_ids_to(:source_name_id).invert[ident]
       id ||= map_all_ids_to(:name).invert[ident]
       id
@@ -373,17 +387,17 @@ module JSS
         # source: and source_id: are considered the same, source_id: wins
         @init_data[:source_id] ||= @init_data[:source]
 
-        raise JSS::MissingDataError, 'source: and name_id: must be provided' unless @init_data[:name_id] && @init_data[:source_id]
+        raise Jamf::MissingDataError, 'source: and name_id: must be provided' unless @init_data[:name_id] && @init_data[:source_id]
 
-        @source_id = JSS::PatchSource.valid_id(@init_data[:source_id])
+        @source_id = Jamf::PatchSource.valid_id(@init_data[:source_id])
 
-        raise JSS::NoSuchItemError, "No Patch Sources match '#{@init_data[:source]}'" unless source_id
+        raise Jamf::NoSuchItemError, "No Patch Sources match '#{@init_data[:source]}'" unless source_id
 
         @name_id = @init_data[:name_id]
 
-        valid_name_id = JSS::PatchSource.available_name_ids(@source_id).include? @name_id
+        valid_name_id = Jamf::PatchSource.available_name_ids(@source_id).include? @name_id
 
-        raise JSS::NoSuchItemError, "source #{@init_data[:source]} doesn't offer name_id '#{@init_data[:name_id]}'" unless valid_name_id
+        raise Jamf::NoSuchItemError, "source #{@init_data[:source]} doesn't offer name_id '#{@init_data[:name_id]}'" unless valid_name_id
       end
 
       @source_name_id = "#{@source_id}-#{@name_id}"
@@ -396,13 +410,13 @@ module JSS
       @versions = {}
       @init_data[:versions] ||= []
       @init_data[:versions].each do |vers|
-        @versions[vers[:software_version]] = JSS::PatchTitle::Version.new(self, vers)
+        @versions[vers[:software_version]] = Jamf::PatchTitle::Version.new(self, vers)
       end # each do vers
 
       @changed_pkgs = []
     end
 
-    # @return [Hash{String => JSS::PatchTitle::Version}] The JSS::PatchVersions fetched for
+    # @return [Hash{String => Jamf::PatchTitle::Version}] The Jamf::PatchVersions fetched for
     #   this title, keyed by version string
     def versions
       return @versions unless in_jss
@@ -427,7 +441,7 @@ module JSS
     #
     def email_notification=(new_setting)
       return if email_notification == new_setting
-      raise JSS::InvalidDataError, 'New Setting must be boolean true or false' unless JSS::TRUE_FALSE.include? @email_notification = new_setting
+      raise Jamf::InvalidDataError, 'New Setting must be boolean true or false' unless Jamf::TRUE_FALSE.include? @email_notification = new_setting
       @need_to_update = true
     end
 
@@ -439,11 +453,11 @@ module JSS
     #
     def web_notification=(new_setting)
       return if web_notification == new_setting
-      raise JSS::InvalidDataError, 'New Setting must be boolean true or false' unless JSS::TRUE_FALSE.include? @web_notification = new_setting
+      raise Jamf::InvalidDataError, 'New Setting must be boolean true or false' unless Jamf::TRUE_FALSE.include? @web_notification = new_setting
       @need_to_update = true
     end
 
-    # this is called by JSS::PatchTitle::Version#package= to update @changed_pkgs which
+    # this is called by Jamf::PatchTitle::Version#package= to update @changed_pkgs which
     # is used by #rest_xml to change the package assigned to a patch version
     # in this title.
     def changed_pkg_for_version(version)
@@ -466,10 +480,10 @@ module JSS
 
     # Get a patch report for this title.
     #
-    # See the class method JSS::PatchTitle.patch_report
+    # See the class method Jamf::PatchTitle.patch_report
     #
     def patch_report(vers = :all)
-      JSS::PatchTitle.patch_report id, version: vers, api: @api
+      Jamf::PatchTitle.patch_report id, version: vers, cnx: @cnx
     end
     alias version_report patch_report
     alias report patch_report
@@ -493,7 +507,7 @@ module JSS
     # for saving or updating.
     #
     def rest_xml
-      doc = REXML::Document.new # JSS::APIConnection::XML_HEADER
+      doc = REXML::Document.new # Jamf::Connection::XML_HEADER
       obj = doc.add_element RSRC_OBJECT_KEY.to_s
 
       obj.add_element('name').text = name
@@ -527,6 +541,4 @@ module JSS
 
   end # class Patch
 
-end # module JSS
-
-require 'jss/api_object/patch_title/version'
+end # module Jamf

data/lib/{jss/api_object → jamf/api/classic/api_objects}/peripheral.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,20 +41,20 @@ module JSS
   ###
   ### A peripheral in the JSS
   ###
-  ### @see JSS::APIObject
+  ### @see Jamf::APIObject
   ###
-  class Peripheral  < JSS::APIObject
+  class Peripheral  < Jamf::APIObject
 
     #####################################
     ### MixIns
     #####################################
 
-    include JSS::Creatable
-    include JSS::Updatable
-    include JSS::Purchasable
-    include JSS::Locatable
-    include JSS::Uploadable
-    include JSS::Sitable
+    include Jamf::Creatable
+    include Jamf::Updatable
+    include Jamf::Purchasable
+    include Jamf::Locatable
+    include Jamf::Uploadable
+    include Jamf::Sitable
 
     #####################################
     ### Class Methods
@@ -115,7 +115,7 @@ module JSS
     ###
     ### @see APIObject
     ###
-    def initialize (args = {})
+    def initialize(**args)
 
       ### periphs don't really have names, and the JSS module list method for
       ### periphs gives the computer_id as the name, so give it a temp
@@ -125,9 +125,9 @@ module JSS
       super
 
       if args[:id] == :new
-        raise JSS::InvalidDataError, "New Peripherals must have a :type, which must be one of those defined in the JSS." unless args[:type]
+        raise Jamf::InvalidDataError, "New Peripherals must have a :type, which must be one of those defined in the JSS." unless args[:type]
         @type = args[:type]
-        raise JSS::InvalidDataError, "No peripheral type '#{@type}' in the JSS" unless JSS::PeripheralType.all_names(:refresh, api: @api).include? @type
+        raise Jamf::InvalidDataError, "No peripheral type '#{@type}' in the JSS" unless Jamf::PeripheralType.all_names(:refresh, cnx: @cnx).include? @type
         @fields = {}
         @rest_rsrc = 'peripherals/id/-1'
         @site = "None"
@@ -135,7 +135,7 @@ module JSS
       end
 
       @type =  @init_data[:general][:type]
-      @site = JSS::APIObject.get_name(@init_data[:general][:site])
+      @site = Jamf::APIObject.get_name(@init_data[:general][:site])
       @bar_code_1 = @init_data[:general][:bar_code_1]
       @bar_code_2 = @init_data[:general][:bar_code_2]
       @computer_id = @init_data[:general][:computer_id]
@@ -145,7 +145,7 @@ module JSS
       @init_data[:general][:fields].each{|f| @fields[f[:name]] = f[:value] }
 
       ### get the field defs for this PeriphType, omitting the leading nil
-      @field_defs ||= JSS::PeripheralType.fetch(:name => @type).fields.compact
+      @field_defs ||= Jamf::PeripheralType.fetch(:name => @type).fields.compact
 
 
     end # initialize
@@ -154,7 +154,7 @@ module JSS
     ###
     ### reset the restrsrc after creation
     ###
-    ### @see JSS::Creatable#create
+    ### @see Jamf::Creatable#create
     ###
     def create
       super
@@ -166,7 +166,7 @@ module JSS
     ### periphs don't have names
     ###
     def name= (newname)
-      raise JSS::UnsupportedError, "Peripherals don't have names."
+      raise Jamf::UnsupportedError, "Peripherals don't have names."
     end
 
     ###
@@ -229,11 +229,11 @@ module JSS
     ###
     def associate(computer)
       if computer =~ /^d+$/
-        raise JSS::NoSuchItemError, "No computer in the JSS with id #{computer}" unless JSS::Computer.all_ids(api: @api).include? computer
+        raise Jamf::NoSuchItemError, "No computer in the JSS with id #{computer}" unless Jamf::Computer.all_ids(cnx: @cnx).include? computer
         @computer_id = computer
       else
-        raise JSS::NoSuchItemError, "No computer in the JSS with name #{computer}" unless JSS::Computer.all_names(api: @api).include? computer
-        @computer_id = JSS::Computer.map_all_ids_to(:name, api: @api).invert[computer]
+        raise Jamf::NoSuchItemError, "No computer in the JSS with name #{computer}" unless Jamf::Computer.all_names(cnx: @cnx).include? computer
+        @computer_id = Jamf::Computer.map_all_ids_to(:name, cnx: @cnx).invert[computer]
       end
       @need_to_update = true
     end
@@ -266,18 +266,18 @@ module JSS
     ###
     def check_field(field, value)
       ### get the field defs for this PeriphType, omitting the leading nil
-      @field_defs ||= JSS::PeripheralType.fetch(:name => @type, api: @api).fields.compact
+      @field_defs ||= Jamf::PeripheralType.fetch(:name => @type, cnx: @cnx).fields.compact
 
       ### we must have the right number of fields, and they must have the same names
       ### as the definition
       required_fields = @field_defs.map{|f| f[:name]}
-      raise JSS::InvalidDataError, "Peripherals of type '#{@type}' doesn't have a field '#{field}', they only have: #{required_fields.join(', ')}" unless required_fields.include? field
+      raise Jamf::InvalidDataError, "Peripherals of type '#{@type}' doesn't have a field '#{field}', they only have: #{required_fields.join(', ')}" unless required_fields.include? field
 
       ### any menu fields can only have values as defined by the type.
       menu_flds = @field_defs.select{|f| f[:type] == "menu" }
       menu_flds.each do |mf|
         next unless mf[:name] == field
-        raise JSS::InvalidDataError, "The value for field '#{field}' must be one of: #{mf[:choices].join(', ')}" unless mf[:choices].include? value
+        raise Jamf::InvalidDataError, "The value for field '#{field}' must be one of: #{mf[:choices].join(', ')}" unless mf[:choices].include? value
       end #if menu_flds.include? field
 
     end # check fields
@@ -287,7 +287,7 @@ module JSS
     ### for saving or updating
     ###
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       periph = doc.add_element RSRC_OBJECT_KEY.to_s
 
       general = periph.add_element('general')

data/lib/{jss/api_object → jamf/api/classic/api_objects}/peripheral_type.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
 
   #####################################
   ### Classes
@@ -33,23 +33,23 @@ module JSS
   ###
   ### A peripheral_type in the JSS.
   ###
-  ### A PeripheralType (as opposed to an individual {JSS::Peripheral}) is just an id, a name, and an Array of
+  ### A PeripheralType (as opposed to an individual {Jamf::Peripheral}) is just an id, a name, and an Array of
   ### Hashes describing the fields of data to be stored for peripherals of this type.
   ###
   ### See {#fields} for a desciption of how field definitions are stored.
   ###
   ### For manipulating the fields, see {#fields=}, {#set_field}, {#append_field}, {#prepend_field}, {#insert_field}, and {#delete_field}
   ###
-  ### @see JSS::APIObject
+  ### @see Jamf::APIObject
   ###
-  class PeripheralType  < JSS::APIObject
+  class PeripheralType  < Jamf::APIObject
 
     #####################################
     ### MixIns
     #####################################
 
-    include JSS::Creatable
-    include JSS::Updatable
+    include Jamf::Creatable
+    include Jamf::Updatable
 
     #####################################
     ### Class Methods
@@ -89,7 +89,7 @@ module JSS
     ###
     ### Initialize
     ###
-    def initialize (args = {})
+    def initialize(**args)
 
       super
 
@@ -146,7 +146,7 @@ module JSS
     ###
     def fields= (new_fields)
       unless new_fields.kind_of? Array and  new_fields.reject{|c| c.kind_of? Hash }.empty?
-        raise JSS::InvalidDataError, "Argument must be an Array of Hashes."
+        raise Jamf::InvalidDataError, "Argument must be an Array of Hashes."
       end
       raise "A peripheral type can have a maximmum of 20 fields"  if new_fields.count > 20
       new_fields.each{ |f| field_ok? f }
@@ -167,8 +167,8 @@ module JSS
     ###
     ### @return [void]
     ###
-    def set_field(order, field = {})
-      raise JSS::NoSuchItemError, "No field with number '#{order}'. Use #append_field, #prepend_field, or #insert_field" unless @fields[order]
+    def set_field(order, **field)
+      raise Jamf::NoSuchItemError, "No field with number '#{order}'. Use #append_field, #prepend_field, or #insert_field" unless @fields[order]
       field_ok? field
       @fields[order] = field
       @need_to_update = true
@@ -181,7 +181,7 @@ module JSS
     ###
     ### @return [void]
     ###
-    def append_field(field = {})
+    def append_field(**field)
       field_ok? field
       @fields << field
       order_fields
@@ -195,7 +195,7 @@ module JSS
     ###
     ### @return [void]
     ###
-    def prepend_field(field = {})
+    def prepend_field(**field)
       field_ok? field
       @fields.unshift field
       order_fields
@@ -211,7 +211,7 @@ module JSS
     ###
     ### @return [void]
     ###
-    def insert_field(order,field = {})
+    def insert_field(order, **field)
       field_ok? field
       @fields.insert((order -1), field)
       order_fields
@@ -227,7 +227,7 @@ module JSS
     ###
     def delete_field(order)
       if @fields[order]
-        raise JSS::MissingDataError, "Fields can't be empty" if @fields.count == 1
+        raise Jamf::MissingDataError, "Fields can't be empty" if @fields.count == 1
         @fields.delete_at index
         order_fields
         @need_to_update = true
@@ -246,13 +246,13 @@ module JSS
     ### Return true or raise an exception
     ###
     def field_ok?(field)
-      raise JSS::InvalidDataError, "Field elements must be hashes with :name, :type, and possibly :choices" unless field.kind_of? Hash
-      raise JSS::InvalidDataError, "Fields require names" if field[:name].to_s.empty?
-      raise JSS::InvalidDataError, "Fields :type must be one of: :#{FIELD_TYPES.join(', :')}" unless FIELD_TYPES.include? field[:type].to_sym
+      raise Jamf::InvalidDataError, "Field elements must be hashes with :name, :type, and possibly :choices" unless field.kind_of? Hash
+      raise Jamf::InvalidDataError, "Fields require names" if field[:name].to_s.empty?
+      raise Jamf::InvalidDataError, "Fields :type must be one of: :#{FIELD_TYPES.join(', :')}" unless FIELD_TYPES.include? field[:type].to_sym
 
       if field[:type].to_sym == :menu
         unless field[:choices].kind_of? Array and  field[:choices].reject{|c| c.kind_of? String}.empty?
-          raise JSS::InvalidDataError, "Choices for menu fields must be an Array of Strings"
+          raise Jamf::InvalidDataError, "Choices for menu fields must be an Array of Strings"
         end # unless
       else
         field[:choices] = []
@@ -275,7 +275,7 @@ module JSS
     ###
     def rest_xml
       order_fields
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       pkg = doc.add_element RSRC_OBJECT_KEY.to_s
       pkg.add_element('id').text = @id
       pkg.add_element('name').text = @name