Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def show
if params[:id]
@message = Message.find(params[:id])
else
@message = Message.from_s3(params[:list_name], params[:list_seq])
list = List.find_by_name(params[:list_name])
@message = Message.find_by(list_id: list.id, list_seq: params[:list_seq])
end
end

Expand Down
23 changes: 23 additions & 0 deletions app/models/list.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
class List
def initialize(name, id)
@name = name
@id = id
end
attr_reader :name, :id

# Ordered by the established dates. ruby-list was started in 1995.
LISTS = [
List.new('ruby-list', 1),
List.new('ruby-dev', 2),
List.new('ruby-core', 3),
List.new('ruby-talk', 4),
]

def self.find_by_name(name)
LISTS.find { |list| list.name == name }
end

def self.find_by_id(id)
LISTS.find { |list| list.id == id }
end
end
6 changes: 5 additions & 1 deletion app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ class Message < ApplicationRecord
def self.from_s3(list_name, list_seq)
client = Aws::S3::Client.new(region: BLADE_BUCKET_REGION)
obj = client.get_object(bucket: BLADE_BUCKET_NAME, key: "#{list_name}/#{list_seq}")
self.from_string(obj.body.read)

m = self.from_string(obj.body.read)
m.list_id = List.find_by_name(list_name).id
m.list_seq = list_seq
m
end

def self.from_string(str)
Expand Down
4 changes: 3 additions & 1 deletion app/views/messages/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<ul>
<% @messages.each do |message| %>
<li>
<%= link_to message.subject, message %>
<% 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>
</li>
<% end %>
Expand Down
7 changes: 7 additions & 0 deletions db/migrate/20241008063550_add_list.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class AddList < ActiveRecord::Migration[7.1]
def change
add_column(:messages, :list_id, :integer)
add_column(:messages, :list_seq, :integer)
add_index(:messages, [:list_id, :list_seq], unique: true)
end
end
4 changes: 3 additions & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions import.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require 'optparse'

params = {}
OptionParser.new do |opts|
opts.on('--list LIST')
opts.on('--from FROM', Integer)
opts.on('--to TO', Integer)
end.parse!(into: params)

(params[:from]..params[:to]).each do |seq|
message = Message.from_s3(params[:list], seq)
message.save
end
4 changes: 4 additions & 0 deletions test/fixtures/messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ one:
subject: MyString
from: MyString
body: MyText
list_id: 1
list_seq: 123

two:
subject: MyString
from: MyString
body: MyText
list_id: 2
list_seq: 234
7 changes: 7 additions & 0 deletions test/models/list_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
require "test_helper"

class ListTest < ActiveSupport::TestCase
test 'name' do
assert_equal 'ruby-list', List::find_by_name('ruby-list').name
end
end