trmnl_preview 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9263986533b5d9aa8b6783bfa9a03e6fa3ac956ec2f54b4058737142c25df9a
-  data.tar.gz: d177e098958fba6ed1160b310034c9c64f32876f2f45c0b5d0bcb86c9d7fc3ec
+  metadata.gz: 84919e1b992ea8c0adab71308260b49c178f6c8c9af501b0d5662f80f123e262
+  data.tar.gz: 58c3960edf707710301e76b004172d0983a7f26e6fc8f4cd79e2376a599938fe
 SHA512:
-  metadata.gz: 042e4f7d5e20ff661d4231f761d97d8fc260daf21c4c7927592e9056e2ddd6cb8c6ea92c28eba47125fe37ae9b9ca42a9920d8ebede846fbe4b756d96589ad1d
-  data.tar.gz: c512a8cdb2256b4a1bd0c795cd4f1c2755e172974ca500cadac05331ad6cb791d2f51c4efddd86853f470760d0c1778deb7ee095a6c52a65c78651c3d5fc1a54
+  metadata.gz: 7c6f55953c874c74239386a4cc703e7e1641058a4b3b4ea37a12eb7403d540f8acae62a3479eeb6c12b7eedf6243ec80dc6e5d887891e3ad5e64684abc4350b1
+  data.tar.gz: 1de6ad69a4708c0c7922cb21ce40f811f6e2fd591641cda99dbddeac157bbb0470c541a7fa661366b83b978075bc27dece96c416aa70d3310b146ea2afacdf74

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 
 # Changelog
 
+## 0.8.8
+
+- Added a `--server` flag to `trmnlp login` so commands like `trmnlp push` can target a self-hosted (BYOS) server. The chosen URL is saved as `base_url`, and the `user_` API key prefix is only required for trmnl.com; BYOS servers accept their own token formats. A scheme-less `--server` value (such as `localhost:3000`) no longer crashes the host check. (#113)
+- `trmnlp list` now shows plugins with a nil `plugin_id`, which BYOS servers like LaraPaper return. (#113)
+
+## 0.8.7
+
+- Fixed `.trmnlp.yml` `variables` overrides under the `trmnl` namespace being dropped. The assembler re-applied the pre-override namespace after the transform, clobbering user overrides like `trmnl.user.time_zone`. (#110)
+- Fixed the transform receiving the `trmnl.system` namespace, which the hosted service withholds. Transforms now see only `trmnl.user`, `trmnl.device`, and `trmnl.plugin_settings`, matching production.
+- Added `trmnl.user.id` to the user namespace so its shape matches the hosted service.
+
 ## 0.8.6
 
 - Fix missing form fields `db/data/form_fields.yml`.

data/lib/trmnlp/cli.rb

@@ -28,6 +28,7 @@ module TRMNLP
     end
 
     desc 'login', 'Authenticate with TRMNL server'
+    method_option :server, type: :string, aliases: '-s', desc: 'Server URL (default: https://trmnl.com)'
     def login
       Commands::Login.run(options)
     end

data/lib/trmnlp/commands/list.rb

@@ -16,7 +16,7 @@ module TRMNLP
         api = APIClient.new(config)
         response = api.get_plugin_settings
         plugins = (response || [])
-                  .select { |p| p['plugin_id'] == PRIVATE_PLUGIN_ID }
+                  .select { |p| p['plugin_id'].nil? || p['plugin_id'] == PRIVATE_PLUGIN_ID }
                   .sort_by { |p| (p['name'] || '').downcase }
 
         if plugins.empty?

data/lib/trmnlp/commands/login.rb

@@ -6,36 +6,46 @@ require_relative '../api_client'
 module TRMNLP
   module Commands
     class Login < Base
-      Options = Data.define(:dir, :quiet)
+      Options = Data.define(:dir, :quiet, :server)
 
       def call
-        if config.app.logged_in?
-          anonymous_key = config.app.api_key[0..10] + ('*' * (config.app.api_key.length - 11))
-          reporter.info "Currently authenticated as: #{anonymous_key}"
-          confirm = prompt('You are already authenticated. Do you want to re-authenticate? (y/N): ')
-          return unless confirm.strip.downcase == 'y'
-        end
+        config.app.base_url = options.server if options.server
+        return unless confirm_reauthentication?
 
         reporter.info "Please visit #{config.app.account_uri} to grab your API key, then paste it here."
 
         api_key = prompt('API Key: ')
         raise InvalidApiKey, 'API key cannot be empty' if api_key.empty?
-        unless api_key.start_with?('user_')
+
+        # Only trmnl.com issues user_-prefixed keys; BYOS servers use their own token formats (e.g. Sanctum).
+        if config.app.trmnl_host? && !api_key.start_with?('user_')
           raise InvalidApiKey,
                 'Invalid API key; did you copy it from the right place?'
         end
 
         config.app.api_key = api_key
+        save_credentials
+      end
+
+      private
 
+      def confirm_reauthentication?
+        return true unless config.app.logged_in?
+
+        anonymous_key = config.app.api_key[0..10] + ('*' * (config.app.api_key.length - 11))
+        reporter.info "Currently authenticated as: #{anonymous_key}"
+        confirm = prompt('You are already authenticated. Do you want to re-authenticate? (y/N): ')
+        confirm.strip.downcase == 'y'
+      end
+
+      def save_credentials
         api_client = APIClient.new(config)
-        begin
-          user_info = api_client.get_me
-          reporter.info "Authenticated as #{user_info['name']} (#{user_info['email']})"
-          config.app.save
-          reporter.info "Saved changes to #{paths.app_config}"
-        rescue StandardError => e
-          raise AuthenticationFailed, "Authentication failed; changes were not saved.\n#{e.message}"
-        end
+        user_info = api_client.get_me
+        reporter.info "Authenticated as #{user_info['name']} (#{user_info['email']})"
+        config.app.save
+        reporter.info "Saved changes to #{paths.app_config}"
+      rescue StandardError => e
+        raise AuthenticationFailed, "Authentication failed; changes were not saved.\n#{e.message}"
       end
     end
   end

data/lib/trmnlp/config/app.rb

@@ -30,8 +30,15 @@ module TRMNLP
         @config['api_key'] = key
       end
 
+      def base_url=(url)
+        @config['base_url'] = url
+      end
+
       def base_uri = URI.parse(@config['base_url'] || 'https://trmnl.com')
 
+      # Scheme-less base_urls (e.g. "localhost:3000") parse to a nil host, so guard before matching.
+      def trmnl_host? = !!base_uri.host&.end_with?('trmnl.com')
+
       def api_uri = URI.join(base_uri, '/api')
 
       def account_uri = URI.join(base_uri, '/account')

data/lib/trmnlp/user_data_assembler.rb

@@ -17,14 +17,14 @@ module TRMNLP
 
     # Assembles the merged data hash. The trmnl namespace is built first,
     # layered with static_data / cached polled data / user_data_overrides,
-    # then piped through the transform. The whole trmnl namespace is
-    # re-applied after the transform so it survives even when the
-    # transform doesn't pass it through.
+    # then piped through the transform. The assembled trmnl namespace
+    # (overrides included) is re-applied after the transform so it
+    # survives even when the transform doesn't pass it through.
     def call(device: {})
       namespace = base_trmnl_data(device:)
       merged = assemble(namespace)
-      result = transform_pipeline.call(merged)
-      result['trmnl'] = namespace['trmnl']
+      result = transform_pipeline.call(transform_input(merged))
+      result['trmnl'] = merged['trmnl']
       result
     end
 
@@ -43,6 +43,13 @@ module TRMNLP
       data
     end
 
+    # The hosted service exposes only user/device/plugin_settings to the
+    # transform; the system namespace is added afterward. Mirror that slice
+    # so transforms behave the same locally as in production.
+    def transform_input(merged)
+      merged.merge('trmnl' => merged['trmnl'].slice('user', 'device', 'plugin_settings'))
+    end
+
     def merge_source_data!(data)
       if config.plugin.static?
         data.merge!(config.plugin.static_data)
@@ -68,6 +75,7 @@ module TRMNLP
       tz = ActiveSupport::TimeZone.find_tzinfo(config.project.time_zone)
       iana = tz.name
       {
+        'id' => 1,
         'name' => 'name', 'first_name' => 'first_name', 'last_name' => 'last_name',
         'locale' => 'en', 'time_zone' => ActiveSupport::TimeZone::MAPPING.invert[iana] || iana,
         'time_zone_iana' => iana, 'utc_offset' => tz.utc_offset

data/lib/trmnlp/version.rb

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

metadata

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