ruby-jss 1.2.4a2 → 1.2.4a3

data/lib/jamf/api/resources/collection_resources/inventory_preload_record.rb

@@ -68,7 +68,6 @@ module Jamf
     # The 'clear' instance method won't change these attrs
     UNCLEARABLE_ATTRS = %i[id serialNumber deviceType].freeze
 
-
     # Object Model / Attributes
     # See APIObject class documentation for details
     # of how the OBJECT_MODEL hash works.
@@ -224,7 +223,8 @@ module Jamf
       #   @return [Jamf::InventoryPreloadExtensionAttribute]
       extensionAttributes: {
         class: Jamf::InventoryPreloadExtensionAttribute,
-        multi: true
+        multi: true,
+        aliases: %i[ext_attrs eas]
       }
 
     }.freeze
@@ -232,7 +232,7 @@ module Jamf
     parse_object_model
 
     # TODO: validation for ea's existance and value data type, once EAs are
-    # implemented in JPAPI
+    # implemented in JPAPI (see inventory_preload_extension_attribute.rb)
     #
     # @param ea_name[String] The name of the EA being set
     #
@@ -256,15 +256,15 @@ module Jamf
       OBJECT_MODEL.keys.each do |attr|
         next if UNCLEARABLE_ATTRS.include? attr
 
-        # skip nils
-        curr_val = send attr
-        next unless curr_val
-
         if attr == :extensionAttributes
           extensionAttributes = []
           next
         end
 
+        # skip nils
+        curr_val = send attr
+        next unless curr_val
+
         send "#{attr}=", nil
       end
     end

data/lib/jamf/api/resources/collection_resources/{md_prestage.rb → mobile_device_prestage.rb}

@@ -106,17 +106,18 @@ module Jamf
       names: {
         class: Jamf::MobileDevicePrestageNames
       }
-
     ).freeze
 
     parse_object_model
 
+    # Class Methods
+    ###############################################
 
     def self.sync_status(prestage = nil, latest = false, cnx: Jamf.cnx)
       @sync_rsrc ||= "#{self::RSRC_VERSION}/#{self::RSRC_PATH}/#{SYNC_RSRC}"
 
       if prestage
-        id = self.valid_id prestage
+        id = valid_id prestage
         raise Jamf::NoSuchItemError, "No #{self.class} matching '#{prestage}'" unless id
 
         rsrc = "#{@sync_rsrc}/#{id}"
@@ -126,9 +127,10 @@ module Jamf
       else
         cnx.get(@sync_rsrc).map { |ss| Jamf::PrestageSyncStatus.new ss }
       end
-
     end # self.sync_status(prestage = nil, latest = false, cnx: Jamf.cnx)
 
+    # Instance Methods
+    ###############################################
 
     def sync_status(latest = false)
       self.class.sync_status @id, latest, cnx: @cnx

data/lib/jamf/exceptions.rb

@@ -89,6 +89,11 @@ module Jamf
   #
   class ConflictError < RuntimeError; end
 
+  # A 409 error specifically raised when a Lockable resource
+  # has changed between fetching and saving.
+  # See the Jamf::Lockable mixin.
+  class VersionLockError < ConflictError; end
+
   # BadRequestError - raise this when
   # attempts to PUT or PUSH or DELETE to the API
   # result in a 400 Bad Request http error.

data/lib/jamf/ruby_extensions/array/utils.rb

@@ -27,18 +27,32 @@ module JamfRubyExtensions
 
     module Utils
 
-        # Fetch a string from an Array of Strings case-insensitively,
-        # e.g. my_array.j_ci_fetch_string('ThRashEer') will return 'thrasher'
-        # or nil if no match
-        #
-        # @param somestring [String] the String to search for
-        #
-        # @return [String, nil] The matching string as it exists in the Array, nil if it doesn't exist
-        #
-        def j_ci_fetch_string(somestring)
-          idx = index { |s| s.to_s.casecmp? somestring }
-          idx ? self[idx] : nil
-        end
+      # Fetch a string from an Array case-insensitively,
+      # e.g. if my_array contains 'thrasher',
+      #    my_array.j_ci_fetch('ThRashEr')
+      # will return 'thrasher'
+      #
+      # returns nil if no match
+      #
+      # @param somestring [String] the String to search for
+      #
+      # @return [String, nil] The matching string as it exists in the Array,
+      #   nil if it doesn't exist
+      #
+      def j_ci_fetch(somestring)
+        each { |s| return s if s.is_a?(String) && s.casecmp?(somestring) }
+        nil
+      end
+
+      # case-insensitive version of include?
+      #
+      # @param somestring [String] the String to search for
+      #
+      # @return [Boolean]
+      #
+      def j_ci_include?(somestring)
+        any? { |s| s.casecmp? somestring if s.is_a? String }
+      end
 
     end # module
 

data/lib/jamf/version.rb

@@ -27,6 +27,6 @@
 module Jamf
 
   ### The version of the Jamf module
-  VERSION = '0.0.0a2'.freeze
+  VERSION = '0.0.0a3'.freeze
 
 end # module

data/lib/jss/api_object/criteriable/criterion.rb

@@ -68,7 +68,6 @@ module JSS
         'more than',
         'less than',
         'greater than',
-        'less than',
         'greater than or equal',
         'less than or equal',
         'before (yyyy-mm-dd)',

data/lib/jss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.2.4a2
+  version: 1.2.4a3
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -147,6 +147,7 @@ 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
@@ -168,6 +169,9 @@ files:
 - 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_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
@@ -200,15 +204,18 @@ files:
 - 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/md_prestage.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