* specs:
  Specs
  Rename scraper
  Refactor scraper
  Allow passing DB into migration

.gitignore

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

Gemfile

@@ -13,5 +13,6 @@ 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"

Gemfile.lock

@@ -1,9 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.3)
     dotenv (2.7.5)
     ffi (1.12.2)
+    hashdiff (1.0.1)
     htmlentities (4.3.4)
     httparty (0.18.0)
       mime-types (~> 3.0)
@@ -18,10 +23,12 @@ GEM
     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)
       rack
     rake (13.0.1)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -48,6 +55,11 @@ GEM
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
+    vcr (6.0.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -64,6 +76,8 @@ DEPENDENCIES
   sequel (~> 5.30)
   sinatra (~> 2.0)
   truncato (~> 0.7.11)
+  vcr (~> 6.0)
+  webmock (~> 3.14)
 
 BUNDLED WITH
    2.1.4

Rakefile

@@ -12,8 +12,22 @@ task 'migrate' do
   migrate
 end
 
+task 'migrate_test' do
+  require_relative './db/migrate'
+
+  TEST_DB = Sequel.connect(
+    adapter: :postgres,
+    database: ENV['DB_DATABASE'] + '_test',
+    user: ENV['DB_USERNAME'],
+    password: ENV['DB_PASSWORD'],
+    logger: ENV['APP_ENV'] == 'development' ? Logger.new('db/log') : nil
+  )
+
+  migrate(db: TEST_DB)
+end
+
 task 'scrape' do
-  require_relative './db/scrape'
+  require_relative './db/scraper'
 
   should_log = ENV['APP_ENV'] == 'development' || ARGV.include?('--log')
   scraper = Scraper.new(log: should_log)

db/connect.rb

@@ -1,5 +1,6 @@
 require 'dotenv'
 require 'logger'
+require 'sequel'
 
 Dotenv.load(File.expand_path('../.env'))
 

db/migrate.rb

@@ -3,8 +3,7 @@ require 'sequel'
 
 require_relative 'connect'
 
-def migrate
-  db = DB
+def migrate(db: DB)
   db.create_table? :threads do
     primary_key :id
     String :title

db/scrape.rb → db/scraper.rb

@@ -3,8 +3,8 @@ require 'sequel'
 
 require_relative '../db/connect'
 require_relative '../lib/auth'
-require_relative '../lib/fetch'
-require_relative '../lib/parse'
+require_relative '../lib/fetcher'
+require_relative '../lib/parser'
 require_relative '../lib/models/post'
 require_relative '../lib/models/thread'
 
@@ -13,21 +13,27 @@ class Scraper
     @first = first
     @last = last
     @log = log
+    @no_new_posts = false
 
     authenticate!
   end
 
   def scrape
     (@first..@last).each_with_index do |page_number, page_index|
-      page = Fetch.page(page_number, @cookie)
-      threads = Parse.threads(page)
+      page = fetcher.page(page_number)
+      threads = parser.threads(page)
 
       threads.each do |t|
         next if page_index > 0 && t[:is_sticky]
-        no_new_posts = scrape_thread(t)
+
+        scrape_thread(t)
+
         if no_new_posts
-          next if t[:is_sticky]
-          return
+          if t[:is_sticky]
+            next
+          else
+            return
+          end
         end
       end
     end
@@ -35,51 +41,58 @@ class Scraper
 
   private
 
-  def authenticate!
-    @cookie = login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD'])
-
-    raise "Error logging into VLV. Check your credentials." if @cookie.nil?
-  end
+  attr_reader :cookie, :fetcher, :parser, :no_new_posts
 
   def scrape_thread(t)
+    @no_new_posts = false
+
     log t[:title]
 
-    page = Fetch.thread(t, @cookie)
+    page = fetcher.thread(t)
     first_post = page.at_css('.postinfo:first-child')
     return false if first_post.nil?
 
-    t[:created_at] = Parse.thread_created_at(first_post)
-
     thread = DB.from(:threads).first(remote_id: t[:remote_id])
     if thread.nil?
-      thread = VLV::Thread.create(t.delete_if { |k| k == :is_sticky })
       log '  Inserting thread'
+      t[:created_at] = parser.thread_created_at(first_post)
+      thread = VLV::Thread.create(t.delete_if { |k| k == :is_sticky })
     end
 
     scrape_posts(thread, page)
   end
 
   def scrape_posts(thread, page)
-    posts = Parse.posts(thread, page)
+    posts = parser.posts(thread, page)
     last_post = posts.last
-    unless DB.from(:posts).first(remote_id: last_post[:remote_id]).nil?
-      log '  No new posts'
-      return true
-    end
 
-    posts_count = posts.size
-    posts.each_with_index do |p, index|
-      msg = "  Inserting post #{index + 1}/#{posts_count}"
-      print msg if @log
-      if DB.from(:posts).first(remote_id: p[:remote_id]).nil?
-        VLV::Post.create(p)
+    if DB.from(:posts).first(remote_id: last_post[:remote_id]).nil?
+      db_posts = VLV::Post.where(remote_id: posts.map { |p| p[:remote_id] }).all
+
+      posts = posts.each_with_index.map do |post|
+        if db_posts.detect { |db_post| db_post.remote_id == post[:remote_id] }.nil?
+          post
+        end
       end
-      print "\b" * msg.size unless index == posts_count - 1 if @log
+
+      log "  Inserting #{posts.size} posts"
+      VLV::Post.multi_insert(posts.compact)
+    else
+      no_new_posts!
+      log '  No new posts'
     end
+  end
 
-    log ''
+  def no_new_posts!
+    @no_new_posts = true
+  end
+
+  def authenticate!
+    @cookie = login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD'])
+    raise "Error logging into VLV. Check your credentials." if @cookie.nil?
 
-    false
+    @fetcher = Fetcher.new(cookie: cookie)
+    @parser = Parser.new
   end
 
   def log(msg)

lib/fetch.rb

@@ -1,24 +0,0 @@
-require 'net/http'
-
-module Fetch
-  def self.page(page_number, cookie)
-    url = URI("http://board.vivalavinyl.com/thread/list/#{page_number}")
-    http = Net::HTTP.new(url.host, url.port)
-    request = Net::HTTP::Get.new(url)
-    request['cookie'] = cookie
-    response = http.request(request)
-    Nokogiri.HTML(response.body)
-  end
-
-  def self.thread(thread, cookie)
-    url =
-      URI(
-        "http://board.vivalavinyl.com/thread/view/#{thread[:remote_id]}&ajax=true"
-      )
-    http = Net::HTTP.new(url.host, url.port)
-    request = Net::HTTP::Get.new(url)
-    request['cookie'] = cookie
-    response = http.request(request)
-    Nokogiri.HTML(response.body)
-  end
-end

lib/fetcher.rb

@@ -0,0 +1,29 @@
+require 'net/http'
+require 'nokogiri'
+
+class Fetcher
+  BASE_URL = 'http://board.vivalavinyl.com'
+
+  def initialize(cookie:)
+    @cookie = cookie
+  end
+
+  def page(page_number)
+    authenticated_request("/thread/list/#{page_number}")
+  end
+
+  def thread(thread)
+    authenticated_request("/thread/view/#{thread[:remote_id]}&ajax=true")
+  end
+
+  private
+
+  def authenticated_request(path)
+    uri = URI("#{BASE_URL}#{path}")
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Get.new(uri)
+    request['cookie'] = @cookie
+    response = http.request(request)
+    Nokogiri.HTML(response.body)
+  end
+end

lib/models/post.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 module VLV
   class Post < Sequel::Model
     many_to_one :thread

lib/models/thread.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 module VLV
   class Thread < Sequel::Model
     one_to_many :posts

lib/parse.rb → lib/parser.rb

@@ -1,7 +1,8 @@
 require 'nokogiri'
+require 'time'
 
-module Parse
-  def self.threads(page)
+class Parser
+  def threads(page)
     threads = Array.new
 
     page.css('.even, .odd').each do |row|
@@ -20,15 +21,14 @@ module Parse
     threads
   end
 
-  def self.posts(thread, page)
+  def posts(thread, page)
     posts = Array.new
 
     page.css('.post').each do |_post|
       post = Hash.new
       post[:remote_id] = _post.at_css('ul.view')[:id].split('_')[1].to_i
       post[:creator] = _post.at_css('.memberlink').text.strip
-      date, time =
-        _post.at_css('.postinfo').text.split('posted this')[1].split('@')
+      date, time = _post.at_css('.postinfo').text.split('posted this')[1].split('@')
       post[:created_at] = Time.parse("#{date} #{time}")
       post[:body] = _post.at_css('.postbody').children.map(&:to_html).join.strip
       post[:thread_id] = thread[:id]
@@ -38,7 +38,7 @@ module Parse
     posts
   end
 
-  def self.thread_created_at(first_post)
+  def thread_created_at(first_post)
     post_info = first_post.text.split('posted this')
     date, time = post_info[1].split('@')
     Time.parse("#{date} #{time}")

lib/search.rb

@@ -1,5 +1,8 @@
 require 'sequel'
 
+require_relative './models/post'
+require_relative './models/thread'
+
 RESULTS_PER_PAGE = 50
 
 def search(params)
@@ -8,6 +11,8 @@ def search(params)
   username = params[:username].strip
   from_date = params[:from_date].strip
   to_date = params[:to_date].strip
+  sort = params[:sort].strip
+  exact_match = params[:exact_match].strip == "yes"
 
   errors = Array.new
 
@@ -39,18 +44,9 @@ def search(params)
 
   results = case params[:type]
   when 'threads'
-    sort =
-      case params[:sort]
-      when 'thread'
-        'created_at DESC'
-      when 'post'
-        'last_post_created_at DESC'
-      else
-        'created_at DESC'
-      end
-    search_threads(query, username, from_date, to_date, sort, offset)
+    search_threads(query, username, from_date, to_date, sort, offset, exact_match)
   when 'posts'
-    search_posts(query, username, from_date, to_date, offset)
+    search_posts(query, username, from_date, to_date, offset, exact_match)
   else
     Array.new
   end
@@ -58,39 +54,42 @@ def search(params)
   {results: results, errors: errors}
 end
 
-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.*,
-      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 #{RESULTS_PER_PAGE}
-    OFFSET ?;
-  SQL
+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'))
+    .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))
+    .order(sort)
+    .limit(RESULTS_PER_PAGE)
+    .offset(Sequel.lit('?', offset))
+
+  if exact_match
+    query.where(Sequel.ilike(:title, "%#{q}%"))
+  else
+    query.full_text_search(:title, Sequel.lit("websearch_to_tsquery(?)", q), tsquery: true, language: 'english')
+  end
 end
 
-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,
-      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 (? = ''))
-      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
+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'))
+    .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))
+    .where(Sequel.lit("posts.created_at >= ? OR ? IS NULL", to_date, to_date))
+    .limit(RESULTS_PER_PAGE)
+    .offset(Sequel.lit('?', offset))
+    .order(Sequel.desc(Sequel.lit('posts.created_at')))
+
+  if exact_match
+    query.where(Sequel.ilike(:body, "%#{q}%"))
+  else
+    query.full_text_search(:tsv, Sequel.lit("websearch_to_tsquery(?)", q), {
+      tsquery: true,
+      tsvector: true,
+      language: 'english'
+    })
+  end
 end

spec/fetcher_spec.rb

@@ -0,0 +1,36 @@
+require 'dotenv/load'
+require_relative '../lib/auth'
+require_relative '../lib/fetcher'
+
+RSpec.describe Fetcher do
+  let(:cookie) { login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD']) }
+  let(:thread_id) { 49668 }
+
+  subject { Fetcher.new(cookie: cookie) }
+
+  describe '#thread' do
+    it "fetches a thread" do
+      VCR.use_cassette "fetch_a_thread" do
+        result = subject.thread({ remote_id: 49668 })
+        aggregate_failures do
+          expect(result).to be_a(Nokogiri::HTML::Document)
+          expect(result.at_css('.post:first-child').text)
+            .to include('reddwarf posted this March 30th, 2020 @ 3:29:23 am')
+        end
+      end
+    end
+  end
+
+  describe '#page' do
+    it "fetches a page of threads" do
+      VCR.use_cassette "fetch_a_page_of_threads" 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.css('.even, .odd').length).to eq(110)
+        end
+      end
+    end
+  end
+end

spec/parser_spec.rb

@@ -1,47 +1,123 @@
-require_relative '../lib/parse'
+require_relative '../lib/parser'
 
-RSpec.describe 'Parser' do
-  it 'should parse threads' do
-    html = Nokogiri::HTML(<<~HTML)
-      <div class="even" id="thread_12345">
-        <ul class="list read">
-          <li class="member">
-            <span>Thread By: </span>
-            <a href="/member/view/creator1/" class="memberlink">creator1</a>
-          </li>
-          <li class="subject">
-            <span>Subject: </span>
-            <a href="/thread/view/12345/&p=999">
-              <strong>Sticky:</sticky> Thread title 1
-            </a>
-          </li>
-          <li class="posts"><span>Posts: </span>999</li>
-          <li class="lastpost">
-            <span>Last Post By:</span>
-            <a href="/member/view/lastposter1/" class="memberlink">lastposter1</a> on Fri&nbsp;Apr&nbsp;10&nbsp;2020&nbsp;01:23&nbsp;am</li>
-        </ul>
-      </div>
-      <div class="even" id="thread_123456">
-        <ul class="list read">
-          <li class="member">
-            <span>Thread By: </span>
-            <a href="/member/view/creator2/" class="memberlink">creator2</a>
-          </li>
-          <li class="subject">
-            <span>Subject: </span>
-            <a href="/thread/view/123456/&p=999">Thread title 2</a>
-          </li>
-          <li class="posts"><span>Posts: </span>999</li>
-          <li class="lastpost">
-            <span>Last Post By:</span>
-            <a href="/member/view/lastposter2/" class="memberlink">lastposter2</a> on Fri&nbsp;Apr&nbsp;10&nbsp;2020&nbsp;01:23&nbsp;am</li>
-        </ul>
+RSpec.describe Parser do
+  subject { Parser.new }
+
+  describe '#threads' do
+    let(:html) do
+      Nokogiri::HTML(<<~HTML)
+        <div class="even" id="thread_12345">
+          <ul class="list read">
+            <li class="member">
+              <span>Thread By: </span>
+              <a href="/member/view/creator1/" class="memberlink">creator1</a>
+            </li>
+            <li class="subject">
+              <span>Subject: </span>
+              <a href="/thread/view/12345/&p=999">
+                <strong>Sticky:</sticky> Thread title 1
+              </a>
+            </li>
+            <li class="posts"><span>Posts: </span>999</li>
+            <li class="lastpost">
+              <span>Last Post By:</span>
+              <a href="/member/view/lastposter1/" class="memberlink">lastposter1</a> on Fri&nbsp;Apr&nbsp;10&nbsp;2020&nbsp;01:23&nbsp;am</li>
+          </ul>
+        </div>
+        <div class="even" id="thread_123456">
+          <ul class="list read">
+            <li class="member">
+              <span>Thread By: </span>
+              <a href="/member/view/creator2/" class="memberlink">creator2</a>
+            </li>
+            <li class="subject">
+              <span>Subject: </span>
+              <a href="/thread/view/123456/&p=999">Thread title 2</a>
+            </li>
+            <li class="posts"><span>Posts: </span>999</li>
+            <li class="lastpost">
+              <span>Last Post By:</span>
+              <a href="/member/view/lastposter2/" class="memberlink">lastposter2</a> on Fri&nbsp;Apr&nbsp;10&nbsp;2020&nbsp;01:23&nbsp;am</li>
+          </ul>
+        </div>
+      HTML
+    end
+
+    it 'parses threads' do
+      expect(subject.threads(html)).to eq([
+        {remote_id: '12345', title: 'Sticky: Thread title 1', creator: 'creator1', is_sticky: true},
+        {remote_id: '123456', title: 'Thread title 2', creator: 'creator2', is_sticky: false},
+      ])
+    end
+  end
+
+  describe '#posts' do
+    let(:html) do
+      Nokogiri::HTML(<<~HTML)
+        <div>
+          <div class="post">
+            <ul class="view" id="post_69">
+              <li class="info">
+                <div class="postinfo">
+                  <a class="memberlink" href="/member/view/User1">User1</a>
+                  posted this October 26th, 2021 @ 12:34:56 am
+                </div>
+              </li>
+              <li class="postbody">
+                This is the body of the first post
+              </li>
+            </ul>
+          </div>
+          <div class="post">
+            <ul class="view" id="post_420">
+              <li class="info">
+                <div class="postinfo">
+                  <a class="memberlink" href="/member/view/User2">User2</a>
+                  posted this October 27th, 2021 @ 12:34:56 am
+                </div>
+              </li>
+              <li class="postbody">
+                This is the body of the second post
+              </li>
+            </ul>
+          </div>
+        </div>
+      HTML
+    end
+
+    it 'parses posts' do
+      expect(subject.posts({ id: 666 }, html)).to match_array([
+        {
+          remote_id: 69,
+          creator: 'User1',
+          thread_id: 666,
+          created_at: Time.new(2021, 10, 26, 0, 34, 56),
+          body: 'This is the body of the first post'
+        },
+        {
+          remote_id: 420,
+          creator: 'User2',
+          thread_id: 666,
+          created_at: Time.new(2021, 10, 27, 0, 34, 56),
+          body: 'This is the body of the second post'
+        }
+      ])
+    end
+  end
+
+  describe '#thread_created_at' do
+    let(:html) do
+      Nokogiri::HTML(<<~HTML)
+      <div class="postinfo">
+        <a class="memberlink" href="/member/view/User1">User1</a>
+        posted this October 27th, 2021 @ 12:34:56 am
       </div>
-    HTML
+      HTML
+    end
 
-    expect(Parse.threads(html)).to eq([
-      {remote_id: '12345', title: 'Sticky: Thread title 1', creator: 'creator1', is_sticky: true},
-      {remote_id: '123456', title: 'Thread title 2', creator: 'creator2', is_sticky: false},
-    ])
+    it 'parses the timestamp of the first post' do
+      expect(subject.thread_created_at(html))
+        .to eq(Time.new(2021, 10, 27, 00, 34, 56))
+    end
   end
 end

spec/scraper_spec.rb

@@ -0,0 +1,30 @@
+require 'dotenv/load'
+require 'spec_helper'
+
+require_relative '../db/scraper'
+
+RSpec.describe Scraper do
+  around(:each) do |example|
+    DB.transaction(rollback: :always, auto_savepoint: true) { example.run }
+  end
+
+  subject { described_class.new(log: true) }
+
+  describe '#initialize' do
+    it 'authenticates' do
+      VCR.use_cassette "authentication" do
+        expect(subject.send(:cookie)).to_not be_nil
+      end
+    end
+  end
+
+  describe '#scrape' do
+    it 'creates new threads and posts' do
+      VCR.use_cassette "create_new_threads_and_posts" do
+        expect { subject.scrape }
+          .to  change { VLV::Thread.count }.by(109)
+          .and change { VLV::Post.count   }.by_at_least(5000)
+      end
+    end
+  end
+end

spec/search_spec.rb

@@ -0,0 +1,48 @@
+require 'dotenv/load'
+require 'spec_helper'
+
+require_relative '../db/connect'
+require_relative '../lib/search'
+require_relative '../lib/models/post'
+require_relative '../lib/models/thread'
+
+RSpec.describe 'Search' do
+  around(:each) do |example|
+    DB.transaction(rollback: :always, auto_savepoint: true) { example.run }
+  end
+
+  before do
+    @thread1 = VLV::Thread.create(title: "This is a thread with many words in the title")
+    @thread2 = VLV::Thread.create(title: "Thread words")
+    @post1   = VLV::Post.create(body: "This is a post with many words in the body", thread_id: @thread1.id)
+    @post2   = VLV::Post.create(body: "Post words", thread_id: @thread2.id)
+  end
+
+  describe '#search_threads' do
+    it "finds threads with matching words" do
+      threads = search_threads('thread words', '', nil, nil, nil, nil, false)
+      expect(threads.map(&:title)).to match_array([@thread1.title, @thread2.title])
+    end
+
+    context "with exact_match" do
+      it "only finds threads with exactly matching phrases" do
+        threads = search_threads('thread words', '', nil, nil, nil, nil, true)
+        expect(threads.map(&:title)).to match_array([@thread2.title])
+      end
+    end
+  end
+
+  describe '#search_posts' do
+    it "finds posts with matching words" do
+      posts = search_posts('post words', '', nil, nil, nil, false)
+      expect(posts.map(&:body)).to match_array([@post1.body, @post2.body])
+    end
+
+    context "with exact_match" do
+      it "only finds posts with exactly matching phrases" do
+        posts = search_posts('post words', '', nil, nil, nil, true)
+        expect(posts.map(&:body)).to match_array([@post2.body])
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'vcr'
+require "webmock/rspec"
+
+ENV["DB_DATABASE"] = ENV["DB_DATABASE"] + '_test'
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+VCR.configure do |c|
+  c.cassette_library_dir = "spec/vcr"
+  c.hook_into :webmock
+  c.ignore_localhost = true
+end

web/server.rb

@@ -37,6 +37,7 @@ class VLVSearch < Sinatra::Base
     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]
+    params[:exact_match] = String.new unless params[:exact_match]
 
     results = search(params)
 

web/views/partials/search.erb

@@ -2,10 +2,21 @@
   <input name="q" type="search" value="<%= params[:q] %>" placeholder="Search for..." class="form__search" required>
   <div class="filters">
     <div class="filters__section">
+      <div class="filters__subsection">
+        <p>Exact match?</p>
+        <label class="form__label">
+          <input type="radio" name="exact_match" value="yes" <% if [nil,true, "yes"].include?(params[:exact_match]) %>checked<% end %>>
+          Yes
+        </label>
+        <label class="form__label">
+          <input type="radio" name="exact_match" value="no" <% if [false, "no"].include?(params[:exact_match]) %>checked<% end %>>
+          No
+        </label>
+      </div>
       <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%>>
+          <input type="radio" name="type" value="threads" <% if [nil, "threads"].include?(params[:type]) %>checked<% end %>>
           Threads
         </label>
         <label class="form__label">
@@ -13,6 +24,8 @@
           Posts
         </label>
       </div>
+    </div>
+    <div class="filters__section">
       <div class="filters__subsection">
         <p>From Date <em>(YYYY-MM-DD)</em>:</p>
         <label class="form__label">
@@ -48,7 +61,7 @@
       <div class="filters__subsection filters__subsection--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%>>
+          <input type="radio" name="sort" value="thread" <% if [nil, "thread"].include? params[:sort] %>checked<% end %>>
           Thread creation
         </label>
         <label class="form__label">