Observables packaging

build.gradle

@@ -10,7 +10,7 @@ subprojects {
     apply plugin: 'maven'
 
     group = "com.github.otah"
-    version = "0.1-SNAPSHOT"
+    version = "0.2-SNAPSHOT"
 
     sourceCompatibility = 1.8
 

hap-examples/src/main/scala/com/github/otah/hap/examples/ExampleSwitch.scala

@@ -2,7 +2,7 @@ package com.github.otah.hap.examples
 
 import com.github.otah.hap.api.characteristics.PowerStateCharacteristic
 import com.github.otah.hap.api.services.SwitchService
-import com.github.otah.hap.observable.ObservableWritableCharacteristic
+import com.github.otah.hap.monix.ObservableWritableCharacteristic
 import monix.reactive.subjects.BehaviorSubject
 
 case class ExampleSwitch(id: Int, label: String)

hap-monix/src/main/scala/com/github/otah/hap/observable/ObservableCharacteristic.scala → hap-monix/src/main/scala/com/github/otah/hap/monix/ObservableCharacteristic.scala

@@ -1,4 +1,4 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.monix
 
 import com.github.otah.hap.api.Characteristic
 import monix.eval.Task
@@ -11,7 +11,7 @@ abstract class ObservableCharacteristic[T](observable: Observable[T], currentVal
 
   def this(behavior: BehaviorSubject[T])(implicit scheduler: Scheduler) = this(behavior, behavior.headL)
 
-  override val reader = Reader(currentValue.runAsync)
+  override val reader = ObservableReader(currentValue)
 
-  override val notifier = Some(ObservableNotifier[T](observable))
+  override val notifier = ObservableNotifier(observable)
 }

hap-monix/src/main/scala/com/github/otah/hap/observable/ObservableNotifier.scala → hap-monix/src/main/scala/com/github/otah/hap/monix/ObservableNotifier.scala

@@ -1,12 +1,12 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.monix
 
 import com.github.otah.hap.api.{Subscription, TypedNotifier}
 import monix.execution.{Ack, Scheduler}
 import monix.reactive.Observable
 
 import scala.concurrent.Future
 
-case class ObservableNotifier[T](observable: Observable[T])(implicit scheduler: Scheduler) extends TypedNotifier[T] {
+class ObservableNotifier[T](observable: Observable[T])(implicit scheduler: Scheduler) extends TypedNotifier[T] {
 
   override def subscribe(callback: T => Future[Unit]) = new Subscription {
 
@@ -15,3 +15,7 @@ case class ObservableNotifier[T](observable: Observable[T])(implicit scheduler:
     override def unsubscribe(): Unit = subscription.cancel()
   }
 }
+
+object ObservableNotifier {
+  def apply[T](observable: Observable[T])(implicit scheduler: Scheduler) = Some(new ObservableNotifier(observable))
+}

hap-monix/src/main/scala/com/github/otah/hap/monix/ObservableReader.scala

@@ -0,0 +1,12 @@
+package com.github.otah.hap.monix
+
+import monix.eval.Task
+import monix.execution.Scheduler
+
+import scala.concurrent.{ExecutionContext, Future}
+
+object ObservableReader {
+
+  def apply[T](currentValue: Task[T])(implicit scheduler: Scheduler): Some[ExecutionContext => Future[Option[T]]] =
+    Some(_ => currentValue.map(Some.apply).runAsync)
+}

hap-monix/src/main/scala/com/github/otah/hap/observable/ObservableWritableCharacteristic.scala → hap-monix/src/main/scala/com/github/otah/hap/monix/ObservableWritableCharacteristic.scala

@@ -1,4 +1,4 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.monix
 
 import monix.eval.Task
 import monix.execution.Scheduler

hap-reactivex/src/main/scala/com/github/otah/hap/observable/ObservableCharacteristic.scala → hap-reactivex/src/main/scala/com/github/otah/hap/reactivex/ObservableCharacteristic.scala

@@ -1,4 +1,4 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.reactivex
 
 import com.github.otah.hap.api.Characteristic
 import rx.lang.scala.Observable
@@ -9,7 +9,7 @@ abstract class ObservableCharacteristic[T](observable: Observable[T], currentVal
 
   def this(behavior: BehaviorSubject[T]) = this(behavior, behavior.head)
 
-  override val reader = Reader(currentValue.toBlocking.toFuture)
+  override val reader = ObservableReader(currentValue)
 
-  override val notifier = Some(ObservableNotifier[T](observable))
+  override val notifier = ObservableNotifier(observable)
 }

hap-reactivex/src/main/scala/com/github/otah/hap/observable/ObservableNotifier.scala → hap-reactivex/src/main/scala/com/github/otah/hap/reactivex/ObservableNotifier.scala

@@ -1,11 +1,11 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.reactivex
 
 import com.github.otah.hap.api.{Subscription, TypedNotifier}
 import rx.lang.scala.Observable
 
 import scala.concurrent.Future
 
-case class ObservableNotifier[T](observable: Observable[T]) extends TypedNotifier[T] {
+class ObservableNotifier[T](observable: Observable[T]) extends TypedNotifier[T] {
 
   override def subscribe(callback: T => Future[Unit]) = new Subscription {
 
@@ -14,3 +14,7 @@ case class ObservableNotifier[T](observable: Observable[T]) extends TypedNotifie
     override def unsubscribe(): Unit = subscription.unsubscribe()
   }
 }
+
+object ObservableNotifier {
+  def apply[T](observable: Observable[T]) = Some(new ObservableNotifier(observable))
+}

hap-reactivex/src/main/scala/com/github/otah/hap/reactivex/ObservableReader.scala

@@ -0,0 +1,11 @@
+package com.github.otah.hap.reactivex
+
+import rx.lang.scala.Observable
+
+import scala.concurrent.{ExecutionContext, Future}
+
+object ObservableReader {
+
+  def apply[T](currentValue: Observable[T]): Some[ExecutionContext => Future[Option[T]]] =
+    Some(_ => currentValue.map(Some.apply).toBlocking.toFuture)
+}

hap-reactivex/src/main/scala/com/github/otah/hap/observable/ObservableWritableCharacteristic.scala → hap-reactivex/src/main/scala/com/github/otah/hap/reactivex/ObservableWritableCharacteristic.scala

@@ -1,4 +1,4 @@
-package com.github.otah.hap.observable
+package com.github.otah.hap.reactivex
 
 import rx.lang.scala.subjects.BehaviorSubject
 import rx.lang.scala.{Observable, Observer, Subject}