oddb2xml 3.0.17 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4185a65a50fc628ba92bc98fb8ac378563d5653882e3e34b54d1c1265e3808
-  data.tar.gz: a62c0d6b0b643458e9885c6ba7d8c1d54c1435696a3c73da2788fd22539a9915
+  metadata.gz: '081c86c751d4c29fa2ce616abdb6043707e50fab79e3b74a67aab568b2084519'
+  data.tar.gz: e3c91770aa8ccd4de0714c45f5a20eb7f87fc989ea84932a8e4cf1a5a3813a7c
 SHA512:
-  metadata.gz: e3718c1c76fbced6bb1ce43350ae13b42fbf747e2dce91980be24df4b9dcea1a78448b20a344ab50685effe3a33341a20ebd520c1a70ed995c996a6fd0dfb0ff
-  data.tar.gz: e0c0dd04ccacc29933a582fd05d19ebee40ce7ae420ca632e4d6f5068ae92de5928ab1fa6daf3b9bd4894f5797dde0090fad74d8bdc25a3610f648b57624aa1c
+  metadata.gz: b8a928d127496fb06cba79dc630c19bd5edc3b09dd3df0c0dda6ca058cd1897643818d4a8aa9e2ab125023d0ebb319dddee2ab1be0fcdabc8e4708299a136dee
+  data.tar.gz: 27c6ef5bcb9fa0df5b7861496468a88b416209a8b83e7c08e3a995407a75944f0d81849d75399254b7ee404787128ed9e4742ef5f6a78107d90f895845afe707

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (3.0.17)
+    oddb2xml (3.0.19)
       csv
       htmlentities
       httpi

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.0.19 / 09.06.2026
+* New option --proxy-check: probe connectivity/proxy reachability for every host oddb2xml could need, print a full OK/BLOCKED/UNREACHABLE report (honouring http(s)_proxy) and exit without downloading or building. Exits 0 if all hosts are reachable, 1 otherwise — handy for cron/deploy preflight on allow-list proxies (e.g. "oddb2xml --proxy-check"). Reuses the 3.0.18 proxy checker; checks run concurrently.
+
+=== 3.0.18 / 09.06.2026
+* Bugfix: stop the FHIR downloader from crashing with "Errno::ENOENT @ rb_file_s_size ... foph-sl-export-latest-de.ndjson" when run with --skip-download (issue #121). FhirDownloader#skip_download? returned true on the bare --skip-download flag and then called File.size on a file that was never downloaded. Each oddb2xml run uses its own ./downloads dir, so deploy scripts that download once and then re-run with --skip-download in a fresh dir hit this every time. skip_download? now requires the target NDJSON to actually exist on disk before honouring the flag; a missing file falls through to a normal download instead of crashing.
+* New: proxy / connectivity preflight check (issue #121). At the very start of a run, oddb2xml now probes the outbound hosts it needs (honouring the http(s)_proxy environment) and prints a loud warning if any host is blocked by the proxy (HTTP 407 on an allow-list proxy such as Aspectra's Skyhigh gateway) or otherwise unreachable — surfacing the cause up front instead of a later empty-output/Errno symptom. The probed host set is option-aware (e.g. id.gs1.ch only with --firstbase, epl.bag.admin.ch only with --fhir). It only warns and never aborts the run; downloads still proceed and fail individually as before. Checks run concurrently (~6s worst case) and are skipped during tests; set ODDB2XML_SKIP_PROXY_CHECK=1 to silence it.
+
 === 3.0.17 / 08.06.2026
 * Compatibility: relax the nokogiri requirement from ">= 1.19.3" to ">= 1.18.10" (lower bound only, no upper cap) so oddb2xml installs on Ruby 3.1 again. nokogiri 1.19.x requires Ruby >= 3.2, which made 3.0.13–3.0.16 uninstallable on Ruby 3.1.0 (the bare "gem install" crashed with the misleading RubyGems resolver error "undefined method `request' for nil:NilClass"). With a lower-bound-only floor, RubyGems still resolves the security-fixed 1.19.3 on Ruby >= 3.2, while Ruby 3.1 installs 1.18.10 (the newest 3.1-compatible release). oddb2xml uses no nokogiri 1.19-only API and runs no CSS/XSLT/C14N over untrusted input, so the 1.19.3 advisories do not apply to its usage. Note: Ruby 3.1 is EOL (since March 2025) — upgrading to Ruby >= 3.2 remains recommended.
 

data/lib/oddb2xml/cli.rb

@@ -3,6 +3,7 @@ require "oddb2xml/downloader"
 require "oddb2xml/extractor"
 require "oddb2xml/compressor"
 require "oddb2xml/options"
+require "oddb2xml/proxy_check"
 require "oddb2xml/util"
 require "rubyXL"
 require "date" # for today
@@ -38,6 +39,12 @@ module Oddb2xml
     def run
       threads = []
       start_time = Time.now
+      if @options[:proxy_check]
+        ok = ProxyCheck.report(@options)
+        exit(ok ? 0 : 1) unless defined?(RSpec)
+        return ok
+      end
+      ProxyCheck.run(@options)
       files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
       FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?
       if @options[:calc] && !(@options[:extended] || @options[:firstbase])

data/lib/oddb2xml/fhir_support.rb

@@ -79,7 +79,12 @@ module Oddb2xml
     end
 
     def skip_download?
-        @options[:skip_download] || (File.exist?(@file2save) && file_age_hours(@file2save) < 24)
+      # Only skip when the target file actually exists on disk. The bare
+      # @options[:skip_download] flag is not enough: each oddb2xml run uses its
+      # own ./downloads dir, so a flag-only short-circuit made download_one call
+      # File.size on a missing NDJSON and crash with Errno::ENOENT (issue #121).
+      return false unless File.exist?(@file2save)
+      @options[:skip_download] || file_age_hours(@file2save) < 24
     end
 
     def file_age_hours(file)

data/lib/oddb2xml/options.rb

@@ -46,6 +46,7 @@ module Oddb2xml
         opt :use_ra11zip, "Use the ra11.zip (a zipped transfer.dat from Galexis)",
           default: File.exist?("ra11.zip") ? "ra11.zip" : nil, type: :string
         opt :firstbase, "Build all NONPHARMA articles on firstbase (GS1 Switzerland CSV from id.gs1.ch)", short: "b", default: false
+        opt :proxy_check, "Only probe connectivity/proxy reachability for every required host, print a report and exit (no download/build). Honours http(s)_proxy. Exits 0 if all reachable, 1 otherwise.", short: :none, default: false
       end
 
       @opts[:percent] = @opts[:increment]

data/lib/oddb2xml/proxy_check.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+require "openssl"
+
+module Oddb2xml
+  # Preflight connectivity check. Run once at the very start of a CLI run, it
+  # probes every outbound host oddb2xml needs (honouring the http(s)_proxy
+  # environment) and prints a loud warning if any host is blocked by the proxy
+  # (HTTP 407 on an allow-list proxy such as Aspectra's Skyhigh gateway) or is
+  # otherwise unreachable. It never aborts the run -- downloads still proceed and
+  # fail individually as before; this just surfaces the cause up front instead of
+  # leaving the user to decode a later Errno/empty-output symptom. See issue #121.
+  module ProxyCheck
+    module_function
+
+    # host => human-readable description of what breaks when it is unreachable.
+    # Hosts only needed for certain options are added conditionally (see #hosts_for).
+    BASE_HOSTS = {
+      "files.refdata.ch" => "Refdata articles",
+      "www.swissmedic.ch" => "Swissmedic registrations",
+      "raw.githubusercontent.com" => "ATC codes (cpp2sqlite)"
+    }.freeze
+
+    TIMEOUT = 6 # seconds, per host (open + read); checks run concurrently
+
+    def proxy_uri
+      env = ENV["https_proxy"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["HTTP_PROXY"]
+      return nil if env.nil? || env.empty?
+      env = "http://#{env}" unless env.start_with?("http")
+      URI.parse(env)
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    def hosts_for(options = {})
+      hosts = BASE_HOSTS.dup
+      hosts["epl.bag.admin.ch"] = "BAG FHIR data (--fhir)" if options[:fhir]
+      hosts["id.gs1.ch"] = "GS1 NONPHARMA (--firstbase / -b)" if options[:firstbase]
+      hosts["www.spezialitaetenliste.ch"] = "BAG Spezialitätenliste" unless options[:fhir]
+      hosts["www.medregbm.admin.ch"] = "Medizinalberuferegister (-x address)" if options[:address]
+      hosts
+    end
+
+    # Full union of every host any run could need, regardless of options.
+    # Used by --proxy-check so the report covers everything in one go.
+    def all_hosts
+      BASE_HOSTS.merge(
+        "epl.bag.admin.ch" => "BAG FHIR data (--fhir)",
+        "id.gs1.ch" => "GS1 NONPHARMA (--firstbase / -b)",
+        "www.spezialitaetenliste.ch" => "BAG Spezialitätenliste",
+        "www.medregbm.admin.ch" => "Medizinalberuferegister (-x address)"
+      )
+    end
+
+    # Probe every host and print a full OK/BLOCKED/UNREACHABLE table.
+    # Returns true when all hosts are reachable. Used by `oddb2xml --proxy-check`.
+    def report(_options = {})
+      proxy = proxy_uri
+      results = all_hosts.map do |host, desc|
+        Thread.new { [host, desc, check_host(host, proxy)] }
+      end.map(&:value).sort_by { |(host, _desc, _status)| host }
+
+      header = "oddb2xml connectivity check"
+      header += proxy ? " (via proxy #{proxy.host}:#{proxy.port})" : " (no proxy configured)"
+      puts header
+      results.each do |(host, desc, status)|
+        tag = case status
+        when :ok then "OK     "
+        when :blocked then "BLOCKED" # proxy returned 407
+        else "UNREACH"
+        end
+        puts format("  [%s] %-28s %s", tag, host, desc)
+      end
+      unreachable = results.reject { |(_host, _desc, status)| status == :ok }
+      if unreachable.empty?
+        puts "All #{results.size} hosts reachable."
+        true
+      else
+        puts "#{unreachable.size} of #{results.size} host(s) NOT reachable -- downloads using them will fail."
+        false
+      end
+    end
+
+    # Returns :ok, :blocked (proxy 407) or :unreachable for a single host.
+    def check_host(host, proxy)
+      http =
+        if proxy
+          Net::HTTP.new(host, 443, proxy.host, proxy.port, proxy.user, proxy.password)
+        else
+          Net::HTTP.new(host, 443)
+        end
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.open_timeout = TIMEOUT
+      http.read_timeout = TIMEOUT
+      http.start do |h|
+        res = h.head("/")
+        return :blocked if res.code.to_s == "407"
+        return :ok # any HTTP answer (200/301/403/404/...) means the host is reachable
+      end
+    rescue => error
+      msg = error.message.to_s.downcase
+      return :blocked if msg.include?("407") || msg.include?("authenticationrequired") || msg.include?("proxy")
+      :unreachable
+    end
+
+    # Probe all relevant hosts concurrently and warn about any that fail.
+    def run(options = {})
+      return if defined?(RSpec) || defined?(VCR) # never touch the network in tests
+      return if ENV["ODDB2XML_SKIP_PROXY_CHECK"]
+
+      proxy = proxy_uri
+      hosts = hosts_for(options)
+      results = hosts.map do |host, desc|
+        Thread.new { [host, desc, check_host(host, proxy)] }
+      end.map(&:value)
+
+      problems = results.reject { |(_host, _desc, status)| status == :ok }
+      return if problems.empty?
+
+      warn_about(problems, proxy)
+    end
+
+    def warn_about(problems, proxy)
+      line = "=" * 72
+      warn line
+      warn " oddb2xml CONNECTIVITY WARNING"
+      warn " The following hosts could not be reached -- the corresponding"
+      warn " downloads will FAIL or produce incomplete data:"
+      problems.each do |(host, desc, status)|
+        tag = (status == :blocked) ? "BLOCKED by proxy (407)" : "UNREACHABLE          "
+        warn format("   [%s] %-26s %s", tag, host, desc)
+      end
+      if proxy
+        warn ""
+        warn " Proxy in use: #{proxy.host}:#{proxy.port}"
+        if problems.any? { |(_h, _d, s)| s == :blocked }
+          warn " This looks like an allow-list proxy. Ask your admin to allow the"
+          warn " hosts above (HTTPS/443), or set credentials in http(s)_proxy."
+        end
+      end
+      warn " (Set ODDB2XML_SKIP_PROXY_CHECK=1 to silence this check.)"
+      warn line
+    end
+  end
+end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "3.0.17"
+  VERSION = "3.0.19"
 end

data/spec/options_spec.rb

@@ -19,6 +19,7 @@ Oddb2xml::DEFAULT_OPTS = {
   firstbase: false,
   fhir: false,
   fhir_url: nil,
+  proxy_check: false,
 }
 
 describe Oddb2xml::Options do
@@ -75,6 +76,7 @@ describe Oddb2xml::Options do
     expected[:nonpharma] = true
     expected[:calc] = true
     expected[:price] = :zurrose
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 
@@ -86,6 +88,7 @@ describe Oddb2xml::Options do
     expected[:calc] = true
     expected[:price] = :zurrose
     expected[:percent] = 80
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 
@@ -165,6 +168,7 @@ describe Oddb2xml::Options do
     expected[:price] = :zurrose
     expected[:extended] = true
     expected[:artikelstamm] = true
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.19
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
@@ -483,6 +483,7 @@ files:
 - lib/oddb2xml/fhir_support.rb
 - lib/oddb2xml/options.rb
 - lib/oddb2xml/parslet_compositions.rb
+- lib/oddb2xml/proxy_check.rb
 - lib/oddb2xml/refdata_cleanup.rb
 - lib/oddb2xml/semantic_check.rb
 - lib/oddb2xml/util.rb