Added config files.

Author: Felipe Rodrigues Michetti

api/app.rb

@@ -1,6 +1,7 @@
 require_relative '../lib/loadpath'
 require 'models/base'
 
+require 'yaml'
 require 'sinatra'
 require 'sinatra/cross_origin'
 require 'sinatra/contrib/all'
@@ -10,15 +11,17 @@
 
 # @class App
 class App < Sinatra::Application
-  register Sinatra::SequelExtension, Sinatra::Namespace, Sinatra::CrossOrigin
+  register Sinatra::SequelExtension, Sinatra::Namespace, Sinatra::CrossOrigin, Sinatra::ConfigFile
+  config_file File.join("#{Dir.pwd}/lib/config/rack.conf.yml")
   extend Models
 
-  DATABASE = load_db
+  DATASOURCE = load_db
+  CLASS_FACTORY_OPTIONS = YAML.safe_load(File.open("#{Dir.pwd}/lib/config/class_factory.conf.yml"))
 
   require 'requires'
   require 'aliases'
 
-  %w[controllers].each {|folder| Dir["#{Dir.pwd}/lib/#{folder}/*.rb"].each {|file| require file}}
+  %w[controllers].each {|folder| Dir["#{Dir.pwd}/lib/#{folder}/*.rb"].each { |file| require file}}
 
   Controllers.constants.each{|ctrl_sym|
     module_name = Kernel.const_get('Controllers::?'.gsub('?', ctrl_sym.to_s))
@@ -28,17 +31,16 @@ class App < Sinatra::Application
   extend Utils::ClassFactory
 
   configure {
-    set :environment, :development
+    set :environment, settings.environment
     set server: 'webrick'
-
-    set :raise_errors, true
-    set :show_exceptions, true
-
-    enable :cross_origin
-
+    set :raise_errors, settings.raise_errors
+    set :show_exceptions, settings.show_exceptions
     set :root, File.dirname(__FILE__)
     set :public_folder, File.join(root, '../', 'public')
+  }
 
+  configure(:development) {
+    enable :cross_origin
     set :allow_origin, :any
     set :allow_methods, %i[get post put delete options]
     set :allow_credentials, true
@@ -65,7 +67,7 @@ def sample_method
     end
   }
 
-  ClassMap = create_classes(DATABASE, Dynamics, false)
+  ClassMap = create_classes(DATASOURCE, Dynamics, CLASS_FACTORY_OPTIONS['name_conflicts'])
   Classes = get_classes(Dynamics)
 
   require 'extensions/models/dynamics_common'

docker-compose.yml

@@ -8,18 +8,17 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     ports:
-      - "5423:5432"
+      - "5432:5432"
     expose: 
       - "5432"
-      - "5423"
   ruby:
     image: ruby:2.5.0
     environment:
       RACK_ENV: DEV
       RUBYLIB: ./lib
       DATABASE_URL_LOCAL: postgres://postgres:postgres@localhost:5422/postgres
     build: .
-    command: rackup config.ru -E DEV
+    command: rackup config.ru -E $RACK_ENV
     ports:
       - "9595:9595"
     depends_on:

docker/docker-compose.yml

@@ -1,6 +1,4 @@
-# Use postgres/example user/password credentials
 version: '3.1'
-
 services:
   postgres:
     image: postgres:9.6

lib/config/class_factory.conf.yml

@@ -0,0 +1,2 @@
+# if name conflicts = true, don't singularize class names
+name_conflicts: true

lib/config/rack.conf.yml

@@ -0,0 +1,3 @@
+environment: development
+raise_errors: true
+show_exceptions: true

lib/controllers/mini_controller.rb

@@ -15,7 +15,7 @@ def included(controller)
           c.namespace('/tables') {|c|
             c.get('') {
               make_default_json_api(self) {
-                {database: App::DATABASE.opts[:database], schema: App::ClassMap.first[:schema], tables: App::ClassMap}
+                {database: App::DATASOURCE.opts[:database], schema: App::ClassMap.first[:schema], tables: App::ClassMap}
               }
             }
 

lib/extensions/models/dynamics_common.rb

@@ -1,12 +1,9 @@
-require 'inflector'
-
 module Extensions
   module DynamicsCommon
     Dynamics.constants.each {|klass_sym|
       klass = Kernel.const_get('Dynamics::?'.gsub('?', klass_sym.to_s))
       klass.class_eval {
         # Do everything(whatever) you want here.
-        include Inflector
         puts "Extending #{klass.name}"
 
         class << self

lib/helpers/api_helper.rb

@@ -12,6 +12,8 @@ module ApiBuilder
     include Utils::ClassFactory
 
     CONTENT_TYPE = 'application/json;charset=utf-8'
+    RESCUES = [ModelException, UniqueConstraintViolation, ConstraintViolation, CheckConstraintViolation,
+               NotNullConstraintViolation, ForeignKeyConstraintViolation, MassAssignmentRestriction, ValidationFailed].freeze
 
     def make_default_json_api(api_instance, payload = {}, table_name = nil)
       request_method = api_instance.env['REQUEST_METHOD']
@@ -44,8 +46,7 @@ def make_default_json_api(api_instance, payload = {}, table_name = nil)
           else
             response = { msg: 'Api not implemented yet.' }
           end
-        rescue ModelException, ConstraintViolation, UniqueConstraintViolation, CheckConstraintViolation,
-               NotNullConstraintViolation, ForeignKeyConstraintViolation, MassAssignmentRestriction, ValidationFailed => e
+        rescue RESCUES => e
           status = 400
           response = prepare_error_response(e)
         end

lib/models/base.rb

@@ -1,7 +1,6 @@
 require 'yaml'
 require 'sequel'
 require 'sequel/adapters/postgresql'
-
 require_relative '../utils/discover_os'
 
 module Models

lib/utils/class_factory.rb

@@ -17,14 +17,14 @@ def create_classes(connection, module_constant, name_conflicts = true)
       next if t[:table_name].eql?('configurations')
 
       name = t[:table_name]
-      schema = t[:schema]
+      _schema = t[:schema]
 
       constraints = table_constraints(connection, name)
       foreign_keys = table_foreign_keys(connection, name)
       fields = scan_fields(connection, name)
       t[:constraints] = constraints.map {|tc| {type: tc[:constraint_type], name: tc[:constraint_name]}}
       t[:foreign_keys] = foreign_keys
-      primary_key_name = t[:constraints].detect {|tc| tc[:type].eql?('PRIMARY KEY')}[:name] rescue nil
+      _primary_key_name = t[:constraints].detect {|tc| tc[:type].eql?('PRIMARY KEY')}[:name] rescue nil
       t[:scanned_fields] = fields
       t[:columns_n_types] = table_columns(connection, name)