trmnl_preview 0.22.1 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbaf54f1f6ccdb3a4b76b1be3d43b574a74c06f63c59e493c4a1b7e2a409bc3
-  data.tar.gz: 4275a70d54b9456786a149bbc43ff778357e06d99bc70be516b89bdf240c1509
+  metadata.gz: 8124e73871c707f410d584753b41438447d13ad2afd1cabc8e3cdbe5380e2122
+  data.tar.gz: 07d30b092fd5d63dbc3851b505cedda84c71d378f16593a40571bb8def898a2f
 SHA512:
-  metadata.gz: 3931b0a7a91a3f2c8fc1eafc72211a799bf980baa7575fb1af1000fe1666b8e846acc6af68a50107349d7e887d46c0b5d01a67be535682c5f5844be43decd050
-  data.tar.gz: 1318426dd6a23949218f826bb4cdcb926914856f4f00447eb5b3a18565c496ab2920e1b5bf06e7952b3ccf578204108834ec3a5b789f98404f9f58d1b71b2cee
+  metadata.gz: 81b1aa797fca660e60ea557ee60914ff00109526376931c64e54f5742cde11da52c0711db3997530e5454ee6bb67faa666a38b959753d520f7d3e9f2e685395d
+  data.tar.gz: 689f8792288c7c8fc9487923f52ac5775cc9357b8cdb3e23edc127a5fef8ff24139cc2e8aa86e2770da88d031340be551f398793354fc60464a49d9cffecd307

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 
 # Changelog
 
+## 0.23.1
+
+- A transform that prints more than about 64 KB no longer hangs until its timeout in `trmnlp test` and `trmnlp serve`; its output is read while it runs.
+
+## 0.23.0
+
+- `TRMNLP::Poller#fetch_responses` is public: each polling url as TRMNL resolves it, with its live response. A tool can keep them as the mocks `trmnlp test` answers with.
+- `it_behaves_like 'a publishable recipe'` uses the group's `data`, so a webhook plugin's examples can draw from the merge variables it stores.
+- A static plugin with blank `static_data` renders with no data, as on TRMNL, instead of failing with "invalid JSON in static_data". A byte order mark before the JSON is skipped, as on TRMNL.
+
 ## 0.22.1
 
 - The Docker image runs liquid 5.14 and selenium-webdriver 4.50, as TRMNL does. It had 5.13 and 4.48, so Liquid output could differ from TRMNL. Installs of the gem already took the newer versions.

data/lib/trmnlp/config/plugin.rb

@@ -69,8 +69,10 @@ module TRMNLP
 
       def id = @config['id']
 
+      # Like TRMNL: blank is no data, and a byte order mark is not part of the JSON.
       def static_data
-        JSON.parse(@config['static_data'] || '{}')
+        text = @config['static_data'].to_s.delete_prefix("\uFEFF")
+        text.strip.empty? ? {} : JSON.parse(text)
       rescue JSON::ParserError
         raise InvalidConfig, 'invalid JSON in static_data'
       end

data/lib/trmnlp/poller.rb

@@ -46,6 +46,16 @@ module TRMNLP
       {}
     end
 
+    # Each polling url as TRMNL resolves it, with its response, or nil when the fetch failed.
+    def fetch_responses
+      # Resolve once per attempt (it refreshes as a side effect), then share across
+      # every URL, header, and body render.
+      variables = trmnl_variables.call.merge(oauth_session.liquid_variables)
+      headers = config.plugin.polling_headers(extra_variables: variables)
+      body = config.plugin.polling_body(extra_variables: variables)
+      config.plugin.polling_urls(extra_variables: variables).map { |url| [url, fetch_one(url, headers, body)] }
+    end
+
     private
 
     attr_reader :config, :paths, :oauth_session, :trmnl_variables, :reporter, :async_callback
@@ -74,24 +84,16 @@ module TRMNLP
     end
 
     def aggregate_responses
-      fetched = fetch_all
+      fetched = fetch_responses
       # Like the hosted service: a token rejected before its expiry gets one refresh and retry.
-      fetched = fetch_all if fetched.any? { |_url, response| response&.status == 401 } && oauth_session.force_refresh!
+      token_rejected = fetched.any? { |_url, response| response&.status == 401 }
+      fetched = fetch_responses if token_rejected && oauth_session.force_refresh!
       responses = fetched.map { |url, response| response ? parse_response(response, url) : {} }
       return responses.first if responses.size == 1
 
       responses.each_with_index.with_object({}) { |(r, i), h| h["IDX_#{i}"] = r }
     end
 
-    def fetch_all
-      # Resolve once per attempt (it refreshes as a side effect), then share across
-      # every URL, header, and body render.
-      variables = trmnl_variables.call.merge(oauth_session.liquid_variables)
-      headers = config.plugin.polling_headers(extra_variables: variables)
-      body = config.plugin.polling_body(extra_variables: variables)
-      config.plugin.polling_urls(extra_variables: variables).map { |url| [url, fetch_one(url, headers, body)] }
-    end
-
     def fetch_one(url, headers, body)
       verb = config.plugin.polling_verb.upcase
       response, failure = outbound_request.call(verb, url, headers:, body:)

data/lib/trmnlp/testing/publishable_recipe.rb

@@ -35,7 +35,8 @@ end
 RSpec.shared_examples 'a publishable recipe' do |screens: TRMNLP::Testing::PUBLISHABLE_RECIPE_SCREENS|
   let(:recipe_inputs) do
     { mocks: respond_to?(:mocks) ? mocks : {}, custom_fields: respond_to?(:custom_fields) ? custom_fields : {},
-      variables: respond_to?(:variables) ? variables : {}, now: respond_to?(:now) ? now : nil }
+      variables: respond_to?(:variables) ? variables : {}, now: respond_to?(:now) ? now : nil,
+      data: respond_to?(:data) ? data : nil }
   end
 
   def draw_cleanly = have_no_problems.and(have_no_leaked_text)

data/lib/trmnlp/transform_backend/subprocess.rb

@@ -65,13 +65,16 @@ module TRMNLP
           @on_spawn&.call(wait_thr.pid)
           stdin_io.write(stdin)
           stdin_io.close
+          # Read while it runs: a process that fills a pipe waits for its reader, so reading after it exits hangs.
+          stdout_reader = Thread.new { stdout_io.read }
+          stderr_reader = Thread.new { stderr_io.read }
 
           unless wait_thr.join(timeout_seconds)
             kill(wait_thr)
             return failure("timeout after #{timeout_seconds}s", monotonic_ms - started)
           end
 
-          build_result(stdout_io.read, stderr_io.read, wait_thr.value, output_path, monotonic_ms - started)
+          build_result(stdout_reader.value, stderr_reader.value, wait_thr.value, output_path, monotonic_ms - started)
         end
       end
 

data/lib/trmnlp/version.rb

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

metadata

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