ruby-jss 0.7.0 → 0.8.1

data/lib/jss/api_object/categorizable.rb

@@ -0,0 +1,221 @@
+### Copyright 2017 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
+
+  # Module Variables
+  #####################################
+
+  # Module Methods
+  #####################################
+
+  # Classes
+  #####################################
+
+  # A mix-in module that centralizes the code for handling objects which can be
+  # assigned a 'category' in the JSS.
+  #
+  # Objects in the JSS present category data in two different ways:
+  #
+  # 1) An 'old' style, where the top-level Hash of the API data contains a
+  #    :category which contains a String, being the category name.
+  #
+  # 2) A 'new' style, where the top-level :general Hash contains a :category key
+  #    which is a Hash with a :name and :id key.
+  #
+  # This module can detect and handle either type.
+  #
+  # Classes mixing in this module MUST:
+  #
+  # - call {#add_category_to_xml(xmldoc)} from their #rest_xml method if they are
+  #   {Updatable} or {Creatable}
+  #
+  module Categorizable
+
+    # Module Constants
+    #####################################
+
+    CATEGORIZABLE = true
+
+    # When no category has been assigned, this is the 'name' and id used
+    NO_CATEGORY_NAME = 'No category assigned'.freeze
+    NO_CATEGORY_ID = -1
+
+    # Setting the category to any of these values will unset the category
+    NON_CATEGORIES = [
+      nil,
+      '',
+      0,
+      NO_CATEGORY_NAME,
+      NO_CATEGORY_ID
+    ].freeze
+
+    # These classes use old-style categories in their data.
+    OLD_STYLE_CATEGORY_CLASSES = [
+      JSS::Script,
+      JSS::Package
+    ].freeze
+
+    # Mixed-in Public Instance Methods
+    #####################################
+
+    # The name of the category for this object.
+    # For backward compatibility, this is aliased to just
+    # 'category'
+    #
+    # @return [String] The name of the category for this object.
+    #
+    def category_name
+      @category_name
+    end # cat name
+    alias category category_name
+
+    # The id of the category for this object.
+    #
+    # @return [Integer] The id of the category for this object.
+    #
+    def category_id
+      @category_id
+    end # cat id
+
+    # The JSS::Category instance for this object's category
+    #
+    # @return [JSS::Category] The JSS::Category instance for this object's category
+    #
+    def category_object
+      return nil unless category_assigned?
+      JSS::Category.new id: @category_id
+    end # cat obj
+
+    # Does this object have a category assigned?
+    #
+    # @return [Boolean] Does this object have a category assigned?
+    #
+    def category_assigned?
+      !@category_name.nil?
+    end # cat assigned?
+    alias categorized? category_assigned?
+
+    # Change the category of this object.
+    # Any of the NON_CATEGORIES values will
+    # unset the category
+    #
+    # @param new_cat[Integer, String] The new category
+    #
+    # @return [void]
+    #
+    def category=(new_cat)
+      return nil unless updatable? || creatable?
+
+      # unset the category? Use nil or an empty string
+      if NON_CATEGORIES.include? new_cat
+        unset_category
+        return
+      end
+
+      new_name, new_id = evaluate_new_category(new_cat)
+
+      # no change, go home.
+      return nil if new_name == @category_name
+
+      raise JSS::NoSuchItemError, "Category '#{new_cat}' is not known to the JSS" unless JSS::Category.all_names(:ref).include? new_name
+
+      @category_name = new_name
+      @category_id = new_id
+      @need_to_update = true
+    end # category =
+
+    # Given a category name or id, return the name and id
+    #
+    # @param new_cat[String, Integer] The name or id of a possible category
+    #
+    # @return [Array<String, Integer>] The matching name and id, which may be nil.
+    #
+    def evaluate_new_category(new_cat)
+      # if we were given anything but a string, assume it was an id.
+      if new_cat.is_a? String
+        new_name = new_cat
+        new_id = JSS::Category.category_id_from_name new_cat
+      else
+        new_id = new_cat
+        new_name = JSS::Category.map_all_ids_to(:name)[new_id]
+      end
+      [new_name, new_id]
+    end
+
+    # Set the category to nothing
+    #
+    # @return [void]
+    #
+    def unset_category
+      # no change, go home
+      return nil if @category_name.nil?
+      @category_name = nil
+      @category_id = nil
+      @need_to_update = true
+    end # unset category
+
+    # Mixed-in Private Instance Methods
+    #####################################
+    private
+
+    # Parse the category data from any incoming API data
+    #
+    # @return [void] description_of_returned_object
+    #
+    def parse_category
+      if @init_data[:category]
+        @category_name = @init_data[:category]
+        @category_id = JSS::Category.category_id_from_name @category_name
+      elsif @init_data[:general][:category]
+        @category_name = @init_data[:general][:category][:name]
+        @category_id = @init_data[:general][:category][:id]
+      end
+      @category_data_style = OLD_STYLE_CATEGORY_CLASSES.include?(self.class) ? :old : :new
+      @category_name = nil if @category_name.to_s.casecmp(NO_CATEGORY_NAME).zero?
+      @category_id = nil if @category_id == NO_CATEGORY_ID
+    end # parse category
+
+    # Add the category to the XML for POSTing or PUTting to the API.
+    #
+    # @param xmldoc[REXML::Document] The in-construction XML document
+    #
+    # @return [void]
+    #
+    def add_category_to_xml(xmldoc)
+      root = xmldoc.root
+      if @category_data_style == :old
+        root.add_element('category').text = @category_name.to_s
+      else
+        gen_elem = root.elements['general'] ? root.elements['general'] : root.add_element('general')
+        cat_elem = gen_elem.add_element 'category'
+        cat_elem.add_element('name').text = @category_name.to_s
+      end
+    end # add_category_to_xml
+
+  end # module categorizable
+
+end # module

data/lib/jss/api_object/category.rb

@@ -1,148 +1,140 @@
 ### Copyright 2017 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
-  
-  #####################################
-  ### Module Variables
-  #####################################
 
+  # Module Variables
   #####################################
-  ### Module Methods
-  #####################################
-  
-  
+
+  # Module Methods
   #####################################
-  ### Classes
+
+  # Classes
   #####################################
-  
-  ### 
-  ### A Category in the JSS.
-  ### 
-  ###
-  ### @see JSS::APIObject
-  ### 
+
+  # A Category in the JSS.
+  #
+  #
+  # @see JSS::APIObject
+  #
   class Category < JSS::APIObject
-    
-    #####################################
-    ### Mix-Ins
+
+    # Mix-Ins
     #####################################
     include JSS::Creatable
     include JSS::Updatable
-    
-    #####################################
-    ### Class Methods
-    #####################################
-    
+
+    # Class Methods
     #####################################
-    ### Class Constants
+
+    def self.category_id_from_name(name)
+      return nil if name.nil?
+      return nil if name.casecmp(JSS::Category::NO_CATEGORY_NAME).zero?
+      JSS::Category.map_all_ids_to(:name).invert[name]
+    end # self cat id from name
+
+    # Class Constants
     #####################################
-    
-    ### The base for REST resources of this class
-    RSRC_BASE = "categories"
-    
-    ### the hash key used for the JSON list output of all objects in the JSS
+
+    # The base for REST resources of this class
+    RSRC_BASE = 'categories'.freeze
+
+    # the hash key used for the JSON list output of all objects in the JSS
     RSRC_LIST_KEY = :categories
-    
-    ### The hash key used for the JSON object output.
-    ### It's also used in various error messages
+
+    # The hash key used for the JSON object output.
+    # It's also used in various error messages
     RSRC_OBJECT_KEY = :category
-    
-    ### these keys, as well as :id and :name,  are present in valid API JSON data for this class
-    VALID_DATA_KEYS = [:priority]
-    
-    ### The Default category
-    DEFAULT_CATEGORY = "Unknown"
-    
-    ### The range of possible priorities
+
+    # these keys, as well as :id and :name,  are present in valid API JSON data for this class
+    VALID_DATA_KEYS = [:priority].freeze
+
+    # When no category has been assigned, this is the 'name' and id used
+    NO_CATEGORY_NAME = JSS::Categorizable::NO_CATEGORY_NAME
+    NO_CATEGORY_ID = JSS::Categorizable::NO_CATEGORY_ID
+
+    # The Default category
+    DEFAULT_CATEGORY = NO_CATEGORY_NAME
+
+    # The range of possible priorities
     POSSIBLE_PRIORITIES = 1..20
-    
-    ### The Default Priority
+
+    # The Default Priority
     DEFAULT_PRIORITY = 5
-    
-    #####################################
-    ### Attributes
+
+    # Attributes
     #####################################
-        
-    ### @return [Integer] the SelfService priority for this category
+
+    # @return [Integer] the SelfService priority for this category
     attr_reader :priority
-    
-    #####################################
-    ### Constructor 
+
+    # Constructor
     #####################################
-    
-    ###
-    ### See JSS::APIObject#initialize
-    ###
+
+    # See JSS::APIObject#initialize
+    #
     def initialize(args = {})
       super
       @priority = @init_data[:priority] || DEFAULT_PRIORITY
-      
     end
-    
-    
-    #####################################
-    ### Public Instance Methods
+
+    # Public Instance Methods
     #####################################
-    
-    
-    ###
-    ### Change the Priority
-    ###
-    ### @param new_val[Integer] the new priority, must be in the range POSSIBLE_PRIORITIES
-    ###
-    ### @return [void]
-    ###
-    def priority= (new_val = @priority)
+
+    # Change the Priority
+    #
+    # @param new_val[Integer] the new priority, must be in the range POSSIBLE_PRIORITIES
+    #
+    # @return [void]
+    #
+    def priority=(new_val = @priority)
       return nil if new_val == @priority
       raise JSS::InvalidDataError, "priority must be an integer between #{POSSIBLE_PRIORITIES.first} and #{POSSIBLE_PRIORITIES.last} (inclusive)" unless POSSIBLE_PRIORITIES.include? new_val
       @priority = new_val
       @need_to_update = true
     end
-    
-    
-    #####################################
-    ### Private Instance Methods
+
+    # Private Instance Methods
     #####################################
     private
 
-    ###
-    ### Return a String with the XML Resource
-    ### for submitting creation or changes to the JSS via
-    ### the API via the Creatable or Updatable modules
-    ###
-    ### Most classes will redefine this method.
-    ###
+    # Return a String with the XML Resource
+    # for submitting creation or changes to the JSS via
+    # the API via the Creatable or Updatable modules
+    #
+    # Most classes will redefine this method.
+    #
     def rest_xml
       doc = REXML::Document.new APIConnection::XML_HEADER
       tmpl = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
       tmpl.add_element('name').text = @name
       tmpl.add_element('priority').text = @priority
-      return doc.to_s
+      doc.to_s
     end
+
   end # class category
-  
+
 end # module

data/lib/jss/api_object/computer.rb

@@ -26,94 +26,88 @@
 ###
 module JSS
 
-  #####################################
-  ### Module Constants
+  # Module Constants
   #####################################
 
-  #####################################
-  ### Module Variables
+  # Module Variables
   #####################################
 
+  # Module Methods
   #####################################
-  ### Module Methods
-  #####################################
-
-
-  ###
-  ### This class represents a Computer in the JSS.
-  ###
-  ### ===Adding Computers to the JSS
-  ###
-  ### This class cannot be used to add new Computers to the JSS. Please use other
-  ### Casper methods (like the Recon App or QuickAdd package)
-  ###
-  ### ---
-  ### ===Editing values
-  ###
-  ### Any data that arrives in the JSS via an "inventory update"
-  ### (a.k.a. 'recon') cannot be modified through this class, or the API.
-  ###
-  ### Data that can be modified are:
-  ### * Management Account (see #set_management_to)
-  ### * asset_tag
-  ### * barcodes 1 and 2
-  ### * ip_address
-  ### * udid
-  ### * mac_addresses
-  ### * location data via the Locatable module
-  ### * purchasing data via the Purchasable module
-  ### * Extension Attribute values via the Extendable module
-  ###   Note: as with other 'recon' generated values, Ext. Attrs.
-  ###   populated by scripts cannot be modified via the API.
-  ###   (the change would be overwritten the next time the machine
-  ###   did a recon)
-  ###
-  ### After making any changes, you must call #update to send those
-  ### changes to the server.
-  ###
-  ### ---
-  ### ===MDM Commands
-  ###
-  ### ==== MDM Commands are Not Yet Supported!
-  ### *Hopefully they will be soon*
-  ###
-  ### The following methods will be used to send an APNS command to the computer represented by an
-  ### instance of JSS::Computer, equivalent to clicking one of the buttons on
-  ### the Management Commands section of the Management tab of the Computer details page in the JSS UI.
-  ###
-  ### The methods supported will be:
-  ### - #blank_push  (aliases blank, noop, send_blank_push)
-  ### - #device_lock (aliases lock, lock_device)
-  ### - #erase_device (aliases wipe)
-  ###
-  ### To send an MDM command without making an instance, use the class method {.send_mdm_command}
-  ###
-  ### Each returns true if the command as sent.
-  ###
-  ### ---
-  ### ===Other Methods
-  ###
-  ### - {#set_management_to} change the management acct and passwd for this computer, aliased to #make_managed
-  ###   - requires calling #update to push changes to the server
-  ### - {#make_unmanaged} an shortcut method for {#set_management_to}(nil)
-  ###   - requires calling #update to push changes to the server
-  ### - {#apps} a shortcut to {#software} [:applications]
-  ### - {#licensed_sw} a shortcut to {#software} [:licensed_software]
-  ### - {#computer_groups} a shortcut to {#groups_accounts} [:computer_group_memberships]
-  ### - {#local_accounts} a shortcut to {#groups_accounts} [:local_accounts]
-  ### - {#drives} a shortcut to {#hardware} [:storage]
-  ### - {#printers} a shortcut to {#hardware} [:mapped_printers]
-  ###
-  ### @see APIObject
-  ### @see Locatable
-  ### @see Purchasable
-  ### @see Matchable
-  ### @see FileUpload
-  ###
-  class Computer  < JSS::APIObject
 
-    #####################################
-    ### MixIns
+  # This class represents a Computer in the JSS.
+  #
+  # ===Adding Computers to the JSS
+  #
+  # This class cannot be used to add new Computers to the JSS. Please use other
+  # Casper methods (like the Recon App or QuickAdd package)
+  #
+  # ---
+  # ===Editing values
+  #
+  # Any data that arrives in the JSS via an "inventory update"
+  # (a.k.a. 'recon') cannot be modified through this class, or the API.
+  #
+  # Data that can be modified are:
+  # * Management Account (see #set_management_to)
+  # * asset_tag
+  # * barcodes 1 and 2
+  # * ip_address
+  # * udid
+  # * mac_addresses
+  # * location data via the Locatable module
+  # * purchasing data via the Purchasable module
+  # * Extension Attribute values via the Extendable module
+  #   Note: as with other 'recon' generated values, Ext. Attrs.
+  #   populated by scripts cannot be modified via the API.
+  #   (the change would be overwritten the next time the machine
+  #   did a recon)
+  #
+  # After making any changes, you must call #update to send those
+  # changes to the server.
+  #
+  # ---
+  # === MDM Commands
+  #
+  # ==== MDM Commands are Not Yet Supported!
+  # *Hopefully they will be soon*
+  #
+  # The following methods will be used to send an APNS command to the computer represented by an
+  # instance of JSS::Computer, equivalent to clicking one of the buttons on
+  # the Management Commands section of the Management tab of the Computer details page in the JSS UI.
+  #
+  # The methods supported will be:
+  # - #blank_push  (aliases blank, noop, send_blank_push)
+  # - #device_lock (aliases lock, lock_device)
+  # - #erase_device (aliases wipe)
+  #
+  # To send an MDM command without making an instance, use the class method {.send_mdm_command}
+  #
+  # Each returns true if the command as sent.
+  #
+  # ---
+  # ===Other Methods
+  #
+  # - {#set_management_to} change the management acct and passwd for this computer, aliased to #make_managed
+  #   - requires calling #update to push changes to the server
+  # - {#make_unmanaged} an shortcut method for {#set_management_to}(nil)
+  #   - requires calling #update to push changes to the server
+  # - {#apps} a shortcut to {#software} [:applications]
+  # - {#licensed_sw} a shortcut to {#software} [:licensed_software]
+  # - {#computer_groups} a shortcut to {#groups_accounts} [:computer_group_memberships]
+  # - {#local_accounts} a shortcut to {#groups_accounts} [:local_accounts]
+  # - {#drives} a shortcut to {#hardware} [:storage]
+  # - {#printers} a shortcut to {#hardware} [:mapped_printers]
+  #
+  # @see APIObject
+  # @see Locatable
+  # @see Purchasable
+  # @see Matchable
+  # @see FileUpload
+  #
+  class Computer < JSS::APIObject
+
+    # MixIns
     #####################################
 
     include JSS::Updatable
@@ -124,430 +118,417 @@ module JSS
 
     extend JSS::Matchable
 
-    #####################################
-    ### Class Variables
+    # Class Variables
     #####################################
 
     @@all_computers = nil
 
-    #####################################
-    ### Class Methods
+    # Class Methods
     #####################################
 
-    ### A larger set of info about the computers in the JSS.
-    ###
-    ### Casper 9.4 introduced the API Resource /computers/subset/basic
-    ### that returns an array of hashes with more data than just /computers/
-    ### (which was just :name and :id). Similar to /mobildevices/, this new
-    ### list includes :udid, :serial_number, and :mac_address, as well as :model,
-    ### :managed, :building, :department, :username, and :report_date
-    ###
-    ### Because this requires a different, unusual, resource path, we're completely re-defining
-    ### {APIObject.all} for JSS::Computer.  Hopefully some day the original /computers/
-    ### resource will be updated to return this data.
-    ###
-    ### @param refresh[Boolean] should the data be re-queried from the API?
-    ###
-    ### @return [Array<Hash{:name=>String, :id=> Integer}>]
-    ###
+    # A larger set of info about the computers in the JSS.
+    #
+    # Casper 9.4 introduced the API Resource /computers/subset/basic
+    # that returns an array of hashes with more data than just /computers/
+    # (which was just :name and :id). Similar to /mobildevices/, this new
+    # list includes :udid, :serial_number, and :mac_address, as well as :model,
+    # :managed, :building, :department, :username, and :report_date
+    #
+    # Because this requires a different, unusual, resource path, we're completely re-defining
+    # {APIObject.all} for JSS::Computer.  Hopefully some day the original /computers/
+    # resource will be updated to return this data.
+    #
+    # @param refresh[Boolean] should the data be re-queried from the API?
+    #
+    # @return [Array<Hash{:name=>String, :id=> Integer}>]
+    #
     def self.all(refresh = false)
       @@all_computers = nil if refresh
       return @@all_computers if @@all_computers
       @@all_computers = JSS::API.get_rsrc(self::LIST_RSRC)[self::RSRC_LIST_KEY]
     end
 
-    ### @return [Array<String>] all computer serial numbers in the jss
+    # @return [Array<String>] all computer serial numbers in the jss
     def self.all_serial_numbers(refresh = false)
-      self.all(refresh).map{|i| i[:serial_number]}
+      all(refresh).map { |i| i[:serial_number] }
     end
 
-    ### @return [Array<String>] all computer mac_addresses in the jss
+    # @return [Array<String>] all computer mac_addresses in the jss
     def self.all_mac_addresses(refresh = false)
-      self.all(refresh).map{|i| i[:mac_address]}
+      all(refresh).map { |i| i[:mac_address] }
     end
 
-    ### @return [Array<String>] all computer udids in the jss
+    # @return [Array<String>] all computer udids in the jss
     def self.all_udids(refresh = false)
-      self.all(refresh).map{|i| i[:udid]}
+      all(refresh).map { |i| i[:udid] }
     end
 
-    ### @return [Array<Hash>] all managed computers in the jss
+    # @return [Array<Hash>] all managed computers in the jss
     def self.all_managed(refresh = false)
-      self.all(refresh).select{|d| d[:managed] }
+      all(refresh).select { |d| d[:managed] }
     end
 
-    ### @return [Array<Hash>] all unmanaged computers in the jss
+    # @return [Array<Hash>] all unmanaged computers in the jss
     def self.all_unmanaged(refresh = false)
-      self.all(refresh).select{|d| not d[:managed] }
+      all(refresh).select { |d| !(d[:managed]) }
     end
 
-    ### @return [Array<Hash>] all laptop computers in the jss
+    # @return [Array<Hash>] all laptop computers in the jss
     def self.all_laptops(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /book/i }
+      all(refresh).select { |d| d[:model] =~ /book/i }
     end
 
-    ### @return [Array<Hash>] all macbooks in the jss
+    # @return [Array<Hash>] all macbooks in the jss
     def self.all_macbooks(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^macbook\d/i  }
+      all(refresh).select { |d| d[:model] =~ /^macbook\d/i }
     end
 
-    ### @return [Array<Hash>] all macbookpros in the jss
+    # @return [Array<Hash>] all macbookpros in the jss
     def self.all_macbookpros(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^macbookpro\d/i  }
+      all(refresh).select { |d| d[:model] =~ /^macbookpro\d/i  }
     end
 
-    ### @return [Array<Hash>] all macbookairs in the jss
+    # @return [Array<Hash>] all macbookairs in the jss
     def self.all_macbookairs(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^macbookair\d/i  }
+      all(refresh).select { |d| d[:model] =~ /^macbookair\d/i  }
     end
 
-    ### @return [Array<Hash>] all xserves in the jss
+    # @return [Array<Hash>] all xserves in the jss
     def self.all_xserves(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /serve/i  }
+      all(refresh).select { |d| d[:model] =~ /serve/i }
     end
 
-    ### @return [Array<Hash>] all desktop macs in the jss
+    # @return [Array<Hash>] all desktop macs in the jss
     def self.all_desktops(refresh = false)
-      self.all(refresh).select{|d| d[:model] !~ /serve|book/i  }
+      all(refresh).select { |d| d[:model] !~ /serve|book/i }
     end
 
-    ### @return [Array<Hash>] all imacs in the jss
+    # @return [Array<Hash>] all imacs in the jss
     def self.all_imacs(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^imac/i  }
+      all(refresh).select { |d| d[:model] =~ /^imac/i }
     end
 
-    ### @return [Array<Hash>] all mac minis in the jss
+    # @return [Array<Hash>] all mac minis in the jss
     def self.all_minis(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^macmini/i  }
+      all(refresh).select { |d| d[:model] =~ /^macmini/i }
     end
 
-    ### @return [Array<Hash>] all macpros in the jss
+    # @return [Array<Hash>] all macpros in the jss
     def self.all_macpros(refresh = false)
-      self.all(refresh).select{|d| d[:model] =~ /^macpro/i  }
-    end
-
-    ###
-    ### Send an MDM command to a managed computer by id or name
-    ###
-    ### @param computer[String,Integer] the name or id of the computer to recieve the command
-    ### @param command[Symbol] the command to send, one of the keys of COMPUTER_MDM_COMMANDS
-    ###
-    ### @return [true] if the command was sent
-    ###
-
-# Not functional until I get more docs from JAMF
-#
-#     def self.send_mdm_command(computer,command)
-#
-#       raise JSS::NoSuchItemError, "Unknown command '#{command}'" unless COMPUTER_MDM_COMMANDS.keys.include? command
-#
-#       command_xml ="#{JSS::APIConnection::XML_HEADER}<computer><command>#{COMPUTER_MDM_COMMANDS[command]}</command></computer>"
-#       the_id = nil
-#
-#       if computer.to_s =~ /^\d+$/
-#         the_id = computer
-#       else
-#         the_id = self.map_all_ids_to(:name).invert[computer]
-#       end
-#
-#       if the_id
-#         response = JSS::API.put_rsrc("#{RSRC_BASE}/id/#{the_id}", command_xml)
-#         response =~ %r{<notification_sent>(.+)</notification_sent>}
-#         return ($1 and $1 == "true")
-#       end
-#       raise JSS::UnmanagedError, "Cannot send command to unknown/unmanaged computer '#{computer}'"
-#     end
-
+      all(refresh).select { |d| d[:model] =~ /^macpro/i }
+    end
 
+    # Send an MDM command to a managed computer by id or name
+    #
+    # @param computer[String,Integer] the name or id of the computer to recieve the command
+    # @param command[Symbol] the command to send, one of the keys of COMPUTER_MDM_COMMANDS
+    #
+    # @return [true] if the command was sent
+    #
+
+    # Not functional until I get more docs from JAMF
+    #
+    #     def self.send_mdm_command(computer,command)
+    #
+    #       raise JSS::NoSuchItemError, "Unknown command '#{command}'" unless COMPUTER_MDM_COMMANDS.keys.include? command
+    #
+    #       command_xml ="#{JSS::APIConnection::XML_HEADER}<computer><command>#{COMPUTER_MDM_COMMANDS[command]}</command></computer>"
+    #       the_id = nil
+    #
+    #       if computer.to_s =~ /^\d+$/
+    #         the_id = computer
+    #       else
+    #         the_id = self.map_all_ids_to(:name).invert[computer]
+    #       end
+    #
+    #       if the_id
+    #         response = JSS::API.put_rsrc("#{RSRC_BASE}/id/#{the_id}", command_xml)
+    #         response =~ %r{<notification_sent>(.+)</notification_sent>}
+    #         return ($1 and $1 == "true")
+    #       end
+    #       raise JSS::UnmanagedError, "Cannot send command to unknown/unmanaged computer '#{computer}'"
+    #     end
+
+    # Class Constants
     #####################################
-    ### Class Constants
-    #####################################
-
 
-    ### The base for REST resources of this class
-    RSRC_BASE = "computers"
+    # The base for REST resources of this class
+    RSRC_BASE = 'computers'.freeze
 
-    ### The (temporary?) list-resource
-    LIST_RSRC = "#{RSRC_BASE}/subset/basic"
+    # The (temporary?) list-resource
+    LIST_RSRC = "#{RSRC_BASE}/subset/basic".freeze
 
-    ### the hash key used for the JSON list output of all objects in the JSS
+    # the hash key used for the JSON list output of all objects in the JSS
     RSRC_LIST_KEY = :computers
 
-    ### The hash key used for the JSON object output.
-    ### It's also used in various error messages
+    # The hash key used for the JSON object output.
+    # It's also used in various error messages
     RSRC_OBJECT_KEY = :computer
 
-    ### these keys, as well as :id and :name,  are present in valid API JSON data for this class
-    VALID_DATA_KEYS = [:sus, :distribution_point, :alt_mac_address ]
+    # these keys, as well as :id and :name,  are present in valid API JSON data for this class
+    #   DEPRECATED, with be removed in a future release.
+    VALID_DATA_KEYS = [:sus, :distribution_point, :alt_mac_address].freeze
+
+    # these keys,  as well as :id and :name, can be used to look up objects of this class in the JSS
+    OTHER_LOOKUP_KEYS = [:udid, :serialnumber, :mac_address].freeze
 
-    ### This class lets us seach for computers
+    # This class lets us seach for computers
     SEARCH_CLASS = JSS::AdvancedComputerSearch
 
-    ### This is the class for relevant Extension Attributes
+    # This is the class for relevant Extension Attributes
     EXT_ATTRIB_CLASS = JSS::ComputerExtensionAttribute
 
-    ### Boot partitions are noted with the string "(Boot Partition)" at the end
-    BOOT_FLAG = " (Boot Partition)"
+    # Boot partitions are noted with the string "(Boot Partition)" at the end
+    BOOT_FLAG = ' (Boot Partition)'.freeze
 
-    ### file uploads can send attachments to the JSS using :computers as the sub-resource.
-    UPLOAD_TYPES = { :attachment => :computers}
+    # file uploads can send attachments to the JSS using :computers as the sub-resource.
+    UPLOAD_TYPES = { attachment: :computers }.freeze
 
-    ### A mapping of Symbols available to the send_mdm_command class method, to
-    ### the String commands actuallly sent via the API.
+    # A mapping of Symbols available to the send_mdm_command class method, to
+    # the String commands actuallly sent via the API.
     COMPUTER_MDM_COMMANDS = {
-      :blank_push => "BlankPush",
-      :send_blank_push => "BlankPush",
-      :blank => "BlankPush",
-      :noop => "BlankPush",
-      :device_lock => "DeviceLock",
-      :lock => "DeviceLock",
-      :lock_device => "DeviceLock",
-      :erase_device => "EraseDevice",
-      :erase => "EraseDevice",
-      :wipe => "EraseDevice",
-      :unmanage_device => "UnmanageDevice",
-      :unmanage => "UnmanageDevice"
-    }
-
-    #####################################
-    ### Attributes
+      blank_push: 'BlankPush',
+      send_blank_push: 'BlankPush',
+      blank: 'BlankPush',
+      noop: 'BlankPush',
+      device_lock: 'DeviceLock',
+      lock: 'DeviceLock',
+      lock_device: 'DeviceLock',
+      erase_device: 'EraseDevice',
+      erase: 'EraseDevice',
+      wipe: 'EraseDevice',
+      unmanage_device: 'UnmanageDevice',
+      unmanage: 'UnmanageDevice'
+    }.freeze
+
+    # Attributes
     #####################################
 
-    ### The values returned in the General, Location, and Purchasing subsets are stored as direct attributes
-    ### Location and Purchasing are defined in the Locatable and Purchasable mixin modules.
-    ### Here's General, in alphabetical order
+    # The values returned in the General, Location, and Purchasing subsets are stored as direct attributes
+    # Location and Purchasing are defined in the Locatable and Purchasable mixin modules.
+    # Here's General, in alphabetical order
 
-    ### @return [String] the secondary mac address
+    # @return [String] the secondary mac address
     attr_reader :alt_mac_address
 
-    ### @return [String] the asset tag
+    # @return [String] the asset tag
     attr_reader :asset_tag
 
-    ### @return [String] the barcodes
+    # @return [String] the barcodes
     attr_reader :barcode_1, :barcode_2
 
-
-    ### @return [String] The name of the distribution point for this computer
+    # @return [String] The name of the distribution point for this computer
     attr_reader :distribution_point
 
-    ### @return [Time] when was it added to the JSS
+    # @return [Time] when was it added to the JSS
     attr_reader :initial_entry_date
 
-    ### @return [IPAddr] the last known IP address
+    # @return [IPAddr] the last known IP address
     attr_reader :ip_address
 
-    ### @return [String] the version of the jamf binary
+    # @return [String] the version of the jamf binary
     attr_reader :jamf_version
 
-    ### @return [Time] the last contact time
+    # @return [Time] the last contact time
     attr_reader :last_contact_time
 
-    ### @return [String] the primary macaddress
+    # @return [String] the primary macaddress
     attr_reader :mac_address
 
-    ### @return [Boolean] is this machine "managed" by Casper?
+    # @return [Boolean] is this machine "managed" by Casper?
     attr_reader :managed
 
-    ### @return [String] the name of the management account
+    # @return [String] the name of the management account
     attr_reader :management_username
 
-    ### @return [Boolean] doesit support MDM?
+    # @return [Boolean] doesit support MDM?
     attr_reader :mdm_capable
 
-    ### @return [String] the name of the netboot server for this machine
+    # @return [String] the name of the netboot server for this machine
     attr_reader :netboot_server
 
-    ### @return [String] what kind of computer?
+    # @return [String] what kind of computer?
     attr_reader :platform
 
-    ### @return [Time] the last recon time
+    # @return [Time] the last recon time
     attr_reader :report_date
 
-    ### @return [String] the serial number
+    # @return [String] the serial number
     attr_reader :serial_number
 
-
-    ### @return [Hash] the :name and :id of the site for this machine
+    # @return [Hash] the :name and :id of the site for this machine
     attr_reader :site
 
-    ### @return [String] the name of the Software Update Server assigned to this machine.
+    # @return [String] the name of the Software Update Server assigned to this machine.
     attr_reader :sus
 
-    ### @return [String] the UDID of the computer
+    # @return [String] the UDID of the computer
     attr_reader :udid
 
-
-    ############
-    ### The remaining subsets each go into an attribute of their own.
-    ###
-
-    ### @return [Array<Hash>]
-    ###
-    ### A Hash for each ConfigurationProfile on the computer
-    ###
-    ### The Hash keys are:
-    ### * :id => the ConfigurationProfile id in the JSS
-    ### * :name => the username to whom this user-level profile has been applied (if it's a user-level profile)
-    ### * :uuid => the ConfigurationProfile uuid
-    ###
+    # The remaining subsets each go into an attribute of their own.
+    #
+
+    # @return [Array<Hash>]
+    #
+    # A Hash for each ConfigurationProfile on the computer
+    #
+    # The Hash keys are:
+    # * :id => the ConfigurationProfile id in the JSS
+    # * :name => the username to whom this user-level profile has been applied (if it's a user-level profile)
+    # * :uuid => the ConfigurationProfile uuid
+    #
     attr_reader :configuration_profiles
 
-    ### @return [Hash]
-    ###
-    ### Info about the local accts and ComputerGroups to which this machine beloings
-    ###
-    ### The Hash keys are:
-    ### * :computer_group_memberships => An Array of names of ComputerGroups to which this computer belongs
-    ### * :local_accounts => An Array of Hashes for each local user acct on this computer. Each hash has these keys:
-    ###   *   :name => String, the login name of the acct
-    ###   *   :realname => the real name of the acct
-    ###   *   :uid => String, the uid of the acct
-    ###   *   :home => String, the path to the home folder
-    ###   *   :home_size => String,  the size of the homedir as a string like "53245MB"
-    ###   *   :home_size_mb => Integer,  the size of the homedir as an integer like 53245
-    ###   *   :administrator => Boolean
-    ###   *   :filevault_enabled => Boolean
-    ###
+    # @return [Hash]
+    #
+    # Info about the local accts and ComputerGroups to which this machine beloings
+    #
+    # The Hash keys are:
+    # * :computer_group_memberships => An Array of names of ComputerGroups to which this computer belongs
+    # * :local_accounts => An Array of Hashes for each local user acct on this computer. Each hash has these keys:
+    #   *   :name => String, the login name of the acct
+    #   *   :realname => the real name of the acct
+    #   *   :uid => String, the uid of the acct
+    #   *   :home => String, the path to the home folder
+    #   *   :home_size => String,  the size of the homedir as a string like "53245MB"
+    #   *   :home_size_mb => Integer,  the size of the homedir as an integer like 53245
+    #   *   :administrator => Boolean
+    #   *   :filevault_enabled => Boolean
+    #
     attr_reader :groups_accounts
 
-    ### @return [Hash]
-    ###
-    ### A Hash with info about the hardware of this cmoputer.
-    ###
-    ### These are the keys & sample data
-    ### * :number_processors=>2,
-    ### * :processor_speed_mhz=>2530,
-    ### * :make=>"Apple",
-    ### * :cache_size=>3072,
-    ### * :processor_type=>"Intel Core i5",
-    ### * :total_ram_mb=>8192,
-    ### * :model=>"15-inch MacBook Pro (Mid 2010)",
-    ### * :available_ram_slots=>0,
-    ### * :processor_architecture=>"i386",
-    ### * :bus_speed_mhz=>0,
-    ### * :total_ram=>8192,
-    ### * :os_name=>"Mac OS X",
-    ### * :optical_drive=>"HL-DT-ST DVDRW  GS23N",
-    ### * :model_identifier=>"MacBookPro6,2",
-    ### * :cache_size_kb=>3072,
-    ### * :boot_rom=>"MBP61.0057.B0F",
-    ### * :os_version=>"10.9.3",
-    ### * :mapped_printers=> An Array of Hashes, one per printer, with these keys
-    ###   *  :name => the name of the printer
-    ###   *  :location => the location of the printer
-    ###   *  :type => the printer model
-    ###   *  :uri => the uri to reach the printer on the network
-    ### * :nic_speed=>"10/100/1000",
-    ### * :processor_speed=>2530,
-    ### * :active_directory_status=>"Not Bound",
-    ### * :bus_speed=>0,
-    ### * :os_build=>"13D65",
-    ### * :smc_version=>"1.58f17",
-    ### * :service_pack=>"",
-    ### * :battery_capacity=>87
-    ### * :storage=> An Array of Hashes, one per Drive, with these keys
-    ###   * :smart_status=>"Verified",
-    ###   * :connection_type=>"NO",
-    ###   * :model=>"M4-CT256M4SSD2",
-    ###   * :revision=>"040H",
-    ###   * :serial_number=>"00000000130709JH7GhhC",
-    ###   * :size=>262205,
-    ###   * :disk=>"disk0",
-    ###   * :drive_capacity_mb=>262205}],
-    ###   * :partition=> A Hash with these keys
-    ###     * :filevault2_status=>"Encrypted",
-    ###     * :type=>"boot",
-    ###     * :filevault2_percent=>100,
-    ###     * :partition_capacity_mb=>38014,
-    ###     * :lvgUUID=>"C4883AF5-3E58-4F76-A56C-094D4CEC7E9F",
-    ###     * :percentage_full=>61,
-    ###     * :lvUUID=>"745A262E-AEA6-4608-8A3A-6CDC225B4DE6",
-    ###     * :filevault_status=>"Encrypted",
-    ###     * :size=>38014,
-    ###     * :pvUUID=>"C38051CF-5066-442F-A442-1035060ED462",
-    ###     * :name=>"KimDrive40 (Boot Partition)",
-    ###     * :filevault_percent=>100
-    ###
+    # @return [Hash]
+    #
+    # A Hash with info about the hardware of this cmoputer.
+    #
+    # These are the keys & sample data
+    # * :number_processors=>2,
+    # * :processor_speed_mhz=>2530,
+    # * :make=>"Apple",
+    # * :cache_size=>3072,
+    # * :processor_type=>"Intel Core i5",
+    # * :total_ram_mb=>8192,
+    # * :model=>"15-inch MacBook Pro (Mid 2010)",
+    # * :available_ram_slots=>0,
+    # * :processor_architecture=>"i386",
+    # * :bus_speed_mhz=>0,
+    # * :total_ram=>8192,
+    # * :os_name=>"Mac OS X",
+    # * :optical_drive=>"HL-DT-ST DVDRW  GS23N",
+    # * :model_identifier=>"MacBookPro6,2",
+    # * :cache_size_kb=>3072,
+    # * :boot_rom=>"MBP61.0057.B0F",
+    # * :os_version=>"10.9.3",
+    # * :mapped_printers=> An Array of Hashes, one per printer, with these keys
+    #   *  :name => the name of the printer
+    #   *  :location => the location of the printer
+    #   *  :type => the printer model
+    #   *  :uri => the uri to reach the printer on the network
+    # * :nic_speed=>"10/100/1000",
+    # * :processor_speed=>2530,
+    # * :active_directory_status=>"Not Bound",
+    # * :bus_speed=>0,
+    # * :os_build=>"13D65",
+    # * :smc_version=>"1.58f17",
+    # * :service_pack=>"",
+    # * :battery_capacity=>87
+    # * :storage=> An Array of Hashes, one per Drive, with these keys
+    #   * :smart_status=>"Verified",
+    #   * :connection_type=>"NO",
+    #   * :model=>"M4-CT256M4SSD2",
+    #   * :revision=>"040H",
+    #   * :serial_number=>"00000000130709JH7GhhC",
+    #   * :size=>262205,
+    #   * :disk=>"disk0",
+    #   * :drive_capacity_mb=>262205}],
+    #   * :partition=> A Hash with these keys
+    #     * :filevault2_status=>"Encrypted",
+    #     * :type=>"boot",
+    #     * :filevault2_percent=>100,
+    #     * :partition_capacity_mb=>38014,
+    #     * :lvgUUID=>"C4883AF5-3E58-4F76-A56C-094D4CEC7E9F",
+    #     * :percentage_full=>61,
+    #     * :lvUUID=>"745A262E-AEA6-4608-8A3A-6CDC225B4DE6",
+    #     * :filevault_status=>"Encrypted",
+    #     * :size=>38014,
+    #     * :pvUUID=>"C38051CF-5066-442F-A442-1035060ED462",
+    #     * :name=>"KimDrive40 (Boot Partition)",
+    #     * :filevault_percent=>100
+    #
     attr_reader :hardware
 
-    ### DEPRECATED
-    ### attr_reader :iphones
-
-    ### @return [Array<Hash>]
-    ###
-    ### A Hash per peripheral
-    ###
-    ### Each hash has these keys & sample data:
-    ### *  :id=>286,
-    ### *  :type=>"Display",
-    ### *  :field_0=>"HP",
-    ### *  :field_1=>"HP LP2480zx",
-    ### *  :field_2=>"DreamColor",
-    ### *  :field_3=>"3CM10800F4",
-    ### *  :field_4=>"",
-    ### *  :field_5=>""
-    ### *  :field_6=>"",
-    ### *  :bar_code_1=>"",
-    ### *  :bar_code_2=>"",
-    ### *  :purchasing=> A hash with these keys:
-    ###    * :warranty_expires_utc=>"",
-    ###    * :is_leased=>false,
-    ###    * :po_date=>"",
-    ###    * :lease_expires=>"",
-    ###    * :po_number=>"",
-    ###    * :po_date_epoch=>0,
-    ###    * :lease_expires_epoch=>0,
-    ###    * :vendor=>"",
-    ###    * :attachments=>[],
-    ###    * :po_date_utc=>"",
-    ###    * :lease_expires_utc=>"",
-    ###    * :applecare_id=>"",
-    ###    * :warranty_expires=>"",
-    ###    * :life_expectancy=>0,
-    ###    * :purchase_price=>"",
-    ###    * :warranty_expires_epoch=>0,
-    ###    * :is_purchased=>true,
-    ###    * :purchasing_contact=>"",
-    ###    * :purchasing_account=>""
-    ###
+    # @return [Array<Hash>]
+    #
+    # A Hash per peripheral
+    #
+    # Each hash has these keys & sample data:
+    # *  :id=>286,
+    # *  :type=>"Display",
+    # *  :field_0=>"HP",
+    # *  :field_1=>"HP LP2480zx",
+    # *  :field_2=>"DreamColor",
+    # *  :field_3=>"3CM10800F4",
+    # *  :field_4=>"",
+    # *  :field_5=>""
+    # *  :field_6=>"",
+    # *  :bar_code_1=>"",
+    # *  :bar_code_2=>"",
+    # *  :purchasing=> A hash with these keys:
+    #    * :warranty_expires_utc=>"",
+    #    * :is_leased=>false,
+    #    * :po_date=>"",
+    #    * :lease_expires=>"",
+    #    * :po_number=>"",
+    #    * :po_date_epoch=>0,
+    #    * :lease_expires_epoch=>0,
+    #    * :vendor=>"",
+    #    * :attachments=>[],
+    #    * :po_date_utc=>"",
+    #    * :lease_expires_utc=>"",
+    #    * :applecare_id=>"",
+    #    * :warranty_expires=>"",
+    #    * :life_expectancy=>0,
+    #    * :purchase_price=>"",
+    #    * :warranty_expires_epoch=>0,
+    #    * :is_purchased=>true,
+    #    * :purchasing_contact=>"",
+    #    * :purchasing_account=>""
+    #
     attr_reader :peripherals
 
-    ### @return [Hash]
-    ###
-    ### A Hash of software data
-    ###
-    ### The Hash has these keys:
-    ### * :running_services => An Array of services running on the computer (if gathered) TODO - is each item a hash?
-    ### * :installed_by_casper => An Array of Package names unstalled on this computer by Casper
-    ### * :fonts => An Array of fonts on this computer (if gathered) TODO - is each item a hash?
-    ### * :installed_by_installer_swu => An Array of pkg IDs for pkgs installed by SoftwareUpdate or the Apple Installer
-    ### * :applications => An Array of Hashes, one per Application on the computer, with these keys:
-    ###   *   :path => String, the path to the app
-    ###   *   :name => String, the name of the app, including the .app suffix
-    ###   *   :version => String, the version of the app at that path.
-    ### * :cached_by_casper => An Array of Casper Package names cached on the machine, awaiting installation
-    ### * :available_software_updates => An Array of available SoftwareUpdate (if gathered) TODO - is each item a hash?
-    ### * :plugins => An Array of plugins installed on the machine (if gathered) TODO - is each item a hash?
-    ### * :available_updates => A Hash - Deprecated?
-    ### * :licensed_software => An Array, the names of Licenced Software (as defined in Casper) on this machine
-    ### * :unix_executables => DEPRECATED
-    ###
+    # @return [Hash]
+    #
+    # A Hash of software data
+    #
+    # The Hash has these keys:
+    # * :running_services => An Array of services running on the computer (if gathered) TODO - is each item a hash?
+    # * :installed_by_casper => An Array of Package names unstalled on this computer by Casper
+    # * :fonts => An Array of fonts on this computer (if gathered) TODO - is each item a hash?
+    # * :installed_by_installer_swu => An Array of pkg IDs for pkgs installed by SoftwareUpdate or the Apple Installer
+    # * :applications => An Array of Hashes, one per Application on the computer, with these keys:
+    #   *   :path => String, the path to the app
+    #   *   :name => String, the name of the app, including the .app suffix
+    #   *   :version => String, the version of the app at that path.
+    # * :cached_by_casper => An Array of Casper Package names cached on the machine, awaiting installation
+    # * :available_software_updates => An Array of available SoftwareUpdate (if gathered) TODO - is each item a hash?
+    # * :plugins => An Array of plugins installed on the machine (if gathered) TODO - is each item a hash?
+    # * :available_updates => A Hash - Deprecated?
+    # * :licensed_software => An Array, the names of Licenced Software (as defined in Casper) on this machine
+    # * :unix_executables => DEPRECATED
+    #
     attr_reader :software
 
+    # Constructor
     #####################################
-    ### Instance Methods
-    #####################################
-
-    ###
-    ### @param (see APIObject#initialize)
-    ###
-    ### As well as :id and :name, computers can be queried using :udid, :serialnumber, and :mac_address
-    ###
-    def initialize (args = {})
 
+    # @param (see APIObject#initialize)
+    #
+    # As well as :id and :name, computers can be queried using :udid, :serialnumber, and :mac_address
+    #
+    def initialize(args = {})
       super args, [:udid, :serialnumber, :mac_address]
 
-      ### now we have raw @init_data with something in it, so fill out the instance vars
+      # now we have raw @init_data with something in it, so fill out the instance vars
       @alt_mac_address = @init_data[:general][:alt_mac_address]
       @asset_tag = @init_data[:general][:asset_tag]
       @barcode_1 = @init_data[:general][:barcode_1]
@@ -565,14 +546,10 @@ module JSS
       @platform = @init_data[:general][:platform]
       @report_date = JSS.epoch_to_time @init_data[:general][:report_date_epoch]
       @serial_number = @init_data[:general][:serial_number]
-      @site =  JSS::APIObject.get_name( @init_data[:general][:site])
+      @site = JSS::APIObject.get_name(@init_data[:general][:site])
       @sus = @init_data[:general][:sus]
       @udid = @init_data[:general][:udid]
 
-      parse_location
-      parse_purchasing
-      parse_ext_attrs
-
       @configuration_profiles = @init_data[:configuration_profiles]
       @extension_attributes = @init_data[:extension_attributes]
       @groups_accounts = @init_data[:groups_accounts]
@@ -581,87 +558,84 @@ module JSS
       @software = @init_data[:software]
 
       @management_password = nil
-
     end # initialize
 
-    ###
-    ### @return [Array] the JSS groups to which thismachine belongs (smart and static)
-    ###
+    # @return [Array] the JSS groups to which thismachine belongs (smart and static)
+    #
     def computer_groups
       @groups_accounts[:computer_group_memberships]
     end
 
-    ###
-    ### @return [Array<Hash>] all the local accts on the machine.
-    ###
-    ### Each item has keys :name, :realname, :uid, :home, :home_size, :administrator, :filevault_enabled
-    ###
+    # @return [Array<Hash>] all the local accts on the machine.
+    #
+    # Each item has keys :name, :realname, :uid, :home, :home_size, :administrator, :filevault_enabled
+    #
     def local_accounts
       @groups_accounts[:local_accounts]
     end
 
-
-    ### @return [Boolean] is FileVault2 enabled?
-    ###
+    # @return [Boolean] is FileVault2 enabled?
+    #
     def filevault2_enabled?
-      boot_drive[:partition][:filevault2_status] != "Not Encrypted"
+      boot_drive[:partition][:filevault2_status] != 'Not Encrypted'
     end
 
-    ### @return [Array<Hash>] The local_accounts Array that have Legacy FV enabled
-    ###
+    # @return [Array<Hash>] The local_accounts Array that have Legacy FV enabled
+    #
     def filevault1_accounts
       return [] if filevault2_enabled?
-      local_accounts.select{ |a| a[:filevault_enabled] }
+      local_accounts.select { |a| a[:filevault_enabled] }
     end
 
-    ### @return [Array<Hash>]  each storage device
-    ###
+    # @return [Array<Hash>]  each storage device
+    #
     def drives
       @hardware[:storage]
     end
 
-    ### @return [Hash, nil] The hardware[:storage] hash of the boot drive
-    ###
+    # @return [Hash, nil] The hardware[:storage] hash of the boot drive
+    #
     def boot_drive
-      drives.each{ |d| return d if d[:partition][:type] == "boot" }
-      return nil
+      drives.each { |d| return d if d[:partition][:type] == 'boot' }
+      nil
     end
 
-    ### @return [Array<Hash>]  each printer on this computer
-    ###   Keys are :name, :uri, :type, :location
-    ###
+    # @return [Array<Hash>]  each printer on this computer
+    #   Keys are :name, :uri, :type, :location
+    #
     def printers
       @hardware[:mapped_printers]
     end
 
-    ###
-    ### @return [Array<Hash>]  all apps installed on this machine.
-    ###   Hash keys are :name, :path, and :version
-    ###
-    def apps ; @software[:applications] ; end
-
-    ###
-    ### @return [Array<String>] the JSS-defined "licensed software" titles
-    ###   installed on this machine.
-    ###
-    def licensed_sw ; @software[:licensed_software] ; end
-
-    ###
-    ### Set or unset management acct and password for this computer
-    ###
-    ### @param name[String] the name of the management acct.
-    ###
-    ### @param password[String] the password of the management acct
-    ###
-    ### @return [void]
-    ###
-    ### The changes will need to be pushed to the server with #update
-    ### before they take effect.
-    ###
-    ### CAUTION: this does nothing to confirm the name and password
-    ### will work on the machine!
-    ###
-    def set_management_to (name, password)
+    # @return [Array<Hash>]  all apps installed on this machine.
+    #   Hash keys are :name, :path, and :version
+    #
+    def apps
+      @software[:applications]
+    end
+
+    # @return [Array<String>] the JSS-defined "licensed software" titles
+    #   installed on this machine.
+    #
+    def licensed_sw
+      @software[:licensed_software]
+    end
+
+    # Set or unset management acct and password for this computer
+    #
+    # @param name[String] the name of the management acct.
+    #
+    # @param password[String] the password of the management acct
+    #
+    # @return [void]
+    #
+    # The changes will need to be pushed to the server with #update
+    # before they take effect.
+    #
+    # CAUTION: this does nothing to confirm the name and password
+    # will work on the machine!
+    #
+    def set_management_to(name, password)
       password = nil unless name
       @management_username = name
       @management_password = password
@@ -669,17 +643,16 @@ module JSS
       @need_to_update = true
     end
 
-    ###
-    ### Make the machine unmanaged.
-    ###
-    ### The same as
-    ###   #set_management_to nil, nil
-    ### followed by
-    ###   JSS::Computer.send_mdm_command @id, :unmanage_device
-    ### which currently isn't working
-    ###
-    ### @return [void]
-    ###
+    # Make the machine unmanaged.
+    #
+    # The same as
+    #   #set_management_to nil, nil
+    # followed by
+    #   JSS::Computer.send_mdm_command @id, :unmanage_device
+    # which currently isn't working
+    #
+    # @return [void]
+    #
     def make_unmanaged
       return nil unless managed?
       set_management_to(nil, nil)
@@ -689,56 +662,54 @@ module JSS
       end
     end
 
-    ###
-    def asset_tag= (new_val)
+    #
+    def asset_tag=(new_val)
       return nil if @asset_tag == new_val
       new_val.strip!
       @asset_tag = new_val
       @need_to_update = true
     end
 
-    ###
-    def barcode_1= (new_val)
+    #
+    def barcode_1=(new_val)
       return nil if @barcode_1 == new_val
       new_val.strip!
       @barcode_1 = new_val
       @need_to_update = true
     end
 
-    ###
-    def barcode_2= (new_val)
+    #
+    def barcode_2=(new_val)
       return nil if @barcode_2 == new_val
       new_val.strip!
       @barcode_2 = new_val
       @need_to_update = true
     end
 
-    ###
-    def ip_address= (new_val)
+    #
+    def ip_address=(new_val)
       return nil if @ip_address == new_val
       new_val.strip!
-      ### this raises an error if its an invalid IP address
+      # this raises an error if its an invalid IP address
       IPAddr.new new_val
       @ip_address = new_val
       @need_to_update = true
     end
 
-    ###
-    ### Send changes to the API
-    ###
-    ### @return [void]
-    ###
+    # Send changes to the API
+    #
+    # @return [void]
+    #
     def update
       id = super
       @management_password = nil
       id
     end
 
-    ###
-    ### Delete this computer from the JSS
-    ###
-    ### @return [void]
-    ###
+    # Delete this computer from the JSS
+    #
+    # @return [void]
+    #
     def delete
       super
       @alt_mac_address = nil
@@ -778,40 +749,38 @@ module JSS
       @peripherals = nil
       @purchasing = nil
       @software = nil
-    end #delete
-
-
-# Not Functional until I get more docs from JAMF
-#
-#     ###
-#     ### Send a blank_push MDM command
-#     ###
-#     def blank_push
-#       self.class.send_mdm_command @id, :blank_push
-#     end
-#     alias noop blank_push
-#     alias send_blank_push blank_push
-#
-#     ###
-#     ### Send a device_lock MDM command
-#     ###
-#     def device_lock
-#       self.class.send_mdm_command @id, :device_lock
-#     end
-#     alias lock device_lock
-#     alias lock_device device_lock
-#
-#     ###
-#     ### Send an erase_device MDM command
-#     ###
-#     def erase_device
-#       self.class.send_mdm_command @id, :erase_device
-#     end
-#     alias erase erase_device
-#     alias wipe erase_device
-
-
-    ### aliases
+    end # delete
+
+    # Not Functional until I get more docs from JAMF
+    #
+    #     #
+    #     # Send a blank_push MDM command
+    #     #
+    #     def blank_push
+    #       self.class.send_mdm_command @id, :blank_push
+    #     end
+    #     alias noop blank_push
+    #     alias send_blank_push blank_push
+    #
+    #     #
+    #     # Send a device_lock MDM command
+    #     #
+    #     def device_lock
+    #       self.class.send_mdm_command @id, :device_lock
+    #     end
+    #     alias lock device_lock
+    #     alias lock_device device_lock
+    #
+    #     #
+    #     # Send an erase_device MDM command
+    #     #
+    #     def erase_device
+    #       self.class.send_mdm_command @id, :erase_device
+    #     end
+    #     alias erase erase_device
+    #     alias wipe erase_device
+
+    # aliases
     alias alt_macaddress alt_mac_address
     alias bar_code_1 barcode_1
     alias bar_code_2 barcode_2
@@ -824,23 +793,17 @@ module JSS
     alias accts local_accounts
     alias make_managed set_management_to
 
-
-
-
-
-    ##############################
-     ### private methods
+    # private methods
     ##############################
     private
 
-    ###
-    ### Return a String with the XML Resource
-    ### for submitting  changes to the JSS via
-    ### the API
-    ###
-    ### For Computers, only some items can be changed via the API
-    ### In particular, any data gatherd by a Recon cannot be changed
-    ###
+    # Return a String with the XML Resource
+    # for submitting  changes to the JSS via
+    # the API
+    #
+    # For Computers, only some items can be changed via the API
+    # In particular, any data gatherd by a Recon cannot be changed
+    #
     def rest_xml
       doc = REXML::Document.new APIConnection::XML_HEADER
       computer = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
@@ -862,15 +825,13 @@ module JSS
 
       computer << ext_attr_xml
 
-      if has_location?
-        computer << location_xml
-      end
-      if has_purchasing?
-        computer << purchasing_xml
-      end
+      computer << location_xml if has_location?
 
-      return doc.to_s
+      computer << purchasing_xml if has_purchasing?
+
+      doc.to_s
     end
 
   end # class Computer
+
 end # module