.ruby-version

@@ -1 +1 @@
-2.6.3@vlv-search
+3.3.4

Gemfile

@@ -10,9 +10,10 @@ gem 'pg', '~> 1.2'
 gem 'rack', '~> 2.2'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.9'
-gem 'sassc', '~> 2.2'
 gem 'sequel', '~> 5.30'
 gem 'sinatra', '~> 2.0'
 gem "truncato", "~> 0.7.11"
 gem "vcr", "~> 6.0"
 gem "webmock", "~> 3.14"
+
+gem "puma", "~> 6.4"

Gemfile.lock

@@ -1,78 +1,101 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    crack (0.4.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.3)
-    dotenv (2.7.5)
-    ffi (1.12.2)
-    hashdiff (1.0.1)
+    diff-lcs (1.5.1)
+    dotenv (2.8.1)
+    hashdiff (1.1.1)
     htmlentities (4.3.4)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    mime-types (3.3.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
-    multi_xml (0.6.0)
-    mustermann (1.1.1)
+    mime-types-data (3.2024.0820)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    pg (1.2.3)
-    public_suffix (4.0.6)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
+    nio4r (2.7.3)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
+    pg (1.5.7)
+    public_suffix (6.0.1)
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-protection (2.2.4)
       rack
-    rake (13.0.1)
-    rexml (3.2.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rake (13.2.1)
+    rexml (3.3.5)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    ruby2_keywords (0.0.2)
-    sassc (2.2.1)
-      ffi (~> 1.9)
-    sequel (5.31.0)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    ruby2_keywords (0.0.5)
+    sequel (5.83.1)
+      bigdecimal
+    sinatra (2.2.4)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    tilt (2.0.10)
-    truncato (0.7.11)
+    strscan (3.1.0)
+    tilt (2.4.0)
+    truncato (0.7.12)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
-    vcr (6.0.0)
-    webmock (3.14.0)
+    vcr (6.3.1)
+      base64
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
   dotenv (~> 2.7)
   httparty (~> 0.18.0)
   nokogiri (~> 1.10)
   pg (~> 1.2)
+  puma (~> 6.4)
   rack (~> 2.2)
   rake (~> 13.0)
   rspec (~> 3.9)
-  sassc (~> 2.2)
   sequel (~> 5.30)
   sinatra (~> 2.0)
   truncato (~> 0.7.11)
@@ -80,4 +103,4 @@ DEPENDENCIES
   webmock (~> 3.14)
 
 BUNDLED WITH
-   2.1.4
+   2.5.11

Rakefile

@@ -35,17 +35,15 @@ task 'scrape' do
 end
 
 task 'build' do
-  require 'sassc'
-
   unless Dir.exist?('./web/public')
     puts 'Creating web/public/'
     Dir.mkdir('./web/public')
   end
 
-  scss = File.read('./web/assets/style.scss')
-  css = SassC::Engine.new(scss, style: :compressed).render
+  css = File.read('./web/assets/style.css')
   puts 'Writing web/public/style.css'
   File.write('./web/public/style.css', css)
+
   js = File.read('./web/assets/script.js')
   puts 'Writing web/public/script.js'
   File.write('./web/public/script.js', js)

db/connect.rb

@@ -7,8 +7,10 @@ Dotenv.load(File.expand_path('../.env'))
 DB =
   Sequel.connect(
     adapter: :postgres,
+    host: ENV['DB_HOST'] || 'localhost',
     database: ENV['DB_DATABASE'],
     user: ENV['DB_USERNAME'],
     password: ENV['DB_PASSWORD'],
+    port: ENV['DB_PORT'] || 5432,
     logger: ENV['APP_ENV'] == 'development' ? Logger.new('db/log') : nil
   )

lib/search.rb

@@ -57,7 +57,7 @@ end
 def search_threads(q, username, from_date, to_date, sort, offset, exact_match)
   sort = Sequel.desc(sort == 'post' ? :last_post_created_at : :created_at)
   query = VLV::Thread
-    .select(Sequel.lit('threads.*, count(*) OVER() AS full_count'))
+    .select(Sequel.lit('threads.*'))
     .where(Sequel.lit("(LOWER(threads.creator) = LOWER(?) OR ? = '')", username, username))
     .where(Sequel.lit("created_at >= ? OR ? IS NULL", from_date, from_date))
     .where(Sequel.lit("created_at >= ? OR ? IS NULL", to_date, to_date))
@@ -74,7 +74,7 @@ end
 
 def search_posts(q, username, from_date, to_date, offset, exact_match)
   query = VLV::Post
-    .select(Sequel.lit('posts.*, threads.title as thread_title, threads.remote_id as remote_thread_id, count(*) OVER() AS full_count'))
+    .select(Sequel.lit('posts.*, threads.title as thread_title, threads.remote_id as remote_thread_id'))
     .join(Sequel.lit('threads on posts.thread_id = threads.id'))
     .where(Sequel.lit("(LOWER(posts.creator) = LOWER(?) OR (? = ''))", username, username))
     .where(Sequel.lit("posts.created_at >= ? OR ? IS NULL", from_date, from_date))

spec/fetcher_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Fetcher do
         result = subject.page(0)
         aggregate_failures do
           expect(result).to be_a(Nokogiri::HTML::Document)
-          expect(result.at_css('h3').text).to eq('VLV: politics, food, and aging')
+          expect(result.at_css('h3').text).to eq('VLV: Can we change the current header to something else')
           expect(result.css('.even, .odd').length).to eq(110)
         end
       end

web/assets/style.css

@@ -0,0 +1,201 @@
+* {
+  box-sizing: border-box;
+}
+
+html, body {
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  font-family: verdana, sans-serif;
+}
+
+img {
+  max-width: 100%;
+}
+
+blockquote {
+  font-style: italic;
+  margin: 0;
+}
+
+.error {
+  color: #DD2222;
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  margin: auto;
+  max-width: 800px;
+  min-height: 100vh;
+  padding: 15px;
+}
+
+.header__link {
+  color: black;
+  text-decoration: none;
+}
+
+.btn {
+  background-color: rgb(40, 96, 144);
+  border: 1px solid #222;
+  border-radius: 5px;
+  color: #ffffff;
+  cursor: pointer;
+  font-size: 20px;
+  padding: 0.5em 0.5em;
+  text-decoration: none;
+}
+
+.btn:hover {
+  background-color: rgb(30, 85, 135);
+}
+
+.btn--small {
+  font-size: 14px;
+}
+
+.btn--prev {
+  margin-right: 1em;
+}
+
+.center {
+  text-align: center;
+}
+
+.auth {
+  align-items: center;
+  display: flex;
+  font-size: 14px;
+  justify-content: space-between;
+}
+
+.auth__copy {
+  margin: 0;
+}
+
+.auth__username {
+  font-weight: bold;
+}
+
+.footer {
+  border-top: 1px solid black;
+  font-size: 12px;
+  margin: 20px 0;
+}
+
+.form {
+  display: flex;
+  flex-direction: column;
+  margin: 2em auto;
+  width: 100%;
+}
+
+.form__search {
+  border: 1px solid #999;
+  border-radius: 5px;
+  font-size: 20px;
+  padding: 0.5em;
+}
+
+.form .filters {
+  margin: 1em 0;
+}
+
+.filters__section {
+  display: flex;
+  padding: .5em 0;
+}
+
+.filters__subsection--sort {
+  visibility: hidden;
+}
+
+.filters__subsection--sort.open {
+  visibility: visible;
+}
+
+.filters__subsection {
+  flex: 1;
+}
+
+.filters__subsection--static {
+  flex: 1;
+}
+
+.filters__subsection:nth-child(2) {
+  padding: 0 1em;
+}
+
+.form__field {
+  margin: 10px 0;
+}
+
+.form__text-field {
+  border: 1px solid #000000;
+  border-radius: 4px;
+  font-size: 16px;
+  padding: 5px;
+  width: 100%;
+}
+
+.form__submit {
+  font-size: 16px;
+}
+
+.form--login {
+  margin-top: 0;
+}
+
+.form--login .form__label {
+  display: block;
+  margin: 10px 0;
+}
+
+.results-container {
+  padding-bottom: 1em;
+}
+
+.results__subheader {
+  border-bottom: 1px solid black;
+  margin: 1.5em 0;
+  padding: 5px 0;
+}
+
+.results__result {
+  background: #efefef;
+  border: 1px solid black;
+  border-radius: 5px;
+  margin: 1em 0;
+  padding: 0.5em;
+}
+
+.results__result.threads .result__info {
+  margin-bottom: 0;
+}
+
+.result__info {
+  display: flex;
+  font-size: 12px;
+  justify-content: space-between;
+}
+
+@media (max-width: 500px) {
+  .result__info {
+    flex-direction: column;
+  }
+
+  .result__info span {
+    display: inline-block;
+    margin: 5px 0;
+  }
+
+  .filters__section {
+    flex-direction: column;
+  }
+
+  .filters__subsection:nth-child(2) {
+    padding: 0;
+  }

web/assets/style.scss

@@ -1,5 +0,0 @@
-@import './web/assets/styles/auth.scss';
-@import './web/assets/styles/form.scss';
-@import './web/assets/styles/global.scss';
-@import './web/assets/styles/results.scss';
-@import './web/assets/styles/footer.scss';

web/assets/styles/auth.scss

@@ -1,14 +0,0 @@
-.auth {
-  align-items: center;
-  display: flex;
-  font-size: 14px;
-  justify-content: space-between;
-}
-
-.auth__copy {
-  margin: 0;
-}
-
-.auth__username {
-  font-weight: bold;
-}

web/assets/styles/footer.scss

@@ -1,5 +0,0 @@
-.footer {
-  border-top: 1px solid black;
-  font-size: 12px;
-  margin: 20px 0;
-}

web/assets/styles/form.scss

@@ -1,76 +0,0 @@
-.form {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  margin: 2em auto;
-  width: 100%;
-}
-
-.form__search {
-  border: 1px solid #999;
-  border-radius: 5px;
-  font-size: 20px;
-  padding: 0.5em;
-}
-
-.form .filters {
-  margin: 1em 0;
-}
-
-.filters__section {
-  display: flex;
-  padding: .5em 0;
-
-  @media(max-width: 768px) {
-    flex-direction: column;
-  }
-}
-
-.filters__subsection--sort {
-  visibility: hidden;
-}
-
-.filters__subsection--sort.open {
-  visibility: visible;
-}
-
-.filters__subsection {
-  flex: 1;
-
-  &.filters__subsection--static {
-    flex: 1;
-  }
-
-  &:nth-child(2) {
-    padding: 0 1em;
-
-    @media(max-width: 768px) {
-      padding: 0;
-    }
-  }
-}
-
-.form__field {
-  margin: 10px 0;
-}
-
-.form__text-field {
-  border: 1px solid #000000;
-  border-radius: 4px;
-  font-size: 16px;
-  padding: 5px;
-  width: 100%;
-}
-
-.form__submit {
-  font-size: 16px;
-}
-
-.form--login {
-  margin-top: 0;
-}
-
-.form--login .form__label {
-  display: block;
-  margin: 10px 0;
-}

web/assets/styles/global.scss

@@ -1,62 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-html, body {
-  margin: 0;
-  padding: 0;
-}
-
-body {
-  font-family: verdana, sans-serif;
-}
-
-img {
-  max-width: 100%;
-}
-
-blockquote {
-  font-style: italic;
-  margin: 0;
-}
-
-.error {
-  color: #DD2222;
-}
-
-.container {
-  display: flex;
-  flex-direction: column;
-  margin: auto;
-  max-width: 800px;
-  min-height: 100vh;
-  padding: 15px;
-}
-
-.header__link {
-  color: black;
-  text-decoration: none;
-}
-
-.btn {
-  background-color: rgb(40, 96, 144);
-  border: 1px solid #222;
-  border-radius: 5px;
-  color: #ffffff;
-  cursor: pointer;
-  font-size: 20px;
-  padding: 0.5em 0.5em;
-  text-decoration: none;
-}
-
-.btn:hover {
-  background-color: rgb(30, 85, 135);
-}
-
-.btn--small {
-  font-size: 14px;
-}
-
-.center {
-  text-align: center;
-}

web/assets/styles/results.scss

@@ -1,40 +0,0 @@
-.results-container {
-  padding-bottom: 1em;
-}
-
-.results__subheader {
-  border-bottom: 1px solid black;
-  margin: 1.5em 0;
-  padding: 5px 0;
-}
-
-.results__result {
-  background: #efefef;
-  border: 1px solid black;
-  border-radius: 5px;
-  margin: 1em 0;
-  padding: 0.5em;
-}
-
-.results__result.threads .result__info {
-  margin-bottom: 0;
-}
-
-.result__info {
-  display: flex;
-  font-size: 12px;
-  justify-content: space-between;
-
-  @media (max-width: 500px) {
-    flex-direction: column;
-
-    span {
-      display: inline-block;
-      margin: 5px 0;
-    }
-  }
-}
-
-.btn--prev {
-  margin-right: 1em;
-}

web/server.rb

@@ -45,7 +45,6 @@ class VLVSearch < Sinatra::Base
       erb :results, { locals: {errors: results[:errors]}, layout: :layout }
     else
       params[:current_count] = results[:results].to_a.size
-      params[:full_count] = results[:results].empty? ? 0 : results[:results].first[:full_count]
       previous_url, next_url = build_urls(params)
 
       locals =