need to run rake db:create

Author: alexHoggett

Gemfile

@@ -6,10 +6,18 @@ source "https://rubygems.org"
 
 gem "sinatra", "~> 2.2"
 gem "sinatra-contrib", "~> 2.2"
-gem "pg", "~> 1.3"
 gem "webrick", "~> 1.7"
 gem "rack-test", "~> 1.1"
 
 gem "rspec", "~> 3.11"
 
 gem "rainbow", "~> 3.1"
+
+gem "activerecord", "~> 7.0"
+
+gem "sinatra-activerecord", "~> 2.0"
+
+gem "rake", "~> 13.0"
+gem "bcrypt", "~> 3.1"
+
+gem "pg", "~> 1.4"

Gemfile.lock

@@ -1,58 +1,84 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    bcrypt (3.1.18)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.17.0)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    pg (1.3.5)
-    rack (2.2.3.1)
-    rack-protection (2.2.0)
+    pg (1.4.5)
+    rack (2.2.6)
+    rack-protection (2.2.4)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.1.1)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.4)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.2.0)
+    sinatra-activerecord (2.0.26)
+      activerecord (>= 4.1)
+      sinatra (>= 1.0)
+    sinatra-contrib (2.2.4)
       multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.2.0)
-      sinatra (= 2.2.0)
+      mustermann (~> 2.0)
+      rack-protection (= 2.2.4)
+      sinatra (= 2.2.4)
       tilt (~> 2.0)
-    tilt (2.0.10)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     webrick (1.7.0)
 
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
   x86_64-darwin-20
+  x86_64-darwin-21
 
 DEPENDENCIES
-  pg (~> 1.3)
+  activerecord (~> 7.0)
+  bcrypt (~> 3.1)
+  pg (~> 1.4)
   rack-test (~> 1.1)
   rainbow (~> 3.1)
+  rake (~> 13.0)
   rspec (~> 3.11)
   sinatra (~> 2.2)
+  sinatra-activerecord (~> 2.0)
   sinatra-contrib (~> 2.2)
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.4.3
+   2.3.26

Rakefile

@@ -0,0 +1,8 @@
+# in Rakefile
+require "sinatra/activerecord/rake"
+
+namespace :db do
+  task :load_config do
+    require "./app"
+  end
+end

app.rb

@@ -1,11 +1,15 @@
 require 'sinatra/base'
 require 'sinatra/reloader'
+require 'sinatra/activerecord'
+require 'bcrypt'
 
 class Application < Sinatra::Base
   configure :development do
     register Sinatra::Reloader
   end
+  register Sinatra::ActiveRecordExtension
 
   get '/' do
     return erb(:index)
   end
+end

config/database.rb

@@ -0,0 +1,16 @@
+# in config/database.rb
+ # set the database based on the current environment
+ # The name cloudbnb in the below line is because my main app controller class in app.rb is called cloudbnb
+ database_name = "cloudbnb-#{Application.environment}"
+ db = URI.parse( ENV['DATABASE_URL'] || "postgres://localhost/#{database_name}")
+ 
+  # connect ActiveRecord with the current database
+ ActiveRecord::Base.establish_connection(
+  :adapter => db.scheme == "postgres" ? "postgresql" : db.scheme,
+  :host => db.host,
+  :port => db.port,
+  :username => db.user,
+  :password => db.password,
+  :database => "#{database_name}",
+  :encoding => "utf8"
+ )

config/database.yml

@@ -0,0 +1,14 @@
+# in config/database.yml
+# this defines the database for the development environment (default environment)
+development:
+  # the type of database it will be
+  adapter:
+    postgresql
+    # name of db to make
+  database: cloudbnb-development
+  host: localhost
+
+  # same but for test env
+test:
+  adapter: postgresql
+  database: cloudbnb-test

config/environment.rb

@@ -0,0 +1,28 @@
+ # in config/environment.rb
+ # get the path of the root of the app
+ # assuming that this file is one folder down in config/
+ APP_ROOT = File.expand_path("..", __dir__)
+
+ # require the controller(s)
+ # says that app.rb is in the root
+Dir.glob(File.join(APP_ROOT, "app", "*.rb")).each { |file| require file }
+
+ # require the model(s)
+ # models stored in lib/
+Dir.glob(File.join(APP_ROOT, "lib", "*.rb")).each { |file| require file }
+
+# require database configurations
+# the database setup files that were just made in config/
+require File.join(APP_ROOT, "config", "database")
+
+# configure Chitter settings
+# This bit of config could also be done in the main app class definition
+# This is monkey-patching onto the main class definition
+# I suppose it's neater to move it here
+# The public/ folder is where images and stylesheets should be, the last line confirms that location
+class Application < Sinatra::Base
+ set :method_override, true
+ set :root, APP_ROOT
+ set :views, File.join(APP_ROOT, "views")
+ set :public_folder, File.join(APP_ROOT, "public")
+end

spec/spec_helper.rb

@@ -1,8 +1,13 @@
-ENV['ENV'] = 'test'
+# ENV['ENV'] = 'test'
 
-require 'database_connection'
+# require 'database_connection'
 
-DatabaseConnection.connect('makersbnb_test')
+# DatabaseConnection.connect('makersbnb_test')
+
+# very important line to say that tests are run in "test" environment
+ENV["RACK_ENV"] = "test"
+# imports the actual controller file
+require_relative "../app"
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.