roqua-support 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c71268f3678a8ff7501d5db547eb5edd6115cf7d403b3383ce3a6c959b0b86
-  data.tar.gz: 8442d43c71a5185051512d0055118c5607722308a902ce11965dfcfb2de549e3
+  metadata.gz: 76f68fbee8a7db03ddae10fbe3d141df7684d51dddf04b31ffe1928afb43c695
+  data.tar.gz: 71b36fe4a8d228e2cde4d0650b7fddfa7cf02d32e5020ec30cc4d8249acc2b6b
 SHA512:
-  metadata.gz: e97ed287127da20afee3bd07833bc6dc44e4548834518cf0ace7fe39685ace2bdbab4d20810dc51913a8b6d85c32129b590cc7fe45aa897976d50c9cc8565d91
-  data.tar.gz: a44868fd90c07f751c9b894d636d1c5c32be83d0ce37c81b094e4544439c47bd0e5a36d4a8bd8704b60420d42809785bfde60b4225b31b8dd5cc94686e5ff84c
+  metadata.gz: 628059e56300c65b3414e0f66b9cf883a5994cbb9299dd0c19a08d231ebf3de4454aed75383819f4fe812801b88c5ef7c426ba9163883b2b5acd4cd665d48ef3
+  data.tar.gz: 02f51d281d67e3c432ab4a5ba5e85ab8a7a89b7ca4851220c71400a2e444c470233c7be97c7f9f5a6f138c0907deb542ddfcb589c6c79eebff0660eea1af9f89

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    roqua-support (0.1.32)
+    roqua-support (0.1.33)
       active_interaction (~> 3.0)
       activesupport (>= 3.2, < 6)
       naught (~> 1.0)

data/README.md

@@ -48,6 +48,10 @@ require 'roqua/support/request_logger'
 Roqua::Support::RequestLogger.attach_to :action_controller
 ```
 
+Starting with Rails version 5 and up logging can be redirected to STDOUT by setting the `RAILS_LOG_TO_STDOUT` environment
+variable to a non blank value. roqua-support adds similar functionality by providing an alternative environment variable
+ - `RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER` - to send the logging output of the custom RoQua logger to STDOUT.
+
 ### Error reporting
 
 Log and error to Roqua.logger, appsignal and/or airbrake, depending on which is configured.

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.1.33'.freeze
+    VERSION = '0.1.34'.freeze
   end
 end

data/lib/roqua/logging/roqua_logging_railtie.rb

@@ -1,13 +1,25 @@
+
 class RoquaLoggingRailtie < Rails::Railtie
-  initializer 'roqua_logging_railtie.configure_roqua_logging' do
-    RoquaLoggingRailtie.configure if ENV['RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER'].present?
+  config.after_initialize do |app|
+    RoquaLoggingRailtie.configure
   end
 
-  def self.configure
-    Roqua.logger = ActiveSupport::Logger.new(STDOUT)
-    Roqua.logger.logger.formatter = Logger::Formatter.new
+  class << self
+    def configure
+      Roqua.logger = ActiveSupport::Logger.new(output_stream).tap do |logger|
+        logger.formatter = Logger::Formatter.new
+      end
+
+      require 'roqua/support/request_logger'
+      Roqua::Support::RequestLogger.attach_to :action_controller
+    end
 
-    require 'roqua/support/request_logger'
-    Roqua::Support::RequestLogger.attach_to :action_controller
+    def output_stream
+      if ENV['RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER'].present?
+        STDOUT
+      else
+        Rails.root.join("log/#{Rails.env}-events.log")
+      end
+    end
   end
 end

data/lib/roqua/support.rb

@@ -16,7 +16,7 @@ module Roqua
     end
 
     def logger
-      @logger ||= LogWrapper.new(Logger.new(STDOUT))
+      @logger || raise('Roqua.logger not yet initialized')
     end
 
     def logger=(logger)

data/spec/roqua/logging/roqua_logging_railtie_spec.rb

@@ -3,40 +3,40 @@ require 'spec_helper'
 require 'roqua/support/request_logger'
 require 'roqua/logging/roqua_logging_railtie'
 
-describe RoquaLoggingRailtie do
-  let(:initializer_key) { 'roqua_logging_railtie.configure_roqua_logging' }
-
-  subject(:initializer) do
-    Rails.application.initializers.select { |i| i.name == initializer_key }.first
-  end
-
-  it 'loads the initializer' do
-    expect(Rails.application.initializers.map(&:name)).to include(initializer_key)
+RSpec.shared_examples 'RoQua logging setup' do
+  def configure_roqua_logging(log_to_stdout)
+    ClimateControl.modify RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER: log_to_stdout do
+      RoquaLoggingRailtie.configure
+    end
   end
 
   it 'attaches Roqua::Support::RequestLogger to action_controller' do
     expect(Roqua::Support::RequestLogger).to receive(:attach_to).with(:action_controller)
-    RoquaLoggingRailtie.configure
+    configure_roqua_logging(log_to_stdout)
   end
+end
 
-  it 'logs to STDOUT' do
-    RoquaLoggingRailtie.configure
-    expect(ActiveSupport::Logger.logger_outputs_to?(Roqua.logger.logger, STDOUT)).to be_truthy
-  end
+Rspec.describe RoquaLoggingRailtie do
+  context 'when RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER is present' do
+    include_examples 'RoQua logging setup'
 
-  it 'when RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER is blank' do
-    expect(RoquaLoggingRailtie).to_not receive(:configure)
+    let(:log_to_stdout) { 'true' }
 
-    ClimateControl.modify RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER: '' do
-      initializer.block.call
+    it 'logs to STDOUT' do
+      expect(
+        ActiveSupport::Logger.logger_outputs_to?(Roqua.logger.logger, STDOUT)
+      ).to be_truthy
     end
   end
 
-  it 'when RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER is present' do
-    expect(RoquaLoggingRailtie).to receive(:configure)
+  context 'when RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER is blank' do
+    include_examples 'RoQua logging setup'
+
+    let(:log_to_stdout) { '' }
 
-    ClimateControl.modify RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER: 'true' do
-      initializer.block.call
+    it 'logs to a log file' do
+      expect(Roqua.logger.logger.instance_variable_get("@logdev").dev.path)
+        .to eql(Rails.root.join('log/test-events.log').to_s)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction