ruby-jss 1.0.3b2 → 1.0.3b3

data/lib/jss/api_object/management_history/user_location_change.rb

@@ -1,3 +1,27 @@
+### Copyright 2019 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+
 #
 module JSS
 

data/lib/jss/api_object/matchable.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/mdm.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/mobile_device.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/mobile_device_application.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/netboot_server.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/network_segment.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/package.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Pixar
+# Copyright 2019 Pixar
 
 #
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_policy.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_source.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_source/patch_external_source.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_source/patch_internal_source.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_title.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/patch_title/version.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/peripheral.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/peripheral_type.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/policy.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Pixar
+# Copyright 2019 Pixar
 
 #
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/purchasable.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/removable_macaddr.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/restricted_software.rb

@@ -1,3 +1,27 @@
+### Copyright 2019 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+
 module JSS
 
   # Restricted Software items in the JSS.

data/lib/jss/api_object/scopable.rb

@@ -1,4 +1,4 @@
-### Copyright 2018 Pixar
+### Copyright 2019 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")

data/lib/jss/api_object/scopable/scope.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Pixar
+# Copyright 2019 Pixar
 
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")
 #    with the following modification; you may not use this file except in
@@ -22,7 +22,6 @@
 #
 #
 
-#
 module JSS
 
   module Scopable
@@ -30,22 +29,17 @@ module JSS
     # Classes
     #####################################
 
+    # This class represents a Scope in the JSS, as can be applied to Scopable
+    # objects like Policies, Profiles, etc. Instances of this class are
+    # generally used as the value of the @scope attribute of those objects.
     #
-    # This class represents a Scope in the JSS, as can be applied to Scopable objects like
-    # Policies, Profiles, etc. Instances of this class are generally used as the value of the @scope attribute
-    # of those objects.
-    #
-    # Scope data comes from the API as a hash within the overall object data. The main keys of the hash
-    # define the included targets of the scope. A sub-hash defines limitations on those inclusions,
-    # and another sub-hash defines explicit exclusions.
+    # Scope data comes from the API as a hash within the overall object data.
+    # The main keys of the hash define the included targets of the scope. A
+    # sub-hash defines limitations on those inclusions, and another sub-hash
+    # defines explicit exclusions.
     #
     # This class provides methods for adding, removing, or fully replacing the
-    # various parts of the scope's inclusions, limitations, and exclusions.
-    #
-    # @todo Implement simple LDAP queries using the defined {LDAPServer}s to confirm the
-    #   existance of users or groups used in limitations and exclusions. As things are now
-    #   if you add invalid user or group names, you'll get a 409 conflict error when you try
-    #   to save your changes to the JSS.
+    # various items in scope's realms: targets, limitations, and exclusions.
     #
     # @see JSS::Scopable
     #
@@ -86,6 +80,9 @@ module JSS
       # their corresponding target group keys from SCOPING_CLASSES.
       TARGETS_AND_GROUPS = { computers: :computer_groups, mobile_devices: :mobile_device_groups }.freeze
 
+      # added to the ends of singular key names if needed, e.g. computer_group => computer_groups
+      ESS = 's'.freeze
+
       # These can be part of the base inclusion list of the scope,
       # along with the appropriate target and target group keys
       INCLUSIONS = %i[buildings departments].freeze
@@ -176,13 +173,13 @@ module JSS
       # If raw_scope is empty, a default scope, scoped to all targets, is created, and can be modified
       # as needed.
       #
-      # @param target_key[Symbol] the kind of thing we're scopeing, one of {TARGETS_AND_GROUPS}
+      # @param target_key[Symbol] the kind of thing we're scoping, one of {TARGETS_AND_GROUPS}
       #
       # @param raw_scope[Hash] the JSON :scope data from an API query that is scopable, e.g. a Policy.
       #
       def initialize(target_key, raw_scope = nil)
         raw_scope ||= DEFAULT_SCOPE
-        raise JSS::InvalidDataError, "The target class of a Scope must be one of the symbols :#{TARGETS_AND_GROUPS.keys.join(', :')}" unless TARGETS_AND_GROUPS.keys.include? target_key
+        raise JSS::InvalidDataError, "The target class of a Scope must be one of the symbols :#{TARGETS_AND_GROUPS.keys.join(', :')}" unless TARGETS_AND_GROUPS.key?(target_key)
 
         @target_key = target_key
         @target_class = SCOPING_CLASSES[@target_key]
@@ -195,19 +192,28 @@ module JSS
         @all_key = "all_#{target_key}".to_sym
         @all_targets = raw_scope[@all_key]
 
-        # Everything gets mapped from an Array of Hashes to an Array of names (or an empty array)
-        # since names are all that really matter when submitting the scope.
+        # Everything gets mapped from an Array of Hashes to
+        # an Array of ids
         @inclusions = {}
-        @inclusion_keys.each { |k| @inclusions[k] = raw_scope[k] ? raw_scope[k].map { |n| n[:name] } : [] }
+        @inclusion_keys.each do |k|
+          raw_scope[k] ||= []
+          @inclusions[k] = raw_scope[k].compact.map { |n| n[:id].to_i  }
+        end # @inclusion_keys.each do |k|
 
         @limitations = {}
         if raw_scope[:limitations]
-          LIMITATIONS.each { |k| @limitations[k] = raw_scope[:limitations][k] ? raw_scope[:limitations][k].map { |n| n[:name] } : [] }
-        end
+          LIMITATIONS.each do |k|
+            raw_scope[:limitations][k] ||= []
+            @limitations[k] = raw_scope[:limitations][k].compact.map { |n| n[:id].to_i }
+          end # LIMITATIONS.each do |k|
+        end # if raw_scope[:limitations]
 
         @exclusions = {}
         if raw_scope[:exclusions]
-          @exclusion_keys.each { |k| @exclusions[k] = raw_scope[:exclusions][k] ? raw_scope[:exclusions][k].map { |n| n[:name] } : [] }
+          @exclusion_keys.each do |k|
+            raw_scope[:exclusions][k] ||= []
+            @exclusions[k] = raw_scope[:exclusions][k].compact.map { |n| n[:id].to_i }
+          end
         end
 
         @container = nil
@@ -246,7 +252,7 @@ module JSS
       # @param key[Symbol] the key from #{SCOPING_CLASSES} for the kind of items
       # being included, :computer, :building, etc...
       #
-      # @param list[Array] the names of the items being added
+      # @param list[Array]  identifiers of the items being added
       #
       # @example
       #   set_targets(:computers, ['kimchi','mantis'])
@@ -254,56 +260,54 @@ module JSS
       # @return [void]
       #
       def set_targets(key, list)
-        raise JSS::InvalidDataError, "Inclusion key must be one of :#{@inclusion_keys.join(', :')}" unless @inclusion_keys.include? key
-        raise JSS::InvalidDataError, "List must be an Array of #{key} names, it may be empty." unless list.is_a? Array
+        key = pluralize_key(key)
+        raise JSS::InvalidDataError, "List must be an Array of #{key} identifiers, it may be empty." unless list.is_a? Array
+
+        # check the idents
+        list.map! do |ident|
+          item_id = validate_item(:target, key, ident)
+          if @exclusions[key] && @exclusions[key].include?(item_id)
+            raise JSS::AlreadyExistsError, \
+              "Can't set #{key} target to '#{ident}' because it's already an explicit exclusion."
+          end
+          item_id
+        end # each
 
         return nil if list.sort == @inclusions[key].sort
 
-        # emptying the list?
-        if list.empty?
-          @inclusion[key] = list
-          # if ALL the @inclusion keys are empty, then set all targets to true.
-          @all_targets =  @inclusions.values.reject { |a| a.nil? || a.empty? }.empty?
-          @container.should_update if @container
-          return list
-        end
-
-        # check the names
-        list.each do |name|
-          raise JSS::NoSuchItemError, "No existing #{key} with name '#{name}'" unless check_name key, name
-          raise JSS::AlreadyExistsError, "Can't set #{key} scope to '#{name}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(name)
-        end # each
-
         @inclusions[key] = list
         @all_targets = false
         @container.should_update if @container
       end # sinclude_in_scope
+      alias set_target set_targets
       alias set_inclusion set_targets
+      alias set_inclusions set_targets
 
-      # Add a single item a a target in this scope.
+      # Add a single item as a target in this scope.
       #
-      # The item name will be checked for existence in the JSS, and an exception raised if the item doesn't exist.
+      # The item name will be checked for existence in the JSS, and an exception
+      #  raised if the item doesn't exist.
       #
       # @param key[Symbol] the key from #{SCOPING_CLASSES} for the kind of item being added, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being added
+      # @param item[String,integer] a valid identifier of the item being added
       #
       # @example
-      #   add_target(:computer, "mantis")
+      #   add_target(:computers, "mantis")
+      #
+      # @example
+      #   add_target(:computer_groups, 2342)
       #
       # @return [void]
       #
       def add_target(key, item)
-        raise JSS::InvalidDataError, "Inclusion key must be one of :#{@inclusion_keys.join(', :')}" unless @inclusion_keys.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
+        key = pluralize_key(key)
+        item_id = validate_item(:target, key, item)
+        return if @inclusions[key] && @inclusions[key].include?(item_id)
 
-        return nil if @inclusions[key] && @inclusions[key].include?(item)
+        raise JSS::AlreadyExistsError, "Can't set #{key} target to '#{item}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(item_id)
 
-        # check the name
-        raise JSS::NoSuchItemError, "No existing #{key} with name '#{item}'" unless check_name key, item
-        raise JSS::AlreadyExistsError, "Can't set #{key} scope to '#{item}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(item)
-
-        @inclusions[key] << item
+        @inclusions[key] << item_id
         @all_targets = false
         @container.should_update if @container
       end
@@ -313,7 +317,7 @@ module JSS
       #
       # @param key[Symbol] the key from #{SCOPING_CLASSES} for the kind of item being removed, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being removed
+      # @param item[String,integer] a valid identifier of the item being removed
       #
       # @example
       #   remove_target(:computer, "mantis")
@@ -321,16 +325,11 @@ module JSS
       # @return [void]
       #
       def remove_target(key, item)
-        raise JSS::InvalidDataError, "Inclusion key must be one of :#{@inclusion_keys.join(', :')}" unless @inclusion_keys.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
-
-        return nil unless @inclusions[key] && @inclusions[key].include?(item)
-
-        @inclusions[key] -= [item]
-
-        # if ALL the @inclusion keys are empty, then set all targets to true.
-        @all_targets = @inclusions.values.reject { |a| a.nil? || a.empty? }.empty?
-
+        key = pluralize_key(key)
+        item_id = validate_item :target, key, item, error_if_not_found: false
+        return unless item_id
+        return unless @inclusions[key] && @inclusions[key].include?(item_id)
+        @inclusions[key].delete item_id
         @container.should_update if @container
       end
       alias remove_inclusion remove_target
@@ -342,35 +341,32 @@ module JSS
       #
       # @param key[Symbol] the type of items being set as limitations, :network_segments, :users, etc...
       #
-      # @param list[Array] the names of the items being set as limitations
+      # @param list[Array] the identifiers of the items being set as limitations
       #
       # @example
-      #   set_limitation(:network_segments, ['foo','bar'])
+      #   set_limitation(:network_segments, ['foo',231])
       #
       # @return [void]
       #
       # @todo  handle ldap user group lookups
       #
       def set_limitation(key, list)
-        raise JSS::InvalidDataError, "Limitation key must be one of :#{LIMITATIONS.join(', :')}" unless LIMITATIONS.include? key
-        raise JSS::InvalidDataError, "List must be an Array of #{key} names, it may be empty." unless list.is_a? Array
-        return nil if list.sort == @limitations[key].sort
-
-        if list.empty?
-          @limitations[key] = []
-          @container.should_update if @container
-          return list
-        end
-
-        # check the names
-        list.each do |name|
-          raise JSS::NoSuchItemError, "No existing #{key} with name '#{name}'" unless check_name key, name
-          raise JSS::AlreadyExistsError, "Can't set #{key} limitation for '#{name}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(name)
+        key = pluralize_key(key)
+        raise JSS::InvalidDataError, "List must be an Array of #{key} identifiers, it may be empty." unless list.is_a? Array
+
+        # check the idents
+        list.map! do |ident|
+          item_id = validate_item(:limitation, key, ident)
+          raise JSS::AlreadyExistsError, "Can't set #{key} limitation for '#{name}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(item_id)
+          item_id
         end # each
 
+        return nil if list.sort == @limitations[key].sort
+
         @limitations[key] = list
         @container.should_update if @container
-      end # limit scope
+      end # set_limitation
+      alias set_limitations set_limitation
 
       # Add a single item for limiting this scope.
       #
@@ -378,7 +374,7 @@ module JSS
       #
       # @param key[Symbol] the type of item being added, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being added
+      # @param item[String,integer] a valid identifier of the item being added
       #
       # @example
       #   add_limitation(:network_segments, "foo")
@@ -388,16 +384,13 @@ module JSS
       # @todo  handle ldap user/group lookups
       #
       def add_limitation(key, item)
-        raise JSS::InvalidDataError, "Limitation key must be one of :#{LIMITATIONS.join(', :')}" unless LIMITATIONS.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
-
-        return nil if @limitations[key] && @limitations[key].include?(item)
+        key = pluralize_key(key)
+        item_id = validate_item(:limitation, key, item)
+        return nil if @limitations[key] && @limitations[key].include?(item_id)
 
-        # check the name
-        raise JSS::NoSuchItemError, "No existing #{key} with name '#{item}'" unless check_name key, item
-        raise JSS::AlreadyExistsError, "Can't set #{key} limitation for '#{name}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(item)
+        raise JSS::AlreadyExistsError, "Can't set #{key} limitation for '#{name}' because it's already an explicit exclusion." if @exclusions[key] && @exclusions[key].include?(item_id)
 
-        @limitations[key] << item
+        @limitations[key] << item_id
         @container.should_update if @container
       end
 
@@ -405,7 +398,7 @@ module JSS
       #
       # @param key[Symbol] the type of item being removed, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being removed
+      # @param item[String,integer] a valid identifier of the item being removed
       #
       # @example
       #   remove_limitation(:network_segments, "foo")
@@ -415,12 +408,11 @@ module JSS
       # @todo  handle ldap user/group lookups
       #
       def remove_limitation(key, item)
-        raise JSS::InvalidDataError, "Limitation key must be one of :#{LIMITATIONS.join(', :')}" unless LIMITATIONS.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
-
-        return nil unless @limitations[key] && @limitations[key].include?(item)
-
-        @limitations[key] -= [item]
+        key = pluralize_key(key)
+        item_id = validate_item :limitation, key, item, error_if_not_found: false
+        return unless item_id
+        return unless @limitations[key] && @limitations[key].include?(item_id)
+        @limitations[key].delete item_id
         @container.should_update if @container
       end ###
 
@@ -431,7 +423,7 @@ module JSS
       #
       # @param key[Symbol] the type of item being excluded, :computer, :building, etc...
       #
-      # @param list[Array] the names of the items being added
+      # @param list[Array] the identifiers of the items being set
       #
       # @example
       #   set_exclusion(:network_segments, ['foo','bar'])
@@ -439,27 +431,23 @@ module JSS
       # @return [void]
       #
       def set_exclusion(key, list)
-        raise JSS::InvalidDataError, "Exclusion key must be one of :#{@exclusion_keys.join(', :')}" unless @exclusion_keys.include? key
-        raise JSS::InvalidDataError, "List must be an Array of #{key} names, it may be empty." unless list.is_a? Array
-        return nil if list.sort == @exclusions[key].sort
-
-        if list.empty?
-          @exclusions[key] = []
-          @container.should_update if @container
-          return list
-        end
+        key = pluralize_key(key)
+        raise JSS::InvalidDataError, "List must be an Array of #{key} identifiers, it may be empty." unless list.is_a? Array
 
-        # check the names
-        list.each do |name|
-          raise JSS::NoSuchItemError, "No existing #{key} with name '#{name}'" unless check_name key, name
+        # check the idents
+        list.map! do |ident|
+          item_id = validate_item(:exclusion, key, ident)
           case key
           when *@inclusion_keys
-            raise JSS::AlreadyExistsError, "Can't exclude #{key} '#{name}' because it's already explicitly included." if @inclusions[key] && @inclusions[key].include?(name)
+            raise JSS::AlreadyExistsError, "Can't exclude #{key} '#{ident}' because it's already explicitly included." if @inclusions[key] && @inclusions[key].include?(item_id)
           when *LIMITATIONS
-            raise JSS::AlreadyExistsError, "Can't exclude #{key} '#{name}' because it's already an explicit limitation." if @limitations[key] && @limitations[key].include?(name)
+            raise JSS::AlreadyExistsError, "Can't exclude #{key} '#{ident}' because it's already an explicit limitation." if @limitations[key] && @limitations[key].include?(item_id)
           end
+          item_id
         end # each
 
+        return nil if list.sort == @exclusions[key].sort
+
         @exclusions[key] = list
         @container.should_update if @container
       end # limit scope
@@ -470,7 +458,7 @@ module JSS
       #
       # @param key[Symbol] the type of item being added to the exclusions, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being added
+      # @param item[String,integer] a valid identifier of the item being added
       #
       # @example
       #   add_exclusion(:network_segments, "foo")
@@ -478,17 +466,13 @@ module JSS
       # @return [void]
       #
       def add_exclusion(key, item)
-        raise JSS::InvalidDataError, "Exclusion key must be one of :#{@exclusion_keys.join(', :')}" unless @exclusion_keys.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
-
-        return nil if @exclusions[key] && @exclusions[key].include?(item)
-
-        # check the name
-        raise JSS::NoSuchItemError, "No existing #{key} with name '#{item}'" unless check_name key, item
+        key = pluralize_key(key)
+        item_id = validate_item(:exclusion, key, item)
+        return if @exclusions[key] && @exclusions[key].include?(item_id)
         raise JSS::AlreadyExistsError, "Can't exclude #{key} scope to '#{item}' because it's already explicitly included." if @inclusions[key] && @inclusions[key].include?(item)
         raise JSS::AlreadyExistsError, "Can't exclude #{key} '#{item}' because it's already an explicit limitation." if @limitations[key] && @limitations[key].include?(item)
 
-        @exclusions[key] << item
+        @exclusions[key] << item_id
         @container.should_update if @container
       end
 
@@ -496,7 +480,7 @@ module JSS
       #
       # @param key[Symbol] the type of item being removed from the excludions, :computer, :building, etc...
       #
-      # @param item[String] the name of the item being removed
+      # @param item[String,integer] a valid identifier of the item being removed
       #
       # @example
       #   remove_exclusion(:network_segments, "foo")
@@ -504,12 +488,10 @@ module JSS
       # @return [void]
       #
       def remove_exclusion(key, item)
-        raise JSS::InvalidDataError, "Exclusion key must be one of :#{@exclusion_keys.join(', :')}" unless @exclusion_keys.include? key
-        raise JSS::InvalidDataError, "Item must be a #{key} name." unless item.is_a? String
-
-        return nil unless @exclusions[key] && @exclusions[key].include?(item)
-
-        @exclusions[key] -= [item]
+        key = pluralize_key(key)
+        item_id = validate_item :exclusion, key, item, error_if_not_found: false
+        return unless @exclusions[key] && @exclusions[key].include?(item_id)
+        @exclusions[key].delete item_id
         @container.should_update if @container
       end
 
@@ -524,24 +506,42 @@ module JSS
         scope.add_element(@all_key.to_s).text = @all_targets
 
         @inclusions.each do |klass, list|
-          list_as_hash = list.map { |i| { name: i } }
-          scope << SCOPING_CLASSES[klass].xml_list(list_as_hash, :name)
+          list.compact!
+          list.delete 0
+          list_as_hash = list.map { |i| { id: i } }
+          scope << SCOPING_CLASSES[klass].xml_list(list_as_hash, :id)
         end
 
         limitations = scope.add_element('limitations')
         @limitations.each do |klass, list|
-          list_as_hash = list.map { |i| { name: i } }
-          limitations << SCOPING_CLASSES[klass].xml_list(list_as_hash, :name)
+          list.compact!
+          list.delete 0
+          list_as_hash = list.map { |i| { id: i } }
+          limitations << SCOPING_CLASSES[klass].xml_list(list_as_hash, :id)
         end
 
         exclusions = scope.add_element('exclusions')
         @exclusions.each do |klass, list|
-          list_as_hash = list.map { |i| { name: i } }
-          exclusions << SCOPING_CLASSES[klass].xml_list(list_as_hash, :name)
+          list.compact!
+          list.delete 0
+          list_as_hash = list.map { |i| { id: i } }
+          exclusions << SCOPING_CLASSES[klass].xml_list(list_as_hash, :id)
         end
         scope
       end # scope_xml
 
+      # Remove the init_data and api object from
+      # the instance_variables used to create
+      # pretty-print (pp) output.
+      #
+      # @return [Array] the desired instance_variables
+      #
+      def pretty_print_instance_variables
+        vars = instance_variables.sort
+        vars.delete :@container
+        vars
+      end
+
       # Aliases
 
       alias all_targets? all_targets
@@ -550,29 +550,43 @@ module JSS
       #####################################
       private
 
-      # Given a name of some class of item to be used in the scope, check that it
-      # exists in the JSS.
+      # look up a valid id or nil, for use in a scope type
       #
-      # @return [Boolean] does the name exist for the key in JSS or LDAP?
+      # @param realm [Symbol] How is this key being used in the scope?
+      #   :target, :limitation, or :exclusion
       #
-      def check_name(key, name)
-        found_in_jss = SCOPING_CLASSES[key].all_names(api: container.api).include?(name)
-
-        return true if found_in_jss
-
-        return false unless CHECK_LDAP_KEYS.include?(key)
-
-        begin
-          return JSS::LDAPServer.user_in_ldap?(name, api: container.api) if LDAP_USER_KEYS.include?(key)
-          return JSS::LDAPServer.group_in_ldap?(name, api: container.api) if LDAP_GROUP_KEYS.include?(key)
-
-        # if an ldap server isn't connected, make a note of it and return true
-        rescue JSS::InvalidConnectionError
-          @unable_to_verify_ldap_entries = true
-          return true
-        end # begin
-
-        false
+      # @param key [Symbol] What kind of thing are we adding to the scope?
+      #  e.g computer, network_segment, etc.
+      #
+      # @param ident [String, Integer] A unique identifier for the item being
+      #   validated, jss id, name, serial number, etc.
+      #
+      # @return [Integer, nil] the valid id for the item, or nil if not found
+      #
+      def validate_item(realm, key, ident, error_if_not_found: true)
+        # which keys allowed depends on how the item is used...
+        possible_keys =
+          case realm
+          when :target then @inclusion_keys
+          when :limitation then LIMITATIONS
+          when :exclusion then @exclusion_keys
+          else
+            raise ArgumentError, 'Unknown realm, must be :target, :limitation, or :exclusion'
+          end
+        key = pluralize_key(key)
+        raise JSS::InvalidDataError, "#{realm} key must be one of :#{possible_keys.join(', :')}" \
+          unless possible_keys.include? key
+
+        # return nil or a valid id
+        id = SCOPING_CLASSES[key].valid_id ident
+        raise JSS::NoSuchItemError, "No existing #{key} matching '#{ident}'" if error_if_not_found && id.nil?
+        id
+      end # validate_item(type, key, ident)
+
+      # the symbols used in the API data are plural, e.g. 'network_segments'
+      # this will pluralize them, allowing us to use singulars as well.
+      def pluralize_key(key)
+        key.to_s.end_with?(ESS) ? key : "#{key}s".to_sym
       end
 
     end # class Scope