glib-web 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc0677c6f29166100884d7d415d3f85a5caaef4
-  data.tar.gz: 1d9ab884a48db31bc4957d86b43370938bc5fefc
+  metadata.gz: 65d643ab1cf84d5f4dabe58840e51d4b1d13a5cf
+  data.tar.gz: 2f01ef5b09d5727aa64994b1d5ba96623ec86ecf
 SHA512:
-  metadata.gz: 5f890e2878ee7d3ac12030008b81c703e3a2398b4ed22b829294ca33d28391a01e656fd7d5ae5362e81e50aeeaae80ab4ff2ea36bb4c101a85c83c77062c50d3
-  data.tar.gz: 3bb000732b8dcc373ee166cdd91bc0d6ef601ab9d74adc427d345e7daad9ca2a840026367059754178a4c2e1c22bda7ae9aa2bcdd09042ab96eced346f53334c
+  metadata.gz: 0413434aeaafd7a0cafd4f550370f9247455cb35eef898afe0fa826b3aae538fbcc0a6496093ad26984bac90f8a4de523f7c5a6355d086b2295ca8ccd8af7d05
+  data.tar.gz: 874e956236407a17bfb7d5731387f0c91c67d7234f1a6d64604938b51f7969e650490d0eed6c95d5b1e6e2db36766c52a4e7a5d92ec25eca908b8c446dcd280e

data/app/models/glib/active_storage/attachment.rb

@@ -1,9 +1,9 @@
 module Glib
   module ActiveStorage
     class Attachment < ::ActiveStorage::Attachment
-      if respond_to? :connects_to
+      if Glib::DynamicText::Config.database_url.present?
         connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
       end
     end
   end
-end
+end

data/app/models/glib/active_storage/blob.rb

@@ -1,9 +1,9 @@
 module Glib
   module ActiveStorage
     class Blob < ::ActiveStorage::Blob
-      if respond_to? :connects_to
+      if Glib::DynamicText::Config.database_url.present?
         connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
       end
     end
   end
-end
+end

data/app/models/glib/dynamic_text_record.rb

@@ -2,10 +2,8 @@ module Glib
   class DynamicTextRecord < ActiveRecord::Base
     self.abstract_class = true
 
-    # DT is only supported in Rails 6 but make sure things still work in Rails 5.
-    # TODO: Remove this check once we don't support Rails 5 anymore
-    if respond_to? :connects_to
+    if Glib::DynamicText::Config.database_url.present?
       connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
     end
   end
-end
+end

data/lib/glib/dynamic_text/config.rb

@@ -0,0 +1,20 @@
+module Glib
+  module DynamicText
+    class Config
+      @@redis = nil
+      @@database_url = ENV['DT_DATABASE_URL']
+
+      def self.redis
+        if @@redis.nil?
+          redis_url = ENV.fetch('DT_REDIS_URL', 'redis://localhost:6379')
+          @@redis = Redis.new(url: redis_url)
+        end
+        @@redis
+      end
+
+      def self.database_url
+        @@database_url
+      end
+    end
+  end
+end

data/lib/glib/dynamic_text.rb

@@ -0,0 +1 @@
+require_relative './dynamic_text/config'

data/lib/glib-web.rb

@@ -1,4 +1,6 @@
 require "glib/version"
 require "glib/engine" if defined?(::Rails)
 require "glib/value"
-require "glib/json_crawler"
+require "glib/json_crawler"
+
+require 'glib/dynamic_text'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - ''
@@ -171,6 +171,8 @@ files:
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
+- lib/glib/dynamic_text.rb
+- lib/glib/dynamic_text/config.rb
 - lib/glib/engine.rb
 - lib/glib/json_crawler.rb
 - lib/glib/json_crawler/action_crawler.rb