forest_liana 6.3.8 → 6.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/initializers/logger.rb +16 -13
- data/lib/forest_liana.rb +2 -0
- data/lib/forest_liana/version.rb +1 -1
- data/spec/config/initializers/logger_spec.rb +30 -0
- metadata +3 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 13952d2e70b5b32f326839ad76067ec236adda426152fd116e4836141d92efc7
|
4
|
+
data.tar.gz: '026179b31057b1ce2bb8b60f6bae5a529467941d27a57c12a897028f4ce8d7bc'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '04698769547e0fd18c1720bf247365e6631ac8ef1715967932ab65d01dc9baef9086d017d5623c080cef6b11b72c4e50d4163584b3e6c89538b2fc85bb77cffe'
|
7
|
+
data.tar.gz: 021f90c8f6ec1962d7761503554e92274d4eb48c6071ab00127cd5fb44ec7243a66d44069d3eafface9ac09b81a5f545fe93b0bb7f92ac2bfeb857622ec688fc
|
@@ -3,21 +3,24 @@ module ForestLiana
|
|
3
3
|
class Logger
|
4
4
|
class << self
|
5
5
|
def log
|
6
|
-
logger
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
6
|
+
if ForestLiana.logger != nil
|
7
|
+
logger = ForestLiana.logger
|
8
|
+
else
|
9
|
+
logger = ::Logger.new(STDOUT)
|
10
|
+
logger_colors = {
|
11
|
+
DEBUG: 34,
|
12
|
+
WARN: 33,
|
13
|
+
ERROR: 31,
|
14
|
+
INFO: 37
|
15
|
+
}
|
13
16
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
17
|
+
logger.formatter = proc do |severity, datetime, progname, message|
|
18
|
+
displayed_message = "[#{datetime.to_s(:db)}] Forest 🌳🌳🌳 " \
|
19
|
+
"#{message}\n"
|
20
|
+
"\e[#{logger_colors[severity.to_sym]}m#{displayed_message}\033[0m"
|
21
|
+
end
|
22
|
+
logger
|
18
23
|
end
|
19
|
-
|
20
|
-
logger
|
21
24
|
end
|
22
25
|
end
|
23
26
|
end
|
data/lib/forest_liana.rb
CHANGED
@@ -27,6 +27,7 @@ module ForestLiana
|
|
27
27
|
mattr_accessor :user_class_name
|
28
28
|
mattr_accessor :names_overriden
|
29
29
|
mattr_accessor :meta
|
30
|
+
mattr_accessor :logger
|
30
31
|
# TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
|
31
32
|
mattr_accessor :names_old_overriden
|
32
33
|
|
@@ -38,6 +39,7 @@ module ForestLiana
|
|
38
39
|
self.user_class_name = nil
|
39
40
|
self.names_overriden = {}
|
40
41
|
self.meta = {}
|
42
|
+
self.logger = nil
|
41
43
|
|
42
44
|
@config_dir = 'lib/forest_liana/**/*.rb'
|
43
45
|
|
data/lib/forest_liana/version.rb
CHANGED
@@ -0,0 +1,30 @@
|
|
1
|
+
module ForestLiana
|
2
|
+
describe Logger do
|
3
|
+
describe 'self.log' do
|
4
|
+
describe 'with a logger overload' do
|
5
|
+
it 'should return the given logger' do
|
6
|
+
logger = ActiveSupport::Logger.new($stdout)
|
7
|
+
logger.formatter = proc do |severity, datetime, progname, msg|
|
8
|
+
{:message => msg}.to_json
|
9
|
+
end
|
10
|
+
ForestLiana.logger = logger
|
11
|
+
|
12
|
+
expect(Logger.log.is_a?(ActiveSupport::Logger)).to be_truthy
|
13
|
+
expect { Logger.log.error "[error] override logger" }.to output({:message => "[error] override logger"}.to_json).to_stdout_from_any_process
|
14
|
+
expect { Logger.log.info "[info] override logger" }.to output({:message => "[info] override logger"}.to_json).to_stdout_from_any_process
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
describe 'with no logger overload' do
|
19
|
+
it 'should return an instance of ::Logger' do
|
20
|
+
ForestLiana.logger = nil
|
21
|
+
|
22
|
+
expect(Logger.log.is_a?(::Logger)).to be_truthy
|
23
|
+
# RegExp is used to check for the forestadmin logger format
|
24
|
+
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
|
25
|
+
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
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: forest_liana
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.
|
4
|
+
version: 6.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sandro Munda
|
@@ -316,6 +316,7 @@ files:
|
|
316
316
|
- lib/generators/forest_liana/install_generator.rb
|
317
317
|
- lib/tasks/display_apimap.rake
|
318
318
|
- lib/tasks/send_apimap.rake
|
319
|
+
- spec/config/initializers/logger_spec.rb
|
319
320
|
- spec/dummy/README.rdoc
|
320
321
|
- spec/dummy/Rakefile
|
321
322
|
- spec/dummy/app/assets/config/manifest.js
|
@@ -607,6 +608,7 @@ test_files:
|
|
607
608
|
- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
|
608
609
|
- spec/services/forest_liana/apimap_sorter_spec.rb
|
609
610
|
- spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
|
611
|
+
- spec/config/initializers/logger_spec.rb
|
610
612
|
- spec/helpers/forest_liana/is_same_data_structure_helper_spec.rb
|
611
613
|
- spec/helpers/forest_liana/schema_helper_spec.rb
|
612
614
|
- spec/helpers/forest_liana/query_helper_spec.rb
|