spoonerize 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ad82a22fd996a0e5af1653a6ed66f27863da252331b4fa58865980d6a27b063
-  data.tar.gz: d206494ce8cc6e9dabbda3ab86389d080e57d1baf0a003800ba6edd3fe3c3b13
+  metadata.gz: bf971b88e97e4e680e1aaa25fdd21238734738ff4b6e230580f93305f5c823a5
+  data.tar.gz: da9f97e86eeb122f7c1ecbe057a5f73bc0908a86ab5dc5acbb76898ff4e326cd
 SHA512:
-  metadata.gz: f8b89f4ea9ca38fb0ee9773ca55e6fb654e94d4135f4b4748abc91c90fe014e3c1bd90e6f0c9c4f9d74f2efcf64b7bfd8b488ebcf3cf92dc40d9c2616089d30e
-  data.tar.gz: 1c81200ffd8922cc1384c11b9a8a8766eae3d59f3301c544dbf9a6928617c85d231f931cec768d4ad4c7c8fcbc697ca94d666c182340974c7d406411c11dab34
+  metadata.gz: 8a74bb8fa978b4a298ea9c3e5fbb3fb53be59875a9a41749570a1014462d5fe4a8aa13dd02683163ee1177b812cd3a69edff1a880975463b83a1fa143f5b2508
+  data.tar.gz: 263a67ba0a8d3bc0d3d89f46a4f2ef9a4f2cb9475684ca0a16309916dab7ffc370c5bd0796224e411f0b22a209aac1779aa21b340bdae96fd88a27836d50bc11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spoonerize (2.0.0)
+    spoonerize (2.1.0)
       csv
       puma (~> 8.0)
       rackup (~> 2.3)

data/README.md

@@ -1,6 +1,7 @@
 # Welcome to Spoonerize -- a word game.
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fevanthegrayt%2Fspoonerize%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/evanthegrayt/spoonerize/goto?ref=master)
-[![Gem Version](https://badge.fury.io/rb/spoonerize.svg)](https://badge.fury.io/rb/spoonerize)
+[![Gem Version](https://img.shields.io/gem/v/spoonerize.svg)](https://rubygems.org/gems/spoonerize)
+![Language: Ruby](https://img.shields.io/static/v1?label=language&message=Ruby&color=CC342D&style=flat&logo=ruby&logoColor=CC342D)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 > Spoonerism *[noun]* a verbal error in which a speaker accidentally transposes

data/lib/spoonerize/version.rb

@@ -15,7 +15,7 @@ module Spoonerize
     # Minor version.
     #
     # @return [Integer]
-    MINOR = 0
+    MINOR = 1
 
     ##
     # Patch version.

data/lib/spoonerize/web/public/styles.css

@@ -41,10 +41,41 @@ body {
   padding-bottom: 1.25rem;
 }
 
+.masthead-with-action {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-between;
+  gap: 1rem;
+}
+
 h1 {
   margin: 0;
-  font-size: clamp(2.2rem, 7vw, 4rem);
-  line-height: 1;
+  font-size: clamp(1.9rem, 4vw, 2.75rem);
+  line-height: 1.08;
+}
+
+.lede {
+  margin: 0.5rem 0 0;
+  color: var(--muted);
+  font-family: ui-sans-serif, system-ui, sans-serif;
+  font-size: 0.95rem;
+  font-weight: 700;
+}
+
+.action-link {
+  flex: 0 0 auto;
+  color: var(--accent-dark);
+  font-family: ui-sans-serif, system-ui, sans-serif;
+  font-size: 0.95rem;
+  font-weight: 750;
+  text-decoration-color: color-mix(in srgb, var(--accent-dark) 35%, transparent);
+  text-underline-offset: 0.18em;
+}
+
+.action-link:hover,
+.action-link:focus {
+  color: var(--accent);
+  text-decoration-color: currentcolor;
 }
 
 .result {
@@ -141,6 +172,72 @@ button:focus {
   background: var(--accent-dark);
 }
 
+.table-wrap {
+  overflow-x: auto;
+  border: 1px solid var(--line);
+  border-radius: 4px;
+  background: var(--panel);
+}
+
+.saved-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-family: ui-sans-serif, system-ui, sans-serif;
+  font-size: 0.95rem;
+}
+
+.saved-table th {
+  border-bottom: 1px solid var(--line);
+  padding: 0.8rem 0.9rem;
+  text-align: left;
+  vertical-align: top;
+}
+
+.saved-table td {
+  border-bottom: 1px solid var(--line);
+  padding: 0;
+  text-align: left;
+  vertical-align: top;
+}
+
+.saved-table th {
+  color: var(--muted);
+  font-size: 0.78rem;
+  letter-spacing: 0;
+  text-transform: uppercase;
+}
+
+.saved-table tbody tr:last-child td {
+  border-bottom: 0;
+}
+
+.saved-table td {
+  color: var(--ink);
+}
+
+.saved-table .row-link {
+  display: block;
+  min-height: 100%;
+  padding: 0.8rem 0.9rem;
+  color: inherit;
+  text-decoration: none;
+}
+
+.saved-table tbody tr:hover,
+.saved-table tbody tr:focus-within {
+  background: color-mix(in srgb, var(--accent) 7%, var(--panel));
+}
+
+.saved-table .row-link:focus {
+  outline: 3px solid color-mix(in srgb, var(--accent) 22%, transparent);
+  outline-offset: 2px;
+}
+
+.saved-table td:last-child {
+  color: var(--muted);
+  white-space: nowrap;
+}
+
 .footer {
   width: min(100%, 46rem);
   margin-top: 2.5rem;
@@ -175,4 +272,65 @@ button:focus {
   button {
     width: 100%;
   }
+
+  .masthead-with-action {
+    display: grid;
+    align-items: start;
+  }
+}
+
+@media (max-width: 34rem) {
+  .table-wrap {
+    overflow: visible;
+    border: 0;
+    background: transparent;
+  }
+
+  .saved-table,
+  .saved-table thead,
+  .saved-table tbody,
+  .saved-table th,
+  .saved-table td,
+  .saved-table tr {
+    display: block;
+  }
+
+  .saved-table thead {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+    clip: rect(0 0 0 0);
+  }
+
+  .saved-table tr {
+    margin-bottom: 0.8rem;
+    border: 1px solid var(--line);
+    border-radius: 4px;
+    background: var(--panel);
+  }
+
+  .saved-table td {
+    display: grid;
+    grid-template-columns: 7rem 1fr;
+    gap: 0.75rem;
+    border-bottom: 1px solid var(--line);
+  }
+
+  .saved-table td::before {
+    content: attr(data-label);
+    padding: 0.8rem 0 0.8rem 0.9rem;
+    color: var(--muted);
+    font-size: 0.78rem;
+    font-weight: 800;
+    text-transform: uppercase;
+  }
+
+  .saved-table .row-link {
+    padding: 0.8rem 0.9rem 0.8rem 0;
+  }
+
+  .saved-table td:last-child {
+    white-space: normal;
+  }
 }

data/lib/spoonerize/web/views/index.erb

@@ -1,6 +1,7 @@
 <section class="shell">
-  <header class="masthead">
-    <h1>Flip a phrase</h1>
+  <header class="masthead masthead-with-action">
+    <h1>Spoonerize a phrase</h1>
+    <a class="action-link" href="/saved/">Saved spoonerisms</a>
   </header>
 
   <% if @result %>
@@ -9,7 +10,8 @@
       <p class="notice">Saved.</p>
     <% end %>
   <% elsif @error %>
-    <p class="notice"><%= h @error %></p>
+    <% display_error = @error == "Not enough words to flip." ? "Not enough words to spoonerize." : @error %>
+    <p class="notice"><%= h display_error %></p>
   <% end %>
 
   <form action="/" method="post" class="spoonerize-form">
@@ -28,7 +30,7 @@
 
       <label class="check">
         <input type="checkbox" name="reverse" value="1" <%= checked?("reverse") %>>
-        <span>Reverse flipping</span>
+        <span>Reverse spoonerizing</span>
       </label>
 
       <label class="check">
@@ -38,7 +40,7 @@
 
       <label class="check">
         <input type="checkbox" name="consonants_only" value="1" <%= checked?("consonants_only") %>>
-        <span>Only flip consonant-starting words</span>
+        <span>Only spoonerize consonant-starting words</span>
       </label>
 
       <label class="check">

data/lib/spoonerize/web/views/saved.erb

@@ -0,0 +1,44 @@
+<section class="shell">
+  <header class="masthead masthead-with-action">
+    <div>
+      <h1>Saved spoonerisms</h1>
+      <p class="lede"><%= @entries.size %> saved <%= @entries.size == 1 ? "spoonerism" : "spoonerisms" %></p>
+    </div>
+    <a class="action-link" href="/">New spoonerism</a>
+  </header>
+
+  <% if @entries.empty? %>
+    <p class="notice">No saved spoonerisms yet.</p>
+  <% else %>
+    <div class="table-wrap">
+      <table class="saved-table">
+        <thead>
+          <tr>
+            <th scope="col">Phrase</th>
+            <th scope="col">Result</th>
+            <th scope="col">Options</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @entries.each do |entry| %>
+            <% phrase = entry[0].to_s %>
+            <% result = entry[1].to_s %>
+            <% options = entry[2].to_s %>
+            <% entry_path = saved_entry_path(phrase, result) %>
+            <tr>
+              <td data-label="Phrase">
+                <a class="row-link" href="<%= h entry_path %>"><%= h phrase %></a>
+              </td>
+              <td data-label="Result">
+                <a class="row-link" href="<%= h entry_path %>"><strong><%= h result %></strong></a>
+              </td>
+              <td data-label="Options">
+                <a class="row-link" href="<%= h entry_path %>"><%= h options %></a>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% end %>
+</section>

data/lib/spoonerize/web.rb

@@ -54,13 +54,34 @@ module Spoonerize
       def h(value)
         Rack::Utils.escape_html(value)
       end
+
+      ##
+      # Path for loading a saved spoonerism on the main web form.
+      #
+      # @param [String] phrase The original phrase.
+      # @param [String] result The saved spoonerized result.
+      #
+      # @return [String]
+      def saved_entry_path(phrase, result)
+        "/?#{Rack::Utils.build_query("phrase" => phrase, "result" => result)}"
+      end
     end
 
     get "/" do
       prepare_request(false)
+      @result = params["result"].to_s unless params["result"].to_s.empty?
       erb :index
     end
 
+    get "/saved" do
+      redirect "/saved/"
+    end
+
+    get "/saved/" do
+      @entries = saved_entries
+      erb :saved
+    end
+
     post "/" do
       prepare_request(true)
       @result = spoonerize_phrase if @submitted && !@phrase.strip.empty?
@@ -96,6 +117,10 @@ module Spoonerize
       @save = @submitted && params.key?("save")
     end
 
+    def saved_entries
+      Spoonerize::Log.new(Spoonerize.config.logfile_name).contents.reverse
+    end
+
     def spoonerize_phrase
       spoonerism = Spoonerism.new(
         *@phrase.split,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoonerize
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Evan Gray
@@ -163,6 +163,7 @@ files:
 - lib/spoonerize/web/public/styles.css
 - lib/spoonerize/web/views/index.erb
 - lib/spoonerize/web/views/layout.erb
+- lib/spoonerize/web/views/saved.erb
 - spoonerize.gemspec
 homepage: https://evanthegrayt.github.io/spoonerize/
 licenses: