ruby-jss 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ab060337594e885ff2fd1022848c5b6fea4ad442a8f531681cf6b347cc8dc4
-  data.tar.gz: 3bcc0b2eca1c2a650295489d2612bdf42c4fadfd0d5a16aa082c6148aefe8100
+  metadata.gz: 83836b3e036658c6254365b47fe0d2b00b03dd3e75e42cd80f27ba29988d6b3b
+  data.tar.gz: 2e5b73fd7fd6f76f474170cc40165a156b79e37e96807fcfad0ee987e5df8018
 SHA512:
-  metadata.gz: f5895079a629e1cae9c3e5fb41ec4a3c5b36fbd3da4d030f600df9b5d6acc9c5edb2231bc0556e5409aa0bfc6895826a474b91d4d2c484a0382b6863d0ff202f
-  data.tar.gz: 77fad42135aa6c91ee95f10bafe8815ac7a738b1aa37280ea275ab9fd6167ec28b994e5a2d5586e99e448c83e62aa3c1a7b1914934f183af5a8366efd0f4936d
+  metadata.gz: fbf7ba2137f3de2a8aaff77c8c53f84086913f6ee154345d3419e94e874422116405d04ab1448c254a09e1375a734738050f07738d860245dc629f8a157c96d8
+  data.tar.gz: 4480768a24e0cd1372f35bafcce1d2effe646e09da4ee44bf195deff2451f46d946c94c8c34aa0ecb74dd5177ad274f4c7f9c7e0c60abf1fe0da55b1271d0b00

data/CHANGES.md

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## \[1.2.2] - 2019-10-31
+### Added
+- the ManagementHistory mixin module used by the Computer and MobileDevice classes, now has a `last_mdm_contact` class and instance method, which returns a Time object for the timestamp of the most recent completed MDM command. This is useful for MobileDevices, which don't have anything like the `last_checkin` value for comptuers, indicating real communication between the device and Jamf Pro.
+Note that the `last_inventory_update` value does NOT indicate such communication, since that timestamp is updated when values are changed via the API
+
+- All APIObject Subclasses (Policy, Computer, MobileDevice, ComputerGroup, etc..) now have `get_raw`, `post_raw` & `put_raw` class methods, which are simpler wrappers for APIConnection#get_rsrc, #post_rsrc, and #put_rsrc.
+  - `get_raw`  takes an object's id, and returns the 'raw' JSON (parsed into a ruby Hash with symbolized keys) or a REXML::Document (from which you'll probably want to use the `root` element). If you pass `as_string: true` you'll get the un-parsed JSON or XML string directly from the API
+  This can be useful when you need to retrieve the full object, to get some data not available in the summary-list, but instantiating the full ruby class is too slow.
+  - `post_raw` & `put_raw` can send raw XML to the API without instantiating objects. In some cases, where you're making simple changes to simple XML, this can be faster than fetching a full instance and the re-saving it.
+  WARNING You must create or acquire the XML to be sent, and no validation will be performed on it. It must be a String of XML, or something that returns such a string with #to_s, such as a REXML::Document, or a REXML::Element.
+
+- APIConnection#get_rsrc now takes the boolean raw_json: parameter (defaults to false). If true, the raw JSON string is
+  returned, not parsed into a Hash. When requesting XML, it already comes as a string.
+
+- ExtensionAttribute#attribute_mapping getter & setter for EAs that have the 'LDAP Attribute Mapping' input type.
+
+### Fixed
+- DB_CNX.valid_server? now specifies utf8 charset, needed for newer versions of mysql.
+
+### Changed
+- Cleaned up and modernized ExtensionAttribute and its subclasses. Marked a few things as deprecated: recon_display, scripting_language, and platform, all in ComputerExtensionAttribute.
+- Better error message when using `APIObject.fetch :random` on a subclass with no objects
+
 ## \[1.2.0] - 2019-10-17
 ### Added
 - APIConnection#flushcache can be used to flush all cached data, or just for specific APIObject lists or ExtensionAttribute definitions. This is now used more often throughout ruby-jss.

data/lib/jss/api_connection.rb

@@ -327,6 +327,9 @@ module JSS
     # These classes are extendable, and may need cache flushing for EA definitions
     EXTENDABLE_CLASSES = [JSS::Computer, JSS::MobileDevice, JSS::User].freeze
 
+    # values for the format param of get_rsrc
+    GET_FORMATS = %i[json xml].freeze
+
     # Attributes
     #####################################
 
@@ -546,36 +549,40 @@ module JSS
     # after the 'JSSResource/' ) The resource must be properly URL escaped
     # beforehand. Note: URL.encode is deprecated, use CGI.escape
     #
-    # By default we get the data in JSON, and parse it
-    # into a ruby data structure (arrays, hashes, strings, etc)
+    # By default we get the data in JSON, and parse it into a ruby Hash
     # with symbolized Hash keys.
     #
+    # If the second parameter is :xml then the XML version is retrieved and
+    # returned as a String.
+    #
+    # To get the raw JSON string as it comes from the API, pass raw_json: true
+    #
     # @param rsrc[String] the resource to get
     #   (the part of the API url after the 'JSSResource/' )
     #
     # @param format[Symbol] either ;json or :xml
-    #  If the second argument is :xml, the XML data is returned as a String.
+    #   If the second argument is :xml, the XML data is returned as a String.
+    #
+    # @param raw_json[Boolean] When GETting JSON, return the raw unparsed string
+    #   (the XML is always returned as a raw string)
     #
     # @return [Hash,String] the result of the get
     #
-    def get_rsrc(rsrc, format = :json)
-      # puts object_id
+    def get_rsrc(rsrc, format = :json, raw_json: false)
       validate_connected
-
-      raise JSS::InvalidDataError, 'format must be :json or :xml' unless %i[json xml].include? format
+      raise JSS::InvalidDataError, 'format must be :json or :xml' unless GET_FORMATS.include? format
 
       begin
         @last_http_response = @cnx[rsrc].get(accept: format)
+        return JSON.parse(@last_http_response.body, symbolize_names: true) if format == :json && !raw_json
+
         @last_http_response.body
       rescue RestClient::ExceptionWithResponse => e
         handle_http_error e
       end
-      # TODO: make sure we're returning the String version of the
-      # response (i.e. its body) here and in POST, PUT, DELETE.
-      format == :json ? JSON.parse(@last_http_response, symbolize_names: true) : @last_http_response
     end
 
-    # Change an existing JSS resource
+    # Update an existing JSS resource
     #
     # @param rsrc[String] the API resource being changed, the URL part after 'JSSResource/'
     #
@@ -1219,7 +1226,7 @@ module JSS
         raise exception
       when RestClient::Conflict
         err = JSS::ConflictError
-        msg_matcher = /<p>Error:(.*)(<|$)/m
+        msg_matcher = /<p>Error:(.*?)(<|$)/m
       when RestClient::BadRequest
         err = JSS::BadRequestError
         msg_matcher = %r{>Bad Request</p>\n<p>(.*?)</p>\n<p>You can get technical detail}m
@@ -1227,7 +1234,7 @@ module JSS
         raise
       else
         err = JSS::APIRequestError
-        msg_matcher = %r{<body.*?>(.*)</body>}m
+        msg_matcher = %r{<body.*?>(.*?)</body>}m
       end
       exception.http_body =~ msg_matcher
       msg = Regexp.last_match(1)

data/lib/jss/api_object.rb

@@ -809,7 +809,12 @@ module JSS
       end
 
       # a random object?
-      return new id: all.sample[:id], api: api if searchterm == :random
+      if searchterm == :random
+        rnd_thing = all.sample
+        raise JSS::NoSuchItemError, "No #{self::RSRC_LIST_KEY} found" unless rnd_thing
+
+        return new id: rnd_thing[:id], api: api
+      end
 
       # get the lookup key and value, if given
       fetch_key, fetch_val = args.to_a.first
@@ -851,6 +856,105 @@ module JSS
       end
     end # fetch
 
+    # Fetch the mostly- or fully-raw JSON or XML data for an object of this
+    # subclass.
+    #
+    # By default, returns the JSON data parsed into a Hash.
+    #
+    # When format: is anything but :json, returns the XML data parsed into
+    # a REXML::Document
+    #
+    # When as_string: is truthy, returns an unparsed JSON String (or XML String
+    # if format: is not :json) as it comes directly from the API.
+    #
+    # When fetching raw JSON, the returned Hash will have its keys symbolized.
+    #
+    # This can be substantialy faster than instantiating, especially when you don't need
+    # all the ruby goodness of a full instance, but just want a few values for
+    # an object that aren't available in the `all` data
+    #
+    # This is really just a wrapper around {APIConnection.get_rsrc} that
+    # automatically fills in the RSRC::BASE value for you.
+    #
+    # @param id [Integer] the id of the object to fetch
+    #
+    # @param format[Symbol] :json or :xml, defaults to :json
+    #
+    # @param as_string[Boolean] return the raw JSON or XML string as it comes
+    #   from the API, do not parse into a Hash or REXML::Document
+    #
+    # @param api[JSS::APIConnection] the connection thru which to fetch this
+    #   object. Defaults to the deault API connection in JSS.api
+    #
+    # @return [Hash, REXML::Document, String] the raw data for the object
+    #
+    def self.get_raw(id, format: :json, as_string: false, api: JSS.api)
+      validate_not_metaclass(self)
+      rsrc = "#{self::RSRC_BASE}/id/#{id}"
+      data = api.get_rsrc rsrc, format, raw_json: as_string
+      return data if format == :json || as_string
+
+      REXML::Document.new(data)
+    rescue RestClient::NotFound
+      raise JSS::NoSuchItemError, "No #{self} with id #{id}"
+    end
+
+    # PUT some raw XML to the API for a given id in this subclass.
+    #
+    # WARNING: You must create or acquire the XML to be sent, and no validation
+    # will be performed on it. It must be a String, or something that returns
+    # an XML string with #to_s, such as a REXML::Document, or
+    # a REXML::Element.
+    #
+    # In some cases, where you're making simple changes to simple XML,
+    # this can be faster than fetching a full instance and the re-saving it.
+    #
+    # This is really just a wrapper around {APIConnection.put_rsrc} that
+    # automatically fills in the RSRC::BASE value for you.
+    #
+    # @param id [Integer] the id of the object to PUT
+    #
+    # @param xml [String, #to_s] The XML to send
+    #
+    # @param api[JSS::APIConnection] the connection thru which to fetch this
+    #   object. Defaults to the deault API connection in JSS.api
+    #
+    # @return [REXML::Document] the XML response from the API
+    #
+    def self.put_raw(id, xml, api: JSS.api)
+      validate_not_metaclass(self)
+      rsrc = "#{self::RSRC_BASE}/id/#{id}"
+      REXML::Document.new(api.put_rsrc rsrc, xml.to_s)
+    rescue RestClient::NotFound
+      raise JSS::NoSuchItemError, "No #{self} with id #{id}"
+    end
+
+    # POST some raw XML to the API for a given id in this subclass.
+    #
+    # WARNING: You must create or acquire the XML to be sent, and no validation
+    # will be performed on it. It must be a String, or something that returns
+    # an XML string with #to_s, such as a REXML::Document, or
+    # a REXML::Element.
+    #
+    # This probably isn't as much of a speed gain as get_raw or put_raw, as
+    # opposed to instantiating a ruby object, but might still be useful.
+    #
+    # This is really just a wrapper around {APIConnection.post_rsrc} that
+    # automatically fills in the RSRC::BASE value for you.
+    #
+    # @param xml [String, #to_s] The XML to send
+    #
+    # @param api[JSS::APIConnection] the connection thru which to fetch this
+    #   object. Defaults to the deault API connection in JSS.api
+    #
+    # @return [REXML::Document] the XML response from the API
+    #
+    def self.post_raw( xml, api: JSS.api)
+      validate_not_metaclass(self)
+      rsrc = "#{self::RSRC_BASE}/id/-1"
+      REXML::Document.new(api.post_rsrc rsrc, xml.to_s)
+    end
+
     # Make a ruby instance of a not-yet-existing APIObject.
     #
     # This is how to create new objects in the JSS. A name: must be provided,

data/lib/jss/api_object/extension_attribute.rb

@@ -20,10 +20,7 @@
 #    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
 
   # Classes
@@ -89,20 +86,33 @@ module JSS
     INPUT_TYPE_SCRIPT = 'script'.freeze
     INPUT_TYPE_LDAP = 'LDAP Attribute Mapping'.freeze
 
-    INPUT_TYPES = [INPUT_TYPE_FIELD, INPUT_TYPE_POPUP, INPUT_TYPE_SCRIPT, INPUT_TYPE_LDAP].freeze
+    INPUT_TYPES = [
+      INPUT_TYPE_FIELD,
+      INPUT_TYPE_POPUP,
+      INPUT_TYPE_SCRIPT,
+      INPUT_TYPE_LDAP
+    ].freeze
+
     DEFAULT_INPUT_TYPE = INPUT_TYPE_FIELD
 
     # Where can it be displayed in the WebApp?
-    # subclasses can add to this list
+    WEB_DISPLAY_CHOICE_GENERAL = 'General'.freeze
+    WEB_DISPLAY_CHOICE_OS = 'Operating System'.freeze
+    WEB_DISPLAY_CHOICE_HW = 'Hardware'.freeze
+    WEB_DISPLAY_CHOICE_USER_LOC = 'User and Location'.freeze
+    WEB_DISPLAY_CHOICE_PURCHASING = 'Purchasing'.freeze
+    WEB_DISPLAY_CHOICE_EAS = 'Extension Attributes'.freeze
+
     WEB_DISPLAY_CHOICES = [
-      'General',
-      'Operating System',
-      'Hardware',
-      'User and Location',
-      'Purchasing',
-      'Extension Attributes'
+      WEB_DISPLAY_CHOICE_GENERAL,
+      WEB_DISPLAY_CHOICE_OS,
+      WEB_DISPLAY_CHOICE_HW,
+      WEB_DISPLAY_CHOICE_USER_LOC,
+      WEB_DISPLAY_CHOICE_PURCHASING,
+      WEB_DISPLAY_CHOICE_EAS
     ].freeze
-    DEFAULT_WEB_DISPLAY_CHOICE = 'Extension Attributes'.freeze
+
+    DEFAULT_WEB_DISPLAY_CHOICE = WEB_DISPLAY_CHOICE_EAS
 
     LAST_RECON_FIELD = 'Last Inventory Update'.freeze
     LAST_RECON_FIELD_SYM = LAST_RECON_FIELD.tr(' ', '_').to_sym
@@ -117,6 +127,7 @@ module JSS
 
     # @return [String] description of the ext attrib
     attr_reader :description
+    alias desc description
 
     # @return [String] the type of data created by the EA. Must be one of DATA_TYPES
     attr_reader :data_type
@@ -127,14 +138,15 @@ module JSS
     # @return [Array<String>] the choices available in the UI when the @input_type is "Pop-up Menu"
     attr_reader :popup_choices
 
+    # @return [String] the LDAP attribute for the User's ldap entry that maps to this EA, when input type is INPUT_TYPE_LDAP
+    attr_reader :attribute_mapping
+
     # @return [String] In which part of the web UI does the data appear?
     attr_reader :web_display
 
-
     # Constructor
     ###################################
 
-
     # @see JSS::APIObject#initialize
     #
     def initialize(args = {})
@@ -142,19 +154,30 @@ module JSS
 
       # @init_data now has the raw data
       # so fill in our attributes or set defaults
-
       @description = @init_data[:description]
       @data_type = @init_data[:data_type] || DEFAULT_DATA_TYPE
-      @web_display = @init_data[:inventory_display] || DEFAULT_WEB_DISPLAY_CHOICE
 
       if @init_data[:input_type]
-        @input_type = @init_data[:input_type][:type] || DEFAULT_INPUT_TYPE
+        @input_type = @init_data[:input_type][:type]
+
+        @script = @init_data[:input_type][:script]
+
+        @attribute_mapping = @init_data[:input_type][:attribute_mapping]
         @popup_choices = @init_data[:input_type][:popup_choices]
         # popups can always contain blank
         @popup_choices << JSS::BLANK if @popup_choices
-      else
-        @input_type = DEFAULT_INPUT_TYPE
+
+        # These two are deprecated - windows won't be supported for long
+        @platform = @init_data[:input_type][:platform]
+        @scripting_language = @init_data[:input_type][:scripting_language]
       end
+      @input_type ||= DEFAULT_INPUT_TYPE
+
+      @enabled = @init_data[:enabled]
+
+      @web_display = @init_data[:inventory_display] || DEFAULT_WEB_DISPLAY_CHOICE
+      # deprecated - no longer in the UI
+      @recon_display = @init_data[:recon_display] || @web_display
 
       # the name of the EA might have spaces and caps, which the will come to us as symbols with the spaces
       # as underscores, like this.
@@ -167,19 +190,16 @@ module JSS
     # @see JSS::Creatable#create
     #
     def create
-      if @input_type == INPUT_TYPE_POPUP
-        raise MissingDataError, 'No popup_choices set for Pop-up Menu input_type.' unless @popup_choices.is_a?(Array) && !@popup_choices.empty?
-      end
+      validate_for_save
       super
     end
 
     # @see JSS::Updatable#update
     #
     def update
-      if @input_type == INPUT_TYPE_POPUP
-        raise MissingDataError, 'No popup_choices set for Pop-up Menu input_type.' unless @popup_choices.is_a?(Array) && !@popup_choices.empty?
-      end
+      validate_for_save
       super
+      # this flushes the cached EA itself, used for validating ea values.
       @api.flushcache self.class
     end
 
@@ -222,10 +242,12 @@ module JSS
     # @return [void]
     #
     def description=(new_val)
-      return nil if @description == new_val
+      new_val = new_val.to_s
+      return if @description == new_val
+
       @description = new_val
       @need_to_update = true
-    end #  name=(newname)
+    end # name=(newname)
 
     # Change the data type of this EA
     #
@@ -234,24 +256,28 @@ module JSS
     # @return [void]
     #
     def data_type=(new_val)
-      return nil if @data_type == new_val
+      return if @data_type == new_val
       raise JSS::InvalidDataError, "data_type must be a string, one of: '#{DATA_TYPES.join("', '")}'" unless DATA_TYPES.include? new_val
+
       @data_type = new_val
       @need_to_update = true
-    end #
+    end
 
     # Change the inventory_display of this EA
     #
-    # @param new_val[String] the new value, which must be a member of INVENTORY_DISPLAY_CHOICES
+    # @param new_val[String] the new value, which must be a member of WEB_DISPLAY_CHOICES
     #
     # @return [void]
     #
     def web_display=(new_val)
-      return nil if @web_display == new_val
-      raise JSS::InvalidDataError, "inventory_display must be a string, one of: #{INVENTORY_DISPLAY_CHOICES.join(', ')}" unless WEB_DISPLAY_CHOICES.include? new_val
+      return if @web_display == new_val
+      unless WEB_DISPLAY_CHOICES.include? new_val
+        raise JSS::InvalidDataError, "inventory_display must be a string, one of: #{WEB_DISPLAY_CHOICES.join(', ')}"
+      end
+
       @web_display = new_val
       @need_to_update = true
-    end #
+    end
 
     # Change the input type of this EA
     #
@@ -260,17 +286,39 @@ module JSS
     # @return [void]
     #
     def input_type=(new_val)
-      return nil if @input_type == new_val
+      return if @input_type == new_val
       raise JSS::InvalidDataError, "input_type must be a string, one of: #{INPUT_TYPES.join(', ')}" unless INPUT_TYPES.include? new_val
+
       @input_type = new_val
-      @popup_choices = nil if @input_type == INPUT_TYPE_FIELD
+      case @input_type
+      when INPUT_TYPE_FIELD
+        @script = nil
+        @scripting_language = nil
+        @platform = nil
+        @popup_choices = nil
+        @attribute_mapping = nil
+      when INPUT_TYPE_POPUP
+        @script = nil
+        @scripting_language = nil
+        @platform = nil
+        @attribute_mapping = nil
+      when INPUT_TYPE_SCRIPT
+        @popup_choices = nil
+        @attribute_mapping = nil
+      when INPUT_TYPE_LDAP
+        @script = nil
+        @scripting_language = nil
+        @platform = nil
+        @popup_choices = nil
+      end # case
+
       @need_to_update = true
-    end #
+    end
 
     # Change the Popup Choices of this EA
     # New value must be an Array, the items will be converted to Strings.
     #
-    # This automatically sets input_type to "Pop-up Menu"
+    # This automatically sets input_type to INPUT_TYPE_POPUP
     #
     # Values are checked to ensure they match the @data_type
     # Note, Dates must be in the format "YYYY-MM-DD hh:mm:ss"
@@ -280,7 +328,7 @@ module JSS
     # @return [void]
     #
     def popup_choices=(new_val)
-      return nil if @popup_choices == new_val
+      return if @popup_choices == new_val
       raise JSS::InvalidDataError, 'popup_choices must be an Array' unless new_val.is_a?(Array)
 
       # convert each one to a String,
@@ -295,10 +343,29 @@ module JSS
         end
         v
       end
+
       self.input_type = INPUT_TYPE_POPUP
       @popup_choices = new_val
       @need_to_update = true
-    end #
+    end
+
+    # Change the LDAP Attribute Mapping of this EA
+    # New value must be a String, or respond correctly to #to_s
+    #
+    # This automatically sets input_type to INPUT_TYPE_LDAP
+    #
+    # @param new_val[String, #to_s] the new value
+    #
+    # @return [void]
+    #
+    def attribute_mapping=(new_mapping)
+      new_mapping = JSS::Validate.non_empty_string new_mapping.to_s
+      return if new_mapping == @attribute_mapping
+
+      self.input_type = INPUT_TYPE_LDAP
+      @attribute_mapping = new_mapping
+      @need_to_update = true
+    end
 
     # Get an Array of Hashes for all inventory objects
     # with a desired result in their latest report for this EA.
@@ -322,7 +389,10 @@ module JSS
     #
     def all_with_result(search_type, desired_value)
       raise JSS::NoSuchItemError, "EA Not In JSS! Use #create to create this #{self.class::RSRC_OBJECT_KEY}." unless @in_jss
-      raise JSS::InvalidDataError, 'Invalid search_type, see JSS::Criteriable::Criterion::SEARCH_TYPES' unless JSS::Criteriable::Criterion::SEARCH_TYPES.include? search_type.to_s
+      unless JSS::Criteriable::Criterion::SEARCH_TYPES.include? search_type.to_s
+        raise JSS::InvalidDataError, 'Invalid search_type, see JSS::Criteriable::Criterion::SEARCH_TYPES'
+      end
+
       begin
         search_class = self.class::TARGET_CLASS::SEARCH_CLASS
         acs = search_class.make api: @api, name: "ruby-jss-EA-result-search-#{Time.now.to_jss_epoch}"
@@ -335,13 +405,14 @@ module JSS
         results = []
 
         acs.search_results.each do |i|
-          value = case @data_type
-                  when 'Date' then JSS.parse_datetime i[@symbolized_name]
-                  when 'Integer' then i[@symbolized_name].to_i
-                  else i[@symbolized_name]
-          end # case
+          value =
+            case @data_type
+            when 'Date' then JSS.parse_datetime i[@symbolized_name]
+            when 'Integer' then i[@symbolized_name].to_i
+            else i[@symbolized_name]
+            end # case
           results << { id: i[:id], name: i[:name], value: value }
-        end
+        end # each
       ensure
         acs.delete if acs.is_a? self.class::TARGET_CLASS::SEARCH_CLASS
       end
@@ -375,6 +446,7 @@ module JSS
     #
     def latest_values
       raise JSS::NoSuchItemError, "EA Not In JSS! Use #create to create this #{self.class::RSRC_OBJECT_KEY}." unless @in_jss
+
       tmp_advsrch = "ruby-jss-EA-latest-search-#{Time.now.to_jss_epoch}"
 
       begin
@@ -391,11 +463,12 @@ module JSS
         results = []
 
         acs.search_results.each do |i|
-          value = case @data_type
-                  when 'Date' then JSS.parse_datetime i[@symbolized_name]
-                  when 'Integer' then i[@symbolized_name].to_i
-                  else i[@symbolized_name]
-          end # case
+          value =
+            case @data_type
+            when 'Date' then JSS.parse_datetime i[@symbolized_name]
+            when 'Integer' then i[@symbolized_name].to_i
+            else i[@symbolized_name]
+            end # case
 
           as_of = Time.parse(i[LAST_RECON_FIELD_SYM]) if i[LAST_RECON_FIELD_SYM] != ''
 
@@ -404,42 +477,66 @@ module JSS
       ensure
         if defined? acs
           acs.delete if acs
-        else
-          search_class.fetch(name: tmp_advsrch, api: @api).delete if search_class.all_names(:refresh, api: @api).include? tmp_advsrch
+        elsif search_class.all_names(:refresh, api: @api).include? tmp_advsrch
+          search_class.fetch(name: tmp_advsrch, api: @api).delete
         end
       end
 
       results
     end
 
-    # aliases
-
-    alias desc description
-
     # Private Instance Methods
     ###################
 
     private
 
-    #
-    # Return a REXML object for this ext attr, with the current values.
-    # Subclasses should augment this in their rest_xml methods
-    # then return it .to_s, for saving or updating
-    #
-    def rest_rexml
+    # make sure things are OK for saving to Jamf
+    def validate_for_save
+      case @input_type
+      when INPUT_TYPE_POPUP
+        raise MissingDataError, "No popup_choices set for input type: #{INPUT_TYPE_POPUP}" unless @popup_choices.is_a?(Array) && !@popup_choices.empty?
+      when INPUT_TYPE_LDAP
+        raise MissingDataError, "No attribute_mapping set for input type: #{INPUT_TYPE_LDAP}" if @attribute_mapping.to_s.empty?
+      when INPUT_TYPE_SCRIPT
+        raise MissingDataError, "No script set for input_type: #{INPUT_TYPE_SCRIPT}" unless @script
+
+        # Next two lines DEPRECATED
+        @platform ||= 'Mac'
+        raise MissingDataError, "No scripting_language set for Windows '#{INPUT_TYPE_SCRIPT}' input_type." if @platform == 'Windows' && !@scripting_language
+      end
+    end
+
+    # Return a REXML doc string for this ext attr, with the current values.
+    def rest_xml
       ea = REXML::Element.new self.class::RSRC_OBJECT_KEY.to_s
       ea.add_element('name').text = @name
-      ea.add_element('description').text = @description
+      ea.add_element('description').text = @description if @description
       ea.add_element('data_type').text = @data_type
-      ea.add_element('inventory_display').text = @web_display
+
+      unless self.class == JSS::UserExtensionAttribute
+        ea.add_element('inventory_display').text = @web_display if @web_display
+        ea.add_element('recon_display').text = @recon_display if @recon_display
+      end
 
       it = ea.add_element('input_type')
       it.add_element('type').text = @input_type
-      if @input_type == 'Pop-up Menu'
+
+      case @input_type
+      when INPUT_TYPE_POPUP
         pcs = it.add_element('popup_choices')
-        @popup_choices.each { |pc| pcs.add_element('choice').text = pc }
+        @popup_choices.each { |pc| pcs.add_element('choice').text = pc } if @popup_choices.is_a? Array
+      when INPUT_TYPE_LDAP
+        it.add_element('attribute_mapping').text = @attribute_mapping
+      when INPUT_TYPE_SCRIPT
+        ea.add_element('enabled').text = @enabled ? 'true' : 'false'
+        it.add_element('script').text = @script
+        it.add_element('platform').text = @platform || 'Mac'
+        it.add_element('scripting_language').text = @scripting_language if @scripting_language
       end
-      ea
+
+      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc << ea
+      doc.to_s
     end # rest xml
 
   end # class ExtAttrib