yake 0.1.3 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e44a168d8c7df7b5e13dcf9da5e2ad452b1c19d07a3b03f0374dbf64473bf811
-  data.tar.gz: 5d81f595d5c0eb228997bbf769ae93370ff74a45c01fb4499f4e151a0d22222c
+  metadata.gz: 7db6ede2c0a492849a3dc42c4f88e85ffa7c4d9569467ea3582a2b780e6f8552
+  data.tar.gz: a64d30572e18b07a3c1b50c0e76f96ca455620c1c5d7b7987a8f32d17f20a88c
 SHA512:
-  metadata.gz: 714d996925867fd88267fcf13a563f99b53e313315717a96b8c427b1e7b72670590a0d23c3bf2d56820efb6df14cc4b47c4d0b14a75dde3db75feea66aeb151b
-  data.tar.gz: a232aeff15dc133befd6e5782825b773a535a05f9653460b2dc622ffa1a7c7e5a2c41472c7834facc5457aa11c74df7b3d9d048ebb69f6a1a36428b7c123f8e4
+  metadata.gz: f74694e031b0b4436175454506c9f2ade6bcaa4d6480acfe5c7be7cb9f5fabb794dff0ec335b599196d90bdeabbe892f35204fcfe01094f4278b33307a499c80
+  data.tar.gz: 5608ca5d6de1e729753e6a67ab23fc155f607ef81ba57b0b860e1eda3b3152e082484432e3e4849bef266933c6af8c1ccd4dbbf20771a7272a637cf68335f3a0

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

@@ -11,7 +11,7 @@ module Yake
     module DSL
       ##
       # Proxy handler for HTTP requests from Slack
-      def route(event, context = nil)
+      def route(event, context = nil, &block)
         # Extract route method
         method = event["routeKey"]
         raise Yake::Errors::UndeclaredRoute, method unless respond_to?(method)
@@ -26,7 +26,7 @@ module Yake
         end
 
         # Execute request
-        send(method, event, context)
+        send(method, event, context).then { |res| block_given? ? yield(res) : res }
       end
 
       ##
@@ -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,17 +10,17 @@ 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 = Yake::Logger.new(nil)
+        Yake.logger = ::Logger.new(nil)
       else
         raise Errors::UnknownLoggingSetting, switch
       end
@@ -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.3"
+  VERSION = "0.2.2"
 end

metadata

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