move app out of subdir in attempt to appease heroku

.gitignore

@@ -1,3 +1,5 @@
 README.textile.html
 .DS_Store
 .bundle
+db/*.sqlite3
+tmp/

Rakefile

@@ -1,3 +1,17 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'tasks/rails'
+
+Dir.glob("lib/tasks/*.rb").each do |f|
+  require f
+end
+
 namespace :twilio_in_ten_minutes do
   namespace :gems do
     desc "Build and install local gems"
@@ -8,9 +22,3 @@ namespace :twilio_in_ten_minutes do
     end
   end
 end
-
-#namespace :db do
-#  task :migrate do
-#    system ("cd twilio-app; rake db:migrate");
-#  end
-#end

twilio-app/app/controllers/application_controller.rb → app/controllers/application_controller.rb

@@ -13,7 +13,8 @@ class ApplicationController < ActionController::Base
   protected
   def expire_old_sessions
     CallSession.connection.execute("select id,updated_at,current_timestamp from call_sessions").each do |rec|
-      t1 = Time.parse(rec["current_timestamp"])
+      Rails.logger.info "EXPIRE: #{rec.inspect}"
+      t1 = Time.parse(rec["now"])
       t2 = Time.parse(rec["updated_at"])
       age = t1 - t2
       if age > 120 # seconds

twilio-app/db/migrate/20110327031129_create_call_sessions.rb → db/migrate/20110327031129_create_call_sessions.rb

@@ -5,7 +5,7 @@ def self.up
       t.string :caller_number,           :null => false
       t.string :workflow_name,           :null => false
       t.string :state,                   :null => false
-      t.string :workflow_internal_state, :null => false
+      t.text   :workflow_internal_state, :null => false
       t.timestamps
     end
   end

twilio-app/db/schema.rb → db/schema.rb

@@ -16,7 +16,7 @@
     t.string   "caller_number",           :null => false
     t.string   "workflow_name",           :null => false
     t.string   "state",                   :null => false
-    t.string   "workflow_internal_state", :null => false
+    t.text     "workflow_internal_state", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end