@@ -1,4 +1,4 @@ -set(:env=>:production, :logging=>true) +Sinatra::Base.set(:environment=>:production, :logging=>true) if defined?(Sinatra) DB = Sequel.connect(case(GIFTSMAS_ENV) when :production 'postgres:///giftsmas' config.rb.example @@ -1,25 +1,26 @@ #!/usr/bin/env ruby require 'rubygems' -require 'sinatra' -set(:appfile=>'giftsmas.rb', :views=>'views') +require 'sinatra/base' require 'cgi' -enable :sessions - require 'models' require 'scaffolding_extensions' -ScaffoldingExtensions::MetaModel::SCAFFOLD_OPTIONS[:text_to_string] = true +ScaffoldingExtensions::MetaModel::SCAFFOLD_OPTIONS[:text_to_string] = true PersonSplitter = /,/ unless defined?(PersonSplitter) -helpers do +class Sinatra::Base + set(:appfile=>'giftsmas.rb', :views=>'views') + enable :sessions + disable :run + def h(text) CGI.escapeHTML(text) end - + def html_opts(hash) hash.map{|k,v| "#{k}=\"#{h(v)}\""}.join(' ') end - + def select(name, options, opts={}) "<select name=\"#{name}\" #{html_opts(opts)}>\n#{options.map{|t,v| "<option value=\"#{v}\">#{h(t)}</option>"}.join("\n")}\n</select>" end @@ -28,108 +29,129 @@ helpers do meth = opts.delete(:meth)||:name select(name, objects.map{|o| [o.send(meth), o.id]}, opts) end -end - -error do - e = request.env['sinatra.error'] - puts e.message - e.backtrace.each{|x| puts x} - render(:erb, "<h3>Oops, an error occurred.</h3>") -end - -not_found do - render(:erb, "<h3>The page you are looking for does not exist.</h3>") -end - -before do - @flash = session.delete(:flash) - unless %w'/application.css /favicon.ico /login /logout'.include?(request.env['REQUEST_PATH']) - redirect('/login', 303) if !session[:user_id] or !(@user = User[session[:user_id]]) - unless %w'/choose_event /add_event'.include?(request.env['REQUEST_PATH']) - @event = Event[session[:event_id]] if session[:event_id] - redirect('/choose_event', 303) if !session[:event_id] or !(@event = Event[session[:event_id]]) + + error do + e = request.env['sinatra.error'] + puts e.message + e.backtrace.each{|x| puts x} + render(:erb, "<h3>Oops, an error occurred.</h3>") + end + + not_found do + render(:erb, "<h3>The page you are looking for does not exist.</h3>") + end + + before do + @flash = session.delete(:flash) + unless %w'/application.css /favicon.ico /login /logout'.include?(request.env['REQUEST_PATH']) + redirect('/login', 303) if !session[:user_id] or !(@user = User[session[:user_id]]) + unless %w'/choose_event /add_event'.include?(request.env['REQUEST_PATH']) + @event = Event[session[:event_id]] if session[:event_id] + redirect('/choose_event', 303) if !session[:event_id] or !(@event = Event[session[:event_id]]) + end end end end -get '/' do - render :erb, :index -end - -post '/add_gift' do - new_senders = params[:new_senders].split(PersonSplitter).map{|name| name.strip}.reject{|name| name.empty?} - new_receivers = params[:new_receivers].split(PersonSplitter).map{|name| name.strip}.reject{|name| name.empty?} - session[:flash] = if gift = Gift.add(@event, params[:gift].strip, Array(params[:senders]), Array(params[:receivers]), new_senders, new_receivers) - "Gift Added: #{h gift.name}<br />Senders: #{gift.senders.map{|s| s.name}.join(', ')}<br />Receivers: #{gift.receivers.map{|s| s.name}.join(', ')}" - else - "Gift Not Added: You must have at least one sender and receiver." - end - redirect('/', 303) -end - -get '/reports/chronological' do - @gifts = @event.gifts - render :erb, :report_chron -end - -get '/reports/crosstab' do - @headers, @rows = @event.gifts_crosstab - render :erb, :report_crosstab -end - -get '/reports/summary' do - @senders, @receivers = @event.gifts_summary - render :erb, :report_summary -end - -get '/reports/by_sender' do - @senders = @event.gifts_by_sender - render :erb, :report_sender -end - -get '/reports/by_receiver' do - @receivers = @event.gifts_by_receiver - render :erb, :report_receiver -end - -get '/reports/thank_yous' do - @receivers = @event.thank_you_notes - render :erb, :report_thank_yous -end - -get '/login' do - render :erb, :login -end - -post '/login' do - if i = User.login_user_id(params[:user], params[:password]) - session[:user_id] = i - redirect('/choose_event', 303) - else - session[:flash] = 'Bad User/Password' - redirect('/login', 303) +class Giftsmas < Sinatra::Base + get '/' do + render :erb, :index + end + + post '/add_gift' do + new_senders = params[:new_senders].split(PersonSplitter).map{|name| name.strip}.reject{|name| name.empty?} + new_receivers = params[:new_receivers].split(PersonSplitter).map{|name| name.strip}.reject{|name| name.empty?} + session[:flash] = if gift = Gift.add(@event, params[:gift].strip, Array(params[:senders]), Array(params[:receivers]), new_senders, new_receivers) + "Gift Added: #{h gift.name}<br />Senders: #{gift.senders.map{|s| s.name}.join(', ')}<br />Receivers: #{gift.receivers.map{|s| s.name}.join(', ')}" + else + "Gift Not Added: You must have at least one sender and receiver." + end + redirect('/', 303) + end + + get '/reports/chronological' do + @gifts = @event.gifts + render :erb, :report_chron + end + + get '/reports/crosstab' do + @headers, @rows = @event.gifts_crosstab + render :erb, :report_crosstab + end + + get '/reports/summary' do + @senders, @receivers = @event.gifts_summary + render :erb, :report_summary + end + + get '/reports/by_sender' do + @senders = @event.gifts_by_sender + render :erb, :report_sender + end + + get '/reports/by_receiver' do + @receivers = @event.gifts_by_receiver + render :erb, :report_receiver + end + + get '/reports/thank_yous' do + @receivers = @event.thank_you_notes + render :erb, :report_thank_yous + end + + get '/login' do + render :erb, :login + end + + post '/login' do + if i = User.login_user_id(params[:user], params[:password]) + session[:user_id] = i + redirect('/choose_event', 303) + else + session[:flash] = 'Bad User/Password' + redirect('/login', 303) + end + end + + post '/logout' do + session.clear + redirect '/login' + end + + get '/choose_event' do + render :erb, :choose_event + end + + post '/choose_event' do + e = Event[:user_id=>@user.id, :id=>params[:event_id]] + session[:event_id] = e.id + redirect('/', 303) + end + + post '/add_event' do + e = Event.create(:user_id=>@user.id, :name=>params[:name]) + session[:event_id] = e.id + redirect('/', 303) end end -post '/logout' do - session.clear - redirect '/login' -end - -get '/choose_event' do - render :erb, :choose_event +class GiftsmasSE < Sinatra::Base + scaffold_all_models :only=>[Event, Gift, Person] end -post '/choose_event' do - e = Event[:user_id=>@user.id, :id=>params[:event_id]] - session[:event_id] = e.id - redirect('/', 303) +app = Rack::Builder.app do + map "/" do + run Giftsmas + end + map "/manage" do + run GiftsmasSE + end end -post '/add_event' do - e = Event.create(:user_id=>@user.id, :name=>params[:name]) - session[:event_id] = e.id - redirect('/', 303) +puts "Starting" +Rack::Handler.get('mongrel').run(app, :Host=>'0.0.0.0', :Port=>3002) do |server| + trap(:INT) do + server.stop + puts "Stopping" + end end - -scaffold_all_models('/manage', :only=>[Event, Gift, Person]) giftsmas.rb @@ -3,13 +3,13 @@ <table> <thead><tr><th>Sender\Receiver</th> <% @headers.each do |x| %> - <th><%=h x.to_s%></th> + <th><%=h x.to_s %></th> <% end %> </tr></thead> <tbody> <% @rows.each do |r| %> - <tr><td><%=h r.shift %></td> - <% r.each do |x| %> + <tr><td><%=h r.first %></td> + <% r[1..-1].each do |x| %> <td><%= x%></td> <% end %> </tr> views/report_crosstab.erb @@ -8,8 +8,8 @@ <% gifts.each do |g| %> <tr><td><%= g.inserted_at.strftime('%I:%M:%S%P') %></td> <td><%=h g.name %></td> - <td><%= g.senders.map{|x| h x.name}.join(', ') %></td> - <td><%= (g.receivers.map{|x| h x.name} - [h r]).join(', ') %></td></tr> + <td><%= g.senders.map{|x| h(x.name)}.join(', ') %></td> + <td><%= (g.receivers.map{|x| h(x.name)} - [h(r)]).join(', ') %></td></tr> <% end %> </tbody></table> <% end %> views/report_receiver.erb @@ -8,8 +8,8 @@ <% gifts.each do |g| %> <tr><td><%= g.inserted_at.strftime('%I:%M:%S%P') %></td> <td><%=h g.name %></td> - <td><%= g.receivers.map{|x| h x.name}.join(', ') %></td> - <td><%= (g.senders.map{|x| h x.name} - [h s]).join(', ') %></td></tr> + <td><%= (g.receivers.map{|x| h(x.name)}).join(', ') %></td> + <td><%= (g.senders.map{|x| h(x.name)} - [h(s)]).join(', ') %></td></tr> <% end %> </tbody></table> <% end %> views/report_sender.erb dd9ba5ef5fb58f63ebf0e2fca8defba37b26c0a6 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/giftsmas/commit/c68c7748bfb7144642667b3f82a08db8d0d80c3b c68c7748bfb7144642667b3f82a08db8d0d80c3b 2009-01-29T13:59:50-08:00 2009-01-29T13:59:50-08:00 Update to Sinatra 0.9.0.4 Move most of the top level code into a Sinatra::Base subclass named Giftsmas. Move the scaffolded code into a Giftsmas SE subclass. Set up Rack manually to use both subclasses at the same time, mounted at different points. Fix an issue in the cross tab report with the senders name's not being displayed. Fix some ruby warnings in the sender and receiver reports. 68ffecda9bfcc431e0d1cd9d1aabd29aa17a442a Jeremy Evans code@jeremyevans.net