bible270 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e566c5e5c2097bfcb768ef08108d115814096e552c768636b67f009a6c31532
-  data.tar.gz: d11ec18971a487ef039492849da05543062b88841b80f79f3d2fa545ff674cbb
+  metadata.gz: f214ecf16725944cbd5ffd021f9ed2a6b17ba97ddc84d8ca0e8a8cc2e45b351c
+  data.tar.gz: 75746ab729d9f9f18681d0c1a65b7bca5474f141720a34e1de2a40494fc549be
 SHA512:
-  metadata.gz: 067e9c103eb5688c04c4e2c352a225768d9d9d98e04a4b046c16a285b736adf313c9687e825a781f615199bac580a94104107b3f273947b2faeb378712a53b87
-  data.tar.gz: f9c658c9e118f25c880ece18f7128b931fef51ddd6cc7d83042c3b18ede120f84398a09c1d34b028ec913ab6a19ad683f8824b28ed9174fecc61e9ac6bdc950e
+  metadata.gz: 44e3360ef501a381938a002b3bdf5d40c948e8783688374aeffb2df2bcc2248c683f16eec25c94f5b5278a6b059643d511a756dea53865be1dbc6f02420c394d
+  data.tar.gz: 10ec4cc9154f7d388c9adfdccb5906261436aab786d73fa676536a664733474587a6d0e53e10e7d01827768855e25d69fd0b680be936211dcd8d6cf844090403

data/CHANGELOG.md

@@ -6,12 +6,14 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ### Added
 
+- add a YouTube Video formatting button for reflections and replies, with optional video names, validated click-to-load players in previews and web views, privacy tooltips, new-tab YouTube links, no autoplay or remote thumbnails, and ordinary video links in notification emails
 - show Blue Letter Bible Scripture popups when readers hover over references in rendered reflections, replies, and Markdown previews; popups follow each reader's selected translation, handle original-language choices by testament, and rescan content added by Turbo without forcing a page reload
 - let administrators sort the reader list and Reader Stats report by most or least recent reading activity, while keeping readers with no activity at the end
 
 ### Changed
 
 - link reader email addresses directly to email composition and link recent-activity day labels to their Day pages with passage tooltips in Admin
+- include each reader's last reading-activity date in the `bible270:readers:list` and Admin Reader Stats reports
 
 **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.2...main)**
 

data/README.md

@@ -1,6 +1,5 @@
 # Bible 270
-
-[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Coverage Status](https://img.shields.io/coverallsCoverage/github/avonderluft/bible270?branch=main&cacheSeconds=300)](https://coveralls.io/github/avonderluft/bible270?branch=main) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
+[![Rails CI](https://github.com/avonderluft/bible270/actions/workflows/railsci.yml/badge.svg)](https://github.com/avonderluft/comfortable-media-surfer/actions/workflows/rubyonrails.yml) [![Test Coverage](https://img.shields.io/coverallsCoverage/github/avonderluft/bible270?branch=main&cacheSeconds=300)](https://coveralls.io/github/avonderluft/bible270?branch=main) [![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
 
 A mountable **Rails engine** that drops a 270-day (9 month) interactive Bible reading plan into any Rails app, built with [ComfortableMediaSurfer](https://github.com/shakacode/comfortable-media-surfer) CMS in mind. Readers tick off each day's readings, post reflections, and see how everyone else is getting on, much like the social plans on Bible.com.
 
@@ -288,7 +287,7 @@ their previous visit. Reflection and reply drafts are retained for up to 30 days
 cleared after a successful post. On a shared device, clearing browser storage also removes saved drafts.
 Typing `@` in the composer offers up to five unambiguous reader handles; manual mentions continue to
 work without JavaScript. A quiet **Formatting** disclosure opens a toolbar for bold, italic,
-quotations, bulleted and numbered lists, and links without requiring readers to know Markdown syntax.
+quotations, bulleted and numbered lists, links, and YouTube videos without requiring readers to know Markdown syntax.
 A separate **Preview** control checks the current draft through the same server-side sanitizer used
 after posting; formatting tools stay out of sight until requested. The source remains
 editable in the ordinary textarea, drafts preserve its format, and all rendered HTML is restricted to that small safe
@@ -296,6 +295,31 @@ set. Existing reflections remain literal plain text until a reader intentionally
 them. Upgrading hosts must copy and run migration `20260101000021`, which records whether each body is
 plain text or Markdown; until then, the composer safely falls back to plain text.
 
+The **Video** button accepts YouTube watch, share (`youtu.be`), Shorts, live, and embed URLs,
+then asks for an optional video name. Leave it blank for **View video**, or name it to show
+**View video ‘Name’**. The name is stored as the link text and is also used in notification emails.
+It inserts an explicit Markdown link on its own paragraph, for example:
+
+```markdown
+[YouTube video](https://www.youtube.com/watch?v=aB3_dE-fG12 "bible270-video")
+```
+
+Preview and posted reflections/replies show a small **View video** card. No YouTube player or remote
+thumbnail is requested until the reader loads the video; the player uses `www.youtube-nocookie.com`
+and does not autoplay. Loading it shares the reader's IP address and request metadata with YouTube;
+privacy-enhanced mode does not make playback anonymous. The button tooltip reads “Loads player and
+shares data with YouTube”; the link tooltip reads “Opens YouTube in a new tab.” An **Open on YouTube** link opens in a new
+tab/window with `rel="nofollow ugc noopener"`, and remains available when JavaScript is disabled or
+the provider disallows embedding. Notification emails retain ordinary
+links, and unmarked links never become players automatically. Only validated YouTube URLs become
+cards; unsupported marked links remain links. No uploads, API keys, extra gems, or database migrations
+are needed for this feature. Shared links' start times and playlist parameters are not retained.
+
+Hosts using Content Security Policy must add `https://www.youtube-nocookie.com` to their existing
+`frame-src` directive. Do not replace the rest of the host's policy or broadly allow arbitrary frames.
+Hosts with a custom engine layout should also render `bible270/shared/video_embeds` once, alongside the
+other shared scripts, to enable click-to-load playback.
+
 When `config.mention_notifications` is enabled, each reader can request email for every new reflection
 and reply, only replies to their reflections and mentions of them, or none. Broad notifications are sent
 once with eligible subscribers in BCC; direct reply and mention notices remain individually addressed.
@@ -633,6 +657,7 @@ The engine's CSS rides in a partial its own layout renders. Using your layout? A
 ```bash
 bundle install
 bundle exec rake test
+node --test test/javascript/*.cjs
 bundle exec rubocop --cache false
 ```
 
@@ -644,6 +669,11 @@ subsequent balancing. Set `PARALLEL_WORKERS` to tune the worker count. Use
 `bundle exec rake test:serial` when a serial coverage run is specifically needed; it writes to the same
 project-local `coverage/` directory.
 
+The video UI tests use Node.js 22+ and its built-in test runner, with no npm dependencies. They run the
+actual toolbar/player scripts against a small mocked DOM and also run as a separate CI job. They do
+not contact YouTube; live playback should be checked in a browser on the deployed host, especially
+when a host supplies a Content Security Policy.
+
 ### Get an email link for local testing
 
 in the rails console: `rails c`

data/app/helpers/bible270/plan_helper.rb

@@ -53,18 +53,18 @@ module Bible270
       end
     end
 
-    # Formats every reflection surface through the same sanitizer. Web views link
-    # resolved mentions; email can opt out because it has no mounted request path.
-    def b270_comment_body(comment, link_mentions: true)
+    # Formats every reflection surface through the same sanitizer. Emails opt out
+    # of interactive video cards and mention links requiring a mounted request path.
+    def b270_comment_body(comment, link_mentions: true, embed_videos: true)
       format = comment.rendered_body_format
       html = if link_mentions
                readers = Bible270::Reader.mentioned_in(comment.body)
-               Bible270::CommentFormatter.html(comment.body, format: format) do |handle|
+               Bible270::CommentFormatter.html(comment.body, format: format, embed_videos: embed_videos) do |handle|
                  reader = readers.find { |candidate| candidate.answers_to?(handle) }
                  reader_path(reader) if reader
                end
              else
-               Bible270::CommentFormatter.html(comment.body, format: format)
+               Bible270::CommentFormatter.html(comment.body, format: format, embed_videos: embed_videos)
              end
       html.html_safe
     end

data/app/views/bible270/comments/_editor.html.erb

@@ -32,6 +32,7 @@
             <button type="button" data-b270-markdown-action="bullet-list" aria-label="Format as a bulleted list" title="Bulleted list">• List</button>
             <button type="button" data-b270-markdown-action="number-list" aria-label="Format as a numbered list" title="Numbered list">1. List</button>
             <button type="button" data-b270-markdown-action="link" aria-label="Add a link" title="Link">Link</button>
+            <button type="button" data-b270-markdown-action="video" aria-label="Add a YouTube video" title="YouTube video">Video</button>
           </div>
         </div>
       </div>

data/app/views/bible270/notice_mailer/comment_notice.html.erb

@@ -10,7 +10,7 @@
       </p>
 
       <blockquote style="margin:0;padding:14px 16px;background:#ece6da;border-left:3px solid #a5812c;border-radius:8px;font-size:15px;line-height:1.55">
-        <%= b270_comment_body(@comment, link_mentions: false) %>
+        <%= b270_comment_body(@comment, link_mentions: false, embed_videos: false) %>
       </blockquote>
 
       <% if @day_url %>

data/app/views/bible270/shared/_markdown_toolbar.html.erb

@@ -105,6 +105,44 @@
       update(editor, textarea, replacement, start, finish, 1, selected.length + 1);
     }
 
+    function youtubeVideoId(href) {
+      if (/[\s\x00-\x1f\x7f]/.test(href) || /%(?![0-9a-f]{2})/i.test(href)) return null;
+      let url;
+      try { url = new URL(href); } catch { return null; }
+      const hosts = ["youtube.com", "www.youtube.com", "m.youtube.com", "youtu.be", "www.youtu.be"];
+      if (!/^https?:\/\//i.test(href) || !hosts.includes(url.hostname) || url.username || url.password || url.port) return null;
+
+      let id;
+      if (url.hostname === "youtu.be" || url.hostname === "www.youtu.be") id = url.pathname.slice(1);
+      else if (url.pathname === "/watch") {
+        const ids = url.searchParams.getAll("v");
+        if (ids.length === 1) id = ids[0];
+      } else id = url.pathname.match(/^\/(?:shorts|live|embed)\/([A-Za-z0-9_-]{11})$/)?.[1];
+      return /^[A-Za-z0-9_-]{11}$/.test(id || "") ? id : null;
+    }
+
+    function addVideo(editor, textarea) {
+      const href = window.prompt("YouTube video address (https://…)");
+      if (!href) return;
+      const id = youtubeVideoId(href.trim());
+      if (!id) {
+        window.alert("Enter a valid YouTube video URL. Use Link for other video sites.");
+        return;
+      }
+
+      const name = window.prompt("Video name (optional — leave blank for View video)");
+      if (name === null) return;
+      // Entity-encode punctuation so a name stays text, not Markdown or HTML.
+      const label = (name.trim().replace(/\s+/g, " ") || "YouTube video")
+        .replace(/[!-/:-@\[-`{-~]/g, (character) => `&#${character.codePointAt(0)};`);
+      const start = textarea.selectionStart;
+      const finish = textarea.selectionEnd;
+      const marker = `[${label}](https://www.youtube.com/watch?v=${id} "bible270-video")`;
+      const before = start > 0 ? "\n\n" : "";
+      const replacement = `${before}${marker}\n\n`;
+      update(editor, textarea, replacement, start, finish, replacement.length, replacement.length);
+    }
+
     function requestPreview(editor, state) {
       const textarea = editor.querySelector("textarea[name='comment[body]']");
       const preview = editor.querySelector("[data-b270-preview-panel]");
@@ -181,6 +219,7 @@
         setFormattingOpen(editor, false, false);
         requestPreview(editor, state);
       } else {
+        window.Bible270Videos?.reset(previewPanel);
         setFormattingOpen(editor, openEditors.has(editorKey(editor)), false);
         const textarea = editor.querySelector("textarea[name='comment[body]']");
         resizeTextarea(textarea);
@@ -198,6 +237,8 @@
         wrap(editor, textarea, "*", "*", "italic text");
       } else if (action === "link") {
         addLink(editor, textarea);
+      } else if (action === "video") {
+        addVideo(editor, textarea);
       } else {
         prefixLines(editor, textarea, action);
       }

data/app/views/bible270/shared/_styles.html.erb

@@ -265,6 +265,12 @@
   .b270-cbody blockquote{margin:7px 0 0;padding:2px 0 2px 12px;border-left:3px solid var(--line);color:var(--muted)}
   .b270-cbody a{color:var(--teal);text-decoration:underline;text-decoration-color:var(--line)}
   .b270-cbody a:hover{text-decoration-color:currentColor}
+  .b270-video{margin:10px 0;padding:12px;border:1px solid var(--line);border-radius:10px;background:var(--paper);width:100%;box-sizing:border-box;white-space:normal}
+
+  .b270 .b270-video button{padding:7px 12px;border:1px solid var(--line);border-radius:7px;background:var(--card);color:var(--ink);font:inherit;cursor:pointer}
+  .b270-video button[hidden]{display:none}
+  .b270-video iframe{display:block;width:100%;aspect-ratio:16/9;border:0;border-radius:6px}
+  .b270-video a{display:block;margin-top:8px;font-size:13px}
   .b270-editform{margin-top:6px}
   .b270-editform textarea{min-height:64px}
   .b270-editerror{margin:0 0 8px;font-size:13px;color:var(--oxblood)}

data/app/views/bible270/shared/_video_embeds.html.erb

@@ -0,0 +1,46 @@
+<script nonce="<%= content_security_policy_nonce %>">
+  (() => {
+    if (window.Bible270Videos) {
+      window.Bible270Videos.scan();
+      return;
+    }
+
+    function scan() {
+      document.querySelectorAll("[data-b270-video-load]").forEach((button) => {
+        button.hidden = !!button.closest(".b270-video")?.querySelector("iframe");
+      });
+    }
+
+    function reset(root = document) {
+      root.querySelectorAll(".b270-video iframe").forEach((frame) => frame.remove());
+      root.querySelectorAll("[data-b270-video-load]").forEach((button) => {
+        button.hidden = false;
+      });
+    }
+
+    document.addEventListener("click", (event) => {
+      const button = event.target.closest?.("[data-b270-video-load]");
+      if (!button) return;
+      const card = button.closest("[data-b270-video-id]");
+      const id = card?.dataset.b270VideoId;
+      if (!/^[A-Za-z0-9_-]{11}$/.test(id || "") || card.querySelector("iframe")) return;
+
+      const frame = document.createElement("iframe");
+      frame.src = `https://www.youtube-nocookie.com/embed/${id}?autoplay=0`;
+      frame.title = "YouTube video player";
+      frame.allow = "encrypted-media; fullscreen; picture-in-picture";
+      frame.allowFullscreen = true;
+      // YouTube requires an origin referrer to identify the embedding site.
+      frame.referrerPolicy = "strict-origin-when-cross-origin";
+      card.insertBefore(frame, button);
+      button.hidden = true;
+      frame.focus();
+    });
+
+    scan();
+    new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true });
+    document.addEventListener("turbo:load", scan);
+    document.addEventListener("turbo:before-cache", () => reset());
+    window.Bible270Videos = { scan, reset };
+  })();
+</script>

data/app/views/layouts/bible270/application.html.erb

@@ -24,5 +24,6 @@
     <%= b270_footer %>
   </div>
   <%= render "bible270/shared/scripture_popups" %>
+  <%= render "bible270/shared/video_embeds" %>
 </body>
 </html>

data/lib/bible270/comment_formatter.rb

@@ -5,6 +5,7 @@ require 'kramdown'
 require 'nokogiri'
 require 'rails-html-sanitizer'
 require 'bible270/mentions'
+require 'bible270/youtube_video'
 
 module Bible270
   # Converts stored reflection source into a deliberately small, safe subset of
@@ -15,22 +16,28 @@ module Bible270
     MARKDOWN = 'markdown'
     FORMATS = [PLAIN, MARKDOWN].freeze
     ALLOWED_TAGS = %w[p br strong em blockquote ul ol li a].freeze
-    ALLOWED_ATTRIBUTES = %w[href rel].freeze
+    ALLOWED_ATTRIBUTES = %w[href rel title].freeze
+    VIDEO_MARKER = 'bible270-video'
+    VIDEO_PRIVACY = 'Loads player and shares data with YouTube'
     LINK_REL = 'nofollow ugc noopener'
     URL_PATTERN = %r{https?://[^\s<>"]*[^\s<>".,;:!?)\]\}]}i
-    SKIP_MENTIONS_IN = %w[a code pre].freeze
+    SKIP_MENTIONS_IN = %w[a button code pre].freeze
 
   module_function
 
-    def html(body, format: PLAIN, &mention_path)
+    def html(body, format: PLAIN, embed_videos: false, &mention_path)
       source = body.to_s
       rendered = format == MARKDOWN ? markdown_html(source) : plain_html(source)
       fragment = fragment_for(sanitize(rendered))
       if format == MARKDOWN
+        replace_video_markers(fragment) if embed_videos
         normalize_lists(fragment)
         hard_wrap(fragment)
         link_urls(fragment)
       end
+      fragment.css('[title]').each { |node| node.remove_attribute('title') }
+      fragment.css('.b270-video button').each { |node| node['title'] = VIDEO_PRIVACY }
+      fragment.css('.b270-video a').each { |node| node['title'] = 'Opens YouTube in a new tab.' }
       decorate_links(fragment)
       link_mentions(fragment, &mention_path) if mention_path
       fragment.to_html
@@ -135,6 +142,43 @@ module Bible270
     end
     private_class_method :link_urls
 
+    def replace_video_markers(fragment)
+      fragment.css('p').each do |paragraph|
+        children = paragraph.children.reject { |node| node.text? && node.text.strip.empty? }
+        next unless children.one?
+
+        link = children.first
+        next unless link.name == 'a' && link['title'] == VIDEO_MARKER
+
+        id = YouTubeVideo.id_from_url(link['href'].to_s)
+        paragraph.replace(video_card(id, fragment.document, name: link.text.strip)) if id
+      end
+    end
+    private_class_method :replace_video_markers
+
+    # These elements are generated only after sanitization; they are deliberately
+    # not part of the allowlist for user-supplied HTML.
+    def video_card(id, document, name:)
+      card = Nokogiri::XML::Node.new('div', document)
+      card['class'] = 'b270-video'
+      card['data-b270-video-id'] = id
+
+      button = Nokogiri::XML::Node.new('button', document)
+      button['type'] = 'button'
+      button['data-b270-video-load'] = ''
+      button['hidden'] = 'hidden'
+      button.content = name.empty? || name == 'YouTube video' ? 'View video' : "View video ‘#{name}’"
+      card.add_child(button)
+
+      link = Nokogiri::XML::Node.new('a', document)
+      link['href'] = "https://www.youtube.com/watch?v=#{id}"
+      link['target'] = '_blank'
+      link.content = 'Open on YouTube'
+      card.add_child(link)
+      card
+    end
+    private_class_method :video_card
+
     def decorate_links(fragment)
       fragment.css('a:not([href])').each do |link|
         link.replace(Nokogiri::XML::Text.new(link.text, fragment.document))

data/lib/bible270/reader_progress_report.rb

@@ -3,18 +3,18 @@
 module Bible270
   # Builds the plain-text reader progress table used by administrative tasks.
   class ReaderProgressReport
-    HEADERS = ['Name', 'Days Read', 'Status'].freeze
+    HEADERS = ['Name', 'Days Read', 'Status', 'Last Activity'].freeze
     SORTS = %w[
       first_name last_name most_completed least_completed most_recent_activity least_recent_activity
     ].freeze
     DEFAULT_SORT = 'most_completed'
-    Row = Struct.new(:name, :days_read, :status, keyword_init: true)
+    Row = Struct.new(:name, :days_read, :status, :last_activity, keyword_init: true)
 
-    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, recent_activities: {},
+    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, recent_activities: nil,
                    sort: DEFAULT_SORT)
-      @readers = readers
+      @readers = readers.to_a
       @completed_days = completed_days
-      @recent_activities = recent_activities
+      @recent_activities = recent_activities || Checkoff.recent_activity_by_reader(@readers.map(&:id))
       @sort = SORTS.include?(sort.to_s) ? sort.to_s : DEFAULT_SORT
     end
 
@@ -25,18 +25,23 @@ module Bible270
     def rows
       @rows ||= sorted_readers.map do |reader|
         days_read = completed_days.fetch(reader.id, 0)
-        Row.new(name: reader.display_name, days_read: days_read, status: status(reader, days_read))
+        Row.new(
+          name: reader.display_name,
+          days_read: days_read,
+          status: status(reader, days_read),
+          last_activity: last_activity_date(reader)
+        )
       end
     end
 
     def empty? = rows.empty?
 
     def to_table
-      values = rows.map { |row| [row.name, row.days_read.to_s, row.status] }
+      values = rows.map { |row| [row.name, row.days_read.to_s, row.status, row.last_activity] }
       widths = HEADERS.each_index.map do |index|
         ([HEADERS[index].length] + values.map { |value| value[index].length }).max
       end
-      format = "%-#{widths[0]}s  %#{widths[1]}s  %-#{widths[2]}s"
+      format = "%-#{widths[0]}s  %#{widths[1]}s  %-#{widths[2]}s  %-#{widths[3]}s"
       lines = [format % HEADERS, format % widths.map { |width| '-' * width }].map(&:rstrip)
       lines.concat(values.map { |value| (format % value).rstrip })
       lines.join("\n")
@@ -70,6 +75,11 @@ module Bible270
       [activity.nil? ? 1 : 0, descending && timestamp ? -timestamp : timestamp.to_f, reader.sort_name, reader.id]
     end
 
+    def last_activity_date(reader)
+      occurred_at = recent_activities[reader.id]&.occurred_at
+      occurred_at ? Bible270.local_time(occurred_at).strftime('%b %-d, %Y') : '—'
+    end
+
     def status(reader, days_read)
       calendar_day = reader.calendar_day
       return 'undated' unless calendar_day

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.7.2'
+  VERSION = '1.8.0'
 end

data/lib/bible270/youtube_video.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module Bible270
+  module YouTubeVideo
+    HOSTS = %w[youtube.com www.youtube.com m.youtube.com youtu.be www.youtu.be].freeze
+    SHORT_HOSTS = %w[youtu.be www.youtu.be].freeze
+    ID_PATTERN = %r{\A[A-Za-z0-9_-]{11}\z}
+
+  module_function
+
+    def id_from_url(url)
+      return if url.match?(%r{[[:space:][:cntrl:]]})
+
+      uri = URI.parse(url)
+      return unless uri.is_a?(URI::HTTP) && HOSTS.include?(uri.host&.downcase)
+      return if uri.userinfo || url.match?(%r{%(?![0-9a-f]{2})}i)
+      # Match the authority literally too: URI accepts empty ports and normalizes
+      # explicit default ports, which would otherwise conceal malformed input.
+      return unless url.match?(%r{\Ahttps?://#{Regexp.escape(uri.host)}(?::#{uri.default_port})?/}i)
+
+      id = candidate_id(uri)
+      id if id&.match?(ID_PATTERN)
+    rescue URI::InvalidURIError, ArgumentError
+      nil
+    end
+
+    def candidate_id(uri)
+      if SHORT_HOSTS.include?(uri.host.downcase)
+        uri.path.delete_prefix('/')
+      elsif uri.path == '/watch'
+        ids = URI.decode_www_form(uri.query.to_s).filter_map { |key, value| value if key == 'v' }
+        ids.first if ids.one?
+      else
+        uri.path.match(%r{\A/(?:shorts|live|embed)/([A-Za-z0-9_-]{11})\z})&.[](1)
+      end
+    end
+    private_class_method :candidate_id
+  end
+end

data/lib/tasks/bible270_readers.rake

@@ -4,7 +4,7 @@ require 'bible270/reader_progress_report'
 
 namespace :bible270 do
   namespace :readers do
-    desc 'List readers by completed days with their schedule status'
+    desc 'List readers by completed days with their schedule status and last activity'
     task list: :environment do
       report = Bible270::ReaderProgressReport.new
       if report.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -190,6 +190,7 @@ files:
 - app/views/bible270/shared/_scripture_popups.html.erb
 - app/views/bible270/shared/_styles.html.erb
 - app/views/bible270/shared/_track_bars.html.erb
+- app/views/bible270/shared/_video_embeds.html.erb
 - app/views/bible270/sign_in_mailer/magic_link.html.erb
 - app/views/bible270/sign_in_mailer/magic_link.text.erb
 - app/views/layouts/bible270/application.html.erb
@@ -232,6 +233,7 @@ files:
 - lib/bible270/translations.rb
 - lib/bible270/versification.rb
 - lib/bible270/version.rb
+- lib/bible270/youtube_video.rb
 - lib/generators/bible270/install/install_generator.rb
 - lib/generators/bible270/install/templates/bible270.rb.tt
 - lib/generators/bible270/install/templates/omniauth.rb.tt