Merge pull request #34 from proppy/remove-child

remove child method

Author: proppy

Firebase.cpp

@@ -27,25 +27,17 @@ Firebase& Firebase::auth(const String& auth) {
   return *this;
 }
 
-Firebase& Firebase::child(const String& key) {
-  _path = key;
-  return *this;
-}
-
-String Firebase::val() {
-  return sendRequest("GET");
+String Firebase::val(const String& path) {
+  return sendRequest("GET", path);
 }
 
-String Firebase::push(const String& value) {
-  return sendRequest("POST", (uint8_t*)value.c_str(), value.length());
+String Firebase::push(const String& path, const String& value) {
+  return sendRequest("POST", path, value);
 }
 
-Firebase& Firebase::stream() {
-  _error.reset();  
-  String url = "/" + _path + ".json";
-  if (_auth.length() > 0) {
-    url += "?auth=" + _auth;
-  }
+Firebase& Firebase::stream(const String& path) {
+  _error.reset();
+  String url = makeURL(path); 
   const char* headers[] = {"Location"};
   _http.setReuse(true);  
   _http.begin(_host.c_str(), firebasePort, url.c_str(), true, firebaseFingerprint);
@@ -70,14 +62,23 @@ Firebase& Firebase::stream() {
   return *this;
 }
 
-String Firebase::sendRequest(const char* method, uint8_t* value, size_t size) {
-  _error.reset();
-  String url = "/" + _path + ".json";
+String Firebase::makeURL(const String& path) {
+  String url;
+  if (path[0] != '/') {
+    url = "/";
+  }
+  url += path + ".json";
   if (_auth.length() > 0) {
     url += "?auth=" + _auth;
   }
+  return url;
+}
+
+String Firebase::sendRequest(const char* method, const String& path, const String& value) {
+  _error.reset();
+  String url = makeURL(path);
   _http.begin(_host.c_str(), firebasePort, url.c_str(), true, firebaseFingerprint);
-  int statusCode = _http.sendRequest(method, value, size);
+  int statusCode = _http.sendRequest(method, (uint8_t*)value.c_str(), value.length());
   if (statusCode < 0) {
     _error.set(statusCode,
 	       String(method) + " " + url + ": "

Firebase.h

@@ -47,14 +47,13 @@ class Firebase {
  public:
   Firebase(const String& host);
   Firebase& auth(const String& auth);
-  Firebase& child(const String& key);
   const FirebaseError& error() const {
     return _error;
   }
-  String val();
-  String push(const String& value);
+  String val(const String& path);
+  String push(const String& path, const String& value);
   bool connected();
-  Firebase& stream();
+  Firebase& stream(const String& path);
   bool available();
   enum Event {
     UNKNOWN,
@@ -63,11 +62,11 @@ class Firebase {
   };
   Event read(String& event);
  private:
-  String sendRequest(const char* method, uint8_t* value = NULL, size_t size = 0);
+  String makeURL(const String& path);
+  String sendRequest(const char* method, const String& path, const String& value = "");
   HTTPClient _http;
   String _host;
   String _auth;
-  String _path;    
   FirebaseError _error;
 };
 

examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino

@@ -20,9 +20,8 @@
 #include <Firebase.h>
 
 // create firebase client.
-Firebase logs = Firebase("example.firebaseio.com")
-                   .auth("secret_or_token")
-                   .child("child_node");
+Firebase fbase = Firebase("example.firebaseio.com")
+                     .auth("secret_or_token");
 
 void setup() {
   Serial.begin(9600);
@@ -39,17 +38,17 @@ void setup() {
   Serial.println(WiFi.localIP());
 
   // add a new entry.
-  String l = logs.push("{\".sv\": \"timestamp\"}");
+  String l = fbase.push("/logs", "{\".sv\": \"timestamp\"}");
   // handle error.
-  if (logs.error()) {
+  if (fbase.error()) {
       Serial.println("Firebase request failed");
-      Serial.println(logs.error().message());
+      Serial.println(fbase.error().message());
       return;
   }
   // print response.
   Serial.println(l);
   // print all entries.
-  Serial.println(logs.val());
+  Serial.println(fbase.val("/logs"));
 }
 
 void loop() {

examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

@@ -19,8 +19,8 @@
 
 #include <Firebase.h>
 
-Firebase node = Firebase("example.firebaseio.com")
-                   .child("child_node");
+Firebase fbase = Firebase("example.firebaseio.com");
+
 void setup() {
   Serial.begin(9600);
 
@@ -35,18 +35,18 @@ void setup() {
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
 
-  node.stream();
+  fbase.stream("/chat");
 }
 
 
 void loop() {
-  if (node.error()) {
+  if (fbase.error()) {
     Serial.println("streaming error");
-    Serial.println(node.error().message());
+    Serial.println(fbase.error().message());
   }
-  if (node.available()) {
+  if (fbase.available()) {
      String event;
-     auto type = node.read(event);
+     auto type = fbase.read(event);
      Serial.print("event: ");
      Serial.println(type);
      if (type != Firebase::Event::UNKNOWN) {