lib/firebase/firebase.rb in motion-firebase-2.0.13 vs lib/firebase/firebase.rb in motion-firebase-2.0.14

@@ -4,19 +4,19 @@
     -2 => :wrong_password,
   }
 
   def self.convert_event_type(event_type)
     case event_type
-    when :child_added, :added
+    when :child_added, :added, FEventTypeChildAdded
       return FEventTypeChildAdded
-    when :child_moved, :moved
-      FEventTypeChildMoved
-    when :child_changed, :changed
+    when :child_moved, :moved, FEventTypeChildMoved
+      return FEventTypeChildMoved
+    when :child_changed, :changed, FEventTypeChildChanged
       return FEventTypeChildChanged
-    when :child_removed, :removed
+    when :child_removed, :removed, FEventTypeChildRemoved
       return FEventTypeChildRemoved
-    when :value
+    when :value, FEventTypeValue
       return FEventTypeValue
     else
       NSLog("Unknown event type #{event_type.inspect}")
     end
     return event_type
@@ -190,10 +190,10 @@
         onDisconnectUpdateChildValues(value, withCompletionBlock: and_then)
       else
         onDisconnectSetValue(value, withCompletionBlock: and_then)
       end
     else
-      if value == :remove
+      if value.nil?
         onDisconnectRemoveValue
       elsif NSDictionary === value
         onDisconnectUpdateChildValues(value)
       else
         onDisconnectSetValue(value)