Merge ed8b722 into d5c1139

.gitignore

@@ -65,3 +65,4 @@ TestResults/Rx.TE.Tests_log.ldf
 .mypy_cache/
 .vscode/
 .noseids
+_build

doc/conf.py

@@ -14,7 +14,7 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('../rx'))
+sys.path.insert(0, os.path.abspath('../'))
 
 
 # -- Project information -----------------------------------------------------
@@ -24,9 +24,9 @@
 author = 'Dag Brattli'
 
 # The short X.Y version
-version = '2.0'
+version = '3.0'
 # The full version, including alpha/beta/rc tags
-release = '2.0.0-alpha1'
+release = '3.0.0-alpha1'
 
 
 # -- General configuration ---------------------------------------------------

doc/get_started.rst

@@ -0,0 +1,4 @@
+.. get_started
+
+Get Started
+============

doc/index.rst

@@ -3,17 +3,19 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to RxPY's documentation!
-================================
+The Reactive Extensions for Python (RxPY)
+==========================================
 
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
+RxPY is a library for composing asynchronous and event-based programs using
+observable collections and pipable query operators in Python.
 
-.. automodule:: rx.core
+.. toctree::
+    :maxdepth: 2
+    :caption: Contents:
 
-.. autoclass:: ObservableBase
-    :members:
+    installation
+    get_started
+    reference
 
 Indices and tables
 ==================

doc/installation.rst

@@ -0,0 +1,4 @@
+.. Installation
+
+Installation
+=============

doc/reference.rst

@@ -0,0 +1,13 @@
+.. reference:
+
+Reference
+==========
+
+
+.. toctree::
+   :name: reference
+
+   Observable Factory <reference_observable>
+   Observer <reference_observer>
+   Subject <reference_subject>
+   Operators <reference_operators>

doc/reference_observable.rst

@@ -0,0 +1,7 @@
+.. reference_observable:
+
+Observable Factory
+=====================
+
+.. automodule:: rx
+    :members:

doc/reference_observer.rst

@@ -0,0 +1,7 @@
+.. reference_observer:
+
+Observer
+========
+
+.. autoclass:: rx.core.Observer
+    :members:

doc/reference_operators.rst

@@ -0,0 +1,7 @@
+.. reference_operators:
+
+Operators
+=========
+
+.. automodule:: rx.operators
+    :members:

doc/reference_subject.rst

@@ -0,0 +1,16 @@
+.. reference_subject:
+
+Subject
+========
+
+.. autoclass:: rx.subjects.Subject
+    :members:
+
+.. autoclass:: rx.subjects.BehaviorSubject
+    :members:
+
+.. autoclass:: rx.subjects.ReplaySubject
+    :members:
+
+.. autoclass:: rx.subjects.AsyncSubject
+    :members:

examples/autocomplete/autocomplete.py

@@ -15,6 +15,7 @@
 from tornado.escape import json_decode
 from tornado import ioloop
 
+from rx import operators as _
 from rx.subjects import Subject
 from rx.concurrency import IOLoopScheduler
 
@@ -48,21 +49,21 @@ def open(self):
         self.stream = Subject()
 
         # Get all distinct key up events from the input and only fire if long enough and distinct
-        query = (self.stream
-                 .map(lambda x: x["term"])
-                 .filter(lambda text: len(text) > 2)  # Only if the text is longer than 2 characters
-                 .debounce(0.750)                     # Pause for 750ms
-                 .distinct_until_changed()            # Only if the value has changed
-                )
-        searcher = query.flat_map_latest(search_wikipedia)
+        searcher = self.stream.pipe(
+            _.map(lambda x: x["term"]),
+            _.filter(lambda text: len(text) > 2),  # Only if the text is longer than 2 characters
+            _.debounce(0.750),                     # Pause for 750ms
+            _.distinct_until_changed(),            # Only if the value has changed
+            _.flat_map_latest(search_wikipedia)
+        )
 
         def send_response(x):
             self.write_message(x.body)
 
         def on_error(ex):
             print(ex)
 
-        searcher.subscribe(send_response, on_error, scheduler=scheduler)
+        searcher.subscribe_(send_response, on_error, scheduler=scheduler)
 
     def on_message(self, message):
         obj = json_decode(message)
@@ -88,5 +89,6 @@ def main():
     app.listen(port)
     ioloop.IOLoop.current().start()
 
+
 if __name__ == '__main__':
     main()

examples/autocomplete/autocomplete_asyncio.py

@@ -8,20 +8,18 @@
 """
 
 import os
-import rx
-asyncio = rx.config['asyncio']
+import asyncio
 
-from tornado.websocket import WebSocketHandler
-from tornado.web import RequestHandler, StaticFileHandler, Application, url
-from tornado.httpclient import AsyncHTTPClient
-from tornado.httputil import url_concat
-from tornado.escape import json_decode
 from tornado.platform.asyncio import AsyncIOMainLoop
+from tornado.escape import json_decode
+from tornado.httputil import url_concat
+from tornado.httpclient import AsyncHTTPClient
+from tornado.web import RequestHandler, StaticFileHandler, Application, url
+from tornado.websocket import WebSocketHandler
 
-from rx.subjects import Subject
+from rx import operators as _
 from rx.concurrency import AsyncIOScheduler
-
-scheduler = AsyncIOScheduler()
+from rx.subjects import Subject
 
 
 def search_wikipedia(term):
@@ -44,28 +42,30 @@ def search_wikipedia(term):
 
 class WSHandler(WebSocketHandler):
     def open(self):
+        scheduler = AsyncIOScheduler()
+
         print("WebSocket opened")
 
         # A Subject is both an observable and observer, so we can both subscribe
         # to it and also feed (send) it with new values
         self.subject = Subject()
 
         # Get all distinct key up events from the input and only fire if long enough and distinct
-        query = (self.subject
-                 .map(lambda x: x["term"])
-                 .filter(lambda text: len(text) > 2)  # Only if the text is longer than 2 characters
-                 .debounce(750)                       # Pause for 750ms
-                 .distinct_until_changed()            # Only if the value has changed
-                )
-        searcher = query.flat_map_latest(search_wikipedia)
+        searcher = self.subject.pipe(
+            _.map(lambda x: x["term"]),
+            _.filter(lambda text: len(text) > 2),  # Only if the text is longer than 2 characters
+            _.debounce(0.750),                     # Pause for 750ms
+            _.distinct_until_changed(),            # Only if the value has changed
+            _.flat_map_latest(search_wikipedia)
+        )
 
         def send_response(x):
             self.write_message(x.body)
 
         def on_error(ex):
             print(ex)
 
-        searcher.subscribe(send_response, on_error, scheduler=scheduler)
+        searcher.subscribe_(send_response, on_error, scheduler=scheduler)
 
     def on_message(self, message):
         obj = json_decode(message)
@@ -81,17 +81,19 @@ def get(self):
 
 
 def main():
-    AsyncIOMainLoop().install()
+    AsyncIOMainLoop().make_current()
 
     port = os.environ.get("PORT", 8080)
     app = Application([
         url(r"/", MainHandler),
         (r'/ws', WSHandler),
         (r'/static/(.*)', StaticFileHandler, {'path': "."})
     ])
+
     print("Starting server at port: %s" % port)
     app.listen(port)
     asyncio.get_event_loop().run_forever()
 
+
 if __name__ == '__main__':
     main()

examples/timeflies/timeflies_tkinter.py

@@ -1,5 +1,7 @@
 from tkinter import Tk, Label, Frame
 
+import rx
+from rx import operators as ops
 from rx.subjects import Subject
 from rx.concurrency import TkinterScheduler
 
@@ -13,25 +15,36 @@ def main():
 
     frame = Frame(root, width=600, height=600)
 
-    def move(event):
-        mousemove.on_next(event)
-    frame.bind("<Motion>", move)
+    frame.bind("<Motion>", mousemove.on_next)
 
     text = 'TIME FLIES LIKE AN ARROW'
-    labels = [Label(frame, text=c) for c in text]
 
-    def handle_label(i, label):
+    def on_next(info):
+        label, ev, i = info
+        label.place(x=ev.x + i*12 + 15, y=ev.y)
+
+    def handle_label(label, i):
         label.config(dict(borderwidth=0, padx=0, pady=0))
 
-        def on_next(ev):
-            label.place(x=ev.x + i*12 + 15, y=ev.y)
-        mousemove.delay(i*100).subscribe(on_next, scheduler=scheduler)
+        mapper = ops.map(lambda ev: (label, ev, i))
+        delayer = ops.delay(i*0.1)
+
+        return mousemove.pipe(
+            delayer,
+            mapper
+        )
 
-    for i, label in enumerate(labels):
-        handle_label(i, label)
+    labeler = ops.flat_map_indexed(handle_label)
+    mapper = ops.map(lambda c: Label(frame, text=c))
+
+    rx.from_(text).pipe(
+        mapper,
+        labeler
+    ).subscribe_(on_next, on_error=print, scheduler=scheduler)
 
     frame.pack()
     root.mainloop()
 
+
 if __name__ == '__main__':
     main()

notebooks/reactivex.io/A Decision Tree of Observable Operators. Part I - Creation.ipynb

@@ -833,7 +833,7 @@
       "        will be run if the condition function returns true.\n",
       "    else_source -- {Observable} [Optional] The observable sequence or\n",
       "        Promise that will be run if the condition function returns False.\n",
-      "        If this is not provided, it defaults to rx.Observable.empty\n",
+      "        If this is not provided, it defaults to rx.empty\n",
       "    scheduler -- [Optional] Scheduler to use.\n",
       "\n",
       "    Returns an observable {Observable} sequence which is either the\n",
@@ -1019,8 +1019,8 @@
       "    Returns an empty observable sequence, using the specified scheduler\n",
       "    to send out the single OnCompleted message.\n",
       "\n",
-      "    1 - res = rx.Observable.empty()\n",
-      "    2 - res = rx.Observable.empty(rx.Scheduler.timeout)\n",
+      "    1 - res = rx.empty()\n",
+      "    2 - res = rx.empty(rx.Scheduler.timeout)\n",
       "\n",
       "    scheduler -- Scheduler to send the termination call on.\n",
       "\n",
@@ -1109,8 +1109,8 @@
       "    Returns an observable sequence that terminates with an exception,\n",
       "    using the specified scheduler to send out the single OnError message.\n",
       "\n",
-      "    1 - res = rx.Observable.throw(Exception('Error'))\n",
-      "    2 - res = rx.Observable.throw(Exception('Error'),\n",
+      "    1 - res = rx.throw(Exception('Error'))\n",
+      "    2 - res = rx.throw(Exception('Error'),\n",
       "                                            rx.Scheduler.timeout)\n",
       "\n",
       "    Keyword arguments:\n",

notebooks/reactivex.io/Part IV - Grouping, Buffering, Delaying, misc.ipynb

@@ -1069,17 +1069,17 @@
       "    1 - observable.group_by_until(\n",
       "            lambda x: x.id,\n",
       "            None,\n",
-      "            lambda : Rx.Observable.never()\n",
+      "            lambda : Rx.rx.never()\n",
       "        )\n",
       "    2 - observable.group_by_until(\n",
       "            lambda x: x.id,\n",
       "            lambda x: x.name,\n",
-      "            lambda: Rx.Observable.never()\n",
+      "            lambda: Rx.rx.never()\n",
       "        )\n",
       "    3 - observable.group_by_until(\n",
       "            lambda x: x.id,\n",
       "            lambda x: x.name,\n",
-      "            lambda:  Rx.Observable.never(),\n",
+      "            lambda:  Rx.rx.never(),\n",
       "            lambda x: str(x))\n",
       "\n",
       "    Keyword arguments:\n",

notebooks/reactivex.io/Part VI - Entirety Operations.ipynb

@@ -345,8 +345,8 @@
       "\n",
       "    1 - res = source.sequence_equal([1,2,3])\n",
       "    2 - res = source.sequence_equal([{ \"value\": 42 }], lambda x, y: x.value == y.value)\n",
-      "    3 - res = source.sequence_equal(Observable.return_value(42))\n",
-      "    4 - res = source.sequence_equal(Observable.return_value({ \"value\": 42 }), lambda x, y: x.value == y.value)\n",
+      "    3 - res = source.sequence_equal(rx.return_value(42))\n",
+      "    4 - res = source.sequence_equal(rx.return_value({ \"value\": 42 }), lambda x, y: x.value == y.value)\n",
       "\n",
       "    second -- Second observable sequence or array to compare.\n",
       "    comparer -- [Optional] Comparer used to compare elements of both sequences.\n",