ruby_smart-simple_logger 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f5d3ae3592f31b6c012044205c37d859c9e809d58f8cce63c7b6b2ed634829
-  data.tar.gz: d50becd65a8386e2466ddebcbbbd6bf2ec92aad95f4c5ae76288974429d607bc
+  metadata.gz: f93f509aad065f314393b0b7f630694091fb06c967bc20ad1fe4e0b7683f843b
+  data.tar.gz: 9d5a325fac9bc01ad330cec1c1c31a9bc3f5602e1934893b04ab5f3baed22ac0
 SHA512:
-  metadata.gz: dbe6aab96f5a2f67f85fd5147462d65e0f8496a1271406710f4d9e8b5df3a245c8f7e1292a9ac3f548973a204442332abafe21a8a97b6724f25a513b3eef7148
-  data.tar.gz: 5165beba92525197a3d9359bc7513c15e4aa6057a3bea5902870541141fe9ca4fdb3b4f6270eefcbbbf7ca75aff209e03cf39d4d8eb00d34e3292a45e71960ad
+  metadata.gz: 5b4b91d4c70cd0e373af89191b9147739a55443e851ffdc8751e3853d833e04f59cd9aa6d125a60c752e924686a190d8bd492560860e91d18749af48adc210d4
+  data.tar.gz: 5cb89dd0a2cf9b77f3ce2cbc4bcf7c9f8ee218fb9030a16c9bba0259ac5ca16bf82fcdffef2602533b567b2591d94f672662a46e3562b8a1fdee398980137718

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # RubySmart::SimpleLogger - CHANGELOG
 
+## [1.2.2] - 2023-03-15
+* **[ref]** simplify device-generation for builtins 
+* **[fix]** `ActionView::Helpers::DateHelper` require, which breaks rails loading process in some cases
+
 ## [1.2.1] - 2023-02-17
 * **[fix]** 'rails'-related builtins
 * **[fix]** `::RubySmart::SimpleLogger::Devices::MultiDevice` register `MultiDevice` instead of nested devices

data/lib/ruby_smart/simple_logger/extensions/helper.rb

@@ -61,36 +61,30 @@ module RubySmart
           # check for already existing +device+
           return if opts[:device]
 
-          # remove builtin key from opts
-          builtin = opts.delete(:builtin)
+          # remove builtin key from opts and force an array
+          builtins = Array(opts.delete(:builtin))
 
-          # retransform array into single value
-          builtin = builtin[0] if builtin.is_a?(Array) && builtin.length < 2
+          # expand builtins with stdout
+          builtins << :stdout if opts.delete(:stdout)
 
-          # expand current builtin with optional provided keywords
-          if opts.delete(:stdout)
-            builtin = [builtin] unless builtin.is_a?(Array)
-            builtin << :stdout
-          end
+          # expand builtins with memory
+          builtins << :memory if opts.delete(:memory)
 
-          if opts.delete(:memory)
-            builtin = [builtin] unless builtin.is_a?(Array)
-            builtin << :memory
-          end
+          builtins.uniq!
 
-          # determinate builtin - first check to create +MultiDevice+.
-          if builtin.is_a?(Array)
+          # don't create multi-device for a single (or +nil+) builtin
+          if builtins.length < 2
+            opts[:device] = _resolve_device(builtins[0], opts)
+          else
             opts[:device] = ::RubySmart::SimpleLogger::Devices::MultiDevice.new
-            builtin.uniq.each do |key|
+            builtins.each do |builtin|
               # IMPORTANT: dup, original hash to prevent reference manipulation (on the TOP-level, only)
               builtin_opts = opts.dup
-              opts[:device].register(_resolve_device(key, builtin_opts), _resolve_formatter(builtin_opts))
+              opts[:device].register(_resolve_device(builtin, builtin_opts), _resolve_formatter(builtin_opts))
             end
 
             # force 'passthrough', as format, since this is required for multi-devices
             opts[:format] = :passthrough
-          else
-            opts[:device] = _resolve_device(builtin, opts)
           end
 
           # prevent to return any data

data/lib/ruby_smart/simple_logger/gem_version.rb

@@ -10,7 +10,7 @@ module RubySmart
     module VERSION
       MAJOR = 1
       MINOR = 2
-      TINY  = 1
+      TINY  = 2
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/ruby_smart/simple_logger.rb

@@ -17,9 +17,8 @@ module RubySmart
 end
 
 # load date extensions for logger
-if GemInfo.loaded?('activesupport') && GemInfo.installed?('actionview')
-  ActiveSupport.on_load(:active_record) do
-    require('action_view/helpers/date_helper')
-    RubySmart::SimpleLogger::Logger.include(ActionView::Helpers::DateHelper)
-  end
+# since 'actionview' is loaded in different ways, we only can check for +installed?+ here...
+if GemInfo.installed?('actionview')
+  # IMPORTANT: any require will break the loading process
+  RubySmart::SimpleLogger::Logger.include(ActionView::Helpers::DateHelper) unless RubySmart::SimpleLogger::Logger.included_modules.include?(ActionView::Helpers::DateHelper)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smart-simple_logger
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Tobias Gonsior
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_smart-support