Skip to content
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 .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
.rvmrc
*~
*.gem
8 changes: 8 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
require 'rake'
require 'spec/version'
require 'spec/rake/spectask'
require 'spec/ruby'

Spec::Rake::SpecTask.new

task :default => :spec
12 changes: 4 additions & 8 deletions lib/pie_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
class Pie::WebApp < Sinatra::Base
set :root, File.join(File.expand_path(File.dirname(__FILE__)), "..")

get '/' do
"hello"
end

get '/:place_name' do
get '/*' do
puts "env= #{request.env.inspect}"
puts "request.env[PIE_DATA]= #{request.env["PIE_DATA"].inspect}"
pie ||= request.env["PIE_DATA"]
pie ||= settings.pie_data if settings.respond_to? :pie_data
pie ||= request.env["PIE_DATA"] || settings.pie_data
puts "pie = #{pie.inspect}"
if pie
name = params[:place_name].to_sym
splat = params[:splat].find { |e| e.length > 0 }
name = (splat || settings.pie_data.places.first.first).to_sym
pie.current_place(name) unless name.nil?
puts "current place name is #{pie.current_place.name}"
puts "current place is #{pie.current_place.description}"
Expand Down
11 changes: 8 additions & 3 deletions spec/pie_app_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@
Capybara.app = Pie::WebApp
end

it "should say hello for the root path" do
visit '/'
page.should have_content "hello"
describe "root path" do
before do
place ship:"ookina fune"
end
it "should visit the first place in the list" do
visit '/'
page.should have_content('ookina fune')
end
end

describe "with one place and an image" do
Expand Down