[ruby] Move database logic to seperate files for clarity

frameworks/Ruby/rack-app/app.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
+require 'bundler/setup'
+Bundler.require(:default) # Load core modules
 
 require 'rack/app'
 require 'rack/app/front_end'
+require_relative 'db'
 require 'json'
+require 'time'
 
 class App < Rack::App
   MAX_PK = 10_000

frameworks/Ruby/rack-app/config.ru

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_relative 'boot'
 require_relative 'app'
 
 run App

frameworks/Ruby/rack-app/boot.rb → frameworks/Ruby/rack-app/db.rb

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
-require 'bundler/setup'
-require 'time'
 
-MAX_PK = 10_000
-ID_RANGE = (1..MAX_PK).freeze
-ALL_IDS = ID_RANGE.to_a
-QUERIES_MIN = 1
-QUERIES_MAX = 500
 SEQUEL_NO_ASSOCIATIONS = true
-#SERVER_STRING = "Sinatra"
-
-Bundler.require(:default) # Load core modules
 
 def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules

frameworks/Ruby/rack-sequel/config.ru

@@ -1,4 +1,5 @@
-require_relative 'boot'
+# frozen_string_literal: true
 require_relative 'hello_world'
+
 use Rack::ContentLength
 run HelloWorld.new

frameworks/Ruby/rack-sequel/boot.rb → frameworks/Ruby/rack-sequel/db.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
-require 'bundler/setup'
 
 SEQUEL_NO_ASSOCIATIONS = true
 
-Bundler.require(:default) # Load core modules
-
 def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules
 

frameworks/Ruby/rack-sequel/hello_world.rb

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+require 'bundler/setup'
+Bundler.require(:default) # Load core modules
+
+require_relative 'db'
 require 'time'
 
 # Our Rack application to be executed by rackup
@@ -8,8 +12,8 @@ class HelloWorld
   ALL_IDS = ID_RANGE.to_a
   QUERIES_MIN = 1
   QUERIES_MAX = 500
+
   CONTENT_TYPE = 'Content-Type'
-  CONTENT_LENGTH = 'Content-Length'
   JSON_TYPE = 'application/json'
   HTML_TYPE = 'text/html; charset=utf-8'
   PLAINTEXT_TYPE = 'text/plain'

frameworks/Ruby/rack/hello_world.rb

@@ -19,8 +19,8 @@ class HelloWorld
   ALL_IDS = QUERY_RANGE.to_a # enumeration of all the IDs in fortune DB
   MIN_QUERIES = 1 # min number of records that can be retrieved
   MAX_QUERIES = 500 # max number of records that can be retrieved
+
   CONTENT_TYPE = 'Content-Type'
-  CONTENT_LENGTH = 'Content-Length'
   JSON_TYPE = 'application/json'
   HTML_TYPE = 'text/html; charset=utf-8'
   PLAINTEXT_TYPE = 'text/plain'

frameworks/Ruby/roda-sequel/config.ru

@@ -1,3 +1,4 @@
-require_relative 'boot'
+# frozen_string_literal: true
 require_relative 'hello_world'
+
 run HelloWorld.freeze.app

frameworks/Ruby/roda-sequel/boot.rb → frameworks/Ruby/roda-sequel/db.rb

@@ -1,23 +1,6 @@
 # frozen_string_literal: true
-require "bundler/setup"
-require "time"
-MAX_PK = 10_000
-QUERY_RANGE = (1..MAX_PK).freeze
-ALL_IDS = QUERY_RANGE.to_a
-QUERIES_MIN = 1
-QUERIES_MAX = 500
-SEQUEL_NO_ASSOCIATIONS = true
-
-SERVER_STRING = "roda"
 
-Bundler.require(:default) # Load core modules
-
-CONTENT_TYPE = 'Content-Type'
-JSON_TYPE = 'application/json'
-HTML_TYPE = 'text/html; charset=utf-8'
-PLAINTEXT_TYPE = 'text/plain'
-DATE_HEADER = 'Date'
-SERVER_HEADER = 'Server'
+SEQUEL_NO_ASSOCIATIONS = true
 
 def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules

frameworks/Ruby/roda-sequel/hello_world.rb

@@ -1,7 +1,26 @@
 # frozen_string_literal: true
+require 'bundler/setup'
+Bundler.require(:default) # Load core modules
+
+require_relative 'db'
+require 'time'
 
 # Our Rack application to be executed by rackup
 class HelloWorld < Roda
+  MAX_PK = 10_000
+  QUERY_RANGE = (1..MAX_PK).freeze
+  ALL_IDS = QUERY_RANGE.to_a
+  QUERIES_MIN = 1
+  QUERIES_MAX = 500
+
+  CONTENT_TYPE = 'Content-Type'
+  JSON_TYPE = 'application/json'
+  HTML_TYPE = 'text/html; charset=utf-8'
+  PLAINTEXT_TYPE = 'text/plain'
+  DATE_HEADER = 'Date'
+  SERVER_HEADER = 'Server'
+  SERVER_STRING = 'roda'
+
   plugin :hooks
   plugin :render, escape: true, layout_opts: { cache_key: "default_layout" }
   plugin :default_headers, SERVER_HEADER => SERVER_STRING

frameworks/Ruby/sinatra-sequel/config.ru

@@ -1,3 +1,4 @@
-require_relative 'boot'
+# frozen_string_literal: true
 require_relative 'hello_world'
+
 run HelloWorld.new

frameworks/Ruby/sinatra-sequel/boot.rb → frameworks/Ruby/sinatra-sequel/db.rb

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
-require 'bundler/setup'
-require 'time'
 
-MAX_PK = 10_000
-ID_RANGE = (1..MAX_PK).freeze
-ALL_IDS = ID_RANGE.to_a
-QUERIES_MIN = 1
-QUERIES_MAX = 500
 SEQUEL_NO_ASSOCIATIONS = true
-SERVER_STRING = "Sinatra"
-
-Bundler.require(:default) # Load core modules
 
 def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules

frameworks/Ruby/sinatra-sequel/hello_world.rb

@@ -1,7 +1,20 @@
 # frozen_string_literal: true
+require 'bundler/setup'
+Bundler.require(:default) # Load core modules
+
+require_relative 'db'
+require 'time'
 
 # Our Rack application to be executed by rackup
 class HelloWorld < Sinatra::Base
+  MAX_PK = 10_000
+  ID_RANGE = (1..MAX_PK).freeze
+  ALL_IDS = ID_RANGE.to_a
+  QUERIES_MIN = 1
+  QUERIES_MAX = 500
+
+  SERVER_STRING = 'Sinatra'
+
   configure do
     # Static file serving is ostensibly disabled in modular mode but Sinatra
     # still calls an expensive Proc on every request...

frameworks/Ruby/sinatra/config.ru

@@ -1,3 +1,4 @@
-require_relative 'boot'
+# frozen_string_literal: true
 require_relative 'hello_world'
+
 run HelloWorld.new

frameworks/Ruby/sinatra/config/puma.rb

@@ -0,0 +1,3 @@
+before_fork do
+  ActiveRecord::Base.connection_handler.clear_active_connections!
+end

frameworks/Ruby/sinatra/boot.rb → frameworks/Ruby/sinatra/db.rb

@@ -1,15 +1,4 @@
 # frozen_string_literal: true
-require 'bundler/setup'
-require 'time'
-
-MAX_PK = 10_000
-ID_RANGE = (1..MAX_PK).freeze
-ALL_IDS = ID_RANGE.to_a
-QUERIES_MIN = 1
-QUERIES_MAX = 500
-SERVER_STRING = "Sinatra"
-
-Bundler.require(:default) # Load core modules
 
 def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules
@@ -64,5 +53,3 @@ def self.upsert_all(attributes, on_duplicate: :update, update_only: nil, returni
 class Fortune < ActiveRecord::Base
   self.table_name = name
 end
-
-ActiveRecord::Base.connection_handler.clear_active_connections!

frameworks/Ruby/sinatra/hello_world.rb

@@ -1,7 +1,20 @@
 # frozen_string_literal: true
+require 'bundler/setup'
+Bundler.require(:default) # Load core modules
+
+require_relative 'db'
+require 'time'
 
 # Our Rack application to be executed by rackup
 class HelloWorld < Sinatra::Base
+  MAX_PK = 10_000
+  ID_RANGE = (1..MAX_PK).freeze
+  ALL_IDS = ID_RANGE.to_a
+  QUERIES_MIN = 1
+  QUERIES_MAX = 500
+
+  SERVER_STRING = 'Sinatra'
+
   configure do
     # Static file serving is ostensibly disabled in modular mode but Sinatra
     # still calls an expensive Proc on every request...