yake 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b755f324408681d9e9d4e46fb13dda73624e023467f5477b568535b0ceecd9
-  data.tar.gz: 2870d5e7a9d3ed5ba7b179f032c656cac5fb0e61f94eb65ba648d0ba303e819d
+  metadata.gz: 498a95a56043103e5ab1315fefef95a6f55a27136fe5013df544e3fe83ed77dc
+  data.tar.gz: 92dfac92a9036c96ea622228795e268b906f156b526b1a1cb46313fa2f4af0c8
 SHA512:
-  metadata.gz: 8fcf70ec87e8c199218e84e789a7b4231fc6186158131256a66bd590f2843a1bac16b90900e7d68fde2325ce75b8125af9113710a748dc13f70fa3cec9053507
-  data.tar.gz: a0b103f2416df14640927006993e2ad991444329060f541f337c7c59385d4fb8c6a063a7184d065b24f7f34dba2501cd1a5b492fe8e3a3cfd73ba57e5ed5d5a6
+  metadata.gz: b26c78cfe69bb588cf37bafeeacc53314e40106eb38416d6b52dd652e2a954c3767fb5c4f5852ea3d132558f69a6d512cfbc48f6c11f766e3a099a5bb7c95697
+  data.tar.gz: c063851aac6c3554dd36a05db53e846d835019bf973c0b060b6cf673697350eeeba6d3ddb0585eaeed92fd165bf1767cf0f9fb0e514ef49c16de604f04783f03

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

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,23 @@ 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
 
+    ##
+    # Helper to get logger
+    def logger
+      Yake.logger
+    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

data/lib/yake/logger.rb

@@ -4,37 +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
 
     def logger
       @logger ||= Logger.new
     end
-  end
 
-  extend Loggable
+    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.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexander Mancevice
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies: []
-description:
+description: 
 email:
 - alexander.mancevice@hey.com
 executables: []
@@ -30,7 +30,7 @@ homepage: https://github.com/amancevice/yake
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Rake-like DSL for declaring AWS Lambda function handlers
 test_files: []