merge PR

Author: sspickle

.gitignore

@@ -10,4 +10,5 @@ __pycache__/
 /.vscode/
 /ide/.vscode
 /ide/flask_secret.py
-/build-tools/Uglify-ES/uglify-es/package-lock.json
+/build-tools/Uglify-ES/uglify-es/package-lock.json
+.env

lib/glow/extrude.js

@@ -546,15 +546,15 @@ function extrusion(args) {
     args.axis = (args.axis === undefined) ? null : args.axis
     args.up = (args.up === undefined) ? vec(0,1,0) : args.up.norm()
     let first_segment = (args.path[1].sub(args.path[0])).norm()
-    if (first_segment.cross(args.up).mag < 0.1)  { // construct args.up to be perpendicular to first_segment
-        if (args.up.cross(vec(0,1,0)).mag > 0.2) { // try making args.up be vec(0,1,0)
-            args.up = vec(0,1,0)
-        } else if (args.up.cross(vec(1,0,0)).mag > 0.2) { // try making args.up be vec(1,0,0)
-            args.up = vec(1,0,0)
-        } else if (args.up.cross(vec(0,0,1)).mag > 0.2) { // try making args.up be vec(0,0,1)
-            args.up = vec(0,0,1)
-        }
-    }
+    // if (first_segment.cross(args.up).mag < 0.1)  { // construct args.up to be perpendicular to first_segment
+    //     if (args.up.cross(vec(0,1,0)).mag > 0.2) { // try making args.up be vec(0,1,0)
+    //         args.up = vec(0,1,0)
+    //     } else if (args.up.cross(vec(1,0,0)).mag > 0.2) { // try making args.up be vec(1,0,0)
+    //         args.up = vec(1,0,0)
+    //     } else if (args.up.cross(vec(0,0,1)).mag > 0.2) { // try making args.up be vec(0,0,1)
+    //         args.up = vec(0,0,1)
+    //     }
+    // }
 
     args.color = (args.color === undefined) ? color.white : args.color
     args.twist = (args.twist === undefined) ? 0 : args.twist
@@ -693,11 +693,23 @@ function extrusion(args) {
     if (L < 2) throw new Error('An extrusion path must contain more than one distinct point.')
     let start_normal, end_normal, theta, A, extraA, axis, x, y, z
 
-    // Deal with normals to the end caps:
     if (!path_closed) {
+        // Adjust x, y, and z (z goes from one point to the next point)
+        // x, y, z are the vectors in a left-handed xyz set; x and y are unit vectors.
         z = p[1].sub(p[0]) // points inward
-        y = norm(args.up)
-        x = norm(z.cross(y))
+        let da = diff_angle(z, args.up)
+        if (da == 0) {
+            x = vec(1,0,0)
+            y = vec(0,0,1)
+        } else if (da == pi) {
+            x = vec(-1,0,0)
+            y = vec(0,0,1)
+        } else {
+            x = norm(z.cross(args.up))
+            y = norm(x.cross(z))
+        }
+
+        // Deal with normals to the end caps:
         start_normal = z
         if (args.start_normal !== null) start_normal = args.start_normal.multiply(-1) // points inward
         if (!norm(start_normal).equals(norm(z))) {
@@ -719,8 +731,8 @@ function extrusion(args) {
         }
     } else {
         z = p[0].sub(p[L-1])
-        y = norm(args.up)
-        x = norm(z.cross(y))
+        x = norm(z.cross(args.up))
+        y = norm(x.cross(z))
     }
 
     // Analyze the whole path before creating quads.

lib/glow/primitives.js

@@ -55,7 +55,14 @@
         }
     }
 
-
+    var plugins_safe = $.plot.plugins
+    function set_crosshairs_disabled(value) {
+        if (value) {
+            $.plot.plugins = []
+        } else {
+            $.plot.plugins = plugins_safe
+        }
+    }
 
     function makeTrail(obj, args) {
         obj.__interval = -1 // indicate no interval setting; add point every render (or determined by pps)
@@ -2919,7 +2926,7 @@
         if (attrs.name !== null && (__radio_buttons[attrs.name] === undefined))
             __radio_buttons[attrs.name] = null
 
-        attrs.jradio = $(`<input type="radio">`).css({width:'16px', height:'16px'}).appendTo(attrs.pos)
+        attrs.jradio = $(`<input type="radio" name="${attrs.name}">`).css({width:'16px', height:'16px'}).appendTo(attrs.pos)
         .click( function() {
             if (attrs.name === null) {
                 attrs.checked = !attrs.checked
@@ -3037,6 +3044,85 @@
         return cradio
     }
 
+    function fieldset(args) { // a form fieldset
+        if (!(this instanceof fieldset)) return new fieldset(args)  // so fieldset() is like new fieldset()
+        var cvs = canvas.get_selected()
+        var attrs = {pos:cvs.caption_anchor, legend:'', width:cvs.width, disabled:false}
+
+        for (a in attrs) {
+            if (args[a] !== undefined) {
+                attrs[a] = args[a]
+                delete args[a]
+            }
+        }
+        attrs.disabled = booleanize(attrs.disabled)       
+
+        let fs_css = {width:`${attrs.width}px`}
+        let fs_string =`<fieldset ${attrs.disabled?'disabled':''}>`
+        attrs.jfieldset = $(fs_string).css(fs_css).appendTo(attrs.pos)
+        $(`<legend>${attrs.legend}</legend>`).appendTo(attrs.jfieldset)
+        
+        var cfieldset = { // this structure implements a JavaScript "closure"
+            get legend() {   
+                if (attrs.legend === undefined) return ""
+                return attrs.legend
+            },
+            set legend(value) {
+                attrs.legend = value
+                $(attrs.jfieldset).find('legend').html(value)
+            },
+            get disabled(){
+                return attrs.disabled
+            },
+            set disabled(value) {
+                attrs.disabled = booleanize(value)
+                $(attrs.jfieldset).attr('disabled', attrs.disabled)
+            },
+            get pos() {
+                return attrs.jfieldset
+            },
+            set pos(value) {
+                throw new Error("Cannot change a fieldsets pos.")
+            }
+        }
+
+        return cfieldset
+    }
+
+    function aria_div(args) { // a form fieldset
+        if (!(this instanceof aria_div)) return new aria_div(args)  // so aria_div() is like new aria_div()
+        var cvs = canvas.get_selected()
+        var attrs = {pos:cvs.caption_anchor, aria_live:""}
+
+        for (a in attrs) {
+            if (args[a] !== undefined) {
+                attrs[a] = args[a]
+                delete args[a]
+            }
+        }
+
+        attrs.jdiv = $(`<div aria-live="${attrs.aria_live}">`).appendTo(attrs.pos)
+        
+        var caria_div = { // this structure implements a JavaScript "closure"
+            get aria_live() {   
+                if (attrs.aria_live === undefined) return ""
+                return attrs.aria_live
+            },
+            set aria_live(value) {
+                attrs.aria_live = value
+                $(attrs.jdiv).attr('aria-live', value)
+            },
+            get pos() {
+                return attrs.jdiv
+            },
+            set pos(value) {
+                throw new Error("Cannot change an aria_div's pos.")
+            }
+        }
+
+        return caria_div
+    }
+
     function checkbox(args) { // a checkbox
         if (!(this instanceof checkbox)) return new checkbox(args)  // so checkbox() is like new checkbox()
         var cvs = canvas.get_selected()
@@ -3644,7 +3730,7 @@
     }
 
     function glowVersion() {
-        return 'Web VPython 3.2 (released 2025-01-02)'
+        return 'Web VPython 3.2 (released 2025-03-29)'
     }
 
     eval("0") // Force minifier not to mangle e.g. box function name (since it breaks constructor.name)
@@ -3683,10 +3769,13 @@
         wtext: wtext,
         winput: winput,
         radio: radio,
+        fieldset:fieldset,
+        aria_div:aria_div,
         checkbox: checkbox,
         button: button,
         slider: slider,
         menu: menu,
+        set_crosshairs_disabled: set_crosshairs_disabled,
     }
 
     Export(exports)

package/glow.3.2.min.js

@@ -0,0 +1,2 @@
+pytest
+pytest-mock

requirements-test.txt

@@ -1,32 +1,32 @@
 async-timeout==4.0.2
-Authlib==1.2.0
+Authlib==1.3.1
 blinker==1.6.2
 cachetools==5.3.0
-certifi==2023.7.22
+certifi==2024.7.4
 cffi==1.15.1
 charset-normalizer==3.1.0
 click==8.1.3
-cryptography==41.0.6
+cryptography==44.0.1
 Flask==2.3.2
-google-api-core==2.11.0
-google-api-python-client==2.86.0
-google-auth==2.18.0
-google-auth-httplib2==0.1.0
-google-cloud-core==2.3.2
-google-cloud-datastore==2.15.2
-google-cloud-ndb==2.1.1
-google-cloud-secret-manager==2.16.1
-googleapis-common-protos==1.59.0
-grpc-google-iam-v1==0.12.6
-grpcio==1.54.2
-grpcio-status==1.54.2
+google-api-core==2.17.1
+google-api-python-client==2.176.0
+google-auth==2.40.3
+google-auth-httplib2==0.2.0
+google-cloud-core==2.4.3
+google-cloud-datastore==2.21.0
+google-cloud-ndb==2.3.4
+google-cloud-secret-manager==2.16.4
+googleapis-common-protos==1.70.0
+grpc-google-iam-v1==0.14.2
+grpcio==1.73.1
+grpcio-status==1.63.0rc1
 httplib2==0.22.0
 idna==3.4
 itsdangerous==2.1.2
-Jinja2==3.1.2
+Jinja2==3.1.6
 MarkupSafe==2.1.2
 proto-plus==1.22.2
-protobuf==4.23.0
+protobuf==4.25.8
 pyasn1==0.5.0
 pyasn1-modules==0.3.0
 pycparser==2.21
@@ -35,10 +35,9 @@ pyparsing==3.0.9
 python-dotenv==1.0.0
 pytz==2023.3
 redis==4.5.5
-requests==2.31.0
+requests==2.32.4
 rsa==4.9
 six==1.16.0
 uritemplate==4.1.1
-urllib3==1.26.18
+urllib3==2.5.0
 Werkzeug==3.0.6
-

requirements.txt

@@ -0,0 +1,32 @@
+
+import pytest
+from unittest.mock import MagicMock, patch
+from main import app as flask_app
+
+@pytest.fixture
+def app():
+    """Create and configure a new app instance for each test."""
+    # Overwrite the GRL value to True so we can bypass some of the checks
+    # that are not relevant for testing.
+    with patch('ide.auth.GRL', True):
+        flask_app.config.update({
+            "TESTING": True,
+        })
+        yield flask_app
+
+@pytest.fixture
+def client(app):
+    """A test client for the app."""
+    return app.test_client()
+
+@pytest.fixture(autouse=True)
+def mock_google_oauth(mocker):
+    """Mock Google OAuth2."""
+    mocker.patch('ide.auth.is_logged_in', return_value=True)
+    mocker.patch('ide.auth.get_user_info', return_value={'email': 'test@example.com'})
+
+@pytest.fixture(autouse=True)
+def mock_datastore(mocker):
+    """Mock Google Cloud Datastore."""
+    mocker.patch('google.cloud.ndb.Client', return_value=MagicMock())
+    mocker.patch('google.cloud.ndb.Key', return_value=MagicMock())