Merge pull request #6 from Gitteroid/dev

amatkivskiy · amatkivskiy · commit 3191eb4ebeeb · 2016-01-14T16:59:28.000+02:00
Added room events streaming API.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.4'
+      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.5'
 }
 ```
 
@@ -63,6 +63,7 @@ dependencies {
 ###<a name="ReleaseNotes">**Release notes**
 - **1.5** (14.01.2016)
 	- Added faye api support.
+	- Added room events streaming api support.
 - **1.4**
 	- Refactored library structure
 	- Added async api support.
@@ -107,6 +108,7 @@ dependencies {
 
 *:heavy_exclamation_mark: Streaming (Avalible only in Rx part.*)
 - Room messages stream
+- Room events stream
 
 *:heavy_exclamation_mark: Faye API (Avalible only in Async part.*)
 - Room messages events
@@ -324,6 +326,24 @@ client.getRoomMessagesStream(roomId).subscribe(new Action1<MessageResponse>() {
 });
 ```
 
+or 
+
+```java
+RxGitterStreamingApiClient client = new RxGitterStreamingApiClient.Builder()
+        .withAccountToken("user_access_token")
+        .build();
+
+String roomId = "room_id";
+
+client.getRoomEventsStream(roomId).subscribe(new Action1<RoomEvent>() {
+	@Override
+	public void call(RoomEvent event) {
+		System.out.println(event.sent);
+	        System.out.println(event.meta);
+	}
+});
+```
+
 ###<a name="Faye">**How to work with Gitter Faye API**
 
 1 Setup ```AsyncGitterFayeClient```:
diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterStreamingApi.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterStreamingApi.java
@@ -10,5 +10,9 @@ public interface RxGitterStreamingApi {
 
   @Streaming
   @GET("/rooms/{roomId}/chatMessages")
-  Observable<Response> getRoomStream(@Path("roomId") String roomId);
+  Observable<Response> getRoomMessagesStream(@Path("roomId") String roomId);
+
+  @Streaming
+  @GET("/rooms/{roomId}/events")
+  Observable<Response> getRoomEventsStream(@Path("roomId") String roomId);
 }
diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterStreamingApiClient.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterStreamingApiClient.java
@@ -1,24 +1,27 @@
 package com.amatkivskiy.gitter.sdk.rx.client;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import com.amatkivskiy.gitter.sdk.Constants;
+import com.amatkivskiy.gitter.sdk.api.builder.GitterApiBuilder;
 import com.amatkivskiy.gitter.sdk.converter.UserJsonDeserializer;
 import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.MessageResponse;
 import com.amatkivskiy.gitter.sdk.rx.api.RxGitterStreamingApi;
 import com.amatkivskiy.gitter.sdk.rx.streaming.OnSubscribeBufferedReader;
-import com.amatkivskiy.gitter.sdk.api.builder.GitterApiBuilder;
+import com.amatkivskiy.gitter.sdk.rx.streaming.model.RoomEvent;
 import com.amatkivskiy.gitter.sdk.util.StringUtils;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import retrofit.client.Response;
-import retrofit.converter.GsonConverter;
-import rx.Observable;
-import rx.functions.Func1;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import retrofit.client.Response;
+import retrofit.converter.GsonConverter;
+import rx.Observable;
+import rx.functions.Func1;
+
 public class RxGitterStreamingApiClient {
   private RxGitterStreamingApi api;
   private Gson gson;
@@ -29,7 +32,7 @@ public RxGitterStreamingApiClient(RxGitterStreamingApi api, Gson gson) {
   }
 
   public Observable<MessageResponse> getRoomMessagesStream(String roomId) {
-    return api.getRoomStream(roomId).flatMap(new Func1<Response, Observable<String>>() {
+    return api.getRoomMessagesStream(roomId).flatMap(new Func1<Response, Observable<String>>() {
       @Override
       public Observable<String> call(Response response) {
         try {
@@ -53,6 +56,31 @@ public MessageResponse call(String s) {
     });
   }
 
+  public Observable<RoomEvent> getRoomEventsStream(String roomId) {
+    return api.getRoomEventsStream(roomId).flatMap(new Func1<Response, Observable<String>>() {
+      @Override
+      public Observable<String> call(Response response) {
+        try {
+          BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(response.getBody().in()));
+          return Observable.create(new OnSubscribeBufferedReader(bufferedReader));
+        } catch (IOException e) {
+          return Observable.error(e);
+        }
+      }
+    }).filter(new Func1<String, Boolean>() {
+      @Override
+      public Boolean call(String s) {
+//        This check is required because server sometimes return empty string or string with newline character.
+        return StringUtils.checkIfValidMessageJson(s);
+      }
+    }).map(new Func1<String, RoomEvent>() {
+      @Override
+      public RoomEvent call(String s) {
+        return gson.fromJson(s, RoomEvent.class);
+      }
+    });
+  }
+
   public static class Builder extends GitterApiBuilder<Builder, RxGitterStreamingApiClient> {
 
     protected String getFullEndpointUrl() {
diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/streaming/OnSubscribeBufferedReader.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/streaming/OnSubscribeBufferedReader.java
@@ -1,11 +1,11 @@
 package com.amatkivskiy.gitter.sdk.rx.streaming;
 
-import rx.Subscriber;
-import rx.observables.AbstractOnSubscribe;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import rx.Subscriber;
+import rx.observables.AbstractOnSubscribe;
+
 public class OnSubscribeBufferedReader extends AbstractOnSubscribe<String, BufferedReader> {
 
   private final BufferedReader reader;
diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/streaming/model/RoomEvent.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/streaming/model/RoomEvent.java
@@ -0,0 +1,31 @@
+package com.amatkivskiy.gitter.sdk.rx.streaming.model;
+
+import com.google.gson.JsonObject;
+
+import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
+
+public class RoomEvent {
+  public final String id;
+  public final String text;
+  public final String html;
+  public final String sent;
+  public final String editedAt;
+  public final UserResponse fromUser;
+
+  public final JsonObject meta;
+  public final JsonObject payload;
+
+  public final String v;
+
+  public RoomEvent(String id, String text, String html, String sent, String editedAt, UserResponse fromUser, JsonObject meta, JsonObject payload, String v) {
+    this.id = id;
+    this.text = text;
+    this.html = html;
+    this.sent = sent;
+    this.editedAt = editedAt;
+    this.fromUser = fromUser;
+    this.meta = meta;
+    this.payload = payload;
+    this.v = v;
+  }
+}
diff --git a/samples/build.gradle b/samples/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'application'
 
-mainClassName = "com.amatkivskiy.gitter.sdk.samples.faye.FayeSamples"
-//mainClassName = "com.amatkivskiy.gitter.sdk.samples.RxSamples"
+//mainClassName = "com.amatkivskiy.gitter.sdk.samples.faye.FayeSamples"
+mainClassName = "com.amatkivskiy.gitter.sdk.samples.RxSamples"
 
 dependencies {
 //    compile project(':library:core')
diff --git a/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java b/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java
@@ -1,24 +1,29 @@
 package com.amatkivskiy.gitter.sdk.samples;
 
-import com.amatkivskiy.gitter.sdk.credentials.GitterDeveloperCredentials;
-import com.amatkivskiy.gitter.sdk.model.response.BooleanResponse;
-import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
-import com.amatkivskiy.gitter.sdk.model.response.room.RoomResponse;
 import com.amatkivskiy.gitter.sdk.GitterOauthUtils;
+import com.amatkivskiy.gitter.sdk.credentials.GitterDeveloperCredentials;
 import com.amatkivskiy.gitter.sdk.credentials.SimpleGitterCredentialsProvider;
 import com.amatkivskiy.gitter.sdk.model.request.ChatMessagesRequestParams;
 import com.amatkivskiy.gitter.sdk.model.request.UserAccountType;
 import com.amatkivskiy.gitter.sdk.model.response.AccessTokenResponse;
+import com.amatkivskiy.gitter.sdk.model.response.BooleanResponse;
+import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.MessageResponse;
+import com.amatkivskiy.gitter.sdk.model.response.room.RoomResponse;
 import com.amatkivskiy.gitter.sdk.rx.client.RxGitterApiClient;
 import com.amatkivskiy.gitter.sdk.rx.client.RxGitterAuthenticationClient;
 import com.amatkivskiy.gitter.sdk.rx.client.RxGitterStreamingApiClient;
-import retrofit.RestAdapter;
-import rx.Observable;
-import rx.functions.Action1;
+import com.amatkivskiy.gitter.sdk.rx.streaming.model.RoomEvent;
+import com.squareup.okhttp.OkHttpClient;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import retrofit.RestAdapter;
+import retrofit.client.OkClient;
+import rx.Observable;
+import rx.functions.Action1;
 
 public class RxSamples {
   //  This information you can take from your Gitter dev account:
@@ -41,6 +46,29 @@ public static void main(String[] args) {
     searchUsersSample();
     markMessagesRead();
     getSuggestedRooms();
+    roomEventsStreamSample();
+  }
+
+  private static void roomEventsStreamSample() {
+    OkHttpClient okClient = new OkHttpClient();
+
+    // Configure OkHttpClient not to drop connection rapidly.
+    okClient.setReadTimeout(10, TimeUnit.MINUTES);
+
+    RxGitterStreamingApiClient client = new RxGitterStreamingApiClient.Builder()
+        .withAccountToken("user_access_token")
+        .withClient(new OkClient(okClient))
+        .build();
+
+    String roomId = "533aa1485e986b0712f00ba5"; // gitterHQ/developers for example.
+
+    client.getRoomEventsStream(roomId).subscribe(new Action1<RoomEvent>() {
+      @Override
+      public void call(RoomEvent event) {
+        System.out.println(event.sent);
+        System.out.println(event.meta);
+      }
+    });
   }
 
   private static void getSuggestedRooms() {
@@ -120,8 +148,14 @@ public void call(BooleanResponse response) {
   }
 
   private static void roomMessagesStreamSample() {
+    OkHttpClient okClient = new OkHttpClient();
+
+    // Configure OkHttpClient not to drop connection rapidly.
+    okClient.setReadTimeout(10, TimeUnit.MINUTES);
+
     RxGitterStreamingApiClient client = new RxGitterStreamingApiClient.Builder()
         .withAccountToken("user_access_token")
+        .withClient(new OkClient(okClient))
         .build();
 
     String roomId = "533aa1485e986b0712f00ba5"; // gitterHQ/developers for example.
