From: OHASHI, Norikazu <katz@neko-mori.sakura.ne.jp>
Date: Thu, 21 Mar 2019 07:19:28 +0000 (+0900)
Subject: CGIでも動作するように対応した
X-Git-Url: http://www.wald-der-katze.sakura.ne.jp/git/gitweb.cgi?a=commitdiff_plain;h=7f5daaeaac895893fdef1ed1d5235982540068b1;p=book_server.git

CGIでも動作するように対応した
---

diff --git a/sinatra/database.yml b/sinatra/app/models/database.yml
similarity index 100%
rename from sinatra/database.yml
rename to sinatra/app/models/database.yml
diff --git a/sinatra/app/models/users_db.rb b/sinatra/app/models/users_db.rb
index 151e1e5..2bb0ec3 100644
--- a/sinatra/app/models/users_db.rb
+++ b/sinatra/app/models/users_db.rb
@@ -5,7 +5,8 @@ require 'mysql2'
 require 'bcrypt'
 
 # DB設定ファイルの読み込み
-ActiveRecord::Base.configurations = YAML.load_file('database.yml')
+db_config = File.join(File.dirname(__FILE__), 'database.yml')
+ActiveRecord::Base.configurations = YAML.load_file(db_config)
 ActiveRecord::Base.establish_connection(:development)
 
 class Users < ActiveRecord::Base
diff --git a/sinatra/start.rb b/sinatra/start.rb
index d2e48f2..73971e8 100644
--- a/sinatra/start.rb
+++ b/sinatra/start.rb
@@ -1,5 +1,5 @@
 require 'sinatra/base'
-require './app/controllers/web_gui'
+require_relative './app/controllers/web_gui'
 # require 'app/controllers/restful_api'
 
 class Main < Sinatra::Base