diff --git a/Gemfile b/Gemfile index f0764fc..efb9b4b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,6 @@ source 'http://rubygems.org' gem 'rake' gem 'rspec' -gem 'superfight', github: "RubyoffRails/superfight" +gem 'sinatra' +gem 'shotgun' +gem 'about_jason', '~> 0.1.0', github: "jperezish/about_jason" diff --git a/Gemfile.lock b/Gemfile.lock index b1daa75..147dc05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,16 @@ GIT - remote: git://github.com/RubyoffRails/superfight.git - revision: 75a5c4f724284ade4132f0a84acf3b2a8e126fcd + remote: git://github.com/jperezish/about_jason.git + revision: 2680921f5cce8a9ecd3b27260051a1ca1768098f specs: - superfight (0.0.1) + about_jason (0.1.0) GEM remote: http://rubygems.org/ specs: diff-lcs (1.1.3) + rack (1.5.2) + rack-protection (1.5.1) + rack rake (0.9.2.2) rspec (2.10.0) rspec-core (~> 2.10.0) @@ -17,11 +20,20 @@ GEM rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) + shotgun (0.9) + rack (>= 1.0) + sinatra (1.4.4) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + tilt (1.4.1) PLATFORMS ruby DEPENDENCIES + about_jason (~> 0.1.0)! rake rspec - superfight! + shotgun + sinatra diff --git a/config.ru b/config.ru new file mode 100644 index 0000000..4bef1cb --- /dev/null +++ b/config.ru @@ -0,0 +1,2 @@ +require "./niner" +run Sinatra::Application \ No newline at end of file diff --git a/niner.rb b/niner.rb index 801bf2a..a75c951 100644 --- a/niner.rb +++ b/niner.rb @@ -1,20 +1,12 @@ require 'rubygems' require 'bundler/setup' +require 'sinatra' Bundler.require -puts "--------------------------------" -puts "welcome to the superfight" -puts "--------------------------------" -puts "" -puts "" -puts "" -puts "What is your first fighter's name?" -fighter_a = $stdin.gets -puts "What is your second fighter's name?" -fighter_b = $stdin.gets - -match = Match.new(Fighter.new(fighter_a), Fighter.new(fighter_b)) - -puts "The winner of match is ....... #{match.winner.name}" +get '/about' do + @title = Jason.title + @subject = Jason.subject + erb :about +end \ No newline at end of file diff --git a/views/about.erb b/views/about.erb new file mode 100644 index 0000000..9cb7be3 --- /dev/null +++ b/views/about.erb @@ -0,0 +1,2 @@ +

<%= @title %>

+

<%= @subject %>

\ No newline at end of file