@@ -20,6 +20,14 @@ class ApplicationController < ActionController::Base end def current_location - @user || session[:geo_location] + @user || begin + loc = session[:geo_location] + case loc + when YAML::Object + [loc.ivars[:lat],loc.ivars[:lng]] + else + loc + end + end end end app/controllers/application_controller.rb @@ -12,9 +12,9 @@ set :git_enable_submodules, true set :user, 'mike' set :use_sudo, false -role :app, "perham" -role :web, "perham" -role :db, "perham", :primary => true +role :app, "tracknowledge.org" +role :web, "tracknowledge.org" +role :db, "tracknowledge.org", :primary => true namespace :deploy do desc "Restart Application" config/deploy.rb @@ -68,7 +68,7 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time config.active_record.default_timezone = :utc - config.threadsafe! if Rails.env.production? + config.threadsafe! if RAILS_ENV == 'production' end #RAILS_DEFAULT_LOGGER.flush config/environment.rb @@ -8,12 +8,17 @@ indy_blob: daytona_blob: tags: daytona500 + notes: x tws_blob: tags: texasworldspeedway + notes: x sepang_blob: tags: sepang + notes: x ironrock_blob: - tags: ironrock \ No newline at end of file + tags: ironrock + notes: x + \ No newline at end of file test/fixtures/track_blobs.yml @@ -1,9 +1,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' -require 'rubygems' require 'flexmock/test_unit' -require 'ostruct' class ActiveSupport::TestCase self.use_transactional_fixtures = true test/test_helper.rb fc499392cb89856f5593879c70d0a8cb83e2ec30 Mike Perham mperham@gmail.com http://github.com/mperham/tracknowledge/commit/dfb6321932356baf153ccf794191fe0d592ba9ff dfb6321932356baf153ccf794191fe0d592ba9ff 2009-03-11T17:59:26-07:00 2009-03-11T17:59:26-07:00 Cleanup d110f76595820e92b10a0ec447b3f5cc04450585 Mike Perham mperham@gmail.com