Merge branch 'main' into feature/dont-execute-block-if-severity-less-than-level

Author: timriley

.github/workflows/ci.yml

@@ -24,6 +24,8 @@ jobs:
 
         - 3.3
 
+        - 3.3.0
+        
         - 3.2
 
         - 3.1
@@ -45,6 +47,13 @@ jobs:
           bundler-cache: true
       - name: Run all tests
         run: bundle exec rake
+  workflow-keepalive:
+    if: github.event_name == 'schedule'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - uses: liskin/gh-workflow-keepalive@v1
   release:
     runs-on: ubuntu-latest
     if: contains(github.ref, 'tags') && github.event_name == 'create'

dry-logger.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
+  spec.extra_rdoc_files = ["README.md", "CHANGELOG.md", "LICENSE"]
+
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-logger/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-logger"
@@ -32,6 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  
 end
 

lib/dry/logger/dispatcher.rb

@@ -213,7 +213,12 @@ def log(severity, message = nil, **payload, &block)
         else
           if block
             progname = message
-            message = block.call
+            block_result = block.call
+            case block_result
+            when Hash then payload = block_result
+            else
+              message = block_result
+            end
           end
           progname ||= id
 

spec/dry/logger_spec.rb

@@ -34,16 +34,30 @@
       expect(output).to match(message)
     end
 
+    it "logs to $stdout by default using a payload block" do
+      logger.info { {test: true} }
+
+      expect(output).to match("test=true")
+    end
+
     it "logs to $stdout by default using a plain text block message and payload" do
       message = "hello, world"
 
       logger.info(test: true) { message }
 
       expect(output).to match("#{message} test=true")
     end
+    
+    it "logs to $stdout by default using a plain text message and payload block" do
+      message = "hello, world"
+
+      logger.info(message) { {test: true} }
+
+      expect(output).to match("#{message} test=true")
+    end
 
     it "does not execute the block if severity is higher" do
-      logger.debug { raise }
+      logger.debug { raise }      
     end
   end