.gitignore

@@ -2,3 +2,4 @@
 vendor/
 web/public/*.css
 web/public/*.js
+db/log

db/connect.rb

@@ -1,4 +1,5 @@
 require 'dotenv'
+require 'logger'
 
 Dotenv.load(File.expand_path('../.env'))
 
@@ -7,5 +8,6 @@ DB =
     adapter: :postgres,
     database: ENV['DB_DATABASE'],
     user: ENV['DB_USERNAME'],
-    password: ENV['DB_PASSWORD']
+    password: ENV['DB_PASSWORD'],
+    logger: ENV['APP_ENV'] == 'development' ? Logger.new('db/log') : nil
   )

lib/search.rb

@@ -1,10 +1,43 @@
 require 'sequel'
 
+RESULTS_PER_PAGE = 50
+
 def search(params)
   query = params[:q].strip
-  offset = (params[:page] - 1) * 10
+  offset = (params[:page] - 1) * RESULTS_PER_PAGE
   username = params[:username].strip
-  case params[:type]
+  from_date = params[:from_date].strip
+  to_date = params[:to_date].strip
+
+  errors = Array.new
+
+  if from_date.empty?
+    from_date = nil
+  else
+    if from_date.match(/\d{4}-\d{2}-\d{2}/)
+      from_date = Date.parse(params[:from_date]) rescue errors << 'Invalid From Date'
+    else
+      errors << 'From Date must be in the format YYYY-MM-DD'
+    end
+  end
+
+  if to_date.empty?
+    to_date = nil
+  else
+    if to_date.match(/\d{4}-\d{2}-\d{2}/)
+      to_date = Date.parse(params[:to_date]).next rescue errors << 'Invalid To Date'
+    else
+      errors << 'To Date must be in the format YYYY-MM-DD'
+    end
+  end
+
+  if errors.empty? && !to_date.nil? && !from_date.nil? &&  to_date < from_date
+    errors << 'To Date must be after From Date'
+  end
+
+  return {results: Array.new, errors: errors} unless errors.empty?
+
+  results = case params[:type]
   when 'threads'
     sort =
       case params[:sort]
@@ -15,43 +48,49 @@ def search(params)
       else
         'created_at DESC'
       end
-    search_threads(query, username, sort, offset)
+    search_threads(query, username, from_date, to_date, sort, offset)
   when 'posts'
-    search_posts(query, username, offset)
+    search_posts(query, username, from_date, to_date, offset)
   else
     Array.new
   end
+
+  {results: results, errors: errors}
 end
 
-def search_threads(query, username, sort, offset)
-  DB[<<-SQL, query, username, username, offset]
+def search_threads(query, username, from_date, to_date, sort, offset)
+  DB[<<-SQL, query, username, username, from_date, from_date, to_date, to_date, offset]
     SELECT
-      threads.*
+      threads.*,
+      count(*) OVER() AS full_count
     FROM threads
     WHERE
       to_tsvector(title) @@ plainto_tsquery(?)
       AND (LOWER(threads.creator) = LOWER(?) OR ? = '')
+      AND (created_at >= ? OR ? IS NULL)
+      AND (created_at <= ? OR ? IS NULL)
     ORDER BY #{sort}
-    LIMIT 50
+    LIMIT #{RESULTS_PER_PAGE}
     OFFSET ?;
   SQL
 end
 
-def search_posts(query, username, offset)
-  DB[<<-SQL, query, username, username, offset]
+def search_posts(query, username, from_date, to_date, offset)
+  DB[<<-SQL, query, username, username, from_date, from_date, to_date, to_date, offset]
     SELECT
       posts.*,
       threads.title as thread_title,
-      threads.remote_id as remote_thread_id
+      threads.remote_id as remote_thread_id,
+      count(*) OVER() AS full_count
     FROM posts
     INNER JOIN threads on posts.thread_id = threads.id
     WHERE
       tsv @@ plainto_tsquery(?)
-      AND (
-        (LOWER(posts.creator) = LOWER(?)) OR (? = '')
-      )
-    ORDER BY created_at DESC
-    LIMIT 50
+      AND ((LOWER(posts.creator) = LOWER(?)) OR (? = ''))
+      AND (posts.created_at >= ? OR ? IS NULL)
+      AND (posts.created_at <= ? OR ? IS NULL)
+    ORDER BY posts.created_at DESC
+    LIMIT #{RESULTS_PER_PAGE}
     OFFSET ?;
   SQL
 end

web/assets/styles/form.scss

@@ -17,12 +17,22 @@
   margin: 1em 0;
 }
 
+.filters__section {
+  display: flex;
+  padding: .5em 0;
+}
+
 .filters__section--sort {
   display: none;
 }
 
 .filters__section--sort.open {
-  display: block;
+  display: flex;
+}
+
+.filters__subsection {
+  flex: 1;
+  padding: 0 1em;
 }
 
 .form__field {

web/server.rb

@@ -34,16 +34,28 @@ class VLVSearch < Sinatra::Base
     params[:page] = params[:page].to_i
     params[:q] = String.new unless params[:q]
     params[:username] = String.new unless params[:username]
+    params[:from_date] = String.new unless params[:from_date]
+    params[:to_date] = String.new unless params[:to_date]
 
     results = search(params)
-    previous_url, next_url = build_urls(params)
 
-    locals =
-      params.merge(
-        results: results, previous_url: previous_url, next_url: next_url
-      )
+    unless results[:errors].empty?
+      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 =
+        params.merge(
+          results: results[:results],
+          previous_url: previous_url,
+          next_url: next_url,
+          errors: Array.new,
+        )
 
-    erb :results, { locals: locals, layout: :layout }
+      erb :results, { locals: locals, layout: :layout }
+    end
   end
 
   get '/login' do
@@ -75,17 +87,28 @@ class VLVSearch < Sinatra::Base
     def build_urls(params)
       current_page = params[:page].to_i
       previous_page = current_page > 1 ? current_page - 1 : nil
-      next_page = current_page + 1
+
+      if (params[:current_count] + ((current_page - 1) * RESULTS_PER_PAGE)) == params[:full_count]
+        next_page = nil
+      else
+        next_page = current_page + 1
+      end
 
       url_params = { q: params[:q], type: params[:type] }
       url_params[:username] = params[:username] if params[:username]
+      url_params[:from_date] = params[:from_date] if params[:from_date]
+      url_params[:to_date] = params[:to_date] if params[:to_date]
 
-      [previous_page, next_page].map do |page|
+      [
         URI::Generic.build(
           path: '/search',
-          query: URI.encode_www_form(url_params.merge(page: page))
-        )
-      end
+          query: URI.encode_www_form(url_params.merge(page: previous_page))
+        ),
+        next_page.nil? ? nil : URI::Generic.build(
+          path: '/search',
+          query: URI.encode_www_form(url_params.merge(page: next_page))
+        ),
+      ]
     end
 
     def current_user

web/views/partials/search.erb

@@ -2,30 +2,60 @@
   <input name="q" type="search" value="<%= params[:q] %>" placeholder="Search for..." class="form__search" required>
   <div class="filters">
     <div class="filters__section">
-      <p>Search in:</p>
-      <label class="form__label">
-        <input type="radio" name="type" value="threads" <% if [nil, "threads"].include?(params[:type]) %>checked<% end%>>
-        Threads
-      </label>
-      <label class="form__label">
-        <input type="radio" name="type" value="posts" <% if params[:type] == "posts" %>checked<% end %>>
-        Posts
-      </label>
+      <div class="filters__subsection">
+        <p>Search in:</p>
+        <label class="form__label">
+          <input type="radio" name="type" value="threads" <% if [nil, "threads"].include?(params[:type]) %>checked<% end%>>
+          Threads
+        </label>
+        <label class="form__label">
+          <input type="radio" name="type" value="posts" <% if params[:type] == "posts" %>checked<% end %>>
+          Posts
+        </label>
+      </div>
+      <div class="filters__subsection">
+        <p>From Date <em>(YYYY-MM-DD)</em>:</p>
+        <label class="form__label">
+          <input
+          type="text"
+          name="from_date"
+          value="<%= params[:from_date] %>"
+          class="form__text-field"
+          pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}"
+          maxlength="10"
+        >
+        </label>
+      </div>
+      <div class="filters__subsection">
+        <p>To Date <em>(YYYY-MM-DD)</em>:</p>
+        <label class="form__label">
+          <input
+          type="text"
+          name="to_date"
+          value="<%= params[:to_date] %>"
+          class="form__text-field"
+          pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}"
+          maxlength="10"
+        >
+        </label>
+      </div>
     </div>
     <div class="filters__section filters__section--sort <%= params[:type] == 'threads' ? 'open' : '' %>">
-      <p>Sort by:</p>
-      <label class="form__label">
-        <input type="radio" name="sort" value="thread" <% if [nil, "thread"].include? params[:sort] %>checked<% end%>>
-        Thread creation
-      </label>
-      <label class="form__label">
-        <input type="radio" name="sort" value="post" <% if params[:sort] == "post" %>checked<% end %>>
-        Most recent post
-      </label>
-    </div>
-    <div class="filters__section">
-      <p>Posted by:</p>
-      <input type="text" name="username" value="<%= params[:username] %>" class="form__text-field">
+      <div class="filters__subsection">
+        <p>Sort by:</p>
+        <label class="form__label">
+          <input type="radio" name="sort" value="thread" <% if [nil, "thread"].include? params[:sort] %>checked<% end%>>
+          Thread creation
+        </label>
+        <label class="form__label">
+          <input type="radio" name="sort" value="post" <% if params[:sort] == "post" %>checked<% end %>>
+          Most recent post
+        </label>
+      </div>
+      <div class="filters__subsection">
+        <p>Posted by:</p>
+        <input type="text" name="username" value="<%= params[:username] %>" class="form__text-field">
+      </div>
     </div>
   </div>
   <input type="submit" value="Search" class="btn form__submit">

web/views/results.erb

@@ -1,63 +1,72 @@
 <%= erb :'partials/search' %>
 
 <div class="results-container">
-  <% if params[:q] %>
-    <p>Showing results for <strong><em><%= params[:q] %></em></strong>:</p>
-  <% end %>
-  <div class="results">
-    <% if results.empty? %>
-      <h3>No results!</h3>
+  <% if errors.empty? %>
+    <% if params[:q] %>
+      <p>Showing results for <strong><em><%= params[:q] %></em></strong>:</p>
     <% end %>
-    <% results.each do |result| %>
-      <div class="results__result <%= params[:type] %>">
-        <% if params[:type] == "threads" %>
-          <%= external_link(
-            "http://board.vivalavinyl.com/thread/view/#{result[:remote_id]}",
-            result[:title]
-          ) %>
-          <p class="result__info">
-            <span>
-              created by <%= result[:creator] %>
-              on <%= result[:created_at].strftime('%B %d, %Y') %>
-            </span>
-            <span>
-              last post by <%= result[:last_post_creator] %>
-              at <%= result[:last_post_created_at].strftime('%-I:%M %p EST') %>
-              on <%= result[:last_post_created_at].strftime('%B %-d, %Y') %>
-            </span>
-          </p>
-        <% elsif params[:type] == "posts" %>
-          <p>
-            In thread:
-            <strong>
-              <%= external_link(
-                "http://board.vivalavinyl.com/thread/view/#{result[:remote_thread_id]}",
-                result[:thread_title]
-              ) %>
-            </strong>
-          </p>
-          <p class="result__info">
-            <%= result[:creator] %> posted this at <%= result[:created_at] %>
-          </p>
-          <p class="result__body">
-            <%= result[:body] %>
-          </p>
+    <div class="results">
+      <% if results.empty? %>
+        <h3>No results!</h3>
+      <% end %>
+      <% results.each do |result| %>
+        <div class="results__result <%= params[:type] %>">
+          <% if params[:type] == "threads" %>
+            <%= external_link(
+              "http://board.vivalavinyl.com/thread/view/#{result[:remote_id]}",
+              result[:title]
+            ) %>
+            <p class="result__info">
+              <span>
+                created by <%= result[:creator] %>
+                on <%= result[:created_at].strftime('%B %d, %Y') %>
+              </span>
+              <span>
+                last post by <%= result[:last_post_creator] %>
+                at <%= result[:last_post_created_at].strftime('%-I:%M %p EST') %>
+                on <%= result[:last_post_created_at].strftime('%B %-d, %Y') %>
+              </span>
+            </p>
+          <% elsif params[:type] == "posts" %>
+            <p>
+              In thread:
+              <strong>
+                <%= external_link(
+                  "http://board.vivalavinyl.com/thread/view/#{result[:remote_thread_id]}",
+                  result[:thread_title]
+                ) %>
+              </strong>
+            </p>
+            <p class="result__info">
+              <%= result[:creator] %> posted this at <%= result[:created_at] %>
+            </p>
+            <p class="result__body">
+              <%= result[:body] %>
+            </p>
+          <% end %>
+        </div>
+      <% end %>
+
+      <% if params[:q] %>
+        <% if params[:page] > 1 %>
+          <a class="btn btn--small btn--prev" href="<%= previous_url %>">
+            previous page
+          </a>
         <% end %>
-      </div>
-    <% end %>
 
-    <% if params[:q] %>
-      <% if params[:page] > 1 %>
-        <a class="btn btn--small btn--prev" href="<%= previous_url %>">
-          previous page
-        </a>
+        <% unless results.empty? || next_url.nil? %>
+          <a class="btn btn--small btn--next" href="<%= next_url %>">
+            next page
+          </a>
+        <% end %>
       <% end %>
-
-      <% unless results.empty? %>
-        <a class="btn btn--small btn--next" href="<%= next_url %>">
-          next page
-        </a>
+    </div>
+  <% else %>
+    <div class="errors">
+      <h3 class="errors__heading">Error(s):</h3>
+      <% errors.each do |error| %>
+        <p class="errors__error error"><%= error %></p>
       <% end %>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </div>