yake 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66fbefc1075634cd8d1e600c992aef045c440a19715f66296695b3cc0c38d45a
-  data.tar.gz: 9d629c68d1ed720382aacefb67608112b404e72488fd6dc4a8b3264cc9b66f56
+  metadata.gz: d97920003245ea42fec1eb6c56d1addc53a743e8a21540f51a86719fb3fe69aa
+  data.tar.gz: 34f51c677d95df8c6773122838815bfd9cf6124177d03192b5f15cc591ff92d1
 SHA512:
-  metadata.gz: 10c73224492b43a8ec5bbd23d3514e3e6dcf7cf4a8a7158f1f98d1ec9fc013ac7bc4b87084f71a10140466890d6f4da2be27c6e46a172d8c44cc36b691b9f475
-  data.tar.gz: edde64eb9832f62bb4af5730561b314a0daff1b0bed201e1d27cb3a33628ae1922a528fedb2e69444e87d404717e3350dbf1a1b92318ad2da407c303bf9c54a2
+  metadata.gz: 900588eb497598196b0081702bf1ac176b0a88167c1c316414887bf56a7f1f5ffe3d746e7f2760ae06f07080242de9cf1fe519f35d9b2bf221aae04842c18b7b
+  data.tar.gz: 9e01f2b55927a2430138556a008353cb22c8405027f97c3dcd3ac566d6942f0ffefb0281df9d290726689738403278a84c682f5fe761d8d21f8998872a8fab5b

data/README.md

@@ -88,6 +88,17 @@ This feature can be disabled by adding a declaration in your handler file:
 logging :off
 ```
 
+Include `Yake::Logger` on a class to access this logger:
+
+```ruby
+class Fizz
+  include Yake::Logger
+end
+
+Fizz.new.logger == Yake.logger
+# => true
+```
+
 #### API Routes
 
 A common use of Lambda functions is as a proxy for API Gateway. Oftentimes users will deploy a single Lambda function to handle all requests coming from API Gateway.
@@ -97,6 +108,10 @@ Requiring the `yake/api` module will add the API-specific DSL into your handler.
 Define API routes using Sinatra-like syntax
 
 ```ruby
+any "/…" do |event|
+  # Handle 'ANY /…' route key events
+end
+
 delete "/…" do |event|
   # Handle 'DELETE /…' route key events
 end
@@ -142,7 +157,7 @@ respond 200, { ok: true }.to_json, "x-extra-header" => "buzz"
 # {
 #   "statusCode" => 200,
 #   "body" => '{"ok":true}',
-#   "headers" => { "x-extra-header" => "fizz" }
+#   "headers" => { "x-extra-header" => "buzz" }
 # }
 ```
 

data/lib/yake/api.rb

@@ -55,6 +55,12 @@ module Yake
         (@headers ||= {}).update(headers)
       end
 
+      ##
+      # Define ANY route
+      def any(path, &block)
+        define_singleton_method("ANY #{ path }") { |*args| instance_exec(*args, &block) }
+      end
+
       ##
       # Define DELETE route
       def delete(path, &block)

data/lib/yake/dsl.rb

@@ -10,15 +10,15 @@ module Yake
     # Lambda handler task wrapper
     def handler(name, &block)
       define_method(name) do |event:nil, context:nil|
-        Yake.logger.nil? ? yield(event, context) : Yake.logger.wrap(event, context, &block)
+        Yake.wrap(event, context, &block)
       end
     end
 
     ##
     # Turn logging on/off
-    def logging(switch, logdev = $stdout, **options)
+    def logging(switch, logger = nil)
       if switch == :on
-        Yake.logger = Yake::Logger.new(logdev)
+        Yake.logger = logger
       elsif switch == :off
         Yake.logger = ::Logger.new(nil)
       else
@@ -29,4 +29,3 @@ module Yake
 end
 
 extend Yake::DSL
-Yake.logger = Yake::Logger.new

data/lib/yake/logger.rb

@@ -4,33 +4,42 @@ require "json"
 require "logger"
 
 module Yake
-  class Logger < ::Logger
-    def initialize(logdev = $stdout, *)
-      super
-      @progname  = "-"
-      @formatter = LambdaFormatter.new
+  module Logger
+    attr_accessor :logger
+
+    def logger
+      @logger ||= Yake.logger
     end
 
-    def wrap(event = nil, context = nil, &block)
-      @progname = "RequestId: #{ context.aws_request_id }" if context.respond_to?(:aws_request_id)
-      info("EVENT #{ event.to_json }")
-      yield(event, context).tap { |res| info("RETURN #{ res.to_json }") }
-    ensure
-      @progname = "-"
+    class << self
+      def new(logdev = $stdout, **params)
+        ::Logger.new(logdev, formatter: Formatter.new, **params)
+      end
     end
-  end
 
-  class LambdaFormatter < ::Logger::Formatter
-    Format = "%s %s %s\n"
+    class Formatter < ::Logger::Formatter
+      Format = "%s %s %s\n"
 
-    def call(severity, time, progname, msg)
-      Format % [ severity, progname, msg2str(msg).strip ]
+      def call(severity, time, progname, msg)
+        Format % [ severity, progname.nil? ? "-" : "RequestId: #{ progname }", msg2str(msg).strip ]
+      end
     end
   end
 
-  module Loggable
+  class << self
     attr_accessor :logger
-  end
 
-  extend Loggable
+    def logger
+      @logger ||= Logger.new
+    end
+
+    def wrap(event = nil, context = nil, &block)
+      original_progname = logger.progname
+      logger.progname = context&.aws_request_id
+      logger.info("EVENT #{ event.to_json }")
+      yield(event, context).tap { |res| logger.info("RETURN #{ res.to_json }") }
+    ensure
+      logger.progname = original_progname
+    end
+  end
 end

data/lib/yake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yake
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies: []
 description:
 email: