zugpferd 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9958c2c1a118694c6232c624d11e2d0d9ea07ec9908e3b7d4398c236d505343
-  data.tar.gz: 0d9a7e373aa70c17becd0c24c1a9ef67eaaa63d67a388b0f31d8f47f1fdb5acd
+  metadata.gz: 62856c1301920bbea44b64a360effeee49572cc5d0563a3585a57821f97a855d
+  data.tar.gz: e1a60440693e9a66f089a5469643d5b9089f1e9e97d2387a415a1fea82420e02
 SHA512:
-  metadata.gz: ae3c9fa8a8fd24afe433d91ec1aedd8695d8bf1b59ace7d3c81a1d9cdf91709c48a6c53910883f62273c1d7f5d16ac3b61ed009f942ed78e0f66b21cde9334bd
-  data.tar.gz: a2cdadd08aab4a70567629555124c22fb620441e6c05d93d6d675d6b0bdbf58c7c0e5c5d8f3b8d180fa26557ee02bc13ebafb55e541d0facf70dfcdee9ef1112
+  metadata.gz: f0f5da629eeeda2b93ec71a4398ea9cdec486742bf43a8871d663afe06498eea56ad4356e98638fbeb613aaca77e8301f48e62ffc1056c277be3f14651b570bf
+  data.tar.gz: 8b26ca18cd6dd8c1ecffc18d465e71796e152ec3ca29e25600627804b119dab8cf962e211937c1eb9ae8e6dcf11e75a5e423a129b6e843f622e84c3381841a79

data/bin/setup-schemas

@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-VENDOR_DIR="$(cd "$(dirname "$0")/../vendor" && pwd)"
+VENDOR_DIR="$(pwd)/vendor"
 SCHEMAS_DIR="$VENDOR_DIR/schemas"
 TMP_DIR=$(mktemp -d)
 trap 'rm -rf "$TMP_DIR"' EXIT
 
+CURL_UA="Mozilla/5.0"
+ZUGPFERD_REPO="https://github.com/alexzeitler/zugpferd"
+
 # --- Saxon HE (for Schematron validation) ---
 
 echo "==> Downloading Saxon HE..."
@@ -18,7 +21,7 @@ MAVEN="https://repo1.maven.org/maven2"
 
 if [ ! -f "$SAXON_DIR/saxon-he-$SAXON_VERSION.jar" ]; then
   echo "    Downloading saxon-he-$SAXON_VERSION.jar..."
-  curl -fsSL "$MAVEN/net/sf/saxon/Saxon-HE/$SAXON_VERSION/Saxon-HE-$SAXON_VERSION.jar" \
+  curl -fsSL -A "$CURL_UA" "$MAVEN/net/sf/saxon/Saxon-HE/$SAXON_VERSION/Saxon-HE-$SAXON_VERSION.jar" \
     -o "$SAXON_DIR/saxon-he-$SAXON_VERSION.jar"
 else
   echo "    saxon-he-$SAXON_VERSION.jar already present"
@@ -26,7 +29,7 @@ fi
 
 if [ ! -f "$SAXON_DIR/xmlresolver-$XMLRESOLVER_VERSION.jar" ]; then
   echo "    Downloading xmlresolver-$XMLRESOLVER_VERSION.jar..."
-  curl -fsSL "$MAVEN/org/xmlresolver/xmlresolver/$XMLRESOLVER_VERSION/xmlresolver-$XMLRESOLVER_VERSION.jar" \
+  curl -fsSL -A "$CURL_UA" "$MAVEN/org/xmlresolver/xmlresolver/$XMLRESOLVER_VERSION/xmlresolver-$XMLRESOLVER_VERSION.jar" \
     -o "$SAXON_DIR/xmlresolver-$XMLRESOLVER_VERSION.jar"
 else
   echo "    xmlresolver-$XMLRESOLVER_VERSION.jar already present"
@@ -41,11 +44,10 @@ UBL_DIR="$SCHEMAS_DIR/ubl"
 
 if [ ! -d "$UBL_DIR/xsd/maindoc" ]; then
   echo "    Downloading UBL-2.1.zip..."
-  curl -fsSL "http://docs.oasis-open.org/ubl/os-UBL-2.1/UBL-2.1.zip" \
+  curl -fsSL -A "$CURL_UA" "http://docs.oasis-open.org/ubl/os-UBL-2.1/UBL-2.1.zip" \
     -o "$TMP_DIR/UBL-2.1.zip"
-  mkdir -p "$UBL_DIR/xsd"
-  unzip -qo "$TMP_DIR/UBL-2.1.zip" "os-UBL-2.1/xsd/*" -d "$TMP_DIR"
-  cp -r "$TMP_DIR/os-UBL-2.1/xsd/"* "$UBL_DIR/xsd/"
+  mkdir -p "$UBL_DIR"
+  unzip -qo "$TMP_DIR/UBL-2.1.zip" "xsd/*" -d "$UBL_DIR"
 else
   echo "    UBL XSD already present"
 fi
@@ -59,23 +61,31 @@ CII_DIR="$SCHEMAS_DIR/cii"
 
 if [ ! -f "$CII_DIR/CrossIndustryInvoice_100pD16B.xsd" ]; then
   echo "    Downloading D16B SCRDM (Subset) CII..."
-  CII_URL="https://unece.org/fileadmin/DAM/cefact/xml_schemas/D16B_SCRDM__Subset__CII.zip"
-  curl -fsSL "$CII_URL" -o "$TMP_DIR/cii-outer.zip" || {
-    echo "    WARN: Could not download CII XSD from UN/CEFACT."
-    echo "    Download manually from: $CII_URL"
-    echo "    Extract the 'uncoupled' XSD files into $CII_DIR/"
-  }
-
-  if [ -f "$TMP_DIR/cii-outer.zip" ]; then
-    mkdir -p "$CII_DIR"
-    unzip -qo "$TMP_DIR/cii-outer.zip" -d "$TMP_DIR/cii-outer"
-    # The outer ZIP contains nested ZIPs — extract the uncoupled one
-    UNCOUPLED_ZIP=$(find "$TMP_DIR/cii-outer" -name "*uncoupled.zip" -type f | head -1)
-    if [ -n "$UNCOUPLED_ZIP" ]; then
-      unzip -qo "$UNCOUPLED_ZIP" -d "$CII_DIR"
+  CII_URL="$ZUGPFERD_REPO/releases/download/v0.3.3/D16B_SCRDM__Subset__CII.zip"
+  curl -fsSL -A "$CURL_UA" "$CII_URL" -o "$TMP_DIR/cii-outer.zip"
+
+  mkdir -p "$CII_DIR"
+  unzip -qo "$TMP_DIR/cii-outer.zip" -d "$TMP_DIR/cii-outer"
+  # The outer ZIP contains nested ZIPs — extract the uncoupled one
+  UNCOUPLED_ZIP=$(find "$TMP_DIR/cii-outer" -name "*uncoupled.zip" -type f | head -1)
+  if [ -n "$UNCOUPLED_ZIP" ]; then
+    unzip -qo "$UNCOUPLED_ZIP" -d "$TMP_DIR/cii-uncoupled"
+    # XSDs are nested deep — move them flat into CII_DIR
+    XSD_DIR=$(find "$TMP_DIR/cii-uncoupled" -name "CrossIndustryInvoice_100pD16B.xsd" -type f -exec dirname {} \; | head -1)
+    if [ -n "$XSD_DIR" ]; then
+      cp -r "$XSD_DIR"/* "$CII_DIR/"
+      # Copy codelist XSDs (relative imports from main XSD)
+      CODELIST_DIR=$(find "$TMP_DIR/cii-uncoupled" -type d -name "codelist" | head -1)
+      if [ -n "$CODELIST_DIR" ]; then
+        cp -r "$CODELIST_DIR" "$CII_DIR/"
+      fi
     else
-      echo "    WARN: Could not find uncoupled ZIP inside CII archive"
+      echo "    ERROR: Could not find CrossIndustryInvoice_100pD16B.xsd in extracted archive"
+      exit 1
     fi
+  else
+    echo "    ERROR: Could not find uncoupled ZIP inside CII archive"
+    exit 1
   fi
 else
   echo "    CII XSD already present"
@@ -92,7 +102,7 @@ CEN_BASE="https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/downlo
 CEN_UBL_DIR="$SCHEMAS_DIR/schematron/cen/ubl"
 if [ ! -f "$CEN_UBL_DIR/xslt/EN16931-UBL-validation.xslt" ]; then
   echo "    Downloading en16931-ubl-$CEN_VERSION.zip..."
-  curl -fsSL "$CEN_BASE/en16931-ubl-$CEN_VERSION.zip" -o "$TMP_DIR/cen-ubl.zip"
+  curl -fsSL -A "$CURL_UA" "$CEN_BASE/en16931-ubl-$CEN_VERSION.zip" -o "$TMP_DIR/cen-ubl.zip"
   mkdir -p "$CEN_UBL_DIR"
   unzip -qo "$TMP_DIR/cen-ubl.zip" -d "$CEN_UBL_DIR"
 else
@@ -102,7 +112,7 @@ fi
 CEN_CII_DIR="$SCHEMAS_DIR/schematron/cen/cii"
 if [ ! -f "$CEN_CII_DIR/xslt/EN16931-CII-validation.xslt" ]; then
   echo "    Downloading en16931-cii-$CEN_VERSION.zip..."
-  curl -fsSL "$CEN_BASE/en16931-cii-$CEN_VERSION.zip" -o "$TMP_DIR/cen-cii.zip"
+  curl -fsSL -A "$CURL_UA" "$CEN_BASE/en16931-cii-$CEN_VERSION.zip" -o "$TMP_DIR/cen-cii.zip"
   mkdir -p "$CEN_CII_DIR"
   unzip -qo "$TMP_DIR/cen-cii.zip" -d "$CEN_CII_DIR"
 else
@@ -120,7 +130,7 @@ XR_DIR="$SCHEMAS_DIR/schematron/xrechnung"
 
 if [ ! -f "$XR_DIR/schematron/ubl/XRechnung-UBL-validation.xsl" ]; then
   echo "    Downloading xrechnung-$XRECHNUNG_SPEC_VERSION-schematron-$XRECHNUNG_SCHEMATRON_VERSION.zip..."
-  curl -fsSL "https://github.com/itplr-kosit/xrechnung-schematron/releases/download/release-$XRECHNUNG_SCHEMATRON_VERSION/xrechnung-$XRECHNUNG_SPEC_VERSION-schematron-$XRECHNUNG_SCHEMATRON_VERSION.zip" \
+  curl -fsSL -A "$CURL_UA" "https://github.com/itplr-kosit/xrechnung-schematron/releases/download/v$XRECHNUNG_SCHEMATRON_VERSION/xrechnung-$XRECHNUNG_SPEC_VERSION-schematron-$XRECHNUNG_SCHEMATRON_VERSION.zip" \
     -o "$TMP_DIR/xrechnung-schematron.zip"
   mkdir -p "$XR_DIR"
   unzip -qo "$TMP_DIR/xrechnung-schematron.zip" -d "$XR_DIR"
@@ -154,14 +164,14 @@ GS_RAW="https://raw.githubusercontent.com/ArtifexSoftware/ghostpdl/$GS_REF"
 
 if [ ! -f "$ZUGFERD_DIR/zugferd.ps" ]; then
   echo "    Downloading zugferd.ps..."
-  curl -fsSL "$GS_RAW/lib/zugferd.ps" -o "$ZUGFERD_DIR/zugferd.ps"
+  curl -fsSL -A "$CURL_UA" "$GS_RAW/lib/zugferd.ps" -o "$ZUGFERD_DIR/zugferd.ps"
 else
   echo "    zugferd.ps already present"
 fi
 
 if [ ! -f "$ZUGFERD_DIR/default_rgb.icc" ]; then
   echo "    Downloading default_rgb.icc..."
-  curl -fsSL "$GS_RAW/iccprofiles/default_rgb.icc" -o "$ZUGFERD_DIR/default_rgb.icc"
+  curl -fsSL -A "$CURL_UA" "$GS_RAW/iccprofiles/default_rgb.icc" -o "$ZUGFERD_DIR/default_rgb.icc"
 else
   echo "    default_rgb.icc already present"
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zugpferd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Zeitler