Merge pull request #53 from orhanobut/oo/rx

rx support

README.md

@@ -17,9 +17,11 @@ Hawk provides:
 
 ###Add dependency
 ```groovy
-compile 'com.orhanobut:hawk:1.15'
+compile 'com.orhanobut:hawk:1.16'
 ```
 
+If you want to have Rx features, make sure to add Rx dependency
+
 #### Initialize the hawk
 ```java
 Hawk.init(context, PASSWORD); // might take 36-400ms depends on device
@@ -63,6 +65,31 @@ Hawk.chain()
      .commit();
 ```
 
+#### Save (Rx)
+```java
+Observable<Boolean> result = Hawk.putObservable(key, T); // Returns the result as boolean
+```
+
+example usage
+```java
+Hawk.putObservable(KEY, new Foo())
+    .observeOn(Schedulers.io())
+    .subscribeOn(AndroidSchedulers.mainThread())
+    .subscribe(new Subscriber<Boolean>() {
+      @Override
+      public void onCompleted() {
+      }
+
+      @Override
+      public void onError(Throwable e) {
+      }
+
+      @Override
+      public void onNext(Boolean s) {
+      }
+    });
+```
+
 #### Get
 ```java
 T result = Hawk.get(key);
@@ -73,6 +100,40 @@ or with default value
 T result = Hawk.get(key, T);
 ```
 
+#### Get Observable (Rx support)
+To be able to use rx support, you need to add the dependency.
+```java
+Observable<T> result = Hawk.getObservable(key);
+```
+or with default value
+
+```java
+Observable<T> result = Hawk.getObservable(key, T);
+```
+
+example usage
+```java
+Hawk.<Foo>getObservable(KEY)
+    .observeOn(Schedulers.io())
+    .subscribeOn(AndroidSchedulers.mainThread())
+    .subscribe(new Subscriber<Foo>() {
+      @Override
+      public void onCompleted() {
+        Log.d("rxtest", "completed");
+      }
+
+      @Override
+      public void onError(Throwable e) {
+        Log.d("rxtest", "error");
+      }
+
+      @Override
+      public void onNext(Foo s) {
+        Log.d("rxtest", s.toString());
+      }
+    });
+```
+
 #### Remove
 ```java
 Hawk.remove(key); // Returns the result as boolean

app/src/main/java/com/orhanobut/hawksample/Foo.java

@@ -4,11 +4,20 @@
  * @author Orhan Obut
  */
 public class Foo {
-    int a = 1;
-    int b = 3;
-    String c = "asdfasdf";
+  int a = 1;
+  int b = 3;
+  String c = "asdfasdf";
 
-    void test() {
+  void test() {
 
-    }
+  }
+
+  @Override
+  public String toString() {
+    return "Foo{" +
+        "a=" + a +
+        ", b=" + b +
+        ", c='" + c + '\'' +
+        '}';
+  }
 }

app/src/main/java/com/orhanobut/hawksample/MainActivity.java

@@ -8,7 +8,6 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.orhanobut.hawk.Hawk;
-import com.orhanobut.hawk.LogLevel;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -18,6 +17,10 @@
 import java.util.Map;
 import java.util.Set;
 
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
 
 public class MainActivity extends Activity {
 
@@ -31,38 +34,81 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
 
-    long start = System.nanoTime();
-    Hawk.initWithoutEncryption(this, LogLevel.FULL);
-    long end = System.nanoTime();
+    //    long start = System.nanoTime();
+    //    Hawk.initWithoutEncryption(this, LogLevel.FULL);
+    //    long end = System.nanoTime();
+    //
+    //    double resultHawk = getTime(start, end);
+    //    log("Hawk init with password : " + resultHawk);
+    //
+    //    start = System.nanoTime();
+    //    prefs = getSharedPreferences("BENCHARMK", MODE_PRIVATE);
+    //    editor = prefs.edit();
+    //    end = System.nanoTime();
+    //    double resultPref = getTime(start, end);
+    //    log("init: Prefs: " + resultPref + "    Hawk : " + resultHawk);
+    //
+    //
+    //    benchmarkPrimitivePut();
+    //    benchmarkStringPut();
+    //    benchmarkListObjectPut();
+    //    benchmarkListStringPut();
+    //    benchmarkObjectPut();
+    //    benchmarkMapPut();
+    //    benchmarkSetPut();
+    //
+    //    benchmarkPrimitiveGet();
+    //    benchmarkStringGet();
+    //    benchmarkListObjectGet();
+    //    benchmarkListStringGet();
+    //    benchmarkObjectGet();
+    //    benchmarkMapGet();
+    //    benchmarkSetGet();
+    //
+    //    benchmarkDelete();
 
-    double resultHawk = getTime(start, end);
-    log("Hawk init with password : " + resultHawk);
+    Hawk.init(this);
+    testRx();
+  }
+
+  private void testRx() {
+    Hawk.putObservable(KEY, new Foo())
+        .observeOn(Schedulers.io())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .subscribe(new Subscriber<Boolean>() {
+          @Override
+          public void onCompleted() {
+          }
+
+          @Override
+          public void onError(Throwable e) {
+          }
+
+          @Override
+          public void onNext(Boolean s) {
+          }
+        });
+
+    Hawk.<Foo>getObservable(KEY)
+        .observeOn(Schedulers.io())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .subscribe(new Subscriber<Foo>() {
+          @Override
+          public void onCompleted() {
+            Log.d("rxtest", "completed");
+          }
+
+          @Override
+          public void onError(Throwable e) {
+            Log.d("rxtest", "error");
+          }
+
+          @Override
+          public void onNext(Foo s) {
+            Log.d("rxtest", s.toString());
+          }
+        });
 
-    start = System.nanoTime();
-    prefs = getSharedPreferences("BENCHARMK", MODE_PRIVATE);
-    editor = prefs.edit();
-    end = System.nanoTime();
-    double resultPref = getTime(start, end);
-    log("init: Prefs: " + resultPref + "    Hawk : " + resultHawk);
-
-
-    benchmarkPrimitivePut();
-    benchmarkStringPut();
-    benchmarkListObjectPut();
-    benchmarkListStringPut();
-    benchmarkObjectPut();
-    benchmarkMapPut();
-    benchmarkSetPut();
-
-    benchmarkPrimitiveGet();
-    benchmarkStringGet();
-    benchmarkListObjectGet();
-    benchmarkListStringGet();
-    benchmarkObjectGet();
-    benchmarkMapGet();
-    benchmarkSetGet();
-
-    benchmarkDelete();
   }
 
   private void testHawkInitWithoutPassword() {

build.gradle

@@ -5,10 +5,11 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+      classpath 'com.android.tools.build:gradle:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
     }
 }
 

gradle.properties

@@ -18,9 +18,8 @@
 # org.gradle.parallel=true
 
 # VERSION_NAME=1.10-SNAPSHOT
-# VERSION_CODE=11
-VERSION_NAME=1.15
-VERSION_CODE=16
+VERSION_NAME=1.16
+VERSION_CODE=17
 GROUP=com.orhanobut
 
 POM_DESCRIPTION=Secure, Advanced Storage for android

hawk/build.gradle

@@ -1,22 +1,27 @@
 apply plugin: 'com.android.library'
+
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+  compileSdkVersion 21
+  buildToolsVersion "21.1.2"
+
+  defaultConfig {
+    minSdkVersion 8
+    targetSdkVersion 21
+  }
 
-    defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
-    }
+  lintOptions {
+    abortOnError false
+  }
+}
 
-    lintOptions {
-        abortOnError false
-    }
+configurations {
+  optional
+  compile.extendsFrom optional
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.3.1'
+  compile 'com.google.code.gson:gson:2.3.1'
+  optional 'io.reactivex:rxandroid:0.25.0'
 }
 
 apply from: '../maven_push.gradle'

hawk/src/androidTest/java/com/orhanobut/hawk/HawkRxTest.java

@@ -0,0 +1,65 @@
+package com.orhanobut.hawk;
+
+import android.content.Context;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * @author Orhan Obut
+ */
+public class HawkRxTest extends InstrumentationTestCase {
+
+  Context context;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    System.setProperty(
+        "dexmaker.dexcache",
+        getInstrumentation().getTargetContext().getCacheDir().getPath());
+    context = getInstrumentation().getContext();
+    Hawk.init(context, "testPassword");
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    context = null;
+    Hawk.clear();
+    Hawk.resetCrypto();
+  }
+
+  private static final String KEY = "TAG";
+
+  public void testString() throws Exception {
+    Hawk.put(KEY, "hawk");
+
+    Hawk.<String>getObservable(KEY)
+        .observeOn(Schedulers.io())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .subscribe(new Subscriber<String>() {
+          @Override
+          public void onCompleted() {
+            Log.d("rxtest", "completed");
+            assertTrue(true);
+          }
+
+          @Override
+          public void onError(Throwable e) {
+            Log.d("rxtest", "error");
+            assertTrue(false);
+          }
+
+          @Override
+          public void onNext(String s) {
+            Log.d("rxtest", s);
+            assertTrue(true);
+          }
+        });
+  }
+
+}