Merge branch 'master' of github.com:Netflix/RxJava

Author: johnhmarks

CHANGES.md

@@ -1,5 +1,69 @@
 # RxJava Releases #
 
+### Version 0.14.1 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.14.1%22)) ###
+
+* [Pull 402](https://github.com/Netflix/RxJava/pull/402) rxjava-apache-http improvements
+
+### Version 0.14.0 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.14.0%22)) ###
+
+Further progress to the Scala adaptor and a handful of new operators.
+
+Bump to 0.14.0 due to small breaking change to `distinct` operator removing overloaded methods with `Comparator`. These methods were added in 0.13.2 and determined to be incorrect.
+
+This release also includes a new contrib module, [rxjava-apache-http](https://github.com/Netflix/RxJava/tree/master/rxjava-contrib/rxjava-apache-http) that provides an Observable API to the Apache HttpAsyncClient.
+
+* [Pull 396](https://github.com/Netflix/RxJava/pull/396) Add missing methods to Scala Adaptor
+* [Pull 390](https://github.com/Netflix/RxJava/pull/390) Operators: ElementAt and ElementAtOrDefault
+* [Pull 398](https://github.com/Netflix/RxJava/pull/398) Operators: IsEmpty and Exists (instead of Any)
+* [Pull 397](https://github.com/Netflix/RxJava/pull/397) Observable API for Apache HttpAsyncClient 4.0
+* [Pull 400](https://github.com/Netflix/RxJava/pull/400) Removing `comparator` overloads of `distinct`
+
+### Version 0.13.5
+
+* Upload to Sonatype failed so version skipped
+
+### Version 0.13.4 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.13.4%22)) ###
+
+* [Pull 393](https://github.com/Netflix/RxJava/pull/393) Parallel Operator & ObserveOn/ScheduledObserver Fixes
+* [Pull 394](https://github.com/Netflix/RxJava/pull/394) Change Interval and Sample default Scheduler
+* [Pull 391](https://github.com/Netflix/RxJava/pull/391) Fix OSGI support for rxjava-scala
+
+### Version 0.13.3
+
+* Upload to Sonatype failed so version skipped
+
+### Version 0.13.2 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.13.2%22)) ###
+
+* [Pull 389](https://github.com/Netflix/RxJava/pull/389) Scala Adaptor Improvements
+* [Pull 382](https://github.com/Netflix/RxJava/pull/382) Removing deprecated RxImplicits from rxjava-scala
+* [Pull 381](https://github.com/Netflix/RxJava/pull/381) Operator: mapWithIndex
+* [Pull 380](https://github.com/Netflix/RxJava/pull/380) Implemented `distinct` and `distinctUntilChanged` variants using a comparator
+* [Pull 379](https://github.com/Netflix/RxJava/pull/379) Make `interval` work with multiple subscribers
+
+### Version 0.13.1 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.13.1%22)) ###
+
+This release includes a new Scala adaptor as part of the effort from issue https://github.com/Netflix/RxJava/issues/336 pursuing idiomatic Scala support.
+
+* [Pull 376](https://github.com/Netflix/RxJava/pull/376) Idiomatic Scala Adaptor
+* [Pull 375](https://github.com/Netflix/RxJava/pull/375) Operator: Distinct
+* [Pull 374](https://github.com/Netflix/RxJava/pull/374) Operator: DistinctUntilChanged
+* [Pull 373](https://github.com/Netflix/RxJava/pull/373) Fixes and Cleanup
+
+### Version 0.13.0 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.13.0%22)) ###
+
+This release has some minor changes related to varargs that could break backwards compatibility 
+if directly passing arrays but for most this release should not be breaking.
+
+* [Pull 354](https://github.com/Netflix/RxJava/pull/354) Operators: Count, Sum, Average
+* [Pull 355](https://github.com/Netflix/RxJava/pull/355) Operators: skipWhile and skipWhileWithIndex
+* [Pull 356](https://github.com/Netflix/RxJava/pull/356) Operator: Interval
+* [Pull 357](https://github.com/Netflix/RxJava/pull/357) Operators: first and firstOrDefault
+* [Pull 368](https://github.com/Netflix/RxJava/pull/368) Operators: Throttle and Debounce
+* [Pull 371](https://github.com/Netflix/RxJava/pull/371) Operator: Retry
+* [Pull 370](https://github.com/Netflix/RxJava/pull/370) Change zip method signature from Collection to Iterable
+* [Pull 369](https://github.com/Netflix/RxJava/pull/369) Generics Improvements: co/contra-variance
+* [Pull 361](https://github.com/Netflix/RxJava/pull/361) Remove use of varargs from API
+
 ### Version 0.12.2 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22%20AND%20v%3A%220.12.2%22)) ###
 
 * [Pull 352](https://github.com/Netflix/RxJava/pull/352) Groovy Language Adaptor: Add Func5-9 and N to the wrapper

gradle.properties

@@ -1 +1 @@
-version=0.12.3-SNAPSHOT
+version=0.14.2-SNAPSHOT

language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/TestParallel.groovy

@@ -0,0 +1,21 @@
+package rx.lang.groovy
+
+import org.junit.Test
+
+import rx.Observable
+import rx.Scheduler
+import rx.concurrency.Schedulers
+import rx.util.functions.Func1
+
+class TestParallel {
+
+    @Test
+    public void testParallelOperator() {
+        Observable.range(0, 100)
+                .parallel({
+                    it.map({ return it; })
+                })
+                .toBlockingObservable()
+                .forEach({ println("T: " + it + " Thread: " + Thread.currentThread());  });
+    }
+}

language-adaptors/rxjava-scala-java/README.md

@@ -0,0 +1,5 @@
+
+rxjava-scala-java
+-----------------
+
+Contains examples illustrating how RxScala code can be used from Java.

language-adaptors/rxjava-scala-java/build.gradle

@@ -0,0 +1,32 @@
+
+apply plugin: 'osgi'
+
+
+project(':language-adaptors:rxjava-scala-java') {
+    //sourceSets.test.java.srcDir 'src/examples/java'
+    sourceSets.main.java.srcDir 'src/main/java'
+}
+
+dependencies {
+    compile 'org.scala-lang:scala-library:2.10.+'
+
+    compile project(':rxjava-core')
+    
+    compile project(':language-adaptors:rxjava-scala')
+    
+    provided 'junit:junit-dep:4.10'
+    provided 'org.mockito:mockito-core:1.8.5'
+    provided 'org.scalatest:scalatest_2.10:1.9.1'
+}
+
+jar {
+    manifest {
+        name = 'rxjava-scala-java'
+        instruction 'Bundle-Vendor', 'Netflix'
+        instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
+        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
+        instruction 'Fragment-Host', 'com.netflix.rxjava.core'
+    }
+}
+
+

language-adaptors/rxjava-scala-java/src/main/java/rx/lang/scala/examples/MovieLibUsage.java

@@ -0,0 +1,24 @@
+package rx.lang.scala.examples;
+
+import org.junit.Test;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+
+
+public class MovieLibUsage {
+	
+	Action1<Movie> moviePrinter = new Action1<Movie>() {
+		public void call(Movie m) {
+			System.out.println("A movie of length " + m.lengthInSeconds() + "s");
+		}
+	};
+	
+	@Test
+	public void test() {
+		MovieLib lib = new MovieLib(Observable.from(new Movie(3000), new Movie(1000), new Movie(2000)));
+		
+		lib.longMovies().subscribe(moviePrinter);		
+	}
+
+}

language-adaptors/rxjava-scala/README.md

@@ -1,19 +1,71 @@
 # Scala Adaptor for RxJava
 
+This adaptor allows to use RxJava in Scala with anonymous functions, e.g.
 
-This adaptor allows 'fn' functions to be used and RxJava will know how to invoke them.
+```scala
+val o = Observable.interval(200 millis).take(5)
+o.subscribe(n => println("n = " + n))
+Observable(1, 2, 3, 4).reduce(_ + _)
+```
+
+For-comprehensions are also supported:
+
+```scala
+val first = Observable(10, 11, 12)
+val second = Observable(10, 11, 12)
+val booleans = for ((n1, n2) <- (first zip second)) yield (n1 == n2)
+```
 
-This enables code such as:
+Further, this adaptor attempts to expose an API which is as Scala-idiomatic as possible. This means that certain methods have been renamed, their signature was changed, or static methods were changed to instance methods. Some examples:
 
 ```scala
-Observable.from("1", "2", "3")
-  .take(2)
-  .subscribe((callback: String) => {
-      println(callback)
-  })
+ // instead of concat:
+def ++[U >: T](that: Observable[U]): Observable[U]
+
+// instance method instead of static:
+def zip[U](that: Observable[U]): Observable[(T, U)] 
+
+// the implicit evidence argument ensures that dematerialize can only be called on Observables of Notifications:
+def dematerialize[U](implicit evidence: T <:< Notification[U]): Observable[U] 
+
+// additional type parameter U with lower bound to get covariance right:
+def onErrorResumeNext[U >: T](resumeFunction: Throwable => Observable[U]): Observable[U] 
+
+// curried in Scala collections, so curry fold also here:
+def fold[R](initialValue: R)(accumulator: (R, T) => R): Observable[R] 
+
+// using Duration instead of (long timepan, TimeUnit duration):
+def sample(duration: Duration): Observable[T] 
+
+// called skip in Java, but drop in Scala
+def drop(n: Int): Observable[T] 
+
+// there's only mapWithIndex in Java, because Java doesn't have tuples:
+def zipWithIndex: Observable[(T, Int)] 
+
+// corresponds to Java's toList:
+def toSeq: Observable[Seq[T]] 
+
+// the implicit evidence argument ensures that switch can only be called on Observables of Observables:
+def switch[U](implicit evidence: Observable[T] <:< Observable[Observable[U]]): Observable[U]
+
+// Java's from becomes apply, and we use Scala Range
+def apply(range: Range): Observable[Int]
+
+// use Bottom type:
+def never: Observable[Nothing] 
 ```
 
-# Binaries
+Also, the Scala Observable is fully covariant in its type parameter, whereas the Java Observable only achieves partial covariance due to limitations of Java's type system (or if you can fix this, your suggestions are very welcome).
+
+For more examples, see [RxScalaDemo.scala](https://github.com/Netflix/RxJava/blob/master/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/examples/RxScalaDemo.scala).
+
+Scala code using Rx should only import members from `rx.lang.scala` and below.
+
+Work on this adaptor is still in progress, and for the moment, the best source of documentation are the comments in the source code of [`rx.lang.scala.Observable`](https://github.com/Netflix/RxJava/blob/master/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala).
+
+
+## Binaries
 
 Binaries and dependency information for Maven, Ivy, Gradle and others can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22rxjava-scala%22).
 

language-adaptors/rxjava-scala/TODO.md

@@ -0,0 +1,17 @@
+
+TODOs for Scala Adapter
+-----------------------
+
+This is a (probably incomplete) list of what still needs to be done in the Scala adaptor:
+
+*    mirror complete Java package structure in Scala
+*    objects for classes with static methods or singletons (e.g. Schedulers, Subscriptions)
+*    Notification as a case class
+*    integrating Scala Futures, should there be a common base interface for Futures and Observables?
+*    Add methods present in Scala collections library, but not in RxJava, e.g. aggregate à la Scala, collect, exists, tails, ...
+*    combineLatest with arities > 2
+*    decide where the MovieLib/MovieLibUsage (use Scala code from Java code) example should live and make sure gradle builds it in the right order
+*    Avoid text duplication in scaladoc using templates, add examples, distinction between use case signature and full signature
+*    other small TODOs
+
+

language-adaptors/rxjava-scala/build.gradle

@@ -49,7 +49,7 @@ jar {
         name = 'rxjava-scala'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
+        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,!org.scalatest.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
 }