From 1c956e662bb2072fa6e769ec5599dfab6db2c829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= <john@ankarstrom.se>
Date: Tue, 2 Mar 2021 19:38:59 +0100
Subject: Load models and sub-interfaces manually instead

I realized that this is more flexible, as it allows the user to
comment out whatever models/sub-interfaces they don't want to use.

Adding a new model or sub-interface requires a tiny bit more work,
but I think it's worth it.
---
 interfaces/http/http.rb    | 8 +++-----
 interfaces/http/web/web.rb | 2 +-
 interfaces/ruby/ruby.rb    | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'interfaces')

diff --git a/interfaces/http/http.rb b/interfaces/http/http.rb
index 5c9eca4..8947890 100644
--- a/interfaces/http/http.rb
+++ b/interfaces/http/http.rb
@@ -1,13 +1,11 @@
 require 'sinatra/base'
 require_relative '../ruby/ruby'
 
-Dir.glob('*/*.rb', base: __dir__).grep(/^(.*)\/\1\.rb$/).each do |f|
-  require_relative f
-end
-
 $config = Config.first
 
 class HTTPInterface < Sinatra::Base
-  use WebInterface
+  require_relative 'web/web'; use WebInterface
+  # require_relative 'admin/admin'; use AdminInterface
+  # require_relative 'rss/rss'; use RSSInterface
   run! if app_file == $0
 end
diff --git a/interfaces/http/web/web.rb b/interfaces/http/web/web.rb
index 8ae8afd..ca04ecc 100644
--- a/interfaces/http/web/web.rb
+++ b/interfaces/http/web/web.rb
@@ -3,4 +3,4 @@ class WebInterface < Sinatra::Base
     @posts = Post.all
     erb :index
   end
-end
\ No newline at end of file
+end
diff --git a/interfaces/ruby/ruby.rb b/interfaces/ruby/ruby.rb
index ffd6d6a..d5c0e9c 100644
--- a/interfaces/ruby/ruby.rb
+++ b/interfaces/ruby/ruby.rb
@@ -5,6 +5,7 @@ ActiveRecord::Base.establish_connection(
   database: "#{__dir__}/../../db.sqlite3"
 )
 
-Dir.glob('models/*.rb', base: __dir__).each do |f|
-  require_relative f
-end  
+require_relative 'models/comment'
+require_relative 'models/config'
+require_relative 'models/post'
+require_relative 'models/tag'
-- 
cgit v1.2.3