ruby · kzys · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -13,3 +13,10 @@
  *= require_tree .
  *= require_self
  */
+
+body {
+    background: #fff;
+    color: #333;
+    margin: 0;
+    padding: .5rem 1rem;
+}
diff --git a/app/assets/stylesheets/messages.css b/app/assets/stylesheets/messages.css
@@ -0,0 +1,15 @@
+
+.headers {
+    list-style: none;
+    padding: 0 0 1rem 0;
+    border-bottom: 1px solid #000;
+}
+
+.search {
+    padding: 0 0 1rem 0;
+    border-bottom: 1px solid #000;
+}
+
+h2 {
+    font-size: 100%;
+}
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
@@ -1,2 +1,24 @@
 module MessagesHelper
+    def without_list_prefix(subject)
+        subject.sub(/^\[.+\]\s*/, '')
+    end
+
+    MARGIN = 50
+    def search_snippet(body, keyword)
+        snippet = ''
+
+        offset = 0
+        while (i = body.index(keyword, offset))
+            start = [i - MARGIN, offset].max
+            len = keyword.length + MARGIN
+            snippet += body[start, len]
+            offset = start + len
+        end
+
+        if snippet.empty?
+            return body[0, MARGIN * 2]
+        else
+            snippet
+        end
+    end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -37,19 +37,21 @@ def self.from_string(str)
         published_at = DateTime.strptime(headers['Date'], '%Y-%m-%dT%H:%M:%S%:z')
 
         self.new(
-            body: body,
+            body: Kconv.toutf8(body),
             subject: headers['Subject'],
             from: headers['From'],
             published_at: published_at,
         )
     end
 
-    def reload_from_s3
-        m = self.from_s3(List.find_by_id(self.list_id).name, self.list_seq)
+    def reload_from_s3(s3_client = Aws::S3::Client.new(region: BLADE_BUCKET_REGION))
+        m = Message.from_s3(List.find_by_id(self.list_id).name, self.list_seq, s3_client)
 
         self.body = m.body
         self.subject = m.subject
         self.from = from
         self.published_at = m.published_at
+
+        m
     end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>BladeRubyLangOrg</title>
+    <title><%=
+      if yield(:title).empty?
+        'blade.ruby-lang.org'
+      else
+        yield(:title)
+      end
+    %></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>

diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb
@@ -1,14 +1,10 @@
-<div id="<%= dom_id message %>">
-  <p>
-    <strong>Subject:</strong>
-    <%= message.subject %>
-  </p>
-
-  <p>
-    <strong>From:</strong>
-    <%= message.from %>
-  </p>
+<% content_for :title, message.subject %>
 
+<div class="message" id="<%= dom_id message %>">
+  <ul class="headers">
+    <li>From: <%= message.from %></li>
+    <li>Date: <%= message.published_at %></li>
+    <li>Subject: <%= message.subject %></li>
+  </ul>
   <pre><%= message.body %></pre>
-
 </div>
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
@@ -2,32 +2,36 @@
 
 <h1>blade.ruby-lang.org</h1>
 
-<%= form_with(method: :get) do |form| %>
-  <%= form.text_field :q, { value: params[:q] }  %>
-  <%= form.submit "Search" %>
+<div class="search">
+  <%= form_with(method: :get) do |form| %>
+    <%= form.text_field :q, { value: params[:q] }  %>
+    <%= form.submit "Search" %>
 
-  <p>
-    <%
-      [
-        [:ruby_talk, 'ruby-talk (English)'],
-        [:ruby_core, 'ruby-core (For developing Ruby iself, English)'],
-        [:ruby_list, 'ruby-list (Japanese)'],
-        [:ruby_dev, 'ruby-dev (For developing Ruby itself, Japanese)'],
-      ].each do |name, label|
-    %>
-      <span>
-        <%= form.check_box name, {checked: params[name] != '0' } %>
-        <%= form.label name, label %>
-      </span>
-    <% end %>
-  </p>
-<% end %>
+    <p>
+      <%
+        [
+          [:ruby_talk, 'ruby-talk (English)'],
+          [:ruby_core, 'ruby-core (For developing Ruby iself, English)'],
+          [:ruby_list, 'ruby-list (Japanese)'],
+          [:ruby_dev, 'ruby-dev (For developing Ruby itself, Japanese)'],
+        ].each do |name, label|
+      %>
+        <span>
+          <%= form.check_box name, {checked: params[name] != '0' } %>
+          <%= form.label name, label %>
+        </span>
+      <% end %>
+    </p>
+  <% end %>
+</div>
 
 <% @messages.each do |message| %>
-  <div>
+  <div class="search-result">
     <% list_name = List.find_by_id(message.list_id).name %>
-    <%= list_name %>:<%= message.list_seq %>
-    <%= link_to message.subject, "/#{list_name}/#{message.list_seq}" %>
-    <small><%= message.body %></small>
+    <h2 class="subject">
+      <span class="prefix"><%= list_name %>:<%= message.list_seq %></span>
+      <%= link_to without_list_prefix(message.subject), "/#{list_name}/#{message.list_seq}" %>
+    </h2>
+    <div class="snippet"><%= search_snippet(message.body, params[:q]) %></div>
   </div>
 <% end %>
diff --git a/test/models/message_test.rb b/test/models/message_test.rb
@@ -26,4 +26,21 @@ class MessageTest < ActiveSupport::TestCase
 END_OF_BODY
     Message.from_s3('ruby-list', 1234, s3_client)
   end
+
+  test 'reload_from_s3' do
+    s3_client = Aws::S3::Client.new(stub_responses: true)
+    s3_client.stub_responses(:get_object, body: <<END_OF_BODY)
+Subject: [ruby-list:1] Hello
+From: alice@...
+Date: 2005-12-15T19:32:40+09:00
+
+Hello, world!
+END_OF_BODY
+
+    m = Message.new
+    m.list_id = 1
+    m.list_seq = 1
+    m.reload_from_s3(s3_client)
+    assert_equal '[ruby-list:1] Hello', m.subject
+  end
 end