ruby-jss 0.10.1 → 0.10.2a4

data/lib/jss/api_object/computer_invitation.rb

@@ -51,9 +51,7 @@ module JSS
     #####################################
 
     include JSS::Creatable
-
-    # Class Variables
-    #####################################
+    include JSS::Sitable
 
     # Class Methods
     #####################################
@@ -88,6 +86,9 @@ module JSS
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 84
 
+    # Where is site data located in the API JSON?
+    SITE_SUBSET = :top
+
     # Attributes
     #####################################
 
@@ -200,6 +201,7 @@ module JSS
       obj.add_element('hide_account').text = hide_account
       obj.add_element('invitation_status').text = invitation_status
       obj.add_element('multiple_uses_allowed').text = multiple_uses_allowed
+      add_site_to_xml(doc)
       doc.to_s
     end
 

data/lib/jss/api_object/ebook.rb

@@ -6,6 +6,8 @@ module JSS
   #
   class EBook < APIObject
 
+    include Sitable
+
     ### The base for REST resources of this class
     RSRC_BASE = 'ebooks'.freeze
 
@@ -21,6 +23,9 @@ module JSS
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 24
 
+    # Where is the Site data in the API JSON?
+    SITE_SUBSET = :general
+
   end
 
 end

data/lib/jss/api_object/group/computer_group.rb

@@ -56,6 +56,7 @@ module JSS
     #####################################
     ### Mix-Ins
     #####################################
+    include JSS::MDM
 
     #####################################
     ### Class Methods
@@ -86,6 +87,9 @@ module JSS
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 7
 
+    # what kind of devices are these WRT MDM
+    MDM_COMMAND_TARGET = :computergroups
+
     #####################################
     ### Class Variables
     #####################################

data/lib/jss/api_object/group/mobile_device_group.rb

@@ -56,7 +56,7 @@ module JSS
     #####################################
     ### Mix-Ins
     #####################################
-
+    include JSS::MDM
 
     #####################################
     ### Class Constants
@@ -83,6 +83,9 @@ module JSS
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 25
 
+    # what kind of devices are these WRT MDM
+    MDM_COMMAND_TARGET = :mobiledevicegroups
+
     #####################################
     ### Class Variables
     #####################################

data/lib/jss/api_object/group.rb

@@ -67,6 +67,7 @@ module JSS
     include JSS::Creatable
     include JSS::Updatable
     include JSS::Criteriable
+    include JSS::Sitable
 
 
     #####################################
@@ -76,6 +77,9 @@ module JSS
     ### the types of groups allowed for creation
     GROUP_TYPES = [:smart, :static]
 
+    # Where is the Site data in the API JSON?
+    SITE_SUBSET = :top
+
     #####################################
     ### Class Variables
     #####################################
@@ -357,7 +361,6 @@ module JSS
       doc = REXML::Document.new JSS::APIConnection::XML_HEADER
       group = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
       group.add_element('name').text = @name
-      group.add_element('site').add_element('name').text = @site if @site
       group.add_element('is_smart').text = @is_smart
       if @is_smart
         group << @criteria.rest_xml if @criteria
@@ -365,6 +368,8 @@ module JSS
         group << self.class::MEMBER_CLASS.xml_list(@members, :id)
       end
 
+      add_site_to_xml(doc)
+
       return doc.to_s
 
     end #rest_xml

data/lib/jss/api_object/mac_application.rb

@@ -6,6 +6,8 @@ module JSS
   #
   class MacApplication < APIObject
 
+    include Sitable
+
     ### The base for REST resources of this class
     RSRC_BASE = 'macapplications'.freeze
 
@@ -21,6 +23,9 @@ module JSS
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 350
 
+    # Where is the Site data in the API JSON?
+    SITE_SUBSET = :general
+
   end
 
 end