ruby-jss 0.14.0 → 1.0.0b2

data/lib/jss/api_object/categorizable.rb

@@ -41,15 +41,22 @@ module 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.
+  #    :category key 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.
+  # 2) A 'new' style, where the :category key is a Hash with a :name and :id key.
+  #    This Hash is usually in the :general subset, but may be elsewhere.
   #
   # Classes mixing in this module MUST:
   #
+  # - Define the constant CATEGORY_SUBSET as a symbol indicating where in
+  #   the API data the :category key will be found. The symbol is either
+  #   :top for the top-level of the API data, or the name of the subsection
+  #   Hash containing :category, e.g. :general.
+  #
+  # - Define the constant CATEGORY_DATA_TYPE as either String or Hash
+  #   (the class names) which indicate if the contents of the :category key
+  #   is a String (The category name) or a Hash (containing :name and :id)
+  #
   # - call {#add_category_to_xml(xmldoc)} from their #rest_xml method if they are
   #   {Updatable} or {Creatable}
   #
@@ -60,8 +67,9 @@ module JSS
 
     CATEGORIZABLE = true
 
-    # When no category has been assigned, this is the 'name' and id used
+    # When no category has been assigned, this is the 'name'
     NO_CATEGORY_NAME = 'No category assigned'.freeze
+    # When no category has been assigned, this is the id
     NO_CATEGORY_ID = -1
 
     # Setting the category to any of these values will unset the category
@@ -73,12 +81,6 @@ module JSS
       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
     #####################################
 
@@ -107,7 +109,7 @@ module JSS
     #
     def category_object
       return nil unless category_assigned?
-      JSS::Category.new id: @category_id
+      JSS::Category.fetch id: @category_id
     end # cat obj
 
     # Does this object have a category assigned?
@@ -187,18 +189,29 @@ module JSS
     # @return [void] description_of_returned_object
     #
     def parse_category
-      if @init_data[:category]
-        @category_name = @init_data[:category]
+      cat =
+        if self.class::CATEGORY_SUBSET == :top
+          @init_data[:category]
+        else
+          @init_data[self.class::CATEGORY_SUBSET][:category]
+        end
+
+      if cat.is_a? String
+        @category_name = cat
         @category_id = JSS::Category.category_id_from_name @category_name
-      elsif @init_data[:general] && @init_data[:general][:category]
-        @category_name = @init_data[:general][:category][:name]
-        @category_id = @init_data[:general][:category][:id]
+      else
+        @category_name = cat[:name]
+        @category_id = cat[: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
+      clean_raw_categories
     end # parse category
 
+    # Set the category name and id to nil, if need be.
+    def clean_raw_categories
+      @category_name = nil if @category_name && @category_name.to_s.casecmp(NO_CATEGORY_NAME).zero?
+      @category_id = nil if @category_id == NO_CATEGORY_ID
+    end
+
     # Add the category to the XML for POSTing or PUTting to the API.
     #
     # @param xmldoc[REXML::Document] The in-construction XML document
@@ -206,15 +219,27 @@ module JSS
     # @return [void]
     #
     def add_category_to_xml(xmldoc)
-      return if @category_name.to_s.empty?
-      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'
+      return if category_name.to_s.empty?
+      cat_elem = REXML::Element.new('category')
+
+      if self.class::CATEGORY_DATA_TYPE == String
+        cat_elem.text = @category_name.to_s
+      elsif self.class::CATEGORY_DATA_TYPE == Hash
         cat_elem.add_element('name').text = @category_name.to_s
+      else
+        raise JSS::InvalidDataError, "Uknown CATEGORY_DATA_TYPE for class #{self.class}"
+      end
+
+      root = xmldoc.root
+
+      if self.class::CATEGORY_SUBSET == :top
+        root.add_element cat_elem
+        return
       end
+
+      parent = root.elements[self.class::CATEGORY_SUBSET.to_s]
+      parent ||= root.add_element self.class::CATEGORY_SUBSET.to_s
+      parent.add_element cat_elem
     end # add_category_to_xml
 
   end # module categorizable

data/lib/jss/api_object/configuration_profile.rb

@@ -62,6 +62,13 @@ module JSS
     # Where is the Site data in the API JSON?
     SITE_SUBSET = :general
 
+    # Where is the Category in the API JSON?
+    CATEGORY_SUBSET = :general
+
+    # How is the category stored in the API data?
+    CATEGORY_DATA_TYPE = Hash
+
+
     # Attributes
     ###################################
 

data/lib/jss/api_object/creatable.rb

@@ -26,12 +26,6 @@
 ###
 module JSS
 
-  ### Module Variables
-  #####################################
-
-  ### Module Methods
-  #####################################
-
   ### Sub-Modules
   #####################################
 
@@ -42,8 +36,8 @@ module JSS
   ### can be instantiated with :id => :new, and :name => "some_new_name".
   ###
   ###
-  ### Classes mixing this module *must* provide a #rest_xml instance method that returns the XML
-  ### String to be submitted to the API for object creation.
+  ### Classes mixing this module *must* provide a #rest_xml instance method that
+  ### returns the XML String to be submitted to the API for object creation.
   ###
   ### The instance can be used to set desired values for the new object, and
   ### once everything's good, use #create to create it in the JSS.
@@ -52,6 +46,7 @@ module JSS
   ### the subclass may want to redefine #initialize to require those data before
   ### calling super, or may want to redefine #create or #rest_xml to check
   ### the data for consistency, and then call super
+  ###
   ### It is also wise to have the individual setter methods do data validation
   ###
   ### @see APIObject#save
@@ -78,9 +73,9 @@ module JSS
     #
     def create(api: nil)
       api ||= @api
-      raise JSS::UnsupportedError, "Creating or editing #{self.class::RSRC_LIST_KEY} isn't yet supported. Please use other Casper workflows." unless respond_to? :create
+      raise JSS::UnsupportedError, "Creating or editing #{self.class::RSRC_LIST_KEY} isn't yet supported. Please use other Casper workflows." unless creatable?
       raise AlreadyExistsError, "This #{self.class::RSRC_OBJECT_KEY} already exists. Use #update to make changes." if @in_jss
-      api.post_rsrc(@rest_rsrc, rest_xml) =~ %r{><id>(\d+)</id><}
+      api.post_rsrc(rest_rsrc, rest_xml) =~ %r{><id>(\d+)</id><}
       @id = Regexp.last_match(1).to_i
       @in_jss = true
       @need_to_update = false
@@ -99,7 +94,7 @@ module JSS
     ###
     def clone(new_name, api: nil)
       api ||= @api
-      raise JSS::UnsupportedError, 'This class is not creatable in via ruby-jss' unless respond_to? :create
+      raise JSS::UnsupportedError, 'This class is not creatable in via ruby-jss' unless creatable?
       raise JSS::AlreadyExistsError, "A #{self.class::RSRC_OBJECT_KEY} already exists with that name" if \
         self.class.all_names(:refresh, api: api).include? new_name
 

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

@@ -1,26 +1,26 @@
 ### Copyright 2018 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.
-### 
+###
 ###
 
 ###
@@ -82,7 +82,9 @@ module JSS
         "member of",
         "not member of",
         "current",
-        "not current"
+        "not current",
+        'matches regex',
+        'does not match regex'
       ]
 
       ### the acceptable symboles for and/or

data/lib/jss/api_object/distribution_point.rb

@@ -220,6 +220,7 @@ module JSS
     ### You can also do this more easily by calling JSS.master_distribution_point
     ###
     def initialize(args = {})
+      #TODO: this looks redundant with super....
       args[:api] ||= JSS.api
       @api = args[:api]
 

data/lib/jss/api_object/group.rb

@@ -1,195 +1,159 @@
-### Copyright 2018 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 Constants
-  #####################################
-
-  #####################################
-  ### Module Variables
-  #####################################
+# Copyright 2018 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 Methods
-  #####################################
+module JSS
 
-  #####################################
-  ### Classes
+  # Classes
   #####################################
 
-  ###
-  ### This is the parent class of the smart/static group objects in the JSS
-  ### namely, {ComputerGroup}, {MobileDeviceGroup}, and {UserGroup}
-  ###
-  ### It provides methods for working with the membership of static groups and, by
-  ### including {JSS::Criteriable}, the criteria for smart groups.
-  ###
-  ### When changing the criteria of a smart group, use the #criteria attribute,
-  ### which is a {JSS::Criteria} instance.
-  ###
-  ### Subclasses must define the constant MEMBER_CLASS which indicates Ruby class
-  ### to which the group members belong (e.g. JSS::MobileDevice)
-  ###
-  ### @see JSS::APIObject
-  ###
-  ### @see JSS::Criteriable
-  ###
+  # This is the parent class of the smart/static group objects in the JSS
+  # namely, {ComputerGroup}, {MobileDeviceGroup}, and {UserGroup}
+  #
+  # It provides methods for working with the membership of static groups and, by
+  # including {JSS::Criteriable}, the criteria for smart groups.
+  #
+  # When changing the criteria of a smart group, use the #criteria attribute,
+  # which is a {JSS::Criteria} instance.
+  #
+  # Subclasses must define the constant MEMBER_CLASS which indicates Ruby class
+  # to which the group members belong (e.g. JSS::MobileDevice)
+  #
+  # @see JSS::APIObject
+  #
+  # @see JSS::Criteriable
+  #
   class Group < JSS::APIObject
 
-    #####################################
-    ### Mix-Ins
+    # Mix-Ins
     #####################################
     include JSS::Creatable
     include JSS::Updatable
     include JSS::Criteriable
     include JSS::Sitable
 
-
-    #####################################
-    ### Class Constants
+    # Class Constants
     #####################################
 
-    ### the types of groups allowed for creation
-    GROUP_TYPES = [:smart, :static]
+    # the types of groups allowed for creation
+    GROUP_TYPES = %i[smart static].freeze
 
     # Where is the Site data in the API JSON?
     SITE_SUBSET = :top
 
-    #####################################
-    ### Class Variables
-    #####################################
-
-    #####################################
-    ### Class Methods
+    # Class Methods
     #####################################
 
-    ###
-    ### Returns an Array of all the smart
-    ### groups.
-    ###
+    # Returns an Array of all the smart
+    # groups.
+    #
     def self.all_smart(refresh = false, api: JSS.api)
-      all(refresh, api: api).select{|g| g[:is_smart] }
+      all(refresh, api: api).select { |g| g[:is_smart] }
     end
 
-    ###
-    ### Returns an Array of all the static
-    ### groups.
-    ###
+    # Returns an Array of all the static
+    # groups.
+    #
     def self.all_static(refresh = false, api: JSS.api)
-      all(refresh, api: api).select{|g| not g[:is_smart] }
+      all(refresh, api: api).select { |g| (g[:is_smart]) }
     end
 
-    #####################################
-    ### Attributes
+    # Attributes
     #####################################
 
-    ### @return [Array<Hash>] the group membership
-    ###
-    ### Each hash contains the identifiers for
-    ### a member of the group, those being:
-    ### - :id, :name, and possibly :udid, :serial_number, :mac_address, :alt_mac_address,  and :wifi_mac_address
-    ###
-    ### @see #member_ids
-    ###
-    ### @see #member_names
-    ###
+    # @return [Array<Hash>] the group membership
+    #
+    # Each hash contains the identifiers for
+    # a member of the group, those being:
+    # - :id, :name, and possibly :udid, :serial_number, :mac_address, :alt_mac_address,  and :wifi_mac_address
+    #
+    # @see #member_ids
+    #
+    # @see #member_names
+    #
     attr_reader :members
 
-    ### @return [Boolean] is this a smart group
+    # @return [Boolean] is this a smart group
     attr_reader :is_smart
 
-    ### @return [Boolean] does this group send notifications when it changes?
+    # @return [Boolean] does this group send notifications when it changes?
     attr_reader :notify_on_change
 
-
-    ### @return [String] the :name of the site for this group
+    # @return [String] the :name of the site for this group
     attr_reader :site
 
-
-    #####################################
-    ### Constructor
+    # Constructor
     #####################################
 
-    ###
-    ### When creating a new group in the JSS, you must call .new with a :type key
-    ### and a value of :smart or :static, as well as a :name and the :id => :new
-    ###
-    ### @see JSS::APIObject
-    ###
+    # When creating a new group in the JSS, you must call .new with a :type key
+    # and a value of :smart or :static, as well as a :name and the :id => :new
+    #
+    # @see JSS::APIObject
+    #
     def initialize(args = {})
-
       if args[:id] == :new
-        raise JSS::InvalidDataError, "New group creation must specify a :type of :smart or :static" unless GROUP_TYPES.include? args[:type]
+        raise JSS::InvalidDataError, 'New group creation must specify a :type of :smart or :static' unless GROUP_TYPES.include? args[:type]
       end
 
       super args
 
       @is_smart = @init_data[:is_smart] || (args[:type] == :smart)
 
-      @members = if @init_data[self.class::MEMBER_CLASS::RSRC_LIST_KEY]
-        @init_data[self.class::MEMBER_CLASS::RSRC_LIST_KEY]
-      else
-        []
-      end
+      @members =
+        if @init_data[self.class::MEMBER_CLASS::RSRC_LIST_KEY]
+          @init_data[self.class::MEMBER_CLASS::RSRC_LIST_KEY]
+        else
+          []
+        end
 
       @site = JSS::APIObject.get_name(@init_data[:site])
+    end # init
 
-    end #init
-
-    #####################################
-    ### Public Instance Methods
+    # Public Instance Methods
     #####################################
 
-    ###
-    ### @see Creatable#create
-    ###
-    def create
+    # @see Creatable#create
+    #
+    def create(calculate_members: true)
       if @is_smart
-        raise JSS::MissingDataError, "No criteria specified for smart group" unless @criteria
+        raise JSS::MissingDataError, 'No criteria specified for smart group' unless @criteria
       end
-      super
-      refresh_members
-      return @id
+      super()
+      refresh_members if calculate_members
+      @id
     end
 
-
-    ###
-    ### @see Updatable#update
-    ###
+    # @see Updatable#update
+    #
     def update
       super
       refresh_members
       true
     end
 
-    ###
-    ### @see APIObject#delete
-    ###
+    # @see APIObject#delete
+    #
     def delete
       super
       @is_smart = nil
@@ -198,54 +162,48 @@ module JSS
       @members = []
     end # delete
 
-    ###
-    ### Apply a new set of criteria to a smart group
-    ###
-    ### @param new_criteria[JSS::Criteria] the new criteria for the smart group
-    ###
-    def criteria= (new_criteria)
-      raise InvalidDataError, "Only smart groups have criteria." unless @is_smart
+    # Apply a new set of criteria to a smart group
+    #
+    # @param new_criteria[JSS::Criteria] the new criteria for the smart group
+    #
+    def criteria=(new_criteria)
+      raise InvalidDataError, 'Only smart groups have criteria.' unless @is_smart
       super
     end
 
-    ###
-    ### How many members of the group?
-    ###
-    ### @return [Integer] the number of members of the group
-    ###
+    # How many members of the group?
+    #
+    # @return [Integer] the number of members of the group
+    #
     def size
       @members.count
     end
 
-
-    ###
-    ### @return [Array<String>] the names of the group members
-    ###
+    # @return [Array<String>] the names of the group members
+    #
     def member_names
-      @members.map{|m| m[:name]}
+      @members.map { |m| m[:name] }
     end
 
-    ###
-    ### @return [Array<Integer>] the ids of the group members
-    ###
+    # @return [Array<Integer>] the ids of the group members
+    #
     def member_ids
-      @members.map{|m| m[:id]}
+      @members.map { |m| m[:id] }
     end
 
-    ###
-    ### Replace all @members with an array of uniq device identfiers (names, ids, serial numbers, etc)
-    ### E.g: [ 'lambic', 1233, '2341', 'monkey']
-    ###
-    ### They must all be in the JSS or an error is raised
-    ### before doing anything. See {#check_member}
-    ###
-    ### @param new_members[Array<Integer,String>] the new group members
-    ###
-    ### @return [void]
-    ###
-    def members= (new_members)
+    # Replace all @members with an array of uniq device identfiers (names, ids, serial numbers, etc)
+    # E.g: [ 'lambic', 1233, '2341', 'monkey']
+    #
+    # They must all be in the JSS or an error is raised
+    # before doing anything. See {#check_member}
+    #
+    # @param new_members[Array<Integer,String>] the new group members
+    #
+    # @return [void]
+    #
+    def members=(new_members)
       raise UnsupportedError, "Smart group members can't be changed." if @is_smart
-      raise InvalidDataError, "Arg must be an array of names and/or ids" unless new_members.kind_of? Array
+      raise InvalidDataError, 'Arg must be an array of names and/or ids' unless new_members.is_a? Array
       ok_members = []
       new_members.each do |m|
         ok_members << check_member(m)
@@ -253,48 +211,41 @@ module JSS
 
       ok_members.uniq!
 
-      ### make sure we've actually changed...
-      unless members.map{|m| m[:id]}.sort == ok_members.map{|m| m[:id]}.sort
-        @members = ok_members
-        @need_to_update = true
-      end
+      # make sure we've actually changed...
+      return if members.map { |m| m[:id] }.sort == ok_members.map { |m| m[:id] }.sort
+      @members = ok_members
+      @need_to_update = true
     end
 
-    ###
-    ### Add a member, by name or id
-    ###
-    ### @param m[Integer,String] the id or name of the member to add
-    ###
-    ### @return [void]
-    ###
-    def add_member(m)
+    # Add a member, by name or id
+    #
+    # @param m[Integer,String] the id or name of the member to add
+    #
+    # @return [void]
+    #
+    def add_member(mem)
       raise UnsupportedError, "Smart group members can't be changed." if @is_smart
-      @members << check_member(m)
+      @members << check_member(mem)
       @need_to_update = true
     end
 
-    ###
-    ### Remove a member by id, or name
-    ###
-    ### @param m[Integer,String] the id or name of the member to remove
-    ###
-    ### @return [void]
-    ###
-    def remove_member(m)
+    # Remove a member by id, or name
+    #
+    # @param m[Integer,String] the id or name of the member to remove
+    #
+    # @return [void]
+    #
+    def remove_member(mem)
       raise InvalidDataError, "Smart group members can't be changed." if @is_smart
-
-      if @members.reject!{ |mm|  [mm[:id], mm[:name], mm[:username]].include? m  }
-        @need_to_update = true
-      else
-        raise JSS::NoSuchItemError, "No member matches '#{m}'"
-      end
+      raise InvalidDataError, "Can't remove nil" if mem.nil?
+      removed = @members.reject! { |mm| [mm[:id], mm[:name], mm[:username]].include? mem }
+      @need_to_update = true if removed
     end
 
-    ###
-    ### Remove all members
-    ###
-    ### @return [void]
-    ###
+    # Remove all members
+    #
+    # @return [void]
+    #
     def clear
       raise InvalidDataError, "Smart group members can't be changed." if @is_smart
       return if @members.empty?
@@ -302,61 +253,55 @@ module JSS
       @need_to_update = true
     end
 
-    ###
-    ### Refresh the membership from the API
-    ###
-    ### @return [Array<Hash>] the refresh membership
-    ###
+    # Refresh the membership from the API
+    #
+    # @return [Array<Hash>] the refresh membership
+    #
     def refresh_members
       @members = @api.get_rsrc(@rest_rsrc)[self.class::RSRC_OBJECT_KEY][self.class::MEMBER_CLASS::RSRC_LIST_KEY]
     end
 
-    ###
-    ### Change the site for this group
-    ###
-    ### @param new_val[String] the name of the new site
-    ###
-    ### @return [void]
-    ###
-    def site= (new_val)
+    # Change the site for this group
+    #
+    # @param new_val[String] the name of the new site
+    #
+    # @return [void]
+    #
+    def site=(new_val)
       raise JSS::NoSuchItemError, "No site named #{new_val} in the JSS" unless JSS::Site.all_names(api: @api).include? new_val
       @site = new_val
       @need_to_update = true
     end
 
-
-    ### aliases
+    # aliases
 
     alias smart? is_smart
     alias notify_on_change? notify_on_change
     alias notify? notify_on_change
     alias count size
 
-    #####################################
-    ### Public Instance Methods
+    # Public Instance Methods
     #####################################
     private
 
-    ###
-    ### Check that a potential group member is valid in the JSS.
-    ### Arg must be an id or name.
-    ### An exception is raised if the device doesn't exist.
-    ###
-    ### @return [Hash{:id=>Integer,:name=>String}] the valid id and name
-    ###
+    # Check that a potential group member is valid in the JSS.
+    # Arg must be an id or name.
+    # An exception is raised if the device doesn't exist.
+    #
+    # @return [Hash{:id=>Integer,:name=>String}] the valid id and name
+    #
     def check_member(m)
       potential_members = self.class::MEMBER_CLASS.map_all_ids_to(:name, api: @api)
       if m.to_s =~ /^\d+$/
-        return {:id=>m.to_i, :name=> potential_members[m]} if potential_members.keys.include? m.to_i
+        return { id: m.to_i, name: potential_members[m] } if potential_members.key?(m.to_i)
       else
-        return {:name=>m, :id=> potential_members.invert[m]} if potential_members.values.include? m
+        return { name: m, id: potential_members.invert[m] } if potential_members.value?(m)
       end
       raise JSS::NoSuchItemError, "No #{self.class::MEMBER_CLASS::RSRC_OBJECT_KEY} matching '#{m}' in the JSS."
     end
 
-    ###
-    ### the xml formated data for adding or updating this in the JSS,
-    ###
+    # the xml formated data for adding or updating this in the JSS,
+    #
     def rest_xml
       doc = REXML::Document.new JSS::APIConnection::XML_HEADER
       group = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
@@ -370,14 +315,13 @@ module JSS
 
       add_site_to_xml(doc)
 
-      return doc.to_s
-
-    end #rest_xml
+      doc.to_s
+    end # rest_xml
 
   end # class ComputerGroup
 
 end # module JSS
 
-require "jss/api_object/group/computer_group"
-require "jss/api_object/group/mobile_device_group"
-require "jss/api_object/group/user_group"
+require 'jss/api_object/group/computer_group'
+require 'jss/api_object/group/mobile_device_group'
+require 'jss/api_object/group/user_group'