Tweaks to Ruby endpoints

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 14, 2025 · a4f3c3f · a4f3c3f
1 parent 2d6a72b
commit a4f3c3f
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 9 deletions.
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -19,7 +19,7 @@ ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=23.0.1-tem
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG GO_VERSION=1.23.4
 ARG NODE_VERSION=23.6.0
 ARG PYTHON_VERSION=3.12

diff --git a/ci/Dockerfile-bun b/ci/Dockerfile-bun
@@ -19,7 +19,7 @@ ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=23.0.1-tem
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG GO_VERSION=1.23.4
 ARG PYTHON_VERSION=3.12
 

diff --git a/ci/Dockerfile-deno b/ci/Dockerfile-deno
@@ -19,7 +19,7 @@ ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=23.0.1-tem
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG GO_VERSION=1.23.4
 ARG PYTHON_VERSION=3.12
 ARG RUBY_VERSION=3.4.1

diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64
@@ -13,7 +13,7 @@ LABEL maintainer="cyclonedx" \
 
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG GO_VERSION=1.23.4
 ARG PYTHON_VERSION=3.12
 

diff --git a/ci/base-images/opensuse/Dockerfile.lang b/ci/base-images/opensuse/Dockerfile.lang
@@ -2,7 +2,7 @@ FROM opensuse/tumbleweed:latest
 
 ARG MAVEN_VERSION=4.0.0-beta-4
 ARG SBT_VERSION=1.10.2
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG DOTNET_SDK_VERSION=9.0.100
 
 ENV SBT_VERSION=$SBT_VERSION \

diff --git a/ci/base-images/sle/Dockerfile.java17 b/ci/base-images/sle/Dockerfile.java17
@@ -2,7 +2,7 @@ FROM registry.suse.com/bci/openjdk-devel:17
 
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 ARG GCC_VERSION=13
 
 ENV SBT_VERSION=$SBT_VERSION \

diff --git a/ci/base-images/sle/Dockerfile.java17-slim b/ci/base-images/sle/Dockerfile.java17-slim
@@ -2,7 +2,7 @@ FROM registry.suse.com/bci/openjdk-devel:17
 
 ARG SBT_VERSION=1.10.7
 ARG MAVEN_VERSION=3.9.9
-ARG GRADLE_VERSION=8.11
+ARG GRADLE_VERSION=8.12
 
 ENV SBT_VERSION=$SBT_VERSION \
     MAVEN_VERSION=$MAVEN_VERSION \

diff --git a/contrib/lima/cdxgen-opensuse.yaml b/contrib/lima/cdxgen-opensuse.yaml
@@ -49,7 +49,7 @@ provision:
     set -e -o pipefail
     export MAVEN_VERSION=3.9.9
     export SBT_VERSION=1.10.7
-    export GRADLE_VERSION=8.11
+    export GRADLE_VERSION=8.12
     export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}"
     export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}"
     export SBT_HOME="/.sdkman/candidates/sbt/${SBT_VERSION}"

diff --git a/contrib/lima/cdxgen-ubuntu.yaml b/contrib/lima/cdxgen-ubuntu.yaml
@@ -43,7 +43,7 @@ provision:
     set -e -o pipefail
     export MAVEN_VERSION=3.9.9
     export SBT_VERSION=1.10.7
-    export GRADLE_VERSION=8.11
+    export GRADLE_VERSION=8.12
     export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}"
     export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}"
     export SBT_HOME="/.sdkman/candidates/sbt/${SBT_VERSION}"

diff --git a/lib/evinser/evinser.js b/lib/evinser/evinser.js
@@ -1163,6 +1163,8 @@ export function extractEndpoints(language, code) {
     case "rb": {
       let urlPrefix = "";
       let urlSuffix = "";
+      // Remove the ellipsis added by the frontend
+      code = code.replaceAll("...", "");
       if (code.includes("namespace ")) {
         urlPrefix = code.split("namespace ").pop().split(" ")[0];
       }
@@ -1182,6 +1184,12 @@ export function extractEndpoints(language, code) {
           `${urlPrefix.replace(/['"]/g, "")}${urlSuffix.replace(/['"]/g, "")}`,
         );
       }
+      endpoints =
+        endpoints && Array.isArray(endpoints)
+          ? endpoints.filter(
+              (u) => u.length > 1 && !u.startsWith(".") && u !== "https:/",
+            )
+          : endpoints;
       break;
     }
     default: