parquet 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8fa4ebaf63f622e06e21085899249ea50edbceed3afa0c378df69bd0bdc8c58
-  data.tar.gz: 9f02946885241758cb26eff3564a6f386c4fafaa77811627e3af2f5768ea002a
+  metadata.gz: b44b6f3ca56a0f4318c361b309c1af213186dcf09e09acbe54561a2dcc920042
+  data.tar.gz: 68aa0636e1467e008ec29bbdb43737904b8f0a26f2d91a5169005f896950687f
 SHA512:
-  metadata.gz: 67edb7775baaec1f214edd359d1aff1768bceb1b24e3d616b23c2a28f60ae3a7c7d9c68b0a767d99558aa3841b725030452cb9726e0567c7e413f15c3da6562d
-  data.tar.gz: a704b96748fb53a272964fddcbe8db5ee4615fc4e96cec51e3897ab2e651b84c5429ebc2a50a48568da71e642b728c8f24b0aa46eab62f896f98a8919ec9141b
+  metadata.gz: 30966ae0335b9caa4458a79e5d627b920f2368605785a978690490a7ed05beb1f7ab25eeeed7349cd3c05b49573dc68405cb8c52af5aad5240a42ce4a56b184b
+  data.tar.gz: 5ea6021844baac3bb31acf41f0fdc3795710f9eff21e9c3556692e70f10398249d802b6f3bb22f414d282f2ff33a2ea951fe9d3040625002752d86311eeae160

data/ext/parquet/src/ruby_reader.rs

@@ -1,23 +1,18 @@
 use bytes::Bytes;
 use magnus::{
     value::{Opaque, ReprValue},
-    RClass, RString, Ruby, Value,
+    RString, Ruby, Value,
 };
 use parquet::{
     errors::ParquetError,
     file::reader::{ChunkReader, Length},
 };
-use std::{
-    fs::File,
-    sync::{Mutex, OnceLock},
-};
+use std::{fs::File, sync::Mutex};
 use std::{
     io::{self, BufReader, Read, Seek, SeekFrom, Write},
     sync::Arc,
 };
 
-static STRING_IO_CLASS: OnceLock<Opaque<RClass>> = OnceLock::new();
-
 /// A reader that can handle various Ruby input types (String, StringIO, IO-like objects)
 /// and provide a standard Read implementation for them.
 pub enum RubyReader {
@@ -34,23 +29,15 @@ pub enum RubyReader {
 }
 
 impl RubyReader {
-    fn is_string_io(ruby: &Ruby, value: &Value) -> bool {
-        let string_io_class = STRING_IO_CLASS.get_or_init(|| {
-            let class = RClass::from_value(ruby.eval("StringIO").expect("Failed to find StringIO"))
-                .expect("Failed to get StringIO class");
-            Opaque::from(class)
-        });
-        value.is_kind_of(ruby.get_inner(*string_io_class))
-    }
-
     fn is_io_like(value: &Value) -> bool {
         value.respond_to("read", false).unwrap_or(false)
     }
 
     // For now, don't use this. Having to use seek in length is scary.
-    fn is_seekable_io_like(_value: &Value) -> bool {
-        // Self::is_io_like(value) && value.respond_to("seek", false).unwrap_or(false)
-        false
+    fn is_seekable_io_like(value: &Value) -> bool {
+        Self::is_io_like(value)
+            && value.respond_to("seek", false).unwrap_or(false)
+            && value.respond_to("pos", false).unwrap_or(false)
     }
 }
 
@@ -59,13 +46,7 @@ impl TryFrom<Value> for RubyReader {
 
     fn try_from(value: Value) -> Result<Self, Self::Error> {
         let ruby = unsafe { Ruby::get_unchecked() };
-        if RubyReader::is_string_io(&ruby, &value) {
-            let string_content = value.funcall::<_, _, RString>("string", ())?;
-            Ok(RubyReader::String {
-                inner: Opaque::from(string_content),
-                offset: 0,
-            })
-        } else if RubyReader::is_seekable_io_like(&value) {
+        if RubyReader::is_seekable_io_like(&value) {
             Ok(RubyReader::RubyIoLike {
                 inner: Opaque::from(value),
             })
@@ -112,10 +93,14 @@ impl Seek for RubyReader {
                 let unwrapped_inner = ruby.get_inner(*inner);
 
                 let new_offset = match pos {
-                    io::SeekFrom::Start(offset) => offset as usize,
-                    io::SeekFrom::Current(offset) => (*original_offset as i64 + offset) as usize,
-                    io::SeekFrom::End(offset) => {
-                        unwrapped_inner.len().saturating_sub(offset as usize)
+                    SeekFrom::Start(off) => off as usize,
+                    SeekFrom::Current(off) => {
+                        let signed = *original_offset as i64 + off;
+                        signed.max(0) as usize
+                    }
+                    SeekFrom::End(off) => {
+                        let signed = unwrapped_inner.len() as i64 + off;
+                        signed.max(0) as usize
                     }
                 };
 
@@ -131,8 +116,12 @@ impl Seek for RubyReader {
                     SeekFrom::End(i) => (2, i),
                 };
 
+                unwrapped_inner
+                    .funcall::<_, _, u64>("seek", (ruby_offset, whence))
+                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+
                 let new_position = unwrapped_inner
-                    .funcall("seek", (ruby_offset, whence))
+                    .funcall::<_, _, u64>("pos", ())
                     .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
 
                 Ok(new_position)

data/lib/parquet/version.rb

@@ -1,3 +1,3 @@
 module Parquet
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parquet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Nathan Jaremko