ruby-jss 1.5.1 → 1.5.2

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of ruby-jss
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -155,88 +155,55 @@ files:
 - bin/netseg-update
 - data/ruby-jss.conf.example
 - lib/jamf.rb
-- lib/jamf/api/abstract_classes/advanced_search.rb
-- lib/jamf/api/abstract_classes/collection_resource.rb
-- lib/jamf/api/abstract_classes/generic_reference.rb
-- lib/jamf/api/abstract_classes/json_object.rb
-- lib/jamf/api/abstract_classes/prestage.rb
-- lib/jamf/api/abstract_classes/prestage_skip_setup_items.rb
-- lib/jamf/api/abstract_classes/resource.rb
-- lib/jamf/api/abstract_classes/singleton_resource.rb
 - lib/jamf/api/attribute_classes/ip_address.rb
 - lib/jamf/api/attribute_classes/timestamp.rb
+- lib/jamf/api/base_classes/collection_resource.rb
+- lib/jamf/api/base_classes/json_object.rb
+- lib/jamf/api/base_classes/prestage.rb
+- lib/jamf/api/base_classes/resource.rb
+- lib/jamf/api/base_classes/singleton_resource.rb
 - lib/jamf/api/connection.rb
 - lib/jamf/api/connection/api_error.rb
 - lib/jamf/api/connection/api_error_styleguide.rb
 - lib/jamf/api/connection/token.rb
-- lib/jamf/api/json_objects/account_prefs.rb
-- lib/jamf/api/json_objects/android_details.rb
-- lib/jamf/api/json_objects/appletv_details.rb
-- lib/jamf/api/json_objects/attachment.rb
-- lib/jamf/api/json_objects/cellular_network.rb
 - lib/jamf/api/json_objects/change_log_entry.rb
-- lib/jamf/api/json_objects/computer_prestage_skip_setup_items.rb
 - lib/jamf/api/json_objects/country.rb
-- lib/jamf/api/json_objects/criterion.rb
 - lib/jamf/api/json_objects/device_enrollment_device.rb
 - lib/jamf/api/json_objects/device_enrollment_device_sync_state.rb
 - lib/jamf/api/json_objects/device_enrollment_sync_status.rb
-- lib/jamf/api/json_objects/extension_attribute_value.rb
-- lib/jamf/api/json_objects/installed_application.rb
-- lib/jamf/api/json_objects/installed_certificate.rb
-- lib/jamf/api/json_objects/installed_configuration_profile.rb
-- lib/jamf/api/json_objects/installed_ebook.rb
-- lib/jamf/api/json_objects/installed_provisioning_profile.rb
 - lib/jamf/api/json_objects/inventory_preload_extension_attribute.rb
-- lib/jamf/api/json_objects/ios_details.rb
 - lib/jamf/api/json_objects/locale.rb
-- lib/jamf/api/json_objects/location.rb
 - lib/jamf/api/json_objects/md_prestage_name.rb
 - lib/jamf/api/json_objects/md_prestage_names.rb
 - lib/jamf/api/json_objects/md_prestage_skip_setup_items.rb
-- lib/jamf/api/json_objects/mobile_device_details.rb
-- lib/jamf/api/json_objects/mobile_device_security.rb
 - lib/jamf/api/json_objects/prestage_assignment.rb
 - lib/jamf/api/json_objects/prestage_location.rb
 - lib/jamf/api/json_objects/prestage_purchasing_data.rb
 - lib/jamf/api/json_objects/prestage_scope.rb
 - lib/jamf/api/json_objects/prestage_sync_status.rb
-- lib/jamf/api/json_objects/purchasing_data.rb
 - lib/jamf/api/json_objects/time_zone.rb
-- lib/jamf/api/mixins/abstract.rb
+- lib/jamf/api/mixins/base_class.rb
 - lib/jamf/api/mixins/bulk_deletable.rb
 - lib/jamf/api/mixins/change_log.rb
 - lib/jamf/api/mixins/extendable.rb
 - lib/jamf/api/mixins/filterable.rb
 - lib/jamf/api/mixins/immutable.rb
-- lib/jamf/api/mixins/locatable.rb
 - lib/jamf/api/mixins/lockable.rb
 - lib/jamf/api/mixins/pageable.rb
-- lib/jamf/api/mixins/referable.rb
 - lib/jamf/api/mixins/searchable.rb
 - lib/jamf/api/mixins/sortable.rb
 - lib/jamf/api/mixins/uncreatable.rb
 - lib/jamf/api/mixins/undeletable.rb
-- lib/jamf/api/resources/collection_resources/account.rb
-- lib/jamf/api/resources/collection_resources/advanced_mobile_device_search.rb
-- lib/jamf/api/resources/collection_resources/advanced_user_search.rb
 - lib/jamf/api/resources/collection_resources/building.rb
 - lib/jamf/api/resources/collection_resources/category.rb
-- lib/jamf/api/resources/collection_resources/computer.rb
 - lib/jamf/api/resources/collection_resources/computer_prestage.rb
 - lib/jamf/api/resources/collection_resources/department.rb
 - lib/jamf/api/resources/collection_resources/device_enrollment.rb
-- lib/jamf/api/resources/collection_resources/extension_attribute.rb
 - lib/jamf/api/resources/collection_resources/inventory_preload_record.rb
-- lib/jamf/api/resources/collection_resources/mobile_device.rb
 - lib/jamf/api/resources/collection_resources/mobile_device_prestage.rb
 - lib/jamf/api/resources/collection_resources/script.rb
-- lib/jamf/api/resources/collection_resources/site.rb
 - lib/jamf/api/resources/singleton_resources/app_store_country_codes.rb
-- lib/jamf/api/resources/singleton_resources/authorization.rb
-- lib/jamf/api/resources/singleton_resources/client_checkin_settings.rb
 - lib/jamf/api/resources/singleton_resources/locales.rb
-- lib/jamf/api/resources/singleton_resources/reenrollment_settings.rb
 - lib/jamf/api/resources/singleton_resources/time_zones.rb
 - lib/jamf/client.rb
 - lib/jamf/client/jamf_binary.rb

data/lib/jamf/api/abstract_classes/advanced_search.rb

@@ -1,86 +0,0 @@
-# Copyright 2020 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.
-#
-#
-
-# The Module
-module Jamf
-
-  # Classes
-  #####################################
-
-  # A building defined in the JSS
-  class AdvancedSearch < Jamf::CollectionResource
-
-    extend Jamf::Abstract
-
-    # Constants
-    #####################################
-
-    # Object Model / Attributes
-    # See APIObject class documentation for details
-    # of how the OBJECT_MODEL hash works.
-    #####################################
-    OBJECT_MODEL = {
-
-      # @!attribute [r] id
-      #   @return [Integer]
-      id: {
-        class: :integer,
-        identifier: :primary,
-        readonly: true
-      },
-
-      # @!attribute name
-      #   @return [String]
-      name: {
-        class: :string,
-        identifier: true
-      },
-
-      # @!attribute criteria
-      #   @return [Array<Jamf::Criterion>]
-      criteria: {
-        class: Jamf::Criterion,
-        multi: true,
-        required: true
-      },
-
-      # @!attribute displayFields
-      #   @return [Array<String>]
-      displayFields: {
-        class: :string,
-        multi: true
-      },
-
-      # @!attribute site
-      #   @return [Jamf::Site::Reference]
-      site: {
-        class: Jamf::Site::Reference
-      }
-
-    }.freeze
-
-  end # class
-
-end # module

data/lib/jamf/api/abstract_classes/generic_reference.rb

@@ -1,153 +0,0 @@
-# Copyright 2020 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 Jamf
-
-  # TODO:  This class and the referable mixin should be removed -
-  # According to the Jamf Pro API Styleguide/Specs:
-  #
-  #   - Objects which reference other objects MUST only reference by its Jamf Pro-assigned numerical ID.
-  #
-  # and in newer endpoints that is what we're seeing, e.g. fields like
-  # 'siteId' and 'categoryId'
-
-  # This class is a reference to an individual API object from some other
-  # API object.
-  #
-  # This class is subclassed automatically when the {Jamf::Referable} module
-  # is included into a class.
-  #
-  # See {Jamf::Referable} for how to use the subclasses of GenericReference.
-  #
-  # Subclasses must define:
-  #
-  # REFERENT_CLASS - the full class to which this is a reference
-  # e.g. for BuildingReference it would be Jamf::Building
-  #
-  # Defining REFERENT_CLASS is handled automatically by including the
-  # Referable module
-  #
-  # @abstract
-  #
-  class GenericReference < Jamf::JSONObject
-
-    extend Jamf::Abstract
-
-    # Constants
-    #####################################
-
-    OBJECT_MODEL = {
-
-      id: {
-        class: :j_id,
-        identifier: :primary,
-        readonly: true
-      },
-
-      name: {
-        class: :string,
-        readonly: true
-      }
-
-    }.freeze
-    parse_object_model
-
-    # Constructor
-    #####################################
-
-    # Make a new reference to an API CollectionResource Object
-    #
-    # The data parameter can be one of:
-    #
-    # 1) A Hash with an :id and :name
-    #    This is mostly used automatically when parsing fetched API data.
-    #    When some attribute of an OBJECT_MODEL has `class: Someclass::Reference`
-    #    the JSON hash from the API will be passed as the data param.
-    #
-    #    e.g.
-    #    - Policy::OBJECT_MODEL[:category][:class] is Jamf::Category::Reference
-    #    - the policy JSON from the api might contain `category: { id: 234, name: 'foobar' }`
-    #    - that hash will be passed into Jamf::Category::Reference.new, and the
-    #      resulting instance used as the value of the  policy's :category attribute.
-    #
-    # 2) An instance of the REFERENT_CLASS.
-    #   This can be used to make a reference to some specific instance of
-    #   the referent class.
-    #
-    #   e.g. if you have an instance of Category in the variable `my_cat`
-    #   then `ref_to_my_cat = Category::Reference.new my_cat` will work as
-    #   expected.
-    #
-    # 3) A valid identifier for an existing REFERENT_CLASS in the JSS.
-    #    The given value will be used with the REFERENT_CLASS's .valid_id method
-    #    to see if there's a matching instance, which the reference refers to.
-    #
-    #    e.g. `ref_to_my_cat = Category::Reference.new 12` creates a reference
-    #    to Category id 12, and `ref_to_my_cat = Category::Reference.new 'foo'`
-    #    creates a reference to the category named 'foo' - assuming they exist.
-    #
-    # The last two of these are commonly used with setters for attributes that
-    # have class: <some reference class>
-    #
-    # e.g. setting the category of a policy when
-    # Policy::OBJECT_MODEL[:category] is Category::Reference
-    #
-    #   `mypolicy.category = a_cat` # a_cat is a Category instance
-    #   `mypolicy.category = 12`    # use categoty id 12
-    #   `mypolicy.category = 'foo'` # use categoty named 'foo'
-    #
-    #
-    #
-    # @param data[Hash,CollectionResource,String,Integer]
-    #
-    def initialize(data, cnx: Jamf.cnx)
-      ref_class = self.class::REFERENT_CLASS
-      case data
-      when Hash
-        super
-      when ref_class
-        raise Jamf::InvalidDataError, "Provided #{ref_class} hasn't been created" unless data.exist?
-        @id = data.id
-        @name = data.name if data.respond_to? :name
-        @cnx = data.cnx
-      when nil
-        @id = nil
-        @name = nil
-        @cnx = cnx
-      else
-        @id = ref_class.valid_id data, cnx: cnx
-        raise "No matching #{ref_class}" unless @id
-        @name = ref_class.map_all(:id, to: :name, cnx: cnx)[@id]
-      end
-    end
-
-    def to_jamf
-      return nil if @id.nil?
-      { id: @id }
-    end
-
-  end # class
-
-end # module

data/lib/jamf/api/abstract_classes/prestage_skip_setup_items.rb

@@ -1,147 +0,0 @@
-# Copyright 2020 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.
-#
-#
-
-# The module
-module Jamf
-
-  # A class that represents the 'Skip' settings for
-  # various Setup options in a DEP prestage
-  # The object model here includes the attributes common
-  # to both Computer and MobileDevice prestages
-  #
-  # To see the current list of settings that are common
-  # to both Computers and MobileDevices, run this in irb:
-  #
-  # Jamf::ComputerPrestage.all.sample[:skipSetupItems].keys & Jamf::MobileDevicePrestage.all.sample[:skipSetupItems].keys
-  #
-  #   => [
-  # :Appearance,
-  # :AppleID,
-  # :Biometric,
-  # :Diagnostics,
-  # :DisplayTone,
-  # :Location,
-  # :Payment,
-  # :Privacy,
-  # :Restore,
-  # :ScreenTime,
-  # :Siri,
-  # :TOS
-  #     ]
-  #
-  class PrestageSkipSetupItems < Jamf::JSONObject
-
-    extend Jamf::Abstract
-
-    OBJECT_MODEL = {
-
-      # @!attribute Appearance
-      #   @return [Boolean]
-      Appearance: {
-        class: :boolean,
-        aliases: %i[appearance]
-      },
-
-      # @!attribute AppleID
-      #   @return [Boolean]
-      AppleID: {
-        class: :boolean,
-        aliases: %i[appleID appleid apple_id]
-      },
-
-      # @!attribute Biometric
-      #   @return [Boolean]
-      Biometric: {
-        class: :boolean,
-        aliases: %i[biometric]
-      },
-
-      # @!attribute Diagnostics
-      #   @return [Boolean]
-      Diagnostics: {
-        class: :boolean,
-        aliases: %i[diagnostics]
-      },
-
-      # @!attribute DisplayTone
-      #   @return [Boolean]
-      DisplayTone: {
-        class: :boolean,
-        aliases: %i[displaytone display_tone]
-      },
-
-      # @!attribute Location
-      #   @return [Boolean]
-      Location: {
-        class: :boolean,
-        aliases: %i[location]
-      },
-
-      # @!attribute Payment
-      #   @return [Boolean]
-      Payment: {
-        class: :boolean,
-        aliases: %i[payment]
-      },
-
-      # @!attribute Privacy
-      #   @return [Boolean]
-      Privacy: {
-        class: :boolean,
-        aliases: %i[privacy]
-      },
-
-      # @!attribute Restore
-      #   @return [Boolean]
-      Restore: {
-        class: :boolean,
-        aliases: %i[restore]
-      },
-
-      # @!attribute ScreenTime
-      #   @return [Boolean]
-      ScreenTime: {
-        class: :boolean,
-        aliases: %i[screenTime screentime]
-      },
-
-      # @!attribute Siri
-      #   @return [Boolean]
-      Siri: {
-        class: :boolean,
-        aliases: %i[siri]
-      },
-
-      # @!attribute TOS
-      #   @return [Boolean]
-      TOS: {
-        class: :boolean,
-        aliases: %i[tos terms_of_service]
-      }
-    }.freeze
-
-  end # class location
-
-end # module