Merge branch 'master' into layout_fixes

Author: bnmnetp

runestone/activecode/js/activecode_sql.js

@@ -40,15 +40,13 @@ export default class SQLActiveCode extends ActiveCode {
                 } else {
                     if (allDburls[self.dburl].status == "loading") {
                         allDburls[self.dburl].xWaitFor.done(function () {
-                            self.db = new SQL.Database(
-                                allDburls[self.dburl].db
-                            );
+                            self.db = allDburls[self.dburl].dbObject;
                             $(self.runButton).removeAttr("disabled");
                             $(self.runButton).text(buttonText);
                         });
                         return;
                     }
-                    self.db = new SQL.Database(allDburls[self.dburl].db);
+                    self.db = allDburls[self.dburl].dbObject;
                     $(self.runButton).removeAttr("disabled");
                     $(self.runButton).text(buttonText);
                     return;
@@ -60,6 +58,7 @@ export default class SQLActiveCode extends ActiveCode {
                 xhr.onload = (e) => {
                     var uInt8Array = new Uint8Array(xhr.response);
                     self.db = new SQL.Database(uInt8Array);
+                    allDburls[self.dburl].dbObject = self.db;
                     $(self.runButton).text(buttonText);
                     $(self.runButton).removeAttr("disabled");
                     allDburls[self.dburl].db = uInt8Array;

runestone/activecode/js/skulpt-stdlib.js

@@ -233,6 +233,15 @@ Support for SQL in the browser ?  Yes!
 
     select * from test;
 
+.. activecode:: test_activecode_6b
+    :language: sql
+    :autograde: unittest
+    :dburl: /_static/test.db
+
+    select * from created_table;
+
+    =====
+    assert 0,0 == itworks
 
 .. activecode:: sql3
     :language: sql

runestone/activecode/js/skulpt.min.js

@@ -140,6 +140,26 @@ def test_sql_activecode(selenium_utils_get):
     out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
     assert "" == out.text.strip()
 
+    div_id = "test_activecode_6"
+    t1 = find_ac(selenium_utils_get, div_id)
+    click_run(selenium_utils_get, t1)
+    ta = t1.find_element_by_class_name("cm-s-default")
+    assert ta
+    selenium_utils_get.driver.execute_script(
+        f"""window.edList['{div_id}'].editor.setValue("CREATE TABLE created_table (x TEXT); INSERT INTO created_table VALUES ('itworks');")"""
+    )
+    click_run(selenium_utils_get, t1)
+
+    div_id = "test_activecode_6b"
+    t2 = find_ac(selenium_utils_get, div_id)
+    # TODO: We don't yet have a way for async operations in ActiveCode constructors to signal when they're complete. So, insert a delay to guesstimate when the async load of the SQL WASM code and other async functions complete.
+    time.sleep(2)
+    click_run(selenium_utils_get, t2)
+    selenium_utils_get.wait.until(EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
+    res = selenium_utils_get.driver.find_element_by_id(f"{div_id}_sql_out")
+    assert res
+    out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
+    assert "You passed 1 out of 1 tests" in out.text
 
 @pytest.fixture
 def selenium_utils_sf(selenium_utils):

runestone/activecode/js/skulpt.min.js.gz

@@ -0,0 +1,61 @@
+# .. Copyright (C) 2021 Bryan A. Jones.
+#
+# *********************************************************
+# |docname| - A Runestone extension supporting cellbotics
+# *********************************************************
+# This extension provides one new directive, ``ble-pair-button``, to add the Bluetooth Low Energy "Pair" button and status display to a page where users will be using the Cellbotics Python module and associated BLE functionality. The extension also includes all the supporting JavaScript files needed for the Cellbotics Python module.
+#
+#
+# Imports
+# =======
+# These are listed in the order prescribed by `PEP 8
+# <http://www.python.org/dev/peps/pep-0008/#imports>`_.
+#
+# Standard library
+# ----------------
+# None.
+#
+# Third-party imports
+# -------------------
+from docutils import nodes
+from docutils.parsers.rst import Directive
+
+# Local imports
+# -------------
+# None
+
+
+# Code
+# ====
+class BlePairNode(nodes.General, nodes.Element):
+    pass
+
+
+def visit_ble_pair_node(self, node):
+    self.body.append(
+        '<div data-component="ble">\n'
+        '   <script>runestone_import("ble");</script>\n'
+        '   <button id="ble_pair_button" type="button" disabled>Pair</button>\n'
+        '   <span id="ble_pair_status"></span>\n'
+        '</div>\n'
+    )
+
+
+def depart_ble_pair_node(self, node):
+    pass
+
+
+class BlePairDirective(Directive):
+    has_content = False
+    required_arguments = 0
+    optional_arguments = 0
+    option_spec = {}
+
+    def run(self):
+        return [BlePairNode()]
+
+
+def setup(app):
+    # Add the Pair button directive.
+    app.add_node(BlePairNode, html=(visit_ble_pair_node, depart_ble_pair_node))
+    app.add_directive('ble-pair-button', BlePairDirective)

runestone/activecode/js/skulpt.min.js.map

@@ -0,0 +1,54 @@
+// .. Copyright (C) 2012-2020 Bryan A. Jones.
+//
+//  This file is part of the CellBotics system.
+//
+//  The CellBotics system is free software: you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License as
+//  published by the Free Software Foundation, either version 3 of the
+//  License, or (at your option) any later version.
+//
+//  The CellBotics system is distributed in the hope that it will be
+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with the CellBotics system.  If not, see
+//  <http://www.gnu.org/licenses/>.
+//
+// *********************************************************
+// |docname| - Automatically bind methods to their instances
+// *********************************************************
+
+"use strict";
+
+
+// The following two functions were taken from https://github.com/sindresorhus/auto-bind/blob/master/index.js and lightly modified. They provide an easy way to bind all callable methods to their instance. See `Binding Methods to Class Instance Objects <https://ponyfoo.com/articles/binding-methods-to-class-instance-objects>`_ for more discussion on this crazy JavaScript necessity.
+//
+// Gets all non-builtin properties up the prototype chain
+const getAllProperties = object => {
+	const properties = new Set();
+
+	do {
+		for (const key of Reflect.ownKeys(object)) {
+			properties.add([object, key]);
+		}
+	} while ((object = Reflect.getPrototypeOf(object)) && object !== Object.prototype);
+
+	return properties;
+};
+
+
+// Invoke this in the constructor of an object.
+export function auto_bind(self) {
+    for (const [object, key] of getAllProperties(self.constructor.prototype)) {
+        if (key === 'constructor') {
+            continue;
+        }
+
+        const descriptor = Reflect.getOwnPropertyDescriptor(object, key);
+        if (descriptor && typeof descriptor.value === 'function') {
+            self[key] = self[key].bind(self);
+        }
+    }
+}