lib/jss/api_object/sitable.rb in ruby-jss-0.14.0 vs lib/jss/api_object/sitable.rb in ruby-jss-1.0.0b2

@@ -78,20 +78,20 @@
     # 'site'
     #
     # @return [String] The name of the site for this object.
     #
     def site_name
-      @site_name
+      @site_name || NO_SITE_NAME
     end # cat name
     alias site site_name
 
     # The id of the site for this object.
     #
     # @return [Integer] The id of the site for this object.
     #
     def site_id
-      @site_id
+      @site_id || NO_SITE_ID
     end # cat id
 
     # The JSS::Site instance for this object's site
     #
     # @return [JSS::Site] The JSS::Site instance for this object's site
@@ -163,11 +163,11 @@
         if self.class::SITE_SUBSET == :top
           @init_data[:site]
         elsif @init_data[self.class::SITE_SUBSET]
           @init_data[self.class::SITE_SUBSET][:site]
         end
-      site_data ||= {}
+      site_data ||= { name: NO_SITE_NAME, id: NO_SITE_ID }
 
       @site_name = site_data[:name]
       @site_id = site_data[:id]
     end # parse site
 
@@ -185,10 +185,10 @@
         else
           parent_elem = root.elements[self.class::SITE_SUBSET.to_s]
           parent_elem ||= root.add_element(self.class::SITE_SUBSET.to_s)
           parent_elem.add_element 'site'
         end
-      site_elem.add_element('name').text = @site_name.to_s
+      site_elem.add_element('name').text = site_name.to_s
     end # add_site_to_xml
 
   end # module categorizable
 
 end # module