imprimatur 0.6.0 → 0.7.0

data/ext/imprimatur_native/ffi/src/pdf.rs

@@ -9,9 +9,17 @@ use crate::read::without_gvl;
 
 type Keywords = (Option<usize>, Option<u64>, Option<f64>);
 
-pub fn info(ruby: &Ruby, document: RString, keywords: Keywords) -> Result<RString, Error> {
+pub fn info(
+    ruby: &Ruby,
+    document: RString,
+    keywords: Keywords,
+    worker: String,
+    memory_bytes: u64,
+) -> Result<RString, Error> {
+    let worker = PathBuf::from(worker);
+    let process = process_limits(memory_bytes);
     let value = without_gvl(ruby, document, keywords, |data, limits| {
-        let info = pdf::info(data, limits)?;
+        let info = pdf::isolation::info_isolated(&worker, data, limits, &process)?;
         Ok(json!({ "page_count": info.page_count, "encrypted": info.encrypted }).to_string())
     })?;
     Ok(ruby.str_new(&value))
@@ -22,12 +30,16 @@ pub fn pages(
     document: RString,
     keywords: Keywords,
     options: (u32, u32, usize, usize, usize),
+    worker: String,
+    memory_bytes: u64,
 ) -> Result<RString, Error> {
     let (first_page, last_page, max_pages, max_page_bytes, max_output_bytes) = options;
     let options =
         pdf::ReadOptions { first_page, last_page, max_pages, max_page_bytes, max_output_bytes };
+    let worker = PathBuf::from(worker);
+    let process = process_limits(memory_bytes);
     let value = without_gvl(ruby, document, keywords, |data, limits| {
-        let result = pdf::pages(data, &options, limits)?;
+        let result = pdf::isolation::pages_isolated(&worker, data, &options, limits, &process)?;
         let pages: Vec<_> = result
             .pages
             .into_iter()
@@ -63,11 +75,14 @@ pub fn render(
     let (page, max_side, max_pixels, max_output_bytes, grayscale) = options;
     let worker = PathBuf::from(worker);
     let options = pdf::RenderOptions { max_side, max_pixels, max_output_bytes, grayscale };
-    let process =
-        pdf::isolation::ProcessLimits { memory_bytes, ..pdf::isolation::ProcessLimits::default() };
+    let process = process_limits(memory_bytes);
     let data = without_gvl(ruby, document, keywords, |data: &[u8], limits: &Limits| {
         pdf::isolation::render_page_isolated(&worker, data, page, &options, limits, &process)
             .map(|image| image.data)
     })?;
     Ok(ruby.str_from_slice(&data))
 }
+
+fn process_limits(memory_bytes: u64) -> pdf::isolation::ProcessLimits {
+    pdf::isolation::ProcessLimits { memory_bytes, ..pdf::isolation::ProcessLimits::default() }
+}

data/lib/imprimatur/pdf_reader.rb

@@ -3,16 +3,18 @@
 module Imprimatur
   # Keyword handling only; parsing, limits and rendering live in the native core.
   module PdfReader
-    def self.info(document, max_bytes: nil, **limits)
-      JSON.parse(Native.pdf_info(Reader.read(document, max_bytes), Reader.limits(max_bytes:, **limits)),
+    def self.info(document, memory_bytes: 1024 * 1024 * 1024, max_bytes: nil, **limits)
+      JSON.parse(Native.pdf_info(Reader.read(document, max_bytes), Reader.limits(max_bytes:, **limits),
+                                 RENDER_WORKER, memory_bytes),
                  symbolize_names: true)
     end
 
     def self.pages(document, first_page: 1, last_page: 0xFFFFFFFF, max_pages: 500,
                    max_page_bytes: 256 * 1024, max_output_bytes: 8 * 1024 * 1024,
-                   max_bytes: nil, **limits)
+                   memory_bytes: 1024 * 1024 * 1024, max_bytes: nil, **limits)
       options = [first_page, last_page, max_pages, max_page_bytes, max_output_bytes]
-      JSON.parse(Native.pdf_pages(Reader.read(document, max_bytes), Reader.limits(max_bytes:, **limits), options),
+      JSON.parse(Native.pdf_pages(Reader.read(document, max_bytes), Reader.limits(max_bytes:, **limits),
+                                  options, RENDER_WORKER, memory_bytes),
                  symbolize_names: true)
     end
 

data/lib/imprimatur/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Imprimatur
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imprimatur
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -106,6 +106,7 @@ files:
 - ext/imprimatur_native/core/src/read/pdf/content/state.rs
 - ext/imprimatur_native/core/src/read/pdf/crypt.rs
 - ext/imprimatur_native/core/src/read/pdf/document.rs
+- ext/imprimatur_native/core/src/read/pdf/document/labels.rs
 - ext/imprimatur_native/core/src/read/pdf/document/pages.rs
 - ext/imprimatur_native/core/src/read/pdf/filter.rs
 - ext/imprimatur_native/core/src/read/pdf/font.rs
@@ -114,6 +115,7 @@ files:
 - ext/imprimatur_native/core/src/read/pdf/images.rs
 - ext/imprimatur_native/core/src/read/pdf/isolation.rs
 - ext/imprimatur_native/core/src/read/pdf/isolation/protocol.rs
+- ext/imprimatur_native/core/src/read/pdf/isolation/stream.rs
 - ext/imprimatur_native/core/src/read/pdf/isolation/system.rs
 - ext/imprimatur_native/core/src/read/pdf/isolation/worker.rs
 - ext/imprimatur_native/core/src/read/pdf/layout.rs