Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nest Form For Pirates and Ships #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.7.7
112 changes: 60 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,44 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
backports (3.11.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bond (0.5.1)
capybara (2.17.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
coderay (1.1.2)
diff-lcs (1.3)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
multi_json (1.13.0)
mustermann (1.0.1)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (2.0.3)
rack-protection (2.0.0)
rack
rack-test (0.8.2)
rack (>= 1.0, < 3)
require_all (1.5.0)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
coderay (1.1.3)
diff-lcs (1.5.1)
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
multi_json (1.15.0)
mustermann (3.0.1)
ruby2_keywords (~> 0.0.1)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.1.1)
racc (1.8.1)
rack (2.2.9)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.9.2)
require_all (3.0.0)
ripl (0.7.1)
bond (~> 0.5.1)
ripl-multi_line (0.3.1)
Expand All @@ -39,42 +47,42 @@ GEM
rack (>= 1.0)
rack-test (>= 0.5)
ripl (>= 0.3.5)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
ruby2_keywords (0.0.5)
shotgun (0.9.2)
rack (>= 1.0)
sinatra (2.0.0)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.0)
sinatra (3.2.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.2.0)
tilt (~> 2.0)
sinatra-contrib (3.2.0)
multi_json (>= 0.0.2)
mustermann (~> 3.0)
rack-protection (= 3.2.0)
sinatra (= 3.2.0)
tilt (~> 2.0)
sinatra-contrib (2.0.0)
backports (>= 2.0)
multi_json
mustermann (~> 1.0)
rack-protection (= 2.0.0)
sinatra (= 2.0.0)
tilt (>= 1.3, < 3)
sinatra-reloader (1.0)
sinatra-contrib
tilt (2.0.8)
tilt (2.4.0)
tux (0.3.0)
ripl (>= 0.3.5)
ripl-multi_line (>= 0.2.4)
ripl-rack (>= 0.2.0)
sinatra (>= 1.2.1)
xpath (3.0.0)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
Expand All @@ -92,4 +100,4 @@ DEPENDENCIES
tux

BUNDLED WITH
1.16.0
2.1.4
20 changes: 19 additions & 1 deletion app.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
require './environment'
require "Pry"

module FormsLab
class App < Sinatra::Base

# code other routes/actions here
get "/" do
erb :root
end

get "/new" do
erb :'pirates/new'
end

post "/pirates" do
@pirate = Pirate.new(params["pirate"])

params[:pirate][:ships].each do |details|
Ship.new(details)
end

@ships = Ship.all

erb :"pirates/show"
Comment on lines +16 to +24

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we were passed the spacing issues???

end
end
end
17 changes: 16 additions & 1 deletion app/models/pirate.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
class Pirate
end
attr_accessor :name, :weight, :height

@@pirates = []

def initialize(pirate)
@name = pirate[:name]
@weight = pirate[:weight]
@height = pirate[:height]

@@pirates << self
end

def self.all
@@pirates
end
end
20 changes: 19 additions & 1 deletion app/models/ship.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,20 @@
class Ship
end
attr_accessor :name, :type, :booty

@@ships = []

def initialize(ship)
@name = ship[:name]
@type = ship[:type]
@booty = ship[:booty]
@@ships << self
end

def self.clear
@@ships.clear
end

def self.all
@@ships
end
end
3 changes: 1 addition & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
RSpec.configure do |config|
config.include Capybara::DSL
config.include Rack::Test::Methods
config.order = 'default'
end

def app
Rack::Builder.parse_file('config.ru').first
end

Capybara.app = app
Capybara.app = app
16 changes: 15 additions & 1 deletion views/pirates/new.erb
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
<h1>Make your form here</h1>
<h1>Create New Pirate</h1>
<form action="/pirates" method="post">
Pirate Name: <input type="text" name="pirate[name]">
Pirate Weight: <input type="text" name="pirate[weight]">
Pirate Height: <input type="text" name="pirate[height]">
<h1>Ship 1</h1>
Ship Name: <input id="ship_name_1" type="text" name="pirate[ships][][name]">
Ship Type: <input id="ship_type_1" type="text" name="pirate[ships][][type]">
Ship Booty: <input id="ship_booty_1" type="text" name="pirate[ships][][booty]">
<h1>Ship 2</h1>
Ship Name: <input id="ship_name_2" type="text" name="pirate[ships][][name]">
Ship Type: <input id="ship_type_2" type="text" name="pirate[ships][][type]">
Ship Booty: <input id="ship_booty_2" type="text" name="pirate[ships][][booty]">
<input type="submit" name="Submit">
</form>
11 changes: 9 additions & 2 deletions views/pirates/show.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<h1>Display your Pirate here</h1>

<p>Pirate Name: <%= @pirate.name %></p>
<p>Pirate Weight: <%= @pirate.weight %></p>
<p>Pirate Height: <%= @pirate.height %></p>

<h2>Display your first ship here</h2>

<p>Ship Name: <%= @ships[0].name %></p>
<p>Ship Type: <%= @ships[0].type %></p>
<p>Ship Booty: <%= @ships[0].booty %></p>

<h2>Display your second ship here</h2>
<p>Ship Name: <%= @ships[1].name %></p>
<p>Ship Type: <%= @ships[1].type %></p>
<p>Ship Booty: <%= @ships[1].booty %></p>