trmnl_preview 0.30.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20431d997e72a0c534f9945c0c8e23cf97dcfff3be5119cbbf2d7973b2c3af73
-  data.tar.gz: 4a96842d311255ad1cd618e36dab4ef4eaa0504c58efe394a609ee5ddc043dba
+  metadata.gz: 69dba3cf0ef5187c4e4b70ea1e465161ebd2367f8d578ef6c94bc3527e5f437c
+  data.tar.gz: 8a1a53e6a0d6cc711eda1b26dde6a6b574956fecced07c260990fdfbec665159
 SHA512:
-  metadata.gz: 6dcab087ef567886345b3ef14e90931af73c236680afb0555667357f277fd650eaed3c473fa7bb514196ca701cccbd3a68ee6f19e302e0be3d37a23bb5abcdb1
-  data.tar.gz: '070453995dac9d20fb77914c1a2adcfde9d01f2ccb34899f00b94cf238278b15a3afae3abfe33da9aae17dbacad5f842e34bd080c169ef256c58d144c449b9b5'
+  metadata.gz: 6ce0c7e09a2f6e3164c15eb9e8a6fa779302e5bb45573e498ca5ac64f98de88be9105751c530a9f3044cdae51cfa1edeb4d20a3d2936373bb4886f6404e5d4cc
+  data.tar.gz: d08dd7466a052fb6dfedcde3e90761e6a236d4c784689213fcf5b17cc575c68f11cb96ecab0a7fd0a08e00b4fbf76b67d6ec4b3ad39202045dd4b645363ceec0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # Changelog
 
+## 0.30.1
+
+- A screen on a device TRMNL scales, as the TRMNL X or a Kobo, runs its scripts at the CSS size and is scaled only for the picture, as TRMNL does. Before, the scripts measured the scaled page, so a table cut rows the device shows (7 of 14 on a TRMNL X) and clamped text kept lines the device cuts.
+
 ## 0.30.0
 
 - `trmnlp test` quits a Firefox that stopped answering before it starts a new one. The old geckodriver kept running until something killed it.

data/lib/trmnlp/screen_generator.rb

@@ -24,8 +24,11 @@ module TRMNLP
       @requested_color_depth = opts[:color_depth]
     end
 
-    # The page as it is shown: chart libraries swapped for TRMNL's copies.
-    def html = CHART_LIBRARIES.reduce(@input) { |page, (from, to)| page.gsub(from, to) }
+    # The page as it is shown: chart libraries swapped for TRMNL's copies, laid out unscaled until the capture.
+    def html
+      CHART_LIBRARIES.reduce(@input) { |page, (from, to)| page.gsub(from, to) }
+                     .sub('</head>', "#{Screenshot::LAYOUT_PASS_STYLE}</head>")
+    end
 
     def process
       output = @screenshot.call(html:, width:, height:)

data/lib/trmnlp/screenshot.rb

@@ -34,6 +34,21 @@ module TRMNLP
       window.onresize = null;
     JS
 
+    # TRMNL lays out a device it scales (TRMNL X, most BYOD screens) at its CSS size while the page's scripts
+    # run, then scales the frozen page for the capture, so a script that measures sees what the device shows.
+    LAYOUT_PASS_STYLE = '<style id="trmnlp-layout-pass">.trmnl .screen { --pixel-ratio: 1 !important; }</style>'
+    APPLY_CAPTURE_SCALE = <<~JS
+      document.getElementById('trmnlp-layout-pass')?.remove();
+      document.documentElement.offsetHeight;
+    JS
+    # A map redraws its canvas at the capture scale before the timers it needs are frozen, for 8s at most.
+    REFRESH_MAPS = <<~JS
+      const done = arguments[arguments.length - 1];
+      if (typeof window.TRMNLMaps?.refresh !== 'function') return done(false);
+      const timeout = new Promise((resolve) => setTimeout(resolve, 8000));
+      Promise.race([window.TRMNLMaps.refresh(), timeout]).then(() => done(true), () => done(false));
+    JS
+
     def initialize(pool:, viewport_timeout: 5, fonts_timeout: FONTS_TIMEOUT_SECONDS)
       @pool = pool
       @viewport_timeout = viewport_timeout
@@ -123,6 +138,14 @@ module TRMNLP
         document.documentElement.style.overflow = 'hidden';
         document.body.style.overflow = 'hidden';
       JS
+      freeze_at_capture_scale(driver, html)
+    end
+
+    def freeze_at_capture_scale(driver, html)
+      return driver.execute_script(FREEZE_TIMERS + APPLY_CAPTURE_SCALE) unless html.match?(MAPS_DOCUMENT_PATTERN)
+
+      driver.execute_script(APPLY_CAPTURE_SCALE)
+      driver.execute_async_script(REFRESH_MAPS)
       driver.execute_script(FREEZE_TIMERS)
     end
 

data/lib/trmnlp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRMNLP
-  VERSION = '0.30.0'
+  VERSION = '0.30.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trmnl_preview
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Rockwell Schrock