Laila

.github/pull_request_template.md

@@ -1,14 +1,14 @@
 # Your name
 
 Please write your full name here to make it easier to find your pull request.
-
+Laila Gharzai 
 # User stories 
 
 Please list which user stories you've implemented (delete the ones that don't apply).
 
-- [ ] User story 1: "I want to see all the messages (peeps) in a browser"
-- [ ] User story 2: "I want to post a message (peep) to chitter"
-- [ ] User story 3: "I want to see the date the message was posted"
+- [x] User story 1: "I want to see all the messages (peeps) in a browser"
+- [x] User story 2: "I want to post a message (peep) to chitter"
+- [x] User story 3: "I want to see the date the message was posted"
 - [ ] User story 4: "I want to see a list of peeps in reverse chronological order"
 - [ ] User story 5: "I want to filter on a specific keyword"
 

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

app.rb

@@ -1,8 +1,23 @@
 require 'sinatra/base'
-
+require './lib/peep'
 class Chitter < Sinatra::Base
-  get '/test' do
-    'Test page'
+
+  get '/' do
+    'Chitter'
+  end
+
+  get '/peeps' do 
+    @peeps = Peep.all
+    erb :'index'
+  end
+
+  get '/peeps/new' do
+    erb :"new"
+  end
+
+  post '/peeps' do 
+    Peep.add(message: params[:peep], username: params[:username], posted_at: params[:posted_at])
+    redirect '/peeps'
   end
 
   run! if app_file == $0

db/migrations/02_add_username_to_peeps.sql

@@ -0,0 +1 @@
+ALTER TABLE peeps ADD COLUMN username VARCHAR(60);

db/migrations/03_add_timestamp_to_peeps.sql

@@ -0,0 +1 @@
+ALTER TABLE peeps ADD COLUMN posted_at TIMESTAMP DEFAULT NOW();

lib/peep.rb

@@ -0,0 +1,39 @@
+require 'pg'
+
+class Peep
+
+  attr_reader :id, :message, :username, :posted_at
+
+  def initialize(id:, message:, username:, posted_at:)
+    @id  = id
+    @message = message 
+    @username = username 
+    @posted_at = posted_at
+  end
+
+    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 do |peep|
+          Peep.new(id: peep['id'], message: peep['message'], username: peep['username'], posted_at: peep['posted_at'])
+        end
+    end
+
+    def self.add(message:, username:, posted_at:)
+            if ENV['ENVIRONMENT'] == 'test'
+              connection = PG.connect(dbname: 'chitter_test')
+            else
+              connection = PG.connect(dbname: 'chitter')
+            end
+
+            result = connection.exec("INSERT INTO peeps (id, message, username, posted_at) VALUES (DEFAULT, '#{message}', '#{username}', CURRENT_TIMESTAMP) RETURNING id, message, username, posted_at;")
+            Peep.new(id: result[0]['id'], message: result[0]['message'], username:result[0]['username'], posted_at:result[0]['posted_at'])
+    end
+
+
+
+end

spec/database_helpers.rb

@@ -0,0 +1,7 @@
+require 'pg'
+
+def persisted_data(id:)
+  connection = PG.connect(dbname: 'chitter_test')
+  result = connection.query("SELECT * FROM peeps WHERE id = #{id};")
+  result.first
+end

spec/features/adding_peeps_spec.rb

@@ -0,0 +1,10 @@
+feature 'Adding a peep' do
+    scenario 'A user can add a new peep (message) to Chitter database' do
+      visit('/peeps/new')
+      fill_in('peep', with: 'This is my message I would like to post')
+      fill_in('username', with: 'jenny123')
+      click_button('Submit')
+
+      expect(page).to have_content('This is my message I would like to post', 'jenny123')
+    end
+  end

spec/features/home_page_spec.rb

@@ -0,0 +1,6 @@
+feature 'Viewing home page' do
+  scenario 'visiting the home page' do
+    visit('/')
+    expect(page).to have_content "Chitter"
+  end
+end

spec/features/viewing_peeps_spec.rb

@@ -0,0 +1,14 @@
+require './lib/peep'
+
+feature 'Viewing peeps' do
+    scenario 'A user can see peeps' do
+
+      Peep.add(message: "peep1", username: 'jenny123')
+      Peep.add(message: "peep2", username: 'benny123')
+
+      visit '/peeps'
+
+      expect(page).to have_content('peep1', 'jenny123')
+      expect(page).to have_content('peep2', 'benny123')
+    end
+  end

spec/peep_spec.rb

@@ -0,0 +1,36 @@
+require 'pg'
+require 'peep'
+require 'database_helpers'
+
+describe Bookmark do
+
+  describe '.all' do 
+    it 'returns a list of peeps and their users' do 
+      connection = PG.connect(dbname: 'chitter_test')
+
+      peep = Peep.add(message: 'hello', username:'jenny1')
+      Peep.add(message: 'hello2', username:'jenny2')
+      Peep.add(message: 'hello3', username:'jenny3')
+
+      peeps = Peep.all
+
+      expect(peeps.length).to eq 3 
+      expect(peeps.first).to be_a Peep
+      expect(peeps.first.id).to eq peep.id
+      expect(peeps.first.message).to eq 'hello'
+      expect(peeps.first.username).to eq 'jenny1'
+    end
+
+  describe '.add' do
+    it 'creates a new peep' do
+      peep = Peep.add(message: 'hello', username: 'jenny123')
+      persisted_data = persisted_data(id: peep.id)
+
+      expect(peep).to be_a Peep
+      expect(peep.id).to eq persisted_data.first['id']
+      expect(peep.message).to eq 'hello'
+      expect(peep.username).to eq 'jenny123'
+    end
+  end
+
+end

views/index.erb

@@ -0,0 +1,12 @@
+
+<ul>
+  <% @peeps.each do |peep| %>
+    <li>
+    <big><%=peep.username%> says: "<%=peep.message%>"</big> 
+    <p style="color:#808080"> <smal><em> (posted on: <%=peep.posted_at%>) </em></smal></p>
+    </li>
+      <% end %>
+</ul>
+
+
+

views/new.erb

@@ -0,0 +1,8 @@
+
+<form action="/peeps" method="post">
+  Type in your peep:<br>
+  <input type="text" name="peep" /><br>
+  Type in your username:<br>
+  <input type="text" name="username" /><br>
+  <input type="submit" value="Submit" />
+</form>