fly-ruby 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dacb7a202a7a167f2ef451373f29893ca4efe7c0a46e60aeb4d958883a6cd3ec
-  data.tar.gz: d650c2d9459908dc81f5bdf8f72f6744c097b5f40de20fc7c339b64b96797361
+  metadata.gz: 506556ce79da83a817f5a6a56b336328912730ace3fb26d10ed0d7e97f971abc
+  data.tar.gz: c2c7ceb044a6a9054da36ae775a0693458e91dac271b5d341666995dd59373b5
 SHA512:
-  metadata.gz: d5cad909dcf688f11958ebb2012c4388d685ca9d691c4db7bc9b2fd43e3522dd6c52b4c98ac7a7f5ae9937a285069bf68608dbec27477d86ac4fad52cdbe624e
-  data.tar.gz: 93879cc71887b23c2f8082b44ee3630844f2b5fc493b9daebff964b119a090ba8e1b28b62f844c239c27b011b852f5a978b12ba27f85aa5fc3607c4f3dea0397
+  metadata.gz: d7a79ba9b2a2db74515bdce0c606c99072d292813b5ef34c8963d44bcc0366fe0230bc784dcb8e489614ef1dd33ebb447d7cb215fd7f475c0fc00d51487446cf
+  data.tar.gz: 38e26c8853bde15845b1cd1c34bcff68f5f87db5a8e726af4451329619b54f3c4dfa26ffd83832e24ea0a743401b1e28c011316ab78b08c60cc76e42022bec58

data/lib/fly-ruby/configuration.rb

@@ -15,6 +15,7 @@ module Fly
     attr_accessor :database_url_env_var
     attr_accessor :database_host_env_var
     attr_accessor :database_port_env_var
+    attr_accessor :redis_url_env_var
 
     # Cookie written and read by this middleware storing a UNIX timestamp.
     # Requests arriving before this timestamp will be replayed in the primary region.
@@ -25,33 +26,61 @@ module Fly
     attr_accessor :replay_threshold_in_seconds
 
     attr_accessor :database_url
+    attr_accessor :redis_url
 
     def initialize
       self.primary_region = ENV["PRIMARY_REGION"]
       self.current_region = ENV["FLY_REGION"]
       self.replay_http_methods = ["POST", "PUT", "PATCH", "DELETE"]
       self.database_url_env_var = "DATABASE_URL"
+      self.redis_url_env_var = "REDIS_URL"
       self.database_host_env_var = "DATABASE_HOST"
       self.database_port_env_var = "DATABASE_PORT"
       self.replay_threshold_cookie = "fly-replay-threshold"
       self.replay_threshold_in_seconds = 5
       self.database_url = ENV[database_url_env_var]
+      self.redis_url = ENV[redis_url_env_var]
     end
 
-    def regional_database_uri
-      @uri ||= URI.parse(database_url)
-      @uri
+    def database_uri
+      @database_uri ||= URI.parse(database_url)
+      @database_uri
+    end
+
+    def regional_database_url
+      uri = database_uri.dup
+      uri.host = regional_database_host
+      uri.to_s
+    end
+
+    def regional_database_host
+      "#{current_region}.#{database_uri.hostname}"
     end
 
     # Rails-compatible database configuration
     def regional_database_config
       {
-        "host" => "#{current_region}.#{regional_database_uri.hostname}",
+        "host" => regional_database_host,
         "port" => 5433,
         "adapter" => "postgresql"
       }
     end
 
+    def redis_uri
+      @redis_uri ||= URI.parse(redis_url)
+      @redis_uri
+    end
+
+    def regional_redis_host
+      "#{current_region}.#{redis_uri.hostname}"
+    end
+
+    def regional_redis_url
+      uri = redis_uri.dup
+      uri.host = regional_redis_host
+      uri.to_s
+    end
+
     def eligible_for_activation?
       database_url && primary_region && current_region && web?
     end

data/lib/fly-ruby/railtie.rb

@@ -1,5 +1,3 @@
-require_relative '../fly-ruby'
-
 class Fly::Railtie < Rails::Railtie
   def hijack_database_connection
     ActiveSupport::Reloader.to_prepare do
@@ -30,7 +28,10 @@ class Fly::Railtie < Rails::Railtie
       app.config.middleware.insert_after ActionDispatch::Executor, 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
-      hijack_database_connection if Fly.configuration.in_secondary_region?
+
+      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,3 +1,3 @@
 module Fly
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua Sierles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack