locatable.rb in jss-api-0.5.8

- old
+ new

@@ -157,70 +157,70 @@
     ###
 
     ###
     def building= (new_val)
       return nil if @building == new_val
-      new_val.strip!
-      raise JSS::NoSuchItemError, "No building named #{new_val} exists in the JSS" unless JSS::Building.all_names.include? new_val
+      new_val = new_val.to_s.strip
+      raise JSS::NoSuchItemError, "No building named #{new_val} exists in the JSS" unless new_val.empty? or JSS::Building.all_names.include? new_val
       @building = new_val
       @need_to_update = true
     end
 
     ###
     def department= (new_val)
       return nil if @department == new_val
-      new_val.strip!
-      raise JSS::NoSuchItemError, "No department named #{new_val} exists in the JSS" unless JSS::Department.all_names.include? new_val
+      new_val = new_val.to_s.strip
+      raise JSS::NoSuchItemError, "No department named #{new_val} exists in the JSS" unless new_val.empty? or JSS::Department.all_names.include? new_val
       @department = new_val
       @need_to_update = true
     end
 
     ###
     def email_address= (new_val)
       return nil if @email_address == new_val
-      new_val.strip!
-      raise JSS::InvalidDataError, "Invalid Email Address" unless new_val =~ /^[^\s@]+@[^\s@]+$/
+      new_val = new_val.to_s.strip
+      raise JSS::InvalidDataError, "Invalid Email Address" unless new_val.empty? or  new_val =~ /^[^\s@]+@[^\s@]+$/
       @email_address = new_val
       @need_to_update = true
     end
 
     ###
     def position= (new_val)
       return nil if @position == new_val
-      new_val.strip!
+      new_val = new_val.to_s.strip
       @position = new_val
       @need_to_update = true
     end
 
     ###
     def phone= (new_val)
       return nil if @phone == new_val
-      new_val.strip!
+      new_val = new_val.to_s.strip
       @phone = new_val
       @need_to_update = true
     end
 
     ###
     def real_name= (new_val)
       return nil if @real_name == new_val
-      new_val.strip!
+      new_val = new_val.to_s.strip
       @real_name = new_val
       @need_to_update = true
     end
 
     ###
     def room= (new_val)
       return nil if @room == new_val
-      new_val.strip!
+      new_val = new_val.to_s.strip
       @room = new_val
       @need_to_update = true
     end
 
     ###
     def username= (new_val)
       return nil if @username == new_val
-      new_val.strip!
+      new_val = new_val.to_s.strip
       @username = new_val
       @need_to_update = true
     end
 
     ###
@@ -235,9 +235,27 @@
       @department or \
       @building or \
       @room
     end
 
+    ###
+    ### Clear all location data
+    ###
+    ### @return [void]
+    ###
+    def clear_location
+      @username = ''
+      @real_name = ''
+      @email_address = ''
+      @position = ''
+      @phone = ''
+      @department  = ''
+      @building = ''
+      @room = ''
+      @need_to_update = true
+    end
+    
+    
     ### aliases
     alias user username
     
     
     ###