Reorganize code, fix rake

Author: nbulaj

.travis.yml

@@ -7,7 +7,7 @@ services:
   - postgresql
 
 before_script:
-  - cp app/config/database.yml.travis app/config/database.yml
+  - cp config/database.yml.travis config/database.yml
   - bundle exec rake db:create db:migrate
 
 before_install:

Procfile

@@ -1 +1 @@
-web: bundle exec puma -e $RACK_ENV -b unix:///tmp/web_server.sock --pidfile /tmp/web_server.pid -d -C config/puma.rb
+web: bundle exec puma -e production -d

Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 
-require_relative 'app/config/application'
+require_relative 'config/application'
 load 'tasks/otr-activerecord.rake'
 
 desc 'Default: run specs.'

config.ru

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'app/config/application'
+require 'config/application'
 
 use OTR::ActiveRecord::ConnectionManagement
 run GrapeOAuth2Sample::API

app/config/application.rb renamed to config/application.rb

@@ -18,20 +18,20 @@
 load File.expand_path('../database.rb', __FILE__)
 
 # Models
-require_relative '../models/application_record'
+require_relative '../app/models/application_record'
 
 %w(access_token access_code application post user).each do |model|
-  require_relative "../models/#{model}"
+  require_relative "../app/models/#{model}"
 end
 
 # Entities
-Dir[File.expand_path('../../entities/*.rb', __FILE__)].each do |entity|
+Dir[File.expand_path('../../app/entities/*.rb', __FILE__)].each do |entity|
   require_relative entity
 end
 
 # Endpoints
-Dir[File.expand_path('../../endpoints/*.rb', __FILE__)].each do |endpoint|
+Dir[File.expand_path('../../app/endpoints/*.rb', __FILE__)].each do |endpoint|
   require_relative endpoint
 end
 
-require_relative '../../app/api'
+require_relative '../app/api'

app/config/database.rb renamed to config/database.rb

@@ -4,6 +4,6 @@
 env = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
 
 ::ActiveRecord::Base.default_timezone = :utc
-::ActiveRecord::Base.logger = Logger.new(File.expand_path("../../../log/#{env}.log", __FILE__), File::WRONLY | File::APPEND)
+::ActiveRecord::Base.logger = Logger.new(File.expand_path("../../log/#{env}.log", __FILE__), File::WRONLY | File::APPEND)
 
 ::ActiveRecord::Migration.verbose = false

app/config/database.yml renamed to config/database.yml

@@ -15,7 +15,7 @@
 require 'rack/test'
 require 'database_cleaner'
 
-require_relative '../app/config/application'
+require_relative '../config/application'
 
 require 'support/api_helper'