studio-engine 0.44.1 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b902bc40b9fcd804ebcd5512e291a092056246fa399a5eac8753c40ee194f0d
-  data.tar.gz: a23566b993e7bb62201be4a428414e6e9f6ffdcc1789248ad6a255031738a2cb
+  metadata.gz: d2291a2d35bfd35a6f54666fd0e3590a9a59275e453cf5ff81ddd2af49717301
+  data.tar.gz: 5ca713c12be81b7353ebd98f281ef89017a02e6fd348e77d6468383e8d85a90d
 SHA512:
-  metadata.gz: f7a3d8f2116ed244a3f9efaa01284f61a173f4df3ad3fdf38f42e8fe64c33601042975427888c841e69e7142b4d847af5619ec5946a08bbfe2feea8be5bd72c9
-  data.tar.gz: 4a0a21442d7b0b313755fa28fe62101f08408410eabf7278e50b74b8753451776d4b6508686f3db8dd3b78ffafcbe2f2f37e4e4e9f24395524ddd86c332bdee5
+  metadata.gz: d8bc026356b0f6e2e1d0b0781719960001dc7fd5bb629b6fd3e7e59a7d3b1ac298f94dc4b88941c709956f49368675089e507ace0851a6f234321f14b5868f07
+  data.tar.gz: cceface91adc12a32ad02246d67a58a93306fd44dce24a12ffd8a54a4350d840f52c8e7537634cddd524d0a5372d5ab4ff216fc6c9760bd725fc4a408ef11f55

data/app/services/studio/email_preview_target.rb

@@ -67,14 +67,18 @@ module Studio
     class << self
       # Every target the page can offer, admin first.
       #
-      # The NAMELESS sample is always offered, even when a real member exists.
-      # It is the only way to see what the name-free fallback header sends, and
-      # the accounts an app actually parks tend to be real people with real names
-      # — McRitchie Studio's member is Mack McRitchie. The alternative was
-      # stripping a real person's name to make a preview reachable, which trades
-      # a worse app for a better test.
+      # TWO REAL PEOPLE: the operator admin and an ordinary member.
+      #
+      # A third, SYNTHETIC "No name on file" entry used to be appended here so
+      # the name-free fallback header could be previewed. Mr. McRitchie asked for
+      # the list to be just the two, knowing what it costs: the "header for
+      # someone with no name on file" field stays in the editor and still ships
+      # to strangers, it simply cannot be previewed from this page any more.
+      # Do not quietly re-add the sample to make that field previewable — if
+      # that needs solving, solve it somewhere this decision is not reversed by
+      # accident.
       def all
-        [find_admin, find_member, sample_member].compact.uniq(&:id)
+        [find_admin, find_member].compact.uniq(&:id)
       end
 
       # The one to preview as. Falls back to the first available rather than
@@ -123,16 +127,41 @@ module Studio
       # `admin` may be a column, a method, or absent entirely. Only the column
       # can be queried; anything else is filtered in Ruby over a bounded slice,
       # because a preview must not table-scan a production users table.
+      # THE HOUSE STANDARD, preferred over whoever happens to sort first. Every
+      # McRitchie app seeds an "alex" admin and a "mack" member, and without a
+      # preference this offered whatever the id order gave: McRitchie Studio
+      # showed team@ instead of alex@, and turf-monster showed a test-fixture
+      # row (jordan@) instead of Mack.
+      #
+      # Matched on the email LOCAL PART, so an app's own-domain admin counts too
+      # — alex@turfmonster.media and alex@mcritchie.industries are the same
+      # person as alex@mcritchie.studio for this purpose.
+      #
+      # Preference only. An app that seeds neither still gets its first admin
+      # and first member, which is what this did before.
+      PREFERRED_ADMIN_LOCAL = "alex"
+      PREFERRED_MEMBER_LOCAL = "mack"
+
+      def local_part(record) = record.try(:email).to_s.split("@").first.to_s.downcase
+
+      def prefer(candidates, local)
+        candidates.detect { |user| local_part(user) == local } || candidates.first
+      end
+
       def admins(model)
-        return model.where(admin: true).first if model.column_names.include?("admin")
+        if model.column_names.include?("admin")
+          return prefer(model.where(admin: true).limit(50).to_a, PREFERRED_ADMIN_LOCAL)
+        end
 
-        model.limit(50).detect { |user| user.try(:admin?) }
+        prefer(model.limit(50).select { |user| user.try(:admin?) }, PREFERRED_ADMIN_LOCAL)
       end
 
       def members(model)
-        return model.where(admin: [false, nil]).first if model.column_names.include?("admin")
+        if model.column_names.include?("admin")
+          return prefer(model.where(admin: [ false, nil ]).limit(50).to_a, PREFERRED_MEMBER_LOCAL)
+        end
 
-        model.limit(50).detect { |user| !user.try(:admin?) }
+        prefer(model.limit(50).reject { |user| user.try(:admin?) }, PREFERRED_MEMBER_LOCAL)
       end
 
       def from_record(record, id_prefix:, label:, admin:)

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.44.1"
+  VERSION = "0.45.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.44.1
+  version: 0.45.0
 platform: ruby
 authors:
 - Alex McRitchie