rails-markup 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d92edb94812f28021a43c76cf45ad13604ed0de5545e3de5b02c47a819839ee
-  data.tar.gz: 6a9704b1c7cd903632a96861f12b7cd17810bb02b87ff31928ea82a86aebd2ee
+  metadata.gz: bfb46593a03e4c5562c8dbec13d69ffa7e0492abc266f7d1bcf1cde6efdc624b
+  data.tar.gz: 60cb28088ec81da177e3bbfcaa52b040c8341e3d9d55e874ad71f65852498b82
 SHA512:
-  metadata.gz: 3decfcd9d93210c4326825ea5cf084b0891169c04f5865696dc01ef996ea0fd3d6222c0df90bbfbb949bbff719f68810d81b8b6fded7f76648f350fdcb03a73e
-  data.tar.gz: 7bf263251ca961e77132c09b678eab22736401a7c512280d7e5055e3906685a6154ade96ddf1b0d12b91625c14169b1a09c2055c2a55a4781d44a759ae238295
+  metadata.gz: 2e9408961851e8c76cb51a920434e59a7c8bc70304ebcf703a6095ecb2aa2f1458147030965c42ad42968ddf748c63c0dc1cce9d12027cc52b01b04682a7dac1
+  data.tar.gz: fbaff2d124dbf48aeea3800e5df2ade96be4527830d4264caa13f3f387a43c3b9b1ca4f3d66281ababb0547e38cd2a3aa4a50c96dc82dc55808ac31b5a10594d

data/README.md

@@ -64,7 +64,7 @@ The generator creates:
 | `app/controllers/rails_markup_auth_controller.rb` | Auth controller |
 | `bin/markup` | CLI wrapper |
 | Route mount | Engine at `/admin/annotations` |
-| Toolbar injection | `<%= render "rails_markup/shared/toolbar" %>` in your layout |
+| Toolbar injection | Admin-gated `render "rails_markup/shared/toolbar"` in your layout |
 
 ### Generator options
 
@@ -83,6 +83,12 @@ customize `authorize_rails_markup!` if your host uses another authorization
 policy. The configured base controller must actually enforce authorization.
 Choosing a public controller makes both interfaces public.
 
+The install generator injects the toolbar behind an admin gate
+(`current_user.admin?`) rather than rendering it unconditionally, so the FAB and
+toolbar chrome only appear for the same users the dashboard/API authorize. If
+your app authorizes annotators differently, adjust that gate in your layout to
+match `authorize_rails_markup!`.
+
 The toolbar uses the same host authentication boundary as the dashboard and
 sends normal Rails CSRF tokens on every mutation. Keep `csrf_meta_tags` in the
 host layout. Rails is authoritative; localStorage is an offline cache and a

data/app/assets/javascripts/rails_markup/toolbar.js

@@ -159,8 +159,9 @@
         .rm-popup { display:none; position:fixed; z-index:9982; width:360px; max-width:calc(100vw - 24px); background:rgba(255,255,255,0.95); backdrop-filter:blur(12px); border-radius:16px; box-shadow:0 25px 50px rgba(0,0,0,0.1); border:1px solid rgba(229,231,235,0.8); padding:16px; }
         .rm-popup textarea { width:100%; font-size:13px; border:1px solid #e5e7eb; border-radius:12px; padding:12px; resize:none; outline:none; font-family:inherit; transition:border-color 0.15s,box-shadow 0.15s; }
         .rm-popup textarea:focus { border-color:#818cf8; box-shadow:0 0 0 3px rgba(99,102,241,0.1); }
-        .rm-popup select { font-size:11px; font-weight:500; border:1px solid #e5e7eb; border-radius:8px; padding:6px 24px 6px 8px; background:#fff; appearance:none; cursor:pointer; }
-        .rm-popup select:focus { outline:none; border-color:#818cf8; box-shadow:0 0 0 3px rgba(99,102,241,0.1); }
+        #rm-toolbar-root .rm-popup select { font-size:11px; font-weight:500; line-height:1.4; color:#374151; height:auto; margin:0; border:1px solid #e5e7eb; border-top:1px solid #e5e7eb; border-right:1px solid #e5e7eb; border-bottom:1px solid #e5e7eb; border-left:1px solid #e5e7eb; border-radius:8px; padding:6px 24px 6px 8px; background:#fff; background-image:none; box-shadow:none; outline:none; text-transform:none; appearance:none; -webkit-appearance:none; -moz-appearance:none; cursor:pointer; }
+        #rm-toolbar-root .rm-popup select:focus { outline:none; border:1px solid #818cf8; box-shadow:0 0 0 3px rgba(99,102,241,0.1); }
+        #rm-toolbar-root .rm-popup select:hover { border:1px solid #d1d5db; background:#fff; }
         .rm-popup-el { font-size:11px; color:#9ca3af; font-family:monospace; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; line-height:1.4; }
         .rm-popup-text { font-size:12px; color:#6b7280; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; margin-top:2px; line-height:1.4; }
         .rm-popup-actions { display:flex; align-items:center; gap:8px; margin-top:8px; }

data/lib/generators/rails_markup/install/templates/bin_markup.erb

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Set up Bundler so the gem's lib path is on $LOAD_PATH. This matters when
+# rails-markup is installed from a git source, where its files live outside
+# Ruby's default load path until bundler/setup runs.
+require "bundler/setup"
 require "rails_markup/cli"
 RailsMarkup::Cli.start(ARGV)

data/lib/generators/rails_markup/install_generator.rb

@@ -58,9 +58,14 @@ module RailsMarkup
           return
         end
 
+        # Gate the toolbar on the same authorization contract as the engine's
+        # auth controller (current_user.admin?), not merely on the partial
+        # existing — otherwise the FAB/toolbar chrome ships to every visitor,
+        # including logged-out and non-admin users. Adjust this condition if
+        # your app authorizes annotators differently.
         toolbar_block = <<~ERB.indent(4)
-          <%# Rails Markup annotation toolbar %>
-          <% if lookup_context.exists?("rails_markup/shared/toolbar", [], true) %>
+          <%# Rails Markup annotation toolbar (admins only) %>
+          <% if respond_to?(:current_user) && current_user.respond_to?(:admin?) && current_user.admin? %>
             <%= render "rails_markup/shared/toolbar" %>
           <% end %>
         ERB
@@ -87,7 +92,11 @@ module RailsMarkup
             say_status :skip, "Procfile.dev already uses bin/markup server", :yellow
           end
         else
-          append_to_file "Procfile.dev", "markup: bin/markup server\n"
+          # Ensure the existing content ends with a newline so the markup
+          # process starts on its own line even when Procfile.dev has no
+          # trailing newline (otherwise it glues onto the last process).
+          leading = content.empty? || content.end_with?("\n") ? "" : "\n"
+          append_to_file "Procfile.dev", "#{leading}markup: bin/markup server\n"
           say_status :append, "Procfile.dev (added markup server)", :green
         end
       end

data/lib/rails_markup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMarkup
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-markup
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - InventList