logster 2.18.1 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458b61f1575d79c07dcf2c72f92dec4061d6edb6ba3d7a56d1b14052f1a73576
-  data.tar.gz: b650d05bf9da5481331c2c81a3755156cead5b61dfa9148321ef6d0387fa0d7b
+  metadata.gz: 8d640ece62f8205d8c641562f84783cb0f66fca777f39aaf55dc52f8ea65c760
+  data.tar.gz: 9b1462d284873256db1efeac24ef63a88603597d62e17d9664c52cd6e815e13a
 SHA512:
-  metadata.gz: 27f0c1453dd626f4d65d720546d9e704bc03d49803e27ef83863c10c114cf7330746baf25e8a2b0eaafee1c4adccbd07719ce0ee5394be6c69fb2764d04dcf02
-  data.tar.gz: d43192c5dcdddece5ebbbec99bedd606f696dc7d3bff0ac4e02051ba36c6693008a8837081ea78377e4856ee87babe0b3081e979e03ea4038871e43b12230f8e
+  metadata.gz: 2853f439922309af9b48d467d5addaf6724d5ba13942ff82bc14970493e2483cc87dbc9ce380f83314f34dc83b3af8b44e8a23c109eacab7e916b413bbe1551a
+  data.tar.gz: ee0e674832871b45699489cae2e91057a33074927053083efd5ae11291a4c76690f62e5c503f8e1e99e19eabda7fbc617cee77e0e983ad3ecf0921f0594288a6

data/.github/workflows/ci.yml

@@ -10,6 +10,8 @@ jobs:
   backend:
     runs-on: ubuntu-latest
 
+    name: "Ruby ${{ matrix.ruby }} - Rails ${{ matrix.rails }}"
+
     services:
       redis:
         image: redis
@@ -18,7 +20,11 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile
 
     steps:
       - uses: actions/checkout@v3
@@ -42,9 +48,12 @@ jobs:
       - name: Build JS app
         run: bash build_client_app.sh
 
-      - name: Tests
+      - name: Tests (no Rails)
         run: bundle exec rake test
 
+      - name: Tests (Railtie)
+        run: bundle exec rake test TEST=test/logster/test_railtie.rb
+
   frontend:
     runs-on: ubuntu-latest
 

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-- 2024002-19: 2.18.1
+- 2024-02-28: 2.19.0
+
+  - FIX: Add compatibility with Rails 7.1+
+
+- 2024-02-19: 2.18.1
 
   - UX: backlink in dark mode has a dark background
 

data/Gemfile

@@ -4,3 +4,7 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rack-log-viewer.gemspec
 gemspec
+
+group :development, :test do
+  gem "rails", ">= 6.1"
+end

data/Rakefile

@@ -4,7 +4,7 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new do |t|
-  t.pattern = "test/**/test_*.rb"
+  t.test_files = FileList["test/**/test_*"].exclude(%r{test/logster/test_railtie\.rb})
 end
 
 task(default: :test)
@@ -12,7 +12,10 @@ task(default: :test)
 desc "Starts Sinatra and Ember servers"
 task :client_dev do
   begin
-    pid = spawn("cd website && LOGSTER_ENV=development BUNDLE_GEMFILE=Gemfile bundle exec rackup --host 0.0.0.0")
+    pid =
+      spawn(
+        "cd website && LOGSTER_ENV=development BUNDLE_GEMFILE=Gemfile bundle exec rackup --host 0.0.0.0",
+      )
     pid2 = spawn("cd client-app && npx ember s --proxy http://localhost:9292")
     Process.wait pid
     Process.wait pid2

data/assets/javascript/{chunk.143.260395dfb82bdb155d19.js → chunk.143.007c0b8cac64ca844382.js}

@@ -1,6 +1,6 @@
 var __ember_auto_import__
-!function(){var e,r={568:function(e,r,n){var o,t
-e.exports=(o=_eai_d,t=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?t("_eai_dyn_"+e):t("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return t("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},o("__v1-addons__early-boot-set__",[],(function(){})),void o("sinon",["__v1-addons__early-boot-set__"],(function(){return n(468)})))},272:function(e,r){window._eai_r=require,window._eai_d=define}},n={}
+!function(){var e,r={530:function(e,r,n){var o,t
+e.exports=(o=_eai_d,t=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?t("_eai_dyn_"+e):t("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return t("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},o("__v1-addons__early-boot-set__",[],(function(){})),void o("sinon",["__v1-addons__early-boot-set__"],(function(){return n(468)})))},477:function(e,r){window._eai_r=require,window._eai_d=define}},n={}
 function o(e){var t=n[e]
 if(void 0!==t)return t.exports
 var i=n[e]={exports:{}}
@@ -17,6 +17,6 @@ var r=function(r,n){var t,i,u=n[0],_=n[1],a=n[2],f=0
 if(u.some((function(r){return 0!==e[r]}))){for(t in _)o.o(_,t)&&(o.m[t]=_[t])
 if(a)var c=a(o)}for(r&&r(n);f<u.length;f++)i=u[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0
 return o.O(c)},n=self.webpackChunk_ember_auto_import_=self.webpackChunk_ember_auto_import_||[]
-n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))}(),o.O(void 0,[468],(function(){return o(272)}))
-var t=o.O(void 0,[468],(function(){return o(568)}))
+n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))}(),o.O(void 0,[468],(function(){return o(477)}))
+var t=o.O(void 0,[468],(function(){return o(530)}))
 t=o.O(t),__ember_auto_import__=t}()

data/assets/javascript/{chunk.178.f01fdd20b1a3e2bdb6af.js → chunk.178.c0a58aba01c86271384b.js}

@@ -1,5 +1,5 @@
 var __ember_auto_import__
-!function(){var r,n={272:function(r,n){window._eai_r=require,window._eai_d=define},576:function(r,n,e){var t,o
+!function(){var r,n={477:function(r,n){window._eai_r=require,window._eai_d=define},887:function(r,n,e){var t,o
 r.exports=(t=_eai_d,o=_eai_r,window.emberAutoImportDynamic=function(r){return 1===arguments.length?o("_eai_dyn_"+r):o("_eai_dynt_"+r)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(r){return o("_eai_sync_"+r)(Array.prototype.slice.call(arguments,1))},t("__v1-addons__early-boot-set__",[],(function(){})),void t("qunit",["__v1-addons__early-boot-set__"],(function(){return e(916)})))}},e={}
 function t(r){var o=e[r]
 if(void 0!==o)return o.exports
@@ -17,6 +17,6 @@ var n=function(n,e){var o,i,_=e[0],u=e[1],a=e[2],c=0
 if(_.some((function(n){return 0!==r[n]}))){for(o in u)t.o(u,o)&&(t.m[o]=u[o])
 if(a)var f=a(t)}for(n&&n(e);c<_.length;c++)i=_[c],t.o(r,i)&&r[i]&&r[i][0](),r[i]=0
 return t.O(f)},e=self.webpackChunk_ember_auto_import_=self.webpackChunk_ember_auto_import_||[]
-e.forEach(n.bind(null,0)),e.push=n.bind(null,e.push.bind(e))}(),t.O(void 0,[916],(function(){return t(272)}))
-var o=t.O(void 0,[916],(function(){return t(576)}))
+e.forEach(n.bind(null,0)),e.push=n.bind(null,e.push.bind(e))}(),t.O(void 0,[916],(function(){return t(477)}))
+var o=t.O(void 0,[916],(function(){return t(887)}))
 o=t.O(o),__ember_auto_import__=o}()

data/assets/javascript/client-app.js

@@ -1387,4 +1387,4 @@ var r=(0,t.createTemplateFactory)({id:"qqSpoh9d",block:'[[[10,0],[14,0,"settings
 e.default=r})),define("client-app/templates/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var r=(0,t.createTemplateFactory)({id:"d6AYgHoB",block:'[[[8,[39,0],[[24,0,"recent-link"]],[["@route"],["index"]],[["default"],[[[[1,"Recent"]],[]]]]],[1,"\\n\\n"],[10,0],[14,1,"bottom-panel"],[14,0,"full"],[12],[1,"\\n  "],[8,[39,1],null,[["@currentMessage","@showTitle","@removeMessage","@solveMessage","@envChangedAction","@currentEnvPosition","@actionsInMenu"],[[30,0,["model"]],"true",[30,0,["removeMessage"]],[30,0,["solveMessage"]],[30,0,["envChanged"]],[30,0,["envPosition"]],false]],null],[1,"\\n"],[13]],[],false,["link-to","message-info"]]',moduleName:"client-app/templates/show.hbs",isStrictMode:!1})
 e.default=r})),define("client-app/config/environment",[],(function(){try{var e="client-app/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),r={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(r,"__esModule",{value:!0}),r}catch(n){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+94d51435"})
+return Object.defineProperty(r,"__esModule",{value:!0}),r}catch(n){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+a023d778"})

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :test do
+  gem "rails", "~> 6.1.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :test do
+  gem "rails", "~> 7.0.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :test do
+  gem "rails", "~> 7.1.0"
+end
+
+gemspec path: "../"

data/lib/logster/configuration.rb

@@ -46,9 +46,7 @@ module Logster
 
       @allow_grouping = false
 
-      if defined?(::Rails) && defined?(::Rails.env) && ::Rails.env.production?
-        @allow_grouping = true
-      end
+      @allow_grouping = true if defined?(::Rails.env) && ::Rails.env.production?
     end
 
     def subdirectory

data/lib/logster/rails/railtie.rb

@@ -5,32 +5,39 @@ module Logster::Rails
   class Engine < Rails::Engine
   end
 
-  def self.set_logger(config)
-    return unless Logster.config.environments.include?(Rails.env.to_sym)
+  class << self
+    def set_logger(config)
+      return unless Logster.config.environments.include?(Rails.env.to_sym)
 
-    require "logster/middleware/debug_exceptions"
-    require "logster/middleware/reporter"
+      require "logster/middleware/debug_exceptions"
+      require "logster/middleware/reporter"
 
-    store = Logster.store ||= Logster::RedisStore.new
-    store.level = Logger::Severity::WARN if Rails.env.production?
+      store = Logster.store ||= Logster::RedisStore.new
+      store.level = Logger::Severity::WARN if Rails.env.production?
 
-    if Rails.env.development?
-      require "logster/defer_logger"
-      logger = Logster::DeferLogger.new(store)
-    else
-      logger = Logster::Logger.new(store)
-    end
+      if Rails.env.development?
+        require "logster/defer_logger"
+        logger = Logster::DeferLogger.new(store)
+      else
+        logger = Logster::Logger.new(store)
+      end
 
-    logger.chain(::Rails.logger)
-    logger.level = ::Rails.logger.level
+      logger.level = ::Rails.logger.level
 
-    Logster.logger = ::Rails.logger = config.logger = logger
-  end
+      Logster.logger = config.logger = logger
 
-  def self.initialize!(app)
-    return unless Logster.config.environments.include?(Rails.env.to_sym)
+      if rails_71?
+        ::Rails.logger.broadcast_to(logger)
+      else
+        logger.chain(::Rails.logger)
+        ::Rails.logger = logger
+      end
+    end
+
+    def initialize!(app)
+      return unless Logster.config.environments.include?(Rails.env.to_sym)
+      return unless logster_enabled?
 
-    if Logster::Logger === Rails.logger
       if Logster.config.enable_js_error_reporting
         app.middleware.insert_before ActionDispatch::ShowExceptions, Logster::Middleware::Reporter
       end
@@ -52,6 +59,17 @@ module Logster::Rails
         Logster.config.application_version = git_version.strip if git_version.present?
       end
     end
+
+    private
+
+    def logster_enabled?
+      return ::Rails.logger == Logster.logger unless rails_71?
+      ::Rails.logger.broadcasts.include?(Logster.logger)
+    end
+
+    def rails_71?
+      ::Rails.version >= "7.1"
+    end
   end
 
   class Railtie < ::Rails::Railtie

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.18.1"
+  VERSION = "2.19.0"
 end

data/lib/logster.rb

@@ -57,4 +57,4 @@ end
 # check logster/configuration.rb for config options
 # Logster.config.environments << :staging
 
-require "logster/rails/railtie" if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
+require "logster/rails/railtie" if defined?(::Rails::VERSION) && ::Rails::VERSION::MAJOR.to_i >= 3

data/logster.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug", "~> 11.1.0"
   spec.add_development_dependency "rubocop-discourse", "~> 2.4.1"
   spec.add_development_dependency "syntax_tree"
+  spec.add_development_dependency "sqlite3"
 end

data/test/dummy/config/application.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require_relative "boot"
+
+require "active_record/railtie"
+require "action_controller/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+require "logster"
+
+module Dummy
+  class Application < Rails::Application
+    config.load_defaults Rails::VERSION::STRING.to_f
+
+    # For compatibility with applications that use this config
+    config.action_controller.include_all_helpers = false
+
+    config.eager_load = false
+
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
+    Logster.set_environments([Rails.env.to_sym])
+  end
+end

data/test/dummy/config/boot.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+# Set up gems listed in the Gemfile.
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
+
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/test/dummy/config/environment.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+# Load the Rails application.
+require_relative "application"
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/test/logster/test_railtie.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+ENV["RAILS_ENV"] = "test"
+
+require "redis"
+require_relative "../dummy/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("dummy/db/migrate", __dir__)]
+
+require_relative "../test_helper"
+
+class TestRailtie < Minitest::Test
+  def test_sets_logger
+    refute_nil Logster.logger
+
+    if Rails.version >= "7.1"
+      assert_includes Rails.logger.broadcasts, Logster.logger
+    else
+      assert_equal Rails.logger, Logster.logger
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.19.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: UI for viewing logs in Rack
 email:
 - sam.saffron@gmail.com
@@ -172,8 +186,8 @@ files:
 - assets/images/icon_144x144.png
 - assets/images/icon_64x64.png
 - assets/javascript/.gitkeep
-- assets/javascript/chunk.143.260395dfb82bdb155d19.js
-- assets/javascript/chunk.178.f01fdd20b1a3e2bdb6af.js
+- assets/javascript/chunk.143.007c0b8cac64ca844382.js
+- assets/javascript/chunk.178.c0a58aba01c86271384b.js
 - assets/javascript/chunk.468.95dd450003497c781cb3.js
 - assets/javascript/chunk.916.85a3fc9d873df80f5ea5.js
 - assets/javascript/client-app.js
@@ -263,6 +277,9 @@ files:
 - client-app/tests/unit/routes/index-test.js
 - client-app/tests/unit/routes/show-test.js
 - client-app/yarn.lock
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
 - lib/examples/sidekiq_logster_reporter.rb
 - lib/logster.rb
 - lib/logster/base_store.rb
@@ -286,6 +303,9 @@ files:
 - lib/logster/version.rb
 - lib/logster/web.rb
 - logster.gemspec
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
 - test/examples/test_sidekiq_reporter_example.rb
 - test/fake_data/Gemfile
 - test/fake_data/generate.rb
@@ -299,6 +319,7 @@ files:
 - test/logster/test_logger.rb
 - test/logster/test_message.rb
 - test/logster/test_pattern.rb
+- test/logster/test_railtie.rb
 - test/logster/test_redis_rate_limiter.rb
 - test/logster/test_redis_store.rb
 - test/test_helper.rb
@@ -327,6 +348,9 @@ signing_key:
 specification_version: 4
 summary: UI for viewing logs in Rack
 test_files:
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
 - test/examples/test_sidekiq_reporter_example.rb
 - test/fake_data/Gemfile
 - test/fake_data/generate.rb
@@ -340,6 +364,7 @@ test_files:
 - test/logster/test_logger.rb
 - test/logster/test_message.rb
 - test/logster/test_pattern.rb
+- test/logster/test_railtie.rb
 - test/logster/test_redis_rate_limiter.rb
 - test/logster/test_redis_store.rb
 - test/test_helper.rb