Compare commits

..

No commits in common. "52f3949aebb9a7505f1c39392f3dadeeb48f23ea" and "6fc151f2cca6c98857682fd087c22ed32e4350b2" have entirely different histories.

3 changed files with 10 additions and 90 deletions

View file

@ -1,66 +0,0 @@
name: CI
on:
push:
branches: [main]
pull_request:
branches: [main]
env:
CARGO_TERM_COLOR: always
RUSTFLAGS: "-D warnings"
RUST_TOOLCHAIN: "1.86"
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
jobs:
ci:
name: Linux x86_64 (Forgejo)
runs-on: ubuntu-latest
steps:
- name: Checkout graph-citation-extract via external URL
run: |
set -eu
mkdir -p "$GITHUB_WORKSPACE"
cd "$GITHUB_WORKSPACE"
git init -q
git remote add origin \
"https://x-access-token:${GITHUB_TOKEN}@git.flemming.ws/${GITHUB_REPOSITORY}.git"
git fetch --depth=1 origin "$GITHUB_SHA"
git checkout -q FETCH_HEAD
- name: Configure git URL rewrite for SDK fetch
env:
SDK_PAT: ${{ secrets.MODULE_SDK_PAT }}
run: |
git config --global \
"url.https://x-access-token:${SDK_PAT}@git.flemming.ws/.insteadOf" \
"https://git.flemming.ws/"
- name: Install system dependencies
run: |
apt-get update -qq
apt-get install -y --no-install-recommends \
curl ca-certificates build-essential pkg-config libssl-dev git
- name: Install Rust toolchain
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --profile minimal \
--default-toolchain "$RUST_TOOLCHAIN" \
--target wasm32-wasip2 --component rustfmt --component clippy
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
- name: Cargo fmt --check
run: cargo fmt --all -- --check
- name: Cargo clippy
run: cargo clippy --all-targets -- -D warnings
- name: Cargo build (host)
run: cargo build --all-targets
- name: Cargo test (host)
run: cargo test --all-targets
- name: Cargo build (wasm32-wasip2)
run: cargo build --release --target wasm32-wasip2

Binary file not shown.

View file

@ -49,11 +49,12 @@ pub fn invoke(_ctx: Context, inputs: Inputs) -> Result<Outputs, ModuleError> {
.require_json("norm")
.map_err(|e| ModuleError::invalid_input(format!("norm shape: {e}")))?;
let re_para = Regex::new(r"§\s*(\d+[a-z]?)\s+([A-Z][A-Za-z0-9]+)").map_err(internal_re)?;
let re_art =
Regex::new(r"Art(?:ikel|\.)\s*(\d+[a-z]?)\s+([A-Z][A-Za-z0-9]+)").map_err(internal_re)?;
let re_ivm =
Regex::new(r"i\.\s?V\.\s?m\.\s+(?:§|Art\.?)\s*(\d+[a-z]?)").map_err(internal_re)?;
let re_para = Regex::new(r"§\s*(\d+[a-z]?)\s+([A-Z][A-Za-z0-9]+)")
.map_err(internal_re)?;
let re_art = Regex::new(r"Art(?:ikel|\.)\s*(\d+[a-z]?)\s+([A-Z][A-Za-z0-9]+)")
.map_err(internal_re)?;
let re_ivm = Regex::new(r"i\.\s?V\.\s?m\.\s+(?:§|Art\.?)\s*(\d+[a-z]?)")
.map_err(internal_re)?;
let from_eli = norm.eli.unwrap_or_else(|| "eli/?".into());
let mut citations = Vec::new();
@ -92,10 +93,7 @@ pub fn invoke(_ctx: Context, inputs: Inputs) -> Result<Outputs, ModuleError> {
}
}
let out = Output {
from: from_eli,
citations,
};
let out = Output { from: from_eli, citations };
Outputs::new().with_json("citations", &out)
}
@ -105,7 +103,6 @@ fn internal_re<E: core::fmt::Display>(e: E) -> ModuleError {
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
use super::*;
use regex::Regex;
@ -117,31 +114,20 @@ mod tests {
for p in &norm.paragraphs {
for c in re_para.captures_iter(&p.text) {
cs.push(Citation {
to: format!(
"eli/bund/{}/{}",
c[2].to_ascii_lowercase(),
c[1].to_ascii_lowercase()
),
to: format!("eli/bund/{}/{}", c[2].to_ascii_lowercase(), c[1].to_ascii_lowercase()),
kind: "cites",
raw: c[0].to_string(),
});
}
for c in re_art.captures_iter(&p.text) {
cs.push(Citation {
to: format!(
"eli/eu/{}/art{}",
c[2].to_ascii_lowercase(),
c[1].to_ascii_lowercase()
),
to: format!("eli/eu/{}/art{}", c[2].to_ascii_lowercase(), c[1].to_ascii_lowercase()),
kind: "cites",
raw: c[0].to_string(),
});
}
}
Output {
from: norm.eli.unwrap_or_default(),
citations: cs,
}
Output { from: norm.eli.unwrap_or_default(), citations: cs }
}
#[test]