zsv 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f5bea8281cd200f96b8902004796d1786254cb04b280e363dfab77dc969853
-  data.tar.gz: 560e6e1b714a3e083fb69ddc35801f74d7309232ba8597dab14d7b6197076a0a
+  metadata.gz: cef0e2af9b74333c1e3d3caeeedf68d8cbd494a5df6406eb3c680277cf726d10
+  data.tar.gz: f37ffbc7e3d95640c772de7405a6f34846254173138c29ce7c140fe2d3038e29
 SHA512:
-  metadata.gz: 00cbf3410f2a191bf3a2985ee64a3296e67dd50cf0483673cf376aab1ae6c5eddae620298ca0ed0b13164603806363dd3a35f592506f82c0d0b42f622b934cf3
-  data.tar.gz: fd6746e2959f54053b2ac2be671214c4e16be14cd3fecb328fde32ca7982170cc5087d35b5ee21f45f6adbf05334b34facfd7c3d23790954ab654de19fa55a10
+  metadata.gz: bfa9f9e43d59a8f6c4d30e52d42da54968c88fa8866056d5be0f1ef45fdd7ad4d4f195b92f66636b752e75c5fefcfd6977a23df588720b89b2ae7c0506413338
+  data.tar.gz: 938569fa2d250c2551d8e279317e8d2c83d3ff962cca315ca98ab0528675643ca4c288310820bb24bf6d2b4491085bb1150db7f36d8221eb6e28106bf2463d2f

data/ext/zsv/extconf.rb

@@ -1,39 +1,53 @@
 # frozen_string_literal: true
 
-require "mkmf"
-require "net/http"
-require "uri"
-require "fileutils"
-require "rubygems/package"
-require "zlib"
+require 'mkmf'
+require 'net/http'
+require 'uri'
+require 'fileutils'
+require 'rubygems/package'
+require 'zlib'
+require 'openssl'
 
 # ZSV version to compile against
-ZSV_VERSION = "1.3.0"
+ZSV_VERSION = '1.3.0' # zsv C library version (not gem version)
 ZSV_URL = "https://github.com/liquidaty/zsv/archive/refs/tags/v#{ZSV_VERSION}.tar.gz".freeze
 # Use absolute path relative to the original extconf.rb location
 EXTCONF_DIR = File.expand_path(__dir__)
-VENDOR_DIR = File.join(EXTCONF_DIR, "vendor")
+VENDOR_DIR = File.join(EXTCONF_DIR, 'vendor')
 ZSV_DIR = File.join(VENDOR_DIR, "zsv-#{ZSV_VERSION}")
 
-def download_file(url, destination)
+def download_file(url, destination, redirect_limit = 10, verify_ssl = true)
+  abort('Too many redirects') if redirect_limit.zero?
+
   uri = URI.parse(url)
-  File.open(destination, "wb") do |file|
-    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-      request = Net::HTTP::Get.new(uri)
-      http.request(request) do |response|
-        case response
-        when Net::HTTPRedirection
-          # Follow redirect
-          download_file(response["location"], destination)
-        when Net::HTTPSuccess
-          response.read_body do |chunk|
-            file.write(chunk)
-          end
-        else
-          abort("Failed to download: #{response.code} #{response.message}")
-        end
-      end
+  http = Net::HTTP.new(uri.host, uri.port)
+
+  if uri.scheme == 'https'
+    http.use_ssl = true
+    http.verify_mode = verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+    http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && verify_ssl
+  end
+
+  request = Net::HTTP::Get.new(uri.request_uri)
+
+  begin
+    response = http.request(request)
+  rescue OpenSSL::SSL::SSLError => e
+    if verify_ssl
+      # Retry without SSL verification (GitHub is trusted)
+      warn "SSL verification failed (#{e.message}), retrying without verification..."
+      return download_file(url, destination, redirect_limit, false)
     end
+    raise
+  end
+
+  case response
+  when Net::HTTPRedirection
+    download_file(response['location'], destination, redirect_limit - 1, verify_ssl)
+  when Net::HTTPSuccess
+    File.binwrite(destination, response.body)
+  else
+    abort("Failed to download: #{response.code} #{response.message}")
   end
 end
 
@@ -59,32 +73,32 @@ def download_and_extract_zsv
   puts "Downloading zsv #{ZSV_VERSION}..."
   FileUtils.mkdir_p(VENDOR_DIR)
 
-  tarball = File.join(VENDOR_DIR, "zsv.tar.gz")
+  tarball = File.join(VENDOR_DIR, 'zsv.tar.gz')
   download_file(ZSV_URL, tarball)
 
-  puts "Extracting zsv..."
+  puts 'Extracting zsv...'
   extract_tar_gz(tarball, VENDOR_DIR)
   FileUtils.rm_f(tarball)
 
-  abort("zsv directory not found after extraction") unless File.directory?(ZSV_DIR)
+  abort('zsv directory not found after extraction') unless File.directory?(ZSV_DIR)
   puts "zsv #{ZSV_VERSION} downloaded successfully"
 end
 
 def build_zsv
-  puts "Building zsv library..."
+  puts 'Building zsv library...'
 
   # Build zsv static library
   Dir.chdir(ZSV_DIR) do
     # Configure zsv
-    system("./configure") or abort("Failed to configure zsv") unless File.exist?("config.mk")
+    system('./configure') or abort('Failed to configure zsv') unless File.exist?('config.mk')
 
     # Build the library
-    Dir.chdir("src") do
-      system("make", "build") or abort("Failed to build zsv library")
+    Dir.chdir('src') do
+      system('make', 'build') or abort('Failed to build zsv library')
     end
   end
 
-  puts "zsv library built successfully"
+  puts 'zsv library built successfully'
 end
 
 # Download and build zsv
@@ -93,45 +107,48 @@ build_zsv
 
 # Determine build directory based on platform
 platform_dir = if RUBY_PLATFORM =~ /darwin/
-                 "Darwin"
+                 'Darwin'
                elsif RUBY_PLATFORM =~ /linux/
-                 "Linux"
+                 'Linux'
                else
-                 "generic"
+                 'generic'
                end
 
-# Find the built library
-zsv_lib_dir = File.join(ZSV_DIR, "build", platform_dir, "rel", "gcc", "lib")
-zsv_lib = File.join(zsv_lib_dir, "libzsv.a")
+# Find the built library - compiler name varies (gcc, gcc-14, clang, etc.)
+# Search for libzsv.a in the build directory
+build_rel_dir = File.join(ZSV_DIR, 'build', platform_dir, 'rel')
+zsv_lib = Dir.glob(File.join(build_rel_dir, '*', 'lib', 'libzsv.a')).first
+
+abort("libzsv.a not found in #{build_rel_dir}/*/lib/") unless zsv_lib && File.exist?(zsv_lib)
 
-abort("libzsv.a not found at #{zsv_lib}") unless File.exist?(zsv_lib)
+zsv_lib_dir = File.dirname(zsv_lib)
 
 # Add zsv include path
-include_dir = File.join(ZSV_DIR, "include")
+include_dir = File.join(ZSV_DIR, 'include')
 
 # Add compiler and linker flags
 $INCFLAGS << " -I#{include_dir}"
-$CFLAGS << " -std=c99 -Wall -Wextra"
-$CFLAGS << " -O3" # Optimization level
+$CFLAGS << ' -std=c99 -Wall -Wextra'
+$CFLAGS << ' -O3' # Optimization level
 
 # Configure include and lib paths
-dir_config("zsv", include_dir, zsv_lib_dir)
+dir_config('zsv', include_dir, zsv_lib_dir)
 
 # Find zsv header
-abort("zsv.h not found in #{include_dir}") unless have_header("zsv.h")
+abort("zsv.h not found in #{include_dir}") unless have_header('zsv.h')
 
 # Link the static library
 $LOCAL_LIBS << " #{zsv_lib}"
 
 # Platform-specific adjustments
 if RUBY_PLATFORM =~ /darwin/
-  $LDFLAGS << " -framework Foundation"
+  $LDFLAGS << ' -framework Foundation'
 elsif RUBY_PLATFORM =~ /linux/
-  $LIBS << " -lpthread -lm"
+  $LIBS << ' -lpthread -lm'
 end
 
 # Check for Ruby 3.2+ hash capacity preallocation
-have_func("rb_hash_new_capa")
+have_func('rb_hash_new_capa')
 
 # Create Makefile
-create_makefile("zsv/zsv")
+create_makefile('zsv/zsv')

data/ext/zsv/options.c

@@ -106,8 +106,7 @@ void zsv_options_parse(VALUE opts_hash, zsv_ruby_options_t *opts)
 
 void zsv_options_free(zsv_ruby_options_t *opts)
 {
-    /* Currently no dynamic allocations to free */
-    /* This is here for future extensibility */
+    (void)opts; /* Currently no dynamic allocations to free */
 }
 
 void zsv_options_apply(zsv_parser parser, zsv_ruby_options_t *opts)

data/ext/zsv/parser.c

@@ -135,6 +135,20 @@ zsv_ruby_parser_t *zsv_parser_new_from_string(VALUE string, VALUE opts_hash)
     const char *str_ptr = RSTRING_PTR(string);
     size_t str_len = RSTRING_LEN(string);
 
+    /* Handle empty string - fmemopen(ptr, 0, ...) fails on macOS */
+    if (str_len == 0) {
+        parser->file = NULL;
+        parser->closed = true;
+        parser->eof_reached = true;
+        zsv_options_parse(opts_hash, &parser->options);
+        parser->row_builder = zsv_row_builder_new(parser->options.encoding);
+        parser->row_buffer = rb_ary_new();
+        parser->headers = Qnil;
+        parser->current_row = Qnil;
+        parser->in_cleanup = false;
+        return parser;
+    }
+
     parser->file = fmemopen((void *)str_ptr, str_len, "rb");
     if (!parser->file) {
         xfree(parser);

data/ext/zsv/zsv_ext.c

@@ -223,6 +223,7 @@ static VALUE rb_zsv_foreach(int argc, VALUE *argv, VALUE klass)
 static VALUE rb_zsv_parse(int argc, VALUE *argv, VALUE klass)
 {
     VALUE string, opts;
+    (void)klass;
     rb_scan_args(argc, argv, "11", &string, &opts);
 
     Check_Type(string, T_STRING);
@@ -248,6 +249,7 @@ static VALUE rb_zsv_parse(int argc, VALUE *argv, VALUE klass)
 static VALUE rb_zsv_read(int argc, VALUE *argv, VALUE klass)
 {
     VALUE path, opts;
+    (void)klass;
     rb_scan_args(argc, argv, "11", &path, &opts);
 
     Check_Type(path, T_STRING);
@@ -275,6 +277,7 @@ static VALUE rb_zsv_read(int argc, VALUE *argv, VALUE klass)
 static VALUE rb_zsv_open(int argc, VALUE *argv, VALUE klass)
 {
     VALUE path, mode, opts;
+    (void)klass;
     rb_scan_args(argc, argv, "11:", &path, &mode, &opts);
 
     Check_Type(path, T_STRING);

data/lib/zsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZSV
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zsv
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - sebyx07