yake 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b15fb667d8aba0f2fed790898bac47dc745883203f5cc7adda48e5f9c1c58bd
-  data.tar.gz: e07bd79d34cb1a6e841eda84df0b392d8419e0ed3bcbcdb5bf49d2319b47b3c7
+  metadata.gz: d0272be54a9cf2f3b94764ac4c87db1f6047b9fd2e8b13286a8be939adde1387
+  data.tar.gz: 9c82744536dd4147039bdf6d3ef8d3e6b395c28ce1d2f64e8999d4a0c80a0a79
 SHA512:
-  metadata.gz: 26e801e5d27b2a8c0241d465f7507cae64913e05e67d91a085ee179e8ec675c06d7e058013464e152e8255343a1790c4a9b7a1c2db45a74461c5a46524549687
-  data.tar.gz: 272b1c2ee937e87fdce222ad8228893614c18b4dd01072b050ce3ba24095c577a8ee6a40988ca00968156d916d87b0b0a9da04a668c2efde79c8ec798721dd94
+  metadata.gz: 835f4171028f915170c3a548b175e6e5ee3a1d57162b4b9d6bbb7a33537fc599e9fd535a925a7b7e3b871d507707757d508f8dadcbe4b1368b47b3000a2cfc8f
+  data.tar.gz: 8ecc31882ad76a1d999f7e5ad1ab3f1ecbe141041f091a12f5dcfefb728416391dfa14d0632345e9da8e3de6bf66b3372b704ea73c3fbb40365181ec1bb8c808

data/README.md

@@ -1,10 +1,12 @@
 # λake
 
-![gem](https://img.shields.io/gem/v/yake?color=crimson&logo=rubygems&logoColor=eee&style=flat-square)
-[![rspec](https://img.shields.io/github/workflow/status/amancevice/yake/RSpec?logo=github&style=flat-square)](https://github.com/amancevice/yake/actions)
+[![gem](https://img.shields.io/gem/v/yake?color=crimson&logo=rubygems&logoColor=eee&style=flat-square)](https://rubygems.org/gems/yake)
+[![rspec](https://img.shields.io/github/actions/workflow/status/amancevice/yake/rspec.yml?logo=github&style=flat-square)](https://github.com/amancevice/yake/actions/workflows/rspec.yml)
 [![coverage](https://img.shields.io/codeclimate/coverage/amancevice/yake?logo=code-climate&style=flat-square)](https://codeclimate.com/github/amancevice/yake/test_coverage)
 [![maintainability](https://img.shields.io/codeclimate/maintainability/amancevice/yake?logo=code-climate&style=flat-square)](https://codeclimate.com/github/amancevice/yake/maintainability)
 
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/smallweirdnumber)
+
 Write your AWS Lambda function handlers using a Rake-like declarative syntax:
 
 ```ruby
@@ -77,7 +79,7 @@ INFO RequestId: 149c500f-028a-4b57-8977-0ef568cf8caf EVENT { … }
 …
 INFO RequestId: 149c500f-028a-4b57-8977-0ef568cf8caf RETURN { … }
 END RequestId: 149c500f-028a-4b57-8977-0ef568cf8caf
-REPORT RequestId: 149c500f-028a-4b57-8977-0ef568cf8caf	Duration: 43.97 ms	Billed Duration: 44 ms	Memory Size: 128 MB	Max Memory Used: 77 MB
+REPORT RequestId: 149c500f-028a-4b57-8977-0ef568cf8caf  Duration: 43.97 ms  Billed Duration: 44 ms  Memory Size: 128 MB  Max Memory Used: 77 MB
 ```
 
 Logging the request ID in this way makes gathering logs lines for a particular execution in CloudWatch much easier.
@@ -208,6 +210,11 @@ MyObject.new.try(:some_method)
 { a: { b: 'c', d: 'e' }, f: 'g' }.deep_keys
 # => [:a, :b, :d, :f]
 
+left  = { a: 'b', c: { d: %w[e] } }
+right = { a: 'a', c: { d: %w[d] } }
+left.deep_merge(right)
+# => { :a => "a", :c => { :d => ["e", "d"] } }
+
 { a: { b: 'c', d: 'e' }, f: 'g' }.deep_transform_keys(&:to_s)
 # => { "a" => { "b" => "c", "d" => "e" }, "f" => "g" }
 
@@ -244,6 +251,12 @@ hash.deep_transform_keys!(&:to_s)
 
 { f: 'g', a: { d: 'e', b: 'c' } }.to_deep_struct
 # => #<OpenStruct f="g", a=#<OpenStruct d="e", b="c">>
+
+{ a: { b: 'c', d: 'e' }, f: 'g' }.to_dynamodb
+# => { :a => { :M => { :b => { :S => "c" }, :d => { :S => "e" } } }, :f => { :S => "g" } }
+
+{ a: { M: { b: { S: 'c' }, d: { S: 'e' } } }, f: { S: 'g' } }.to_h_from_dynamodb
+# => { :a => { :b => "c", :d => "e" }, :f => "g" }
 ```
 
 `Integer` helpers:
@@ -331,6 +344,8 @@ UTC.now
 
 As of `~> 0.4`, `yake` comes with a helper for writing Lambdas that integrate with Datadog's `datadog-ruby` gem.
 
+As of `~> 0.8`, `yake` uses the v2 Datadog Lambda gem.
+
 Creating a Lambda handler that wraps the Datadog tooling is easy:
 
 ```ruby
@@ -338,7 +353,7 @@ require 'aws-sdk-someservice'
 require 'yake/datadog'
 
 # Configure Datadog to use AWS tracing
-Datadog::Lambda.configure_apm { |config| config.use :aws }
+Datadog::Lambda.configure_apm { |c| c.tracing.instrument :aws }
 
 datadog :handler do |event|
   # …

data/lib/yake/datadog/v1.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+require 'datadog/lambda'
+require 'yake'
+
+module Yake
+  module Datadog
+    class Formatter < ::Logger::Formatter
+      Format = "[%s] %s %s %s %s\n"
+
+      def call(severity, time, progname, msg)
+        Format % [
+          severity,
+          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+          progname.nil? ? '-' : progname.split.last,
+          ::Datadog.tracer.active_correlation,
+          msg2str(msg).strip,
+        ]
+      end
+    end
+
+    class MockContext < Struct.new(
+      :clock_diff,
+      :deadline_ms,
+      :aws_request_id,
+      :invoked_function_arn,
+      :log_group_name,
+      :log_stream_name,
+      :function_name,
+      :memory_limit_in_mb,
+      :function_version)
+
+      def invoked_function_arn
+        @invoked_function_arn ||= begin
+          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+          "arn:aws:lambda:#{region}:123456789012:function-name"
+        end
+      end
+    end
+
+    module DSL
+      include Yake::DSL
+
+      ##
+      # Datadog handler wrapper
+      def datadog(name, &block)
+        define_method(name) do |event:nil, context:nil|
+          context ||= MockContext.new
+          ::Datadog::Lambda.wrap(event, context) do
+            Yake.wrap(event, context, &block)
+          end
+        end
+      end
+    end
+  end
+
+  logger.formatter = Datadog::Formatter.new
+end
+
+extend Yake::Datadog::DSL

data/lib/yake/datadog/v2.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+require 'datadog/lambda'
+require 'yake'
+
+module Yake
+  module Datadog
+    class Formatter < ::Logger::Formatter
+      Format = "[%s] %s %s %s %s\n"
+
+      def call(severity, time, progname, msg)
+        Format % [
+          severity,
+          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+          progname.nil? ? '-' : progname.split.last,
+          ::Datadog::Tracing.log_correlation,
+          msg2str(msg).strip,
+        ]
+      end
+    end
+
+    class MockContext < Struct.new(
+      :clock_diff,
+      :deadline_ms,
+      :aws_request_id,
+      :invoked_function_arn,
+      :log_group_name,
+      :log_stream_name,
+      :function_name,
+      :memory_limit_in_mb,
+      :function_version)
+
+      def invoked_function_arn
+        @invoked_function_arn ||= begin
+          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+          "arn:aws:lambda:#{region}:123456789012:function-name"
+        end
+      end
+    end
+
+    module DSL
+      include Yake::DSL
+
+      ##
+      # Datadog handler wrapper
+      def datadog(name, &block)
+        define_method(name) do |event:nil, context:nil|
+          context ||= MockContext.new
+          ::Datadog::Lambda.wrap(event, context) do
+            Yake.wrap(event, context, &block)
+          end
+        end
+      end
+    end
+  end
+
+  logger.formatter = Datadog::Formatter.new
+end
+
+extend Yake::Datadog::DSL

data/lib/yake/datadog.rb

@@ -1,61 +1,4 @@
 # frozen_string_literal: true
-require 'logger'
 
 require 'datadog/lambda'
-require 'yake'
-
-module Yake
-  module Datadog
-    class Formatter < ::Logger::Formatter
-      Format = "[%s] %s %s %s %s\n"
-
-      def call(severity, time, progname, msg)
-        Format % [
-          severity,
-          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
-          progname.nil? ? '-' : progname.split.last,
-          ::Datadog.tracer.active_correlation,
-          msg2str(msg).strip,
-        ]
-      end
-    end
-
-    class MockContext < Struct.new(
-      :clock_diff,
-      :deadline_ms,
-      :aws_request_id,
-      :invoked_function_arn,
-      :log_group_name,
-      :log_stream_name,
-      :function_name,
-      :memory_limit_in_mb,
-      :function_version)
-
-      def invoked_function_arn
-        @invoked_function_arn ||= begin
-          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
-          "arn:aws:lambda:#{region}:123456789012:function-name"
-        end
-      end
-    end
-
-    module DSL
-      include Yake::DSL
-
-      ##
-      # Datadog handler wrapper
-      def datadog(name, &block)
-        define_method(name) do |event:nil, context:nil|
-          context ||= MockContext.new
-          ::Datadog::Lambda.wrap(event, context) do
-            Yake.wrap(event, context, &block)
-          end
-        end
-      end
-    end
-  end
-
-  logger.formatter = Datadog::Formatter.new
-end
-
-extend Yake::Datadog::DSL
+require_relative "datadog/v#{Datadog::Lambda::VERSION::MAJOR}"

data/lib/yake/dsl.rb

@@ -33,6 +33,19 @@ module Yake
       end
     end
   end
+
+  class << self
+    def wrap(event = nil, context = nil, &block)
+      original_progname = logger.progname
+      logger.progname   = context&.aws_request_id
+      jsonify           = -> (obj) { pretty? ? JSON.pretty_generate(obj) : obj.to_json }
+      log_return        = -> (res) { logger.info("RETURN #{ jsonify === res }") }
+      logger.info("EVENT #{ jsonify === event }")
+      (yield(event, context) if block_given?).tap(&log_return)
+    ensure
+      logger.progname = original_progname
+    end
+  end
 end
 
 extend Yake::DSL

data/lib/yake/logger.rb

@@ -36,17 +36,5 @@ module Yake
     def pretty?
       @pretty == true
     end
-
-    def wrap(event = nil, context = nil, &block)
-      original_progname = logger.progname
-      logger.progname   = context&.aws_request_id
-      jsonify           = -> (obj) { pretty? ? JSON.pretty_generate(obj) : obj.to_json }
-      logger.info("EVENT #{ jsonify === event }")
-      yield(event, context).tap do |res|
-        logger.info("RETURN #{ jsonify === res }")
-      end
-    ensure
-      logger.progname = original_progname
-    end
   end
 end

data/lib/yake/support.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'digest'
 require 'json'
 require 'time'
 
+class Array
+  def to_dynamodb() { L: map(&:to_dynamodb) } end
+end
+
 class Hash
   def deep_keys() map { |k,v| v.respond_to?(:deep_keys) ? [k] + v.deep_keys : k }.flatten end
   def deep_sort() sort.map { |k,v| [ k, v.try(:deep_sort) { |x| x } ] }.to_h end
@@ -17,6 +23,23 @@ class Hash
   def to_json_sorted() deep_sort.to_json end
   def to_struct() OpenStruct.new(self) end
 
+  ##
+  # Adapted from ActiveSupport Hash#deep_merge
+  # https://github.com/rails/rails/blob/f95c0b7e96eb36bc3efc0c5beffbb9e84ea664e4/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+  def deep_merge(other, &block)
+    merge(other) do |key, a, b|
+      if a.is_a?(Hash) && b.is_a?(Hash)
+        a.deep_merge(b, &block)
+      elsif a.is_a?(Array) && b.is_a?(Array)
+        a + b
+      elsif block_given?
+        yield key, a, b
+      else
+        b
+      end
+    end
+  end
+
   def deep_transform_keys(&block)
     deep_transform(:transform_keys, &block)
   end
@@ -41,6 +64,27 @@ class Hash
     end
   end
 
+  def to_dynamodb
+    map do |key, val|
+      { key => val.is_a?(Hash) ? { M: val.to_dynamodb } : val.to_dynamodb }
+    end.reduce(&:merge)
+  end
+
+  def to_h_from_dynamodb
+    decode = -> (i) do
+      type, val = i.first
+      case type.to_sym
+      when :S then val
+      when :N then val =~ /^[0-9]+$/ ? val.to_i : val.to_f
+      when :L then val.map(&decode)
+      when :M then val.transform_values(&decode)
+      end
+    end
+    map do |key, val|
+      { key => decode === val }
+    end.reduce(&:merge)
+  end
+
   private def deep_transform(method, &block)
     f = -> (x) { x.respond_to?(:"deep_#{method}") ? x.send(:"deep_#{method}", &block) : x }
     block_given? ? send(method, &block).map do |key, val|
@@ -49,6 +93,10 @@ class Hash
   end
 end
 
+class Numeric
+  def to_dynamodb() { N: to_s } end
+end
+
 class Integer
   def weeks() days * 7 end
   def days() hours * 24 end
@@ -82,6 +130,7 @@ class String
   def snake_case() gsub(/([a-z])([A-Z])/, '\1_\2').downcase end
   def strict_decode64() Base64.strict_decode64(self) end
   def strict_encode64() Base64.strict_encode64(self) end
+  def to_dynamodb() { S: self } end
   def to_h_from_json(**params) JSON.parse(self, **params) end
   def to_h_from_form() URI.decode_www_form(self).to_h end
   def utc() UTC.parse(self) end
@@ -90,6 +139,7 @@ end
 class Symbol
   def camel_case() to_s.camel_case.to_sym end
   def snake_case() to_s.snake_case.to_sym end
+  def to_dynamodb() { S: to_s } end
 end
 
 class UTC < Time

data/lib/yake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yake
-  VERSION = '0.7.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -22,6 +22,8 @@ files:
 - lib/yake.rb
 - lib/yake/api.rb
 - lib/yake/datadog.rb
+- lib/yake/datadog/v1.rb
+- lib/yake/datadog/v2.rb
 - lib/yake/dsl.rb
 - lib/yake/errors.rb
 - lib/yake/logger.rb
@@ -46,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rake-like DSL for declaring AWS Lambda function handlers