yake 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be2a80d8b7737cf954f33faef88eb7054ce7b0bbb516f8a216f3b6ec0b5578c
-  data.tar.gz: 69e7b3323594c0f2d794674dc938104ecf1f2d37ccbd4818272aefb6ab4345f7
+  metadata.gz: d61ebfe7c8e0e2f9446a021e541ab35d08f28edd280ccd157871681782c29f00
+  data.tar.gz: f33daed6bda622626465054cb2367772fa1da1d0c5c7b0e6c97d1e358dff68ca
 SHA512:
-  metadata.gz: 206fdff33a178be14611721811bf5d3177b7e5b3bc7bf09237844aeac2a93e74b7b88281675a169fe41333dfaa9d40eb8bfb4aab3cac20ee762c3fa4d419c5d0
-  data.tar.gz: cc3a7a75a4f467028acc9bc892681067fbe86f4be6ed7cfe120deadfd34100f2da648f013d6ac81021fade9bcf0342ba576b6fa61a520cbc0724022aadae0aba
+  metadata.gz: 8c588738b06ebb6e4e0a338c7537116cdfaf8c925ca0b6b82c66acc579f66723d26bd31d11fe850bb22eb401dd9b71f23544e8de3b6e1ae9cafe02e8ac4a074b
+  data.tar.gz: 66e6267f694f5ee26a02b270d1c1cbe376bb2cb39cd11dcee80cd7bfafe03e2ae0d568fe9de6c2525213a07fae1ed122296b48ffbf9a4c8fe90cce12d867ca87

data/README.md

@@ -108,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

@@ -1,32 +1,33 @@
 # frozen_string_literal: true
 
-require "base64"
-require "json"
+require 'base64'
+require 'json'
 
-require "yake"
-require_relative "errors"
+require 'yake'
+require_relative 'errors'
 
 module Yake
   module API
     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"]
+        method = event['routeKey']
         raise Yake::Errors::UndeclaredRoute, method unless respond_to?(method)
 
         # Normalize headers
-        event["headers"]&.transform_keys!(&:downcase)
+        event['headers']&.transform_keys!(&:downcase)
 
         # Decode body if Base64-encoded
-        if event["isBase64Encoded"]
-          body = Base64.strict_decode64(event["body"])
-          event.update("body" => body, "isBase64Encoded" => false)
+        if event['isBase64Encoded']
+          body = Base64.strict_decode64(event['body'])
+          event.update('body' => body, 'isBase64Encoded' => false)
         end
 
         # Execute request
-        send(method, event, context)
+        res = send(method, event, context)
+        block_given? ? yield(res) : res
       end
 
       ##
@@ -37,10 +38,10 @@ module Yake
         Yake.logger&.send(status_code.to_i >= 400 ? :error : :info, log)
 
         # Set headers
-        content_length = (body&.length || 0).to_s
+        content_length = (body&.bytesize || 0).to_s
         to_s_downcase  = -> (key) { key.to_s.downcase }
         headers = {
-          "content-length" => content_length,
+          'content-length' => content_length,
           **(@headers || {}),
           **headers,
         }.transform_keys(&to_s_downcase).compact

data/lib/yake/datadog.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'datadog/lambda'
+require 'yake'
+
+module Yake
+  module Datadog
+    module DSL
+      include Yake::DSL
+
+      ##
+      # Datadog handler wrapper
+      def datadog(name, &block)
+        define_method(name) do |event:nil, context:nil|
+          ::Datadog::Lambda.wrap(event, context) do
+            Yake.wrap(event, context, &block)
+          end
+        end
+      end
+    end
+  end
+end
+
+extend Yake::Datadog::DSL

data/lib/yake/dsl.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "json"
+require 'json'
 
-require_relative "logger"
+require_relative 'logger'
 
 module Yake
   module DSL
@@ -14,6 +14,12 @@ module Yake
       end
     end
 
+    ##
+    # Helper to get logger
+    def logger
+      Yake.logger
+    end
+
     ##
     # Turn logging on/off
     def logging(switch, logger = nil)

data/lib/yake/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Yake
   module Errors
     class Error < StandardError; end

data/lib/yake/logger.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "json"
-require "logger"
+require 'json'
+require 'logger'
 
 module Yake
   module Logger
@@ -12,8 +12,8 @@ module Yake
     end
 
     class << self
-      def new(logdev = $stdout)
-        ::Logger.new(logdev, progname: "-", formatter: Formatter.new)
+      def new(logdev = $stdout, **params)
+        ::Logger.new(logdev, formatter: Formatter.new, **params)
       end
     end
 
@@ -21,7 +21,7 @@ module Yake
       Format = "%s %s %s\n"
 
       def call(severity, time, progname, msg)
-        Format % [ severity, progname, msg2str(msg).strip ]
+        Format % [ severity, progname.nil? ? '-' : "RequestId: #{ progname }", msg2str(msg).strip ]
       end
     end
   end
@@ -34,11 +34,12 @@ module Yake
     end
 
     def wrap(event = nil, context = nil, &block)
-      logger.progname = "RequestId: #{ context.aws_request_id }" if context.respond_to?(:aws_request_id)
+      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 = "-"
+      logger.progname = original_progname
     end
   end
 end

data/lib/yake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yake
-  VERSION = "0.2.0"
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -22,6 +22,7 @@ files:
 - README.md
 - lib/yake.rb
 - lib/yake/api.rb
+- lib/yake/datadog.rb
 - lib/yake/dsl.rb
 - lib/yake/errors.rb
 - lib/yake/logger.rb
@@ -45,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Rake-like DSL for declaring AWS Lambda function handlers