ruby-jss 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b5c8beb1d7a007dbb874b47918d3a921b19d765e7aadfbf81dd8a44b7a8803
-  data.tar.gz: '03842c76300248af3b5384bdf37b809308ee5aa380741359dd97bab045432ec3'
+  metadata.gz: '0196bdb655afca3d5ed45a3a3843664581141d379b5549814945d1868ed51fa4'
+  data.tar.gz: f818199e33219b7c21b1353874b4d3c5c2f92943acbd01e2a9b332fc868628a7
 SHA512:
-  metadata.gz: abd2f45834eb413f253f7514f0992a668f362a9e925e78ead0d714aab5107fdcc849ce2996f9a3f104bdc4e76b8bc921316c1478f5f3cd82203038d2f8c4ec37
-  data.tar.gz: 72024e8a6f5a103d582f985c94ef99eb0d5ad040cd02d7d4d266410d1fdc24a3b8815757b60047899f650c6217210e70468976e18d6f8976be713855b05e32fb
+  metadata.gz: b90fb35e0f5f132edf4b396d0608225f30722322fc9cbea5826c127b2b2e77fa2bce69345952b4440454be3a3ce110530c54b349ea472220bc5d4ad1e83f32d2
+  data.tar.gz: d2952cb9ff7f44b3617946f93d522fba7d990f98754542f1413ccd1736ea33fed85e4e4fc24b96dc347aa32907793888dacf6b26cfd068366d63f5b460d3b6d4

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Change History
 
+## v 1.0.2 2018-10-16
+
+- add: Support for parentheses (opening_paren and closing_paren) in JSS::Criteriable::Criterion objects
+- add: Support for patch-related criterion comparisons "greater than", "less than",  "greater than or equal",  "less than or equal"
+- fix: a couple lingering calls to `.new` on APIObject classes, now `.fetch`
+
 ## v 1.0.1, 2018-08-27
 
 - add:  `JSS::MobileDeviceApplication#version=` and `#bundle_id=` These two attributes are now settable and will be saved to the server if the application is hosted externally. Thanks to [ctaintor](https://github.com/ctaintor) for providing this patch.

data/README.md

@@ -1,4 +1,4 @@
-# ruby-jss: Working with the Jamf Pro API in Ruby
+# ruby-jss: Working with the Jamf Pro Classic API in Ruby
 [![Gem Version](https://badge.fury.io/rb/ruby-jss.svg)](http://badge.fury.io/rb/ruby-jss)
 
 ### Table of contents
@@ -354,7 +354,7 @@ JSS.api.connect pw: password   # other arguments used from the config settings
 
 ## BEYOND THE API
 
-While the Jamf Pro API provides access to object data in the JSS, this gem tries to use that data to provide more than just information exchange. Here are some examples of how we use the API data to provide functionality found in various Casper tools:
+While the Jamf Pro Classic API provides access to object data in the JSS, this gem tries to use that data to provide more than just information exchange. Here are some examples of how we use the API data to provide functionality found in various Casper tools:
 
 * Client Machine Access
   * The {JSS::Client} module provides the ability to run jamf binary commands, and access the local cache of package receipts

data/lib/jss/api_object/criteriable.rb

@@ -1,189 +1,190 @@
-### Copyright 2018 Pixar
+# 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.
+#
+#
 
-###
-###    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
 
-
-### A mix-in module providing consistent access to JSS::Criteriable::Criteria and
-### JSS::Criteriable::Criterion objects from within objects that contain Criteria.
-###
-###
-
-
-  #####################################
-  ### Module Variables
-  #####################################
-
-
-  #####################################
-  ### Module Methods
-  #####################################
-
-  #####################################
-  ### Sub-Modules
-  #####################################
-
-  ###
-  ### A mix-in module that allows objects to handle standardized search Criteria.
-  ###
-  ### Some objects in the JSS, such as Advanced Searches and Smart Groups,
-  ### include a set of Criteria. (i.e conditions which, when met, signify inclusion
-  ### in some result set.)
-  ###
-  ### A {JSS::Criteriable::Criteria} instance is a container for one or more
-  ### {JSS::Criteriable::Criterion} instances and provides methods for dealing with
-  ### them easily.
-  ###
-  ### When a {JSS::APIObject} subclass includes this module, that subclass
-  ### will have a :criteria attribute, which holds a {JSS::Criteriable::Criteria}
-  ### object and can be used to manipulate the Criterion objects inside.
-  ###
-  ### The including subclass also gains some instance methods:
-  ### * #parse_critera - sets up the :criteria attribute during initialization
-  ### * #criteria= - allows the wholesale replacement of the criteria
-  ### * #need_to_update - allows the {JSS::Criteriable::Criteria} instance to
-  ###   inform the subclass instance that it has changed and needs an #update
-  ###
-  ### Classes mixing in this module *must*
-  ### *  If they are Updatable or Creatable, they must insert
-  ###    self.criteria.rest_xml into their own xml output.
-  ###
-  ###
-  ### @example Working with the criteria of an advanced search
-  ###   # create a couple of Criterion instances
-  ###   crtn_0 = JSS::Criteriable::Criterion.new :and_or => :or, :name => "Username", :search_type => "is", :value => "jeauxbleaux"
-  ###   crtn_1 = JSS::Criteriable::Criterion.new :and_or => :and, :name => "Last Check-in", :search_type => "less than x days ago", :value => 3
-  ###
-  ###   # use them to create a Criteria instance
-  ###   crta = JSS::Criteriable::Criteria.new [crtn_0, crtn_1]
-  ###
-  ###   # create a new Advanced Search
-  ###   srch = JSS::AdvancedComputerSearch.make, :name => "my computer search"
-  ###   srch.display_fields = ["Computer Name"]
-  ###
-  ###   # add our Criteria to it
-  ###   srch.criteria = crta
-  ###
-  ###   # create it in the JSS
-  ###   srch.create # srch.search_results now contains the matching computers
-  ###
-  ###   # append a new criterion to the criteria, limiting the search results farther
-  ###   srch.criteria.append_criterion JSS::Criteriable::Criterion.new(:and_or => :or, :name => "Computer Name", :search_type => "like", :value => "o")
-  ###
-  ###   # save the change to the JSS
-  ###   srch.save  # srch.search_results  now contains the matching computers
-  ###
-  ###   # oops - that last one should have been :and, not :or
-  ###   srch.criteria.criteria[2].and_or = :and
-  ###
-  ###   # the above can also be achieved like this, by replacing the last criterion altogether:
-  ###   srch.criteria.set_criterion 2, JSS::Criteriable::Criterion.new(:and_or => :and, :name => "Computer Name", :search_type => "like", :value => "o")
-  ###
-  ###   # save the change to the JSS
-  ###   srch.save  # srch.search_results  now contains the matching computers
-  ###
-  ### @see JSS::Criteriable::Criteria
-  ### @see JSS::Criteriable::Criterion
-  ###
+  # A mix-in module that allows objects to handle standardized search Criteria.
+  #
+  # Some objects in the JSS, such as Advanced Searches and Smart Groups,
+  # include a set of Criteria. (i.e conditions which, when met, signify inclusion
+  # in a result set.)
+  #
+  # A {JSS::Criteriable::Criteria} instance is a container for one or more
+  # {JSS::Criteriable::Criterion} instances and provides methods for dealing with
+  # them easily.
+  #
+  # When a {JSS::APIObject} subclass includes this module, that subclass
+  # will have a :criteria attribute, which holds a {JSS::Criteriable::Criteria}
+  # object and can be used to manipulate the Criterion objects inside.
+  #
+  # The including subclass also gains some instance methods:
+  # * #parse_critera - sets up the :criteria attribute during initialization
+  # * #criteria= - allows the wholesale replacement of the criteria
+  # * #need_to_update - allows the {JSS::Criteriable::Criteria} instance to
+  #   inform the subclass instance that it has changed and needs an #update
+  #
+  # Classes mixing in this module *must*
+  # *  If they are Updatable or Creatable, they must insert
+  #    self.criteria.rest_xml into their own xml output.
+  #
+  #
+  # @example Working with the criteria of an advanced computer search
+  #   # create three Criterion instances (split over multiple lines for clarity)
+  #   #
+  #   # These find all of jeauxbleaux's computers that have either
+  #   # Excel or Word installed
+  #
+  #   crtn_0 = JSS::Criteriable::Criterion.new(
+  #     and_or: :and, # NOTE: the and_or value of the first criterion is ignored
+  #     name: 'Username',
+  #     search_type: 'is',
+  #     value: 'jeauxbleaux'
+  #   )
+  #
+  #   crtn_1 = JSS::Criteriable::Criterion.new(
+  #     and_or: :and,
+  #     paren: :opening,
+  #     name: 'Application Title',
+  #     search_type: 'has',
+  #     value: 'Microsoft Excel.app'
+  #   )
+  #
+  #   crtn_2 = JSS::Criteriable::Criterion.new(
+  #     and_or: :or,
+  #     name: 'Application Title',
+  #     search_type: 'has',
+  #     value: 'Microsoft Word.app',
+  #     paren: :closing
+  #   )
+  #
+  #   # use them to create a Criteria instance
+  #   crta = JSS::Criteriable::Criteria.new [crtn_0, crtn_1, crtn_2]
+  #
+  #   # create a new Advanced Search
+  #   srch = JSS::AdvancedComputerSearch.make, :name => "my computer search"
+  #   srch.display_fields = ["Computer Name"]
+  #
+  #   # add our Criteria to it
+  #   srch.criteria = crta
+  #
+  #   # create it in the JSS
+  #   srch.create # srch.search_results now contains the matching computers
+  #
+  #   # append a new criterion to the criteria, limiting the search results farther
+  #   # to those computers that have done a recon in the past week
+  #   srch.criteria.append_criterion JSS::Criteriable::Criterion.new(
+  #     and_or: :or,
+  #     name: "Last Inventory Update",
+  #     search_type: "less than x days ago",
+  #     value: 8
+  #   )
+  #
+  #   # save the change to the JSS
+  #   srch.save
+  #
+  #   # fetch the new results
+  #   srch.requery_search_results
+  #
+  #   # oops - that last one should have been :and, not :or
+  #   # so replace the last criterion with a correct one
+  #   srch.criteria.set_criterion 3, JSS::Criteriable::Criterion.new(
+  #     and_or: :and,
+  #     name: "Last Inventory Update",
+  #     search_type: "less than x days ago",
+  #     value: 8
+  #   )
+  #
+  #   # save the change to the JSS
+  #   # providing a non-false parameter to #update will automatically
+  #   # perform the requery  after the update.
+  #   srch.update :requery
+  #
+  # @see JSS::Criteriable::Criteria
+  # @see JSS::Criteriable::Criterion
+  #
   module Criteriable
 
-    #####################################
-    ###  Constants
+    #  Constants
     #####################################
 
     CRITERIABLE = true
 
-
-    #####################################
-    ###  Variables
+    #  Variables
     #####################################
 
-    #####################################
-    ###  Mixed-in Attributes
+    #  Mixed-in Attributes
     #####################################
 
-    ### @return [JSS::Criteriable::Criteria] the criteria for the instance into which we're mixed.
+    # @return [JSS::Criteriable::Criteria] the criteria for the instance into which we're mixed.
     attr_reader :criteria
 
-    #####################################
-    ###  Mixed-in Instance Methods
+    #  Mixed-in Instance Methods
     #####################################
 
-    ###
-    ### During initialization, convert the @init_data[:criteria] Hash into
-    ### a JSS::Criteriable::Criteria instance stored in @criteria
-    ###
-    ### Classes mixing in this module must call this in #initialize
-    ###
-    ### @return [void]
-    ###
+    #
+    # During initialization, convert the @init_data[:criteria] Hash into
+    # a JSS::Criteriable::Criteria instance stored in @criteria
+    #
+    # Classes mixing in this module must call this in #initialize
+    #
+    # @return [void]
+    #
     def parse_criteria
-      @criteria = if @init_data[:criteria]
-        JSS::Criteriable::Criteria.new @init_data[:criteria].map{|c| JSS::Criteriable::Criterion.new c}
-      else
-        nil
-      end
+      @criteria = (JSS::Criteriable::Criteria.new @init_data[:criteria].map { |c| JSS::Criteriable::Criterion.new c } if @init_data[:criteria])
       @criteria.container = self if @criteria
     end
 
-    ###
-    ### Change the criteria, it must be a JSS::Criteriable::Criteria instance
-    ###
-    ### @param new_criteria[JSS::Criteriable::Criteria] the new criteria
-    ###
-    ### @return [void]
-    ###
-    def criteria= (new_criteria)
-      raise JSS::InvalidDataError, "JSS::Criteriable::Criteria instance required" unless new_criteria.kind_of?(JSS::Criteriable::Criteria)
+    #
+    # Change the criteria, it must be a JSS::Criteriable::Criteria instance
+    #
+    # @param new_criteria[JSS::Criteriable::Criteria] the new criteria
+    #
+    # @return [void]
+    #
+    def criteria=(new_criteria)
+      raise JSS::InvalidDataError, 'JSS::Criteriable::Criteria instance required' unless new_criteria.is_a?(JSS::Criteriable::Criteria)
       @criteria = new_criteria
       @criteria.container = self
       @need_to_update = true
     end
 
-    ###
-    ###
-    ### @api private
-    ### Allow our Criteria to tell us when there's been a change that needs
-    ### to be updated.
-    ###
-    ### @return [void]
-    ###
+    #
+    #
+    # @api private
+    # Allow our Criteria to tell us when there's been a change that needs
+    # to be updated.
+    #
+    # @return [void]
+    #
     def should_update
       @need_to_update = true if @in_jss
     end
 
-    #####################################
-    ###  Mixed-in Class Methods
-    #####################################
-
-
-
-  end # module Criteriable
+    end # module Criteriable
 
 end # module JSS
 
-require "jss/api_object/criteriable/criterion"
-require "jss/api_object/criteriable/criteria"
+require 'jss/api_object/criteriable/criterion'
+require 'jss/api_object/criteriable/criteria'

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

@@ -1,128 +1,129 @@
-### 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.
-###
-###
-
-###
+# 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 Criteriable
 
-    #####################################
-    ### Module Variables
+    # Module Variables
     #####################################
 
-    #####################################
-    ### Module Methods
+    # Module Methods
     #####################################
 
-    #####################################
-    ### Classes
+    # Classes
     #####################################
 
-    ### This class defines a single criterion used in advanced searches and
-    ### smart groups throughout the JSS module.
-    ###
-    ### They are used within {JSS::Criteriable::Criteria} instances which store an
-    ### array of these objects and provides methods for working with them as a group.
-    ###
-    ### The classes that mix-in {JSS::Criteriable} each have a :criteria attribute which
-    ### holds one {JSS::Criteriable::Criteria}
-    ###
-    ### See {JSS::Criteriable} for examples
-    ###
+    # This class defines a single criterion used in advanced searches and
+    # smart groups throughout the JSS module.
+    #
+    # They are used within {JSS::Criteriable::Criteria} instances which store an
+    # array of these objects and provides methods for working with them as a group.
+    #
+    # The classes that mix-in {JSS::Criteriable} each have a :criteria attribute which
+    # holds one {JSS::Criteriable::Criteria}
+    #
+    # See {JSS::Criteriable} for examples
+    #
     class Criterion
 
-      #####################################
-      ### Mix Ins
+      # Mix Ins
       #####################################
 
-      include Comparable  # this allows us compare instances using <=>
+      include Comparable # this allows us compare instances using <=>
 
-      #####################################
-      ### Class Constants
+      # Class Constants
       #####################################
 
-      ### These are the available search-types for building criteria
+      # These are the available search-types for building criteria
       SEARCH_TYPES = [
-        "is",
-        "is not",
-        "like",
-        "not like",
-        "has",
-        "does not have",
-        "more than",
-        "less than",
-        "before (yyyy-mm-dd)",
-        "after (yyyy-mm-dd)",
-        "more than x days ago",
-        "less than x days ago",
-        "in more than x days",
-        "in less than x days",
-        "member of",
-        "not member of",
-        "current",
-        "not current",
+        'is',
+        'is not',
+        'like',
+        'not like',
+        'has',
+        'does not have',
+        'more than',
+        'less than',
+        'greater than',
+        'less than',
+        'greater than or equal',
+        'less than or equal',
+        'before (yyyy-mm-dd)',
+        'after (yyyy-mm-dd)',
+        'more than x days ago',
+        'less than x days ago',
+        'in more than x days',
+        'in less than x days',
+        'member of',
+        'not member of',
+        'current',
+        'not current',
         'matches regex',
         'does not match regex'
-      ]
+      ].freeze
 
-      ### the acceptable symboles for and/or
-      AND_OR = [:and, :or]
+      # the acceptable symboles for and/or
+      AND_OR = %i[and or].freeze
 
-      #####################################
-      ### Attributes
+      # Attributes
       #####################################
 
-      ### @return [Integer] zero-based index of this criterion within an array of criteria
-      ###  used for an advanced search or smart group.
-      ###  This is maintained automaticaly by the enclosing Criteria object
+      # @return [Integer] zero-based index of this criterion within an array of criteria
+      #  used for an advanced search or smart group.
+      #  This is maintained automaticaly by the enclosing Criteria object
       attr_accessor :priority
 
-      ### @return [Symbol] :and or :or - the and_or value for associating this criterion with the previous one
+      # @return [Symbol] :and or :or - the and_or value for associating this criterion with the previous one, defaults to :and
       attr_reader :and_or
 
-      ### @return [String] the name of the field being searched
+      # @return [String] the name of the field being searched
       attr_accessor :name
 
-      ### @return [String] the comparator between the field and the value, must be one of SEARCH_TYPES
-      ### @see #criteria=
+      # @return [String] the comparator between the field and the value, must be one of SEARCH_TYPES
+      # @see #criteria=
       attr_reader :search_type
 
-      ### @return [String] the value being searched for in the field named by :name
+      # @return [String] the value being searched for in the field named by :name
       attr_reader :value
 
-      ###
-      ### @param args[Hash] a hash of settings for the new criterion
-      ### @option args :and_or [String, Symbol] :and, or :or. How should this criterion be join with its predecessor?
-      ### @option args :name [String] the name of a Criterion as is visible in the JSS webapp.
-      ### @option args :search_type [String] one of SEARCH_TYPES, the comparison between the stored value and :value
-      ### @option args :value [String] the value to compare with that stored for :name
-      ###
-      ### @note :priority is maintained by the JSS::Criteriable::Criteria object holding this instance
-      ###
-      def initialize(args = {})
+      # @return [Boolean] Is there an opening paren before this criterion
+      attr_reader :opening_paren
+
+      # @return [Boolean] Is there a closing paren after this criterion
+      attr_reader :closing_paren
 
+      # @param args[Hash] a hash of settings for the new criterion
+      # @option args :and_or [String, Symbol] :and, or :or. How should this criterion be join with its predecessor?
+      # @option args :name [String] the name of a Criterion as is visible in the JSS webapp.
+      # @option args :search_type [String] one of SEARCH_TYPES, the comparison between the stored value and :value
+      # @option args :value [String] the value to compare with that stored for :name
+      #
+      # @note :priority is maintained by the JSS::Criteriable::Criteria object holding this instance
+      #
+      def initialize(args = {})
         @priority = args[:priority]
 
         @and_or = (args[:and_or].downcase.to_sym if args[:and_or]) || :and
@@ -131,89 +132,114 @@ module JSS
         @name = args[:name]
 
         if args[:search_type]
-          raise JSS::InvalidDataError, "Invalid :search_type" unless SEARCH_TYPES.include? args[:search_type]
+          raise JSS::InvalidDataError, 'Invalid :search_type' unless SEARCH_TYPES.include? args[:search_type]
           @search_type = args[:search_type]
         end
 
+        # from the API, parens come like this
+        @opening_paren = args[:opening_paren]
+        @closing_paren = args[:closing_paren]
+
+        # but from a user, they might come as a single :paren key, which
+        # will be handled by the setter below
+        send 'paren=', args[:paren] if args.key? :paren
+
+        # default to false
+        @opening_paren ||= false
+        @closing_paren ||= false
+
         @value = args[:value]
       end # init
 
-      ###
-      ### Set a new and_or for the criteron
-      ###
-      ### @param new_val[Symbol] the new and_or
-      ###
-      ### @return [void]
-      ###
-      def and_or= (new_val)
+      # Set a new and_or for the criteron
+      #
+      # @param new_val[Symbol] the new and_or
+      #
+      # @return [void]
+      #
+      def and_or=(new_val)
         @and_or = new_val.to_sym
         raise JSS::InvalidDataError, ":and_or must be 'and' or 'or'." unless AND_OR.include? @and_or.to_sym
       end
 
-      ###
-      ### Set a new search type for the criteron
-      ###
-      ### @param new_val[String] the new search type
-      ###
-      ### @return [void]
-      ###
-      def search_type= (new_val)
-        raise JSS::InvalidDataError, "Invalid :search_type" unless SEARCH_TYPES.include? new_val
+      # set the parenthesis for the criteria
+      #
+      # @param side[Symbol] :opening, :closing, or nil to remove
+      #
+      # @return [void]
+      def paren=(new_val)
+        case new_val
+        when :opening
+          @opening_paren = true
+          @closing_paren = false
+        when :closing
+          @opening_paren = false
+          @closing_paren = true
+        when nil
+          @opening_paren = false
+          @closing_paren = false
+        else
+          raise JSS::InvalidDataError, 'paren must be :opening, :closing, or nil.'
+        end
+      end
+
+      # Set a new search type for the criteron
+      #
+      # @param new_val[String] the new search type
+      #
+      # @return [void]
+      #
+      def search_type=(new_val)
+        raise JSS::InvalidDataError, 'Invalid :search_type' unless SEARCH_TYPES.include? new_val
         @search_type = new_val
       end
 
-      ###
-      ### Set a new value for the criteron
-      ###
-      ### @param new_val[Integer,String] the new value
-      ###
-      ### @return [void]
-      ###
+      # Set a new value for the criteron
+      #
+      # @param new_val[Integer,String] the new value
+      #
+      # @return [void]
+      #
       def value=(new_val)
         case @search_type
 
-          when *["more than", "less than", "more than x days ago", "less than x days ago"]
-            raise JSS::InvalidDataError, "Value must be an integer for search type '#{new_val}'" unless new_val =~ /^\d+$/
+        when 'more than', 'less than', 'more than x days ago', 'less than x days ago'
+          raise JSS::InvalidDataError, "Value must be an integer for search type '#{new_val}'" unless new_val =~ /^\d+$/
 
-          when *["before (yyyy-mm-dd)", "after (yyyy-mm-dd)"]
-            raise JSS::InvalidDataError, "Value must be a a date in the format yyyy-mm-dd for search type '#{new_val}'"  unless new_val =~ /^\d\d\d\d-\d\d-\d\d$/
+        when 'before (yyyy-mm-dd)', 'after (yyyy-mm-dd)'
+          raise JSS::InvalidDataError, "Value must be a a date in the format yyyy-mm-dd for search type '#{new_val}'" unless new_val =~ /^\d\d\d\d-\d\d-\d\d$/
 
         end # case
 
         @value = new_val
-
       end
 
-      ###
-      ### @return [String] All our values except priority joined together
-      ###   for comparing this Criterion to another for equality and order
-      ###
-      ### @see #<=>
-      ###
+      # @return [String] All our values except priority joined together
+      #   for comparing this Criterion to another for equality and order
+      #
+      # @see #<=>
+      #
       def signature
-        [@and_or, @name, @search_type, @value].join ","
+        [@and_or, @name, @search_type, @value].join ','
       end
 
-
-      ###
-      ### Comparison - allows the Comparable module to do its work
-      ###
-      ### @return [Integer]  -1, 0, or 1
-      ###
-      ### @see Comparable
-      ###
+      # Comparison - allows the Comparable module to do its work
+      #
+      # @return [Integer]  -1, 0, or 1
+      #
+      # @see Comparable
+      #
       def <=>(other)
-        self.signature <=> other.signature
+        signature <=> other.signature
       end
 
-      ###
-      ### @api private
-      ###
-      ### @return [REXML::Element] The xml element for the criterion, to be embeded in that of
-      ###   a Criteria instance
-      ###
-      ### @note For this class, rest_xml can't be a private method.
-      ###
+      # @api private
+      #
+      # @return [REXML::Element] The xml element for the criterion, to be embeded in that of
+      #   a Criteria instance
+      #
+      # @note For this class, rest_xml can't be a private method.
+      #
       def rest_xml
         crn = REXML::Element.new 'criterion'
         crn.add_element('priority').text = @priority
@@ -221,9 +247,13 @@ module JSS
         crn.add_element('name').text = @name
         crn.add_element('search_type').text = @search_type
         crn.add_element('value').text = @value
-        return crn
-     end
+        crn.add_element('opening_paren').text = @opening_paren ? 'true' : 'false'
+        crn.add_element('closing_paren').text = @closing_paren ? 'true' : 'false'
+        crn
+      end
 
     end # class criterion
+
   end # module Criteriable
+
 end # module

data/lib/jss/api_object/extension_attribute.rb

@@ -290,7 +290,7 @@ module JSS
       raise JSS::InvalidDataError, 'Invalid search_type, see JSS::Criteriable::Criterion::SEARCH_TYPES' unless JSS::Criteriable::Criterion::SEARCH_TYPES.include? search_type.to_s
       begin
         search_class = self.class::TARGET_CLASS::SEARCH_CLASS
-        acs = search_class.new api: @api, id: :new, name: "ruby-jss-EA-result-search-#{Time.now.to_jss_epoch}"
+        acs = search_class.make api: @api, name: "ruby-jss-EA-result-search-#{Time.now.to_jss_epoch}"
         acs.display_fields = [@name]
         crit_list = [JSS::Criteriable::Criterion.new(and_or: 'and', name: @name, search_type: search_type.to_s, value: desired_value)]
         acs.criteria = JSS::Criteriable::Criteria.new crit_list
@@ -308,7 +308,7 @@ module JSS
           results << { id: i[:id], name: i[:name], value: value }
         end
       ensure
-        acs.delete
+        acs.delete if acs.is_a? self.class::TARGET_CLASS::SEARCH_CLASS
       end
       results
     end # Return an Array of Hashes showing the most recent value

data/lib/jss/client.rb

@@ -195,7 +195,7 @@ module JSS
     # @return [JSS::Computer,nil] The JSS record for this computer, nil if not in the JSS
     #
     def self.jss_record
-      JSS::Computer.new udid: udid
+      JSS::Computer.fetch udid: udid
     rescue JSS::NoSuchItemError
       nil
     end

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of the JSS ruby gem
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist