fly-ruby 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1ca64bcd11ed8a60774f0d8ec255ffb49bc6b8e21a8bd32e7410068bec35c0
-  data.tar.gz: fb55ad6c98cb631bf202aea206c53a9b2e9a7c738cd9835095dd647011cfc7f6
+  metadata.gz: eca3058695c9bca72614139b04fe716c66e51391fe0c97174d7585655b6360fc
+  data.tar.gz: 7cc2f305188afd9f78f7bc40a59fc4669bf531ec9d48bf15fc324e1c1a0f46cd
 SHA512:
-  metadata.gz: 7c3df04f8bb9f97bfb87903b0fffc14ef2b320802e1183752c07f8b769b629f6c66af21ae0e4bb5a23a2608cfdfdda2f3b1c387e3edcd1f64b5d2474a79f7a6f
-  data.tar.gz: ff4ca7c18d4b18ec237c8e1c59bce88dce849198934ed1d42c28ab2a081b577f8fa2cc38930d0478ec94a5bee580e2f12649b38d3ad46d176a774edaba60446c
+  metadata.gz: 4c9786f36932df4f606b4944ba19ff658629490a69e86c10b8c4ea3c102235d8368780884f9e9cc436b079dcb683c34dd82007da59dfa6f70f7e6132fcff1f1c
+  data.tar.gz: db27454d933e0db41dd48c05b741eb3dc64a06bd0c688f9ccad08a879f616fa9d872e0a38923d4922d82e667a21c0ee19563cfac3ab47d4b9aa10ba3dc5b01bb

data/.github/workflows/test.yml

@@ -7,8 +7,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - { os: ubuntu-latest, ruby_version: 2.5 }
-          - { os: ubuntu-latest, ruby_version: 2.6 }
           - { os: ubuntu-latest, ruby_version: 2.7 }
           - { os: ubuntu-latest, ruby_version: '3.0' }
     services:

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rack-test'
 gem 'minitest'
 gem "rails"
 gem "pg"
+gem "sqlite3"
 gem "climate_control"
 gem "minitest-around"
 gem "m"

data/lib/fly-ruby/configuration.rb

@@ -62,26 +62,39 @@ module Fly
 
     def database_uri
       @database_uri ||= URI.parse(database_url)
-      @database_uri
     end
 
-    def regional_database_url
+    def database_app_name
+      database_uri.hostname.split(".")[-2] || database_uri.hostname
+    end
+
+    def database_domain
+      "#{database_app_name}.internal"
+    end
+
+    def primary_database_url
       uri = database_uri.dup
-      uri.host = regional_database_host
+      uri.host = "#{primary_region}.#{database_domain}"
+      uri.port = secondary_database_port
       uri.to_s
     end
 
-    def regional_database_host
-      "#{current_region}.#{database_uri.hostname}"
+    def secondary_database_url
+      uri = database_uri.dup
+      uri.host = "top1.nearest.of.#{database_domain}"
+      uri.port = secondary_database_port
+      uri.to_s
     end
 
-    # Rails-compatible database configuration
-    def regional_database_config
-      {
-        :host => regional_database_host,
-        :port => 5433,
-        :adapter => "postgresql"
-      }
+    def secondary_database_port
+      port = if in_secondary_region?
+        case database_uri.scheme
+        when "postgres"
+          5433
+        end
+      end
+
+      port || database_uri.port
     end
 
     def redis_uri
@@ -100,7 +113,13 @@ module Fly
     end
 
     def eligible_for_activation?
-      database_url && primary_region && current_region && web?
+      database_url && primary_region && current_region && !rake_task?
+    end
+
+    def hijack_database_connection!
+      # Don't reset the database URL for on-disk sqlite
+      return if database_uri.scheme.start_with?("sqlite") || database_uri.host !~ /(internal|localhost)/
+      ENV["DATABASE_URL"] = in_secondary_region? ? secondary_database_url : primary_database_url
     end
 
     def in_secondary_region?

data/lib/fly-ruby/railtie.rb

@@ -1,30 +1,18 @@
 # frozen_string_literal: true
 
 class Fly::Railtie < Rails::Railtie
-  def hijack_database_connection
-    ActiveSupport::Reloader.to_prepare do
-      # If we already have a database connection when this initializer runs,
-      # we should reconnect to the region-local database. This may need some additional
-      # hooks for forking servers to work correctly.
-      if defined?(ActiveRecord)
-        config = ActiveRecord::Base.connection_db_config.configuration_hash
-        ActiveRecord::Base.establish_connection(config.symbolize_keys.merge(Fly.configuration.regional_database_config))
-      end
-    end
-  end
-
-  initializer("fly.regional_database") do |app|
+  initializer("fly.regional_database", before: "active_record.initialize_database") do |app|
     # Insert the request middleware high in the stack, but after static file delivery
-    app.config.middleware.insert_after ActionDispatch::Executor, Fly::Headers if Fly.configuration.web?
+    app.config.middleware.insert_after ActionDispatch::Executor, Fly::Headers
 
     if Fly.configuration.eligible_for_activation?
+
+      Fly.configuration.hijack_database_connection!
+
       app.config.middleware.insert_after Fly::Headers, Fly::RegionalDatabase::ReplayableRequestMiddleware
       # Insert the database exception handler at the bottom of the stack to take priority over other exception handlers
       app.config.middleware.use Fly::RegionalDatabase::DbExceptionHandlerMiddleware
 
-      if Fly.configuration.in_secondary_region?
-        hijack_database_connection
-      end
     elsif Fly.configuration.web?
       puts "Warning: DATABASE_URL, PRIMARY_REGION and FLY_REGION must be set to activate the fly-ruby middleware. Middleware not loaded."
     end

data/lib/fly-ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fly
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

data/lib/fly-ruby.rb

@@ -22,16 +22,14 @@ module Fly
   end
 
   class Instance
-    attr_accessor :configuration
+    attr_writer :configuration
 
-    def initialize
-      self.configuration = Fly::Configuration.new
+    def configuration
+      @configuration ||= Fly::Configuration.new
     end
 
-    def configure
-      configuration = Fly::Configuration.new
-      yield(configuration) if block_given?
-      self.configuration = configuration
+    def configure(&block)
+      configuration.tap(&block)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Joshua Sierles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack