Pablo Joyce chitter challenge

Gemfile

@@ -11,3 +11,14 @@ end
 group :development, :test do
   gem 'rubocop', '1.20'
 end
+
+gem "pg", "~> 1.4"
+
+gem "sinatra", "~> 3.0"
+gem "sinatra-contrib", "~> 3.0"
+gem "webrick", "~> 1.8"
+gem "rack-test", "~> 2.1"
+
+gem "rackup", "~> 1.0"
+
+gem "bcrypt", "~> 3.1"

Gemfile.lock

@@ -3,11 +3,24 @@ GEM
   specs:
     ansi (1.5.0)
     ast (2.4.2)
+    bcrypt (3.1.18)
     diff-lcs (1.4.4)
     docile (1.4.0)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pg (1.4.6)
+    rack (2.2.6.4)
+    rack-protection (3.0.5)
+      rack
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
     rainbow (3.0.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
@@ -36,6 +49,7 @@ GEM
     rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -46,18 +60,41 @@ GEM
       terminal-table
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
+    sinatra (3.0.5)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.5)
+      tilt (~> 2.0)
+    sinatra-contrib (3.0.5)
+      multi_json
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.5)
+      sinatra (= 3.0.5)
+      tilt (~> 2.0)
     terminal-table (3.0.1)
       unicode-display_width (>= 1.1.1, < 3)
+    tilt (2.1.0)
     unicode-display_width (2.0.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
+  x86_64-darwin-20
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
+  bcrypt (~> 3.1)
+  pg (~> 1.4)
+  rack-test (~> 2.1)
+  rackup (~> 1.0)
   rspec
   rubocop (= 1.20)
   simplecov
   simplecov-console
+  sinatra (~> 3.0)
+  sinatra-contrib (~> 3.0)
+  webrick (~> 1.8)
 
 RUBY VERSION
    ruby 3.0.2p107

README.md

@@ -1,3 +1,24 @@
+# Chitter Challenge by Pablo Joyce
+
+This project uses:
+* Ruby
+* PostgreSQL
+* ERB
+* Rackup
+* Sinatra
+* Webrick
+* Git
+* GitHub
+* Bcrypt
+
+In development, I employed:
+* Postman
+* TablePlus
+* RSpec
+
+
+
+
 Chitter Challenge
 =================
 

app.rb

@@ -0,0 +1,167 @@
+require_relative 'lib/database_connection'
+require 'sinatra/base'
+require 'sinatra/reloader'
+require_relative 'lib/user_repository'
+require_relative 'lib/peep_repository'
+require 'bcrypt'
+
+DatabaseConnection.connect
+
+class Application < Sinatra::Base
+
+  enable :sessions # allows users sessions
+
+  # This allows the app code to refresh
+  # without having to restart the server.
+  configure :development do
+    register Sinatra::Reloader
+    also_reload 'lib/user_repository'
+    also_reload 'lib/peep_repository'
+    set :message, "Log in to create new peeps."
+    set :logged, false
+    set :validation_error, ""
+  end
+
+  get '/' do
+    repo = PeepRepository.new
+    peeps = repo.all_with_names
+    @peep_info = peeps.map{ |peep| [peep.username, peep.time, peep.body, peep.tags, peep.name]}.reverse
+    return erb(:index)
+  end
+
+  get '/peeps/new' do
+    @user_id = session[:user_id] # placeholder code for sending logged in user id!!!
+    return erb(:add_peep)
+  end
+
+  post '/peeps' do
+    @body, @tags, @user_id = params[:body], params[:tags],params[:user_id]
+    script_check([@body, @tags, @user_id], '/peeps/new')
+    validate_string(@body, "peep")
+    repo = PeepRepository.new
+    new_peep = Peep.new
+    new_peep.body = @body
+    new_peep.time = Time.now#.strftime("%Y-%m-%d %T")
+    new_peep.tags = @tags
+    new_peep.user_id = @user_id 
+    repo.create(new_peep)
+    return redirect('/')
+  end
+
+  get '/register/new' do
+    return erb(:register)
+  end
+
+  post '/register' do
+    @name, @username, @email, @password = params[:name], params[:username], params[:email], params[:password]
+    script_check([@name, @username, @email, @password], '/register/new')
+    validate_string(@name, "name")
+    validate_string(@username, "username")
+    validate_email(@email)
+    username_email_unique(@username, @email)
+    validate_password(@password)
+    user_repo = UserRepository.new
+    new_user = User.new
+    new_user.name = @name
+    new_user.username = @username
+    new_user.email = @email
+    new_user.password = @password
+    user_repo.create(new_user)
+    user = user_repo.find_by_email(@email)
+    login_user(user)
+    return redirect('/')
+  end
+
+  get '/login/form' do
+    return erb(:login)
+  end
+
+  post '/login' do
+    @email = params[:email]
+    @password = params[:password]
+    script_check([@email, @password], '/login/form')
+    email_exists(@email)
+    user = UserRepository.new.find_by_email(@email)
+    email_password_match(user, @password)
+    return redirect('/')
+  end
+
+  get '/logout' do
+    session.clear
+    settings.logged = false
+    settings.message = "Log in to create new peeps."
+    return redirect('/')
+  end
+
+  helpers do
+    def validate_string(name, field)
+      unless name.match?(/[a-zA-Z]/)
+        settings.validation_error = "Invalid #{field}: must contain one or more letters.\n"
+        return redirect('register/new')
+      end
+    end
+
+    def validate_email(email)
+      unless email =~ URI::MailTo::EMAIL_REGEXP
+        settings.validation_error = "Invalid email: please enter a valid email to register.\n"
+        return redirect('register/new')
+      end
+    end
+
+    def validate_password(password)
+      unless password.match(/^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9]).{8,}$/)
+        settings.validation_error = "Invalid password: minimum eight characters and contain at least one lowercase letter, uppercase letter and digit.\n"
+        return redirect('register/new')
+      end
+    end
+
+    def username_email_unique(username, email)
+      if UserRepository.new.all_usernames.include?(username)
+        settings.validation_error = "That username is already taken.\n"
+        return redirect('register/new')
+      end
+      if UserRepository.new.all_emails.include?(email)
+        settings.validation_error = "That email is already registered to a user.\n"
+        return redirect('register/new')
+      end
+    end
+
+    def email_exists(email)
+      emails = UserRepository.new.all_emails
+      unless emails.include?(email)
+        settings.validation_error = "Email and password do not match any registered user.\n"
+        return redirect('login/form')
+      end
+    end
+
+    def email_password_match(user, entered_password)
+      stored_password = BCrypt::Password.new(user.password)
+      unless stored_password == entered_password # i.e. UNLESS <stored-password-hash> == <entered-password>
+        session[:user_id] = nil
+        settings.logged = false
+        settings.validation_error = "Email and password do not match any registered user.\n"
+        return redirect('/login/form')
+      end
+      login_user(user)
+      # session[:username] = user.username
+      # session[:user_id] = user.id
+      settings.logged = true
+    end
+
+    def login_user(user)
+      session[:username] = user.username
+      session[:user_id] = user.id
+      settings.logged = true
+    end
+
+    def script_check(inputs_array, redirect_path)
+      if inputs_array.join.match?(/[<>\/]/)
+        session[:user_id] = nil
+        settings.logged = false
+        settings.validation_error = "'<', '>' and '/' are not permitted characters.\n"
+        return redirect(redirect_path)
+      end
+    end
+
+  end
+end

config.ru

@@ -0,0 +1,2 @@
+require './app'
+run Application

lib/database_connection.rb

@@ -0,0 +1,44 @@
+require 'pg'
+
+class DatabaseConnection
+  # This method connects to PostgreSQL using the PG gem. We connect to 127.0.0.1
+
+  ################## RENDER connect method
+  # def self.connect
+    # If the environment variable (set by Render)
+    # is present, use this to open the connection.
+  #   if ENV['DATABASE_URL'] != nil
+  #     @connection = PG.connect(ENV['DATABASE_URL'])
+  #     return
+  #   end
+
+  #   if ENV['ENV'] == 'test'
+  #     database_name = 'chitter_test'
+  #   else
+  #     database_name = 'chitter_render_db'
+  #   end
+  #   @connection = PG.connect({ host: '127.0.0.1', dbname: database_name })
+  # end
+
+
+
+
+  ################### local connect method - NOT for RENDER
+  def self.connect
+    if ENV['ENV'] == 'test'
+      database_name = 'chitter_test'
+    else
+      database_name = 'chitter'
+    end
+    @connection = PG.connect({ host: '127.0.0.1', dbname: database_name })
+  end
+
+  def self.exec_params(query, params)
+    if @connection.nil?
+      raise 'DatabaseConnection.exec_params: Cannot run a SQL query as the connection to'\
+      'the database was never opened. Did you make sure to call first the method '\
+      '`DatabaseConnection.connect` in your app.rb file (or in your tests spec_helper.rb)?'
+    end
+    @connection.exec_params(query, params)
+  end
+end

lib/peep.rb

@@ -0,0 +1,7 @@
+class Peep
+  attr_accessor :id, :body, :time, :tags, :user_id, :username, :name
+
+  # def initialize
+  #   @tags = []
+  # end
+end

lib/peep_repository.rb

@@ -0,0 +1,54 @@
+require_relative './peep'
+require_relative './user'
+require 'time'
+
+class PeepRepository
+  def all # return all peeps
+    sql = 'SELECT * FROM peeps;'
+    results = DatabaseConnection.exec_params(sql, [])
+    peeps = []
+    results.each{ |record| peeps << peep_builder(record) }
+    return peeps
+  end
+
+  def all_with_names
+    sql = 'SELECT users.name, users.username, peeps.body, peeps.time, peeps.tags, peeps.user_id
+    FROM users
+    JOIN peeps
+    ON peeps.user_id = users.id;'
+    results = DatabaseConnection.exec_params(sql, [])
+    peeps_with_names = []
+    p results
+    results.each do |record|
+      peep = Peep.new
+      peep.id = record['id'].to_i
+      peep.body = record['body']
+      peep.time = (record['time'])
+      peep.tags = record['tags']
+      peep.user_id = record['user_id'].to_i
+      peep.name = record['name']
+      peep.username = record['username']
+      peeps_with_names << peep
+    end
+    return peeps_with_names
+  end
+
+  def create(peep)
+    sql = 'INSERT INTO peeps (body, time, tags, user_id) VALUES ($1, $2, $3, $4);'
+    params = [peep.body, peep.time, peep.tags, peep.user_id]
+    DatabaseConnection.exec_params(sql, params)
+  end
+
+  private
+
+  def peep_builder(record) # used to build peeps in iteration by #all
+    peep = Peep.new
+    peep.id = record['id'].to_i
+    peep.body = record['body']
+    peep.time = record['time']
+    peep.tags = record['tags']
+    peep.user_id = record['user_id'].to_i
+    return peep
+  end
+end
+