forest_liana 6.3.8 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0fd5ef4e67fd45b6a701da7dbf8da36d6f6abb3d9e2be4d0031d0495a10727a
-  data.tar.gz: 9c823060491af5ff42f098e041ffe9f2ac672865c4a790e4b8bb3f1bb1e7447b
+  metadata.gz: 13952d2e70b5b32f326839ad76067ec236adda426152fd116e4836141d92efc7
+  data.tar.gz: '026179b31057b1ce2bb8b60f6bae5a529467941d27a57c12a897028f4ce8d7bc'
 SHA512:
-  metadata.gz: c6a0639f27ebecd6f7e66e83bbdc527a08e0483435e6485c80ed66f45832c886ef50cb46402a4b74b1ff8cc6b8f284419f53fd1ebebf532c57fe089d2d0bdec6
-  data.tar.gz: 0e329ab499ed3b2414c50097f3b2cad74733c0bc51db835b25bb1a9713229f8feb6f42ad1b7fa3a038f73e357dc46bc3cad0fc6f6ad61224f306c644d02fbf1e
+  metadata.gz: '04698769547e0fd18c1720bf247365e6631ac8ef1715967932ab65d01dc9baef9086d017d5623c080cef6b11b72c4e50d4163584b3e6c89538b2fc85bb77cffe'
+  data.tar.gz: 021f90c8f6ec1962d7761503554e92274d4eb48c6071ab00127cd5fb44ec7243a66d44069d3eafface9ac09b81a5f545fe93b0bb7f92ac2bfeb857622ec688fc

data/config/initializers/logger.rb

@@ -3,21 +3,24 @@ module ForestLiana
   class Logger
     class << self
       def log
-        logger = ::Logger.new(STDOUT)
-        logger_colors = {
-          DEBUG: 34,
-          WARN: 33,
-          ERROR: 31,
-          INFO: 37
-        }
+        if ForestLiana.logger != nil
+          logger = ForestLiana.logger
+        else
+          logger = ::Logger.new(STDOUT)
+          logger_colors = {
+            DEBUG: 34,
+            WARN: 33,
+            ERROR: 31,
+            INFO: 37
+          }
 
-        logger.formatter = proc do |severity, datetime, progname, message|
-          displayed_message = "[#{datetime.to_s(:db)}] Forest 🌳🌳🌳  " \
-            "#{message}\n"
-          "\e[#{logger_colors[severity.to_sym]}m#{displayed_message}\033[0m"
+          logger.formatter = proc do |severity, datetime, progname, message|
+            displayed_message = "[#{datetime.to_s(:db)}] Forest 🌳🌳🌳  " \
+                  "#{message}\n"
+                "\e[#{logger_colors[severity.to_sym]}m#{displayed_message}\033[0m"
+            end
+          logger
         end
-
-        logger
       end
     end
   end

data/lib/forest_liana.rb

@@ -27,6 +27,7 @@ module ForestLiana
   mattr_accessor :user_class_name
   mattr_accessor :names_overriden
   mattr_accessor :meta
+  mattr_accessor :logger
   # TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
   mattr_accessor :names_old_overriden
 
@@ -38,6 +39,7 @@ module ForestLiana
   self.user_class_name = nil
   self.names_overriden = {}
   self.meta = {}
+  self.logger = nil
 
   @config_dir = 'lib/forest_liana/**/*.rb'
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.3.8"
+  VERSION = "6.4.0"
 end

data/spec/config/initializers/logger_spec.rb

@@ -0,0 +1,30 @@
+module ForestLiana
+  describe Logger do
+    describe 'self.log' do
+      describe 'with a logger overload' do
+        it 'should return the given logger' do
+          logger = ActiveSupport::Logger.new($stdout)
+          logger.formatter = proc do |severity, datetime, progname, msg|
+            {:message => msg}.to_json
+          end
+          ForestLiana.logger = logger
+
+          expect(Logger.log.is_a?(ActiveSupport::Logger)).to be_truthy
+          expect { Logger.log.error "[error] override logger" }.to output({:message => "[error] override logger"}.to_json).to_stdout_from_any_process
+          expect { Logger.log.info "[info] override logger" }.to output({:message => "[info] override logger"}.to_json).to_stdout_from_any_process
+        end
+      end
+
+      describe 'with no logger overload' do
+        it 'should return an instance of ::Logger' do
+          ForestLiana.logger = nil
+
+          expect(Logger.log.is_a?(::Logger)).to be_truthy
+          # RegExp is used to check for the forestadmin logger format
+          expect { Logger.log.error "[error] default logger" }.to output(/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] Forest .* \[error\]/).to_stdout_from_any_process
+          expect { Logger.log.info "[info] default logger" }.to output(/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] Forest .* \[info\]/).to_stdout_from_any_process
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.3.8
+  version: 6.4.0
 platform: ruby
 authors:
 - Sandro Munda
@@ -316,6 +316,7 @@ files:
 - lib/generators/forest_liana/install_generator.rb
 - lib/tasks/display_apimap.rake
 - lib/tasks/send_apimap.rake
+- spec/config/initializers/logger_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -607,6 +608,7 @@ test_files:
 - spec/services/forest_liana/permissions_checker_live_queries_spec.rb
 - spec/services/forest_liana/apimap_sorter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
+- spec/config/initializers/logger_spec.rb
 - spec/helpers/forest_liana/is_same_data_structure_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
 - spec/helpers/forest_liana/query_helper_spec.rb