[ tonton.rb to app.rm ]

app.rb

@@ -4,17 +4,14 @@ require 'sinatra/flash'
 require 'securerandom'
 require "sqlite3"
 
-class TonTon
-end
-
-TonTon::User = Struct.new(:id, :username, :email, :name, :password)
+TonTonWeb::User = Struct.new(:id, :username, :email, :name, :password)
 
 Warden::Manager.serialize_into_session do |user|
 	user.id
 end
 
 Warden::Manager.serialize_from_session do |id|
-	TonTon::App.find_user id
+	TonTonWeb::Wiki.find_user id
 end
 
 Warden::Manager.before_failure do |env,opts|
@@ -31,7 +28,7 @@ Warden::Strategies.add(:password) do
 	def authenticate!
 		user_params = params['user']
 
-		user = TonTon::App.find_user_by_username user_params['username']
+		user = TonTonWeb::Wiki.find_user_by_username user_params['username']
 
 		if user and user.password == user_params['password']
 			success!(user)
@@ -41,7 +38,7 @@ Warden::Strategies.add(:password) do
 	end
 end
 
-class TonTon::App < Precious::App
+class TonTonWeb::Wiki < Precious::App
 	set :host_authorization, { permitted_hosts: ['localhost', 'mytonton.com.br'] }
 
 	use Warden::Manager do |manager|
@@ -62,7 +59,7 @@ class TonTon::App < Precious::App
 		user = nil
 
 		@db.execute("select id, username, email, name, password from users where id = ?", id) do |row|
-			user = TonTon::User.new(*row)
+			user = TonTonWeb::User.new(*row)
 		end
 
 		return user
@@ -72,7 +69,7 @@ class TonTon::App < Precious::App
 		user = nil
 
 		@db.execute("select id, username, email, name, password from users where username = ?", username) do |row|
-			user = TonTon::User.new(*row)
+			user = TonTonWeb::User.new(*row)
 		end
 
 		return user
@@ -98,6 +95,7 @@ class TonTon::App < Precious::App
 	end
 
 	before do
+		puts request.path_info
 		if not env['warden'].authenticated?
 			@allow_editing = false
 		else