models/system_status.rb test/evoke_api_test.rb test/evoke_status_test.rb @@ -5,4 +5,6 @@ require 'evoke' use Rack::CommonLogger, File.new("#{File.dirname(__FILE__)}/log/#{ENV['APP_ENV']}.log", 'a+') -map("/") { run Evoke } +use Evoke::Api +use Evoke::Status +run Sinatra::Base config.ru @@ -7,7 +7,7 @@ require 'yaml' Configuration = YAML.load_file(File.join(File.dirname(__FILE__), 'config.yml')) LIBS = %w[rubygems logger config/database rest_client delayed_job haml sass - sinatra chicago sinatra/authorization] + sinatra/base chicago sinatra/authorization] LIBS.each { |lib| require lib } require_local_lib('../models') config/boot.rb @@ -1,103 +1,105 @@ require File.join(File.dirname(__FILE__), 'config', 'boot') -class Evoke < Sinatra::Base - register Sinatra::Chicago - helpers Sinatra::Chicago::Helpers - helpers Sinatra::Chicago::Responders - helpers Sinatra::Authorization - - error do - $stdout.puts "Sorry there was a nasty error - #{request.env['sinatra.error'].inspect}" - end - - # Resource management - - not_found { throw :halt, [404, json_response('')] } - - def valid_record(record, options={}) - options = {:status => 200, :response => record}.merge(options) - status(options[:status]) - json_response(options[:response]) - end - - def invalid_record(record) - # Need a simple logging facility - # $stdout.puts "ERROR: record #{record.inspect} says #{record.errors.full_messages.inspect}" - throw :halt, [422, json_response(:errors => record.errors.full_messages)] - end - - def manage_resource(resource, options={}) - raise Sinatra::NotFound unless resource - yield(resource) if block_given? - valid_record(resource, options) - rescue ActiveRecord::RecordInvalid => e - invalid_record(e.record) - end - - # Actions - - get "/callbacks/:guid" do - manage_resource(Callback.by_guid(params['guid'])) - end - - post "/callbacks" do - manage_resource(Callback.new(params), :status => 201) do |callback| - callback.save! - CallbackRunner.make_job_from_callback!(callback) +module Evoke + class Api < Sinatra::Base + register Sinatra::Chicago + helpers Sinatra::Chicago::Helpers + helpers Sinatra::Chicago::Responders + + error do + $stdout.puts "Sorry there was a nasty error - #{request.env['sinatra.error'].inspect}" end - end - put "/callbacks/:guid" do - manage_resource(Callback.by_guid(params['guid'])) do |callback| - attributes = params.reject {|k,v| k == "guid"} - callback.update_attributes!(attributes) - CallbackRunner.replace_job_for_callback!(callback) + # Resource management + + not_found { throw :halt, [404, json_response('')] } + + def valid_record(record, options={}) + options = {:status => 200, :response => record}.merge(options) + status(options[:status]) + json_response(options[:response]) + end + + def invalid_record(record) + # Need a simple logging facility + # $stdout.puts "ERROR: record #{record.inspect} says #{record.errors.full_messages.inspect}" + throw :halt, [422, json_response(:errors => record.errors.full_messages)] + end + + def manage_resource(resource, options={}) + raise Sinatra::NotFound unless resource + yield(resource) if block_given? + valid_record(resource, options) + rescue ActiveRecord::RecordInvalid => e + invalid_record(e.record) end - end - delete "/callbacks/:guid" do - manage_resource(Callback.by_guid(params['guid']), :response => nil) do |callback| - callback.destroy + # Actions + + get "/callbacks/:guid" do + manage_resource(Callback.by_guid(params['guid'])) end - # begin - # callback = Callback.by_guid(params['guid']) - # raise Sinatra::NotFound unless callback - # callback.destroy - # status(200) - # json_response("") - # rescue ActiveRecord::RecordInvalid => e - # invalid_record(e.record) - # end - end - - # - # Status and stuff - - catch_all_css - - helpers do - def authorize(username, password) - [username, password] == Configuration["authorization"].values_at("username", "password") + + post "/callbacks/" do + manage_resource(Callback.new(params), :status => 201) do |callback| + callback.save! + CallbackRunner.make_job_from_callback!(callback) + end end - def truncate(str, n) - str.length > n ? "#{str[0..n]}..." : str + put "/callbacks/:guid" do + manage_resource(Callback.by_guid(params['guid'])) do |callback| + attributes = params.reject {|k,v| k == "guid"} + callback.update_attributes!(attributes) + CallbackRunner.replace_job_for_callback!(callback) + end end - def verbal_status_message(callback) - if callback.called_back? - haml '.okay Already evoked callback', :layout => false - elsif callback.should_have_been_called_back? && !callback.called_back? - haml '.uhoh This callback should have been evoked but has not yet', :layout => false - else - haml '.okay Just waiting for callback time', :layout => false + delete "/callbacks/:guid" do + manage_resource(Callback.by_guid(params['guid']), :response => nil) do |callback| + callback.destroy end end - end + end # Api + + class Status < Sinatra::Base + register Sinatra::Chicago + helpers Sinatra::Chicago::Helpers + helpers Sinatra::Authorization - get "/status" do - login_required - @status = Status.new - haml :status, :layout => :application - end + error do + $stdout.puts "Sorry there was a nasty error - #{request.env['sinatra.error'].inspect}" + end + + # + # Status and stuff + + catch_all_css + + helpers do + def authorize(username, password) + [username, password] == Configuration["authorization"].values_at("username", "password") + end + + def truncate(str, n) + str.length > n ? "#{str[0..n]}..." : str + end + + def verbal_status_message(callback) + if callback.called_back? + haml '.okay Already evoked callback', :layout => false + elsif callback.should_have_been_called_back? && !callback.called_back? + haml '.uhoh This callback should have been evoked but has not yet', :layout => false + else + haml '.okay Just waiting for callback time', :layout => false + end + end + end + + get "/status" do + login_required + @status = SystemStatus.new + haml :status, :layout => :application + end + end # Status end # Evoke evoke.rb @@ -33,7 +33,4 @@ class Test::Unit::TestCase end end end - - def O(*args) OpenStruct.new(*args); end # Shortcut for OpenStruct - end test/test_helper.rb models/status.rb test/evoke_test.rb 2d3e19a514b2f220cea3d75b6a2bb89bfcb34225 Justin Knowlden gus@gusg.us http://github.com/thumblemonks/evoke/commit/6cada5776fd4507c1587830f91c6c4f1a5ddf5b4 6cada5776fd4507c1587830f91c6c4f1a5ddf5b4 2009-10-02T15:02:03-07:00 2009-10-02T15:02:03-07:00 Broke API and Status handlers into two Sinatra modules. Fun times 85a39102bd360f1be30d7d190392fc0b0e2773d6 Justin Knowlden gus@gusg.us