ferrum_pdf 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32142f653d2f6e9d0b5f1f5ec7f86d897c2f2dd1e3107299809a5561b540d604
-  data.tar.gz: a7b306cc4817869043b1f9785d7ddf8b5eb1d40e957bc9091315ca3d1983851f
+  metadata.gz: 286b43b8607b0e0b3763aa9b16b3f6152abf88ae4ce213df5eccdbed399be730
+  data.tar.gz: 7090ac955effd15d1e350140195ba6c979d88fc7286f306021d54fbe95639a12
 SHA512:
-  metadata.gz: afec9dc5c17c618ac9fb6108f445310c6680d98b8329ff1f31d3967a62a8f1fa7ac3329cb852b2c04df285884f8c12598b64f38681d148d53216993891093944
-  data.tar.gz: df9c2ce1b26fd9f9b077621d80d865e1cd3b32b041fa28cbf10d573ad8731e72634d4e755c273fecf1fb98c1b48efbf50b3e4cfdbad0005576b5b6c4f829884c
+  metadata.gz: f7dbeee04fdb949642d331c88f22bd49ad6317a9e64f63b4239b0612deeea4278bd3f74850c1b8b50601f47b5fbb9ec60d0c6a9e4306d0e3cba13b4d0ac7d004
+  data.tar.gz: 1999f985c696e8c684792d169df268ac099ea28af0890a6b0868ec17ab8a8328f418f5fa6c13fd4b767bab887d9a9646839d1bbe390236d80ddc79336588df51

data/README.md

@@ -212,21 +212,44 @@ RUN apt-get update && apt-get install gnupg wget -y && \
     rm -rf /var/lib/apt/lists/*
 ```
 
-### Multiple Browser Support
+### Browser Management
+
+FerrumPdf uses a single browser instance per Ruby process that is automatically created when needed using your configuration settings:
+
+```ruby
+# Browser is auto-created on first use
+FerrumPdf.render_pdf(url: "https://example.org")
+```
+
+You can also set a custom browser instance:
 
 ```ruby
-# Create two browsers using the FerrumPdf config, but overriding `window_size`
-FerrumPdf.add_browser(:small, window_size: [1024, 768]))
-FerrumPdf.add_browser(:large, window_size: [1920, 1080]))
+# Set a custom browser with specific options
+custom_browser = Ferrum::Browser.new(window_size: [800, 600], headless: false)
+FerrumPdf.browser = custom_browser
 
-FerrumPdf.render_pdf(url: "https://example.org", browser: :small)
-FerrumPdf.render_pdf(url: "https://example.org", browser: :large)
+# All subsequent calls will use this browser
+FerrumPdf.render_pdf(url: "https://example.org")
 ```
 
-You can also create a `Ferrum::Browser` instance and pass it in as `browser`:
+To safely shut down the browser process:
+
+```ruby
+# This will quit the current browser and set it to nil
+FerrumPdf.browser = nil
+
+# Next call will auto-create a new browser
+FerrumPdf.render_pdf(url: "https://example.org")
+```
+
+> [!TIP]
+> **Thread Safety**: FerrumPdf is thread-safe within a single Ruby process. Multiple threads can safely use FerrumPdf concurrently, and they will share the same Chrome browser instance. However, each Ruby worker process will have its own separate Chrome instance.
+
+If you need multiple browsers, you can pass the browser option when rendering:
 
 ```ruby
-FerrumPdf.render_pdf(url: "https://example.org", browser: Ferrum::Browser.new)
+other_browser = Ferrum::Browser.new
+FerrumPdf.render_pdf(url: "https://example.org", browser: other_browser)
 ```
 
 ## Debugging

data/lib/ferrum_pdf/version.rb

@@ -1,3 +1,3 @@
 module FerrumPdf
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/ferrum_pdf.rb

@@ -13,20 +13,43 @@ module FerrumPdf
   autoload :Controller, "ferrum_pdf/controller"
   autoload :HTMLPreprocessor, "ferrum_pdf/html_preprocessor"
 
+  mattr_accessor :browser_mutex, default: Mutex.new
   mattr_accessor :include_assets_helper_module, default: true
   mattr_accessor :include_controller_module, default: true
-  mattr_accessor :browsers, default: {}
   mattr_accessor :config, default: ActiveSupport::OrderedOptions.new.merge(
     window_size: [ 1920, 1080 ]
   )
 
+  # This doesn't use mattr_accessor because having a `.browser` getter and also
+  # having local variables named `browser` would be confusing. For simplicity,
+  # this is explicitly accessed.
+  @@browser = nil
+
   class << self
     def configure
       yield config
     end
 
-    def add_browser(name, **options)
-      @@browsers[name] = Ferrum::Browser.new(@@config.merge(options))
+    # Sets the browser instance to use for all operations
+    # If a browser is already set, it will be shut down before setting the new one
+    def browser=(browser_instance)
+      browser_mutex.synchronize do
+        @@browser&.quit
+        @@browser = browser_instance
+      end
+    end
+
+    # Provides thread-safe access to the browser instance
+    def with_browser(browser=nil)
+      if browser
+        yield browser
+      else
+        browser_mutex.synchronize do
+          @@browser ||= Ferrum::Browser.new(config)
+          @@browser.restart unless @@browser.client.present?
+          yield @@browser
+        end
+      end
     end
 
     # Renders HTML or URL to PDF
@@ -65,36 +88,32 @@ module FerrumPdf
     #
     # This automatically applies HTML preprocessing if `html:` is present
     #
-    def load_page(url: nil, html: nil, base_url: nil, authorize: nil, wait_for_idle_options: nil, browser: :default, retries: 1)
+    def load_page(url: nil, html: nil, base_url: nil, authorize: nil, wait_for_idle_options: nil, browser: nil, retries: 1)
       try = 0
 
-      # Lookup browser if a name was passed
-      browser = @@browsers[browser] || add_browser(browser) if browser.is_a? Symbol
+      with_browser(browser) do |browser|
+        # Closes page automatically after block finishes
+        # https://github.com/rubycdp/ferrum/blob/main/lib/ferrum/browser.rb#L169
+        browser.create_page do |page|
+          page.network.authorize(**authorize) { |req| req.continue } if authorize
 
-      # Automatically restart the browser if it was disconnected
-      browser.restart unless browser.client.present?
+          # Load content
+          if html
+            page.content = FerrumPdf::HTMLPreprocessor.process(html, base_url)
+          else
+            page.go_to(url)
+          end
 
-      # Closes page automatically after block finishes
-      # https://github.com/rubycdp/ferrum/blob/main/lib/ferrum/browser.rb#L169
-      browser.create_page do |page|
-        page.network.authorize(**authorize) { |req| req.continue } if authorize
+          # Wait for everything to load
+          page.network.wait_for_idle(**wait_for_idle_options)
 
-        # Load content
-        if html
-          page.content = FerrumPdf::HTMLPreprocessor.process(html, base_url)
-        else
-          page.go_to(url)
+          yield browser, page
         end
-
-        # Wait for everything to load
-        page.network.wait_for_idle(**wait_for_idle_options)
-
-        yield browser, page
       end
     rescue Ferrum::DeadBrowserError
       try += 1
       if try <= retries
-        browser.restart
+        with_browser(&:restart)
         retry
       else
         raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ferrum_pdf
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Oliver
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.0
 specification_version: 4
 summary: PDFs & screenshots for Rails using Ferrum & headless Chrome
 test_files: []