Miranda Frudd - chitter challenge (unfinished)

Gemfile.lock

@@ -18,6 +18,8 @@ GEM
     mini_mime (1.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    nokogiri (1.12.3-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.12.3-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -83,6 +85,7 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES

README.md

@@ -17,6 +17,7 @@ To setup the database:
 * Connect to the database using the psql command `\c chitter`;
 * Run the query we have saved in the file 01_create_chitter_table.sql
 * Populate your table with a row by running `INSERT INTO peeps (message) values ('This is a peep!');`
+* Create the user table using the query saved in 02_create_user_table.sql
 
 To check you have everything set up ok, please take a look at the peeps table inside the chitter database. You should see one row in there.  
 
@@ -26,11 +27,17 @@ To setup the test database:
 command `CREATE DATABASE chitter_test;`;
 * Connect to the database using the psql command `\c chitter_test`
 * Run the query we have saved in the file 01_create_chitter_table.sql
+* Populate your table with a row by running `INSERT INTO peeps (message) values ('This is a peep!');`
+* Create the user table using the query saved in 02_create_user_table.sql
 
 * `bundle install`
 * `rspec`
 
-You should see 1 passing test.
+## Run
+
+run use ruby app.rb
+
+rackup is not working - currently unsure why
 
 ## User stories
 
@@ -64,3 +71,51 @@ As a Maker
 So that I can find relevant peeps
 I want to filter on a specific keyword
 ```
+
+
+# FIRST USER STORY
+
+```
+As a Maker
+So that I can see what people are doing
+I want to see all the messages (peeps)
+in a browser
+```
+
+class Message
+  def initialize # name is a string
+    @messages = []
+  end
+
+  def add(message)
+    # adds the message to @messages
+  end
+
+  def self.all
+    # Returns @messages
+  end
+end
+
+# TESTS
+
+# 1
+RSpec.describe Message do
+  context "so that I can see what people are doing" do
+    it "#all displays all messages do
+      message1 = Message.new
+      message2 = Message.new
+      message1.add("First message")
+      message2.add("Second message")
+      expect(Message.all).to eq ["First message", "Second message"]
+    end
+  end
+end
+
+# 2 -> feature test
+
+feature 'messages' do
+  scenario 'to have a messages on it' do
+    visit '/messages'
+    expect(page).to have_content "First message", "Second message"
+  end
+end

app.rb

@@ -1,8 +1,22 @@
 require 'sinatra/base'
+require './lib/message'
 
 class Chitter < Sinatra::Base
-  get '/test' do
-    'Test page'
+
+  enable :sessions
+
+  get '/' do
+    erb :index
+  end
+
+  post '/message' do
+    Message.create(params[:message])
+  end
+
+  get '/messages' do
+    @messages = Message.all
+    p @messages
+    erb :messages
   end
 
   run! if app_file == $0

db/migrations/02_create_user_table.sql

@@ -0,0 +1 @@
+CREATE TABLE users(id SERIAL PRIMARY KEY, name VARCHAR(150), email VARCHAR(60), password VARCHAR(60));

lib/message.rb

@@ -0,0 +1,22 @@
+require 'pg'
+
+class Message
+  def self.all
+    if ENV['ENVIRONMENT'] == 'test'
+      connection = PG.connect(dbname: 'chitter_test')
+    else
+      connection = PG.connect(dbname: 'chitter')
+    end
+    result = connection.exec('SELECT * FROM peeps;')
+    result.map { |peep| peep['message'] }
+  end
+
+  def self.create(message)
+    if ENV['ENVIRONMENT'] == 'test'
+      connection = PG.connect(dbname: 'chitter_test')
+    else
+      connection = PG.connect(dbname: 'chitter')
+    end
+    connection.exec("INSERT INTO peeps (message) VALUES ('#{message}');")
+  end
+end

lib/user.rb

@@ -0,0 +1,22 @@
+require 'pg'
+
+class User
+  def self.all
+    if ENV['ENVIRONMENT'] == 'test'
+      connection = PG.connect(dbname: 'chitter_test')
+    else
+      connection = PG.connect(dbname: 'chitter')
+    end
+    result = connection.exec('SELECT * FROM users;')
+    result.map { |peep| peep['name'] }
+  end
+
+  def self.create(name, email, password)
+    if ENV['ENVIRONMENT'] == 'test'
+      connection = PG.connect(dbname: 'chitter_test')
+    else
+      connection = PG.connect(dbname: 'chitter')
+    end
+    connection.exec("INSERT INTO users (name, email, password) VALUES ('#{name}', '#{email}', '#{password}');")
+  end
+end

spec/features/homepage_spec.rb

@@ -0,0 +1,7 @@
+feature '/' do
+  scenario 'to have a form' do
+    visit '/'
+    fill_in 'Message', with: 'First Message'
+    expect(page).to have_button('Submit')
+  end
+end

spec/features/messages_page_spec.rb

@@ -0,0 +1,9 @@
+feature '/' do
+  scenario 'to submit a form' do
+    visit '/'
+    fill_in 'Message', with: 'First Message'
+    click_on 'Submit'
+    visit '/messages'
+    expect(page).to have_content "First Message"
+  end
+end

spec/message_spec.rb

@@ -0,0 +1,27 @@
+require 'message'
+
+RSpec.describe '.all' do
+  context "so that I can see what people are doing" do
+    it "#all displays all messages" do
+      connection = PG.connect(dbname: 'chitter_test')
+
+      connection.exec("INSERT INTO peeps (message) VALUES ('First message')")
+      connection.exec("INSERT INTO peeps (message) VALUES ('Second message')")
+
+      messages = Message.all
+
+      expect(messages).to include "First message"
+      expect(messages).to include "Second message"
+
+    end
+  end
+end
+
+RSpec.describe '.create' do
+  context "so that I can create a new message" do
+    it "#create adds a new message" do
+      message = Message.create('Another message')
+      expect(Message.all).to include "Another message"
+    end
+  end
+end

spec/user_spec.rb

@@ -0,0 +1,17 @@
+require 'user'
+
+describe User do
+  context "#all" do
+    it "returns all users" do
+      user1 = User.create("example name1", "[email protected]", "password1")
+      expect(User.all[-1]).to eq "example name1"
+    end
+  end
+
+  context "#create" do
+    it "adds a user" do
+      User.create("example name2", "[email protected]", "password2")
+      expect(User.all[-1]).to eq "example name2"
+    end
+  end
+end

views/index.erb

@@ -0,0 +1,10 @@
+<form action="/message" method="post" >
+  <label for="message">Message</label>
+  <input id="message" name="message" type="text" />
+  <input name="submit" type="submit" value="Submit" />
+  <label for="start">Post date</label>
+  <input type="date" id="start" name="start"
+      required pattern="\d{4}-\d{2}-\d{2}"
+      value="2022-07-22"
+      min="2022-01-01" max="2023-12-31">
+  </form>

views/messages.erb

@@ -0,0 +1,3 @@
+<% @messages.each do | message | %>
+  <li> <%= message %> </li>
+<% end %>