yake 0.8.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27610c07a200a3f10913adf3a8ce42a892383de03663587f885770b903b48c03
-  data.tar.gz: 062e3bcfab24054137e70643435c39bfe9e61e37b6882a9fc720b0fb57ded05f
+  metadata.gz: fc13e0e5293f2878eedbe89a7e9aa132d72d478751a5d5f159b28ee579d97d59
+  data.tar.gz: 29fe7d819734aec8b28b27b30eca18340e37ba59bb24b705efcf3e036ba46479
 SHA512:
-  metadata.gz: c9dbfc3ff7244e92d1a963054ef23007fe31cfabce8a00423d0d4d926fa130017b84e1737d8ba527cb274afce62a06cc59f129c97906bdabfd7c683b99ded112
-  data.tar.gz: 4d6e4458f0e305468499bef5e069dda1b6912969083c0d18469ffcd7e906c2f29536a670ddaf1bcd63e8734a56b72ec041abaa69898ab6963393128eee6254b7
+  metadata.gz: 8608775e85da8d706e49a066f2df7df9b133f672cedbb3bb226d7854c48fedec84e45887c92b173fb7be71de5b274a6aa1737cebd7f69dfb87f29f85f9c547e6
+  data.tar.gz: 0b746f99b54c0428ff20feb7083aca5addb6479ce395c6fe0d26e20d20fd2973a650a5acc2ad38ab38dc2735b116f144f1e755700222335ed7cc80b7392a4b3b

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)](https://rubygems.org/gems/yake)
-[![rspec](https://img.shields.io/github/workflow/status/amancevice/yake/RSpec?logo=github&style=flat-square)](https://github.com/amancevice/yake/actions)
+[![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:
@@ -329,7 +342,7 @@ UTC.now
 
 ## Datadog Integration
 
-As of `~> 0.4`, `yake` comes with a helper for writing Lambdas that integrate with Datadog's `datadog-ruby` gem.
+As of `v1.0`, `yake` comes with a helper for writing Lambdas that integrate with Datadog's `datadog-lambda` gem.
 
 As of `~> 0.8`, `yake` uses the v2 Datadog Lambda gem.
 
@@ -361,7 +374,7 @@ After checking out the repo, run `bundle` to install dependencies. Then, run `ra
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/amancevice/yake.
+Bug reports and pull requests are welcome on GitHub at [amancevice/yake](https://github.com/amancevice/yake).
 
 ## License
 

data/lib/yake/api.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
 require 'json'
 
 require 'yake'
@@ -21,7 +20,7 @@ module Yake
 
         # Decode body if Base64-encoded
         if event['isBase64Encoded']
-          body = Base64.strict_decode64(event['body'])
+          body = event['body'].unpack1('m0')
           event.update('body' => body, 'isBase64Encoded' => false)
         end
 

data/lib/yake/datadog.rb

@@ -1,3 +1,62 @@
 # frozen_string_literal: true
+
+require 'logger'
+
 require 'datadog/lambda'
-require_relative "datadog/v#{Datadog::Lambda::VERSION::MAJOR}"
+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/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,28 +1,44 @@
-require 'base64'
+# frozen_string_literal: true
+
 require 'digest'
 require 'json'
 require 'time'
 
+class Array
+  def to_dynamodb = { L: map(&:to_dynamodb) }
+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
-  def encode64() to_json.encode64 end
-  def except(*keys) reject { |key,_| keys.include? key } end
-  def strict_encode64() to_json.strict_encode64 end
-  def stringify_names() deep_transform_keys(&:to_s) end
-  def stringify_names!() deep_transform_keys!(&:to_s) end
-  def symbolize_names() deep_transform_keys(&:to_sym) end
-  def symbolize_names!() deep_transform_keys!(&:to_sym) end
-  def to_form() URI.encode_www_form(self) end
-  def to_json_sorted() deep_sort.to_json end
-  def to_struct() OpenStruct.new(self) end
-
-  def deep_transform_keys(&block)
-    deep_transform(:transform_keys, &block)
-  end
+  def deep_keys                     = map { |k,v| v.respond_to?(:deep_keys) ? [k] + v.deep_keys : k }.flatten
+  def deep_sort                     = sort.map { |k,v| [ k, v.try(:deep_sort) { |x| x } ] }.to_h
+  def deep_transform_keys(&block)   = deep_transform(:transform_keys, &block)
+  def deep_transform_keys!(&block)  = deep_transform(:transform_keys!, &block)
+  def encode64                      = to_json.encode64
+  def except(*keys)                 = reject { |key,_| keys.include? key }
+  def strict_encode64               = to_json.strict_encode64
+  def stringify_names               = deep_transform_keys(&:to_s)
+  def stringify_names!              = deep_transform_keys!(&:to_s)
+  def symbolize_names               = deep_transform_keys(&:to_sym)
+  def symbolize_names!              = deep_transform_keys!(&:to_sym)
+  def to_form                       = URI.encode_www_form(self)
+  def to_json_sorted                = deep_sort.to_json
+  def to_struct                     = OpenStruct.new(self)
 
-  def deep_transform_keys!(&block)
-    deep_transform(:transform_keys!, &block)
+  ##
+  # 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 to_deep_struct
@@ -41,7 +57,30 @@ class Hash
     end
   end
 
-  private def deep_transform(method, &block)
+  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|
       [key, val.is_a?(Array) ? val.map(&f) : val.then(&f)]
@@ -49,13 +88,17 @@ class Hash
   end
 end
 
+class Numeric
+  def to_dynamodb = { N: to_s }
+end
+
 class Integer
-  def weeks() days * 7 end
-  def days() hours * 24 end
-  def hours() minutes * 60 end
-  def minutes() seconds * 60 end
-  def seconds() self end
-  def utc() UTC.at(self) end
+  def weeks   = days * 7
+  def days    = hours * 24
+  def hours   = minutes * 60
+  def minutes = seconds * 60
+  def seconds = self
+  def utc     = UTC.at(self)
 
   alias :second :seconds
   alias :minute :minutes
@@ -73,27 +116,29 @@ class Object
 end
 
 class String
-  def /(path) File.join(self, path.to_s) end
-  def camel_case() split(/_/).map(&:capitalize).join end
-  def decode64() Base64.decode64(self) end
-  def encode64() Base64.encode64(self) end
-  def md5sum() Digest::MD5.hexdigest(self) end
-  def sha1sum() Digest::SHA1.hexdigest(self) end
-  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_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
+  def /(path)             = File.join(self, path.to_s)
+  def camel_case          = split(/_/).map(&:capitalize).join
+  def decode64            = self.unpack1('m')
+  def encode64            = [self].pack('m')
+  def md5sum              = Digest::MD5.hexdigest(self)
+  def sha1sum             = Digest::SHA1.hexdigest(self)
+  def snake_case          = gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+  def strict_decode64     = self.unpack1('m0')
+  def strict_encode64     = [self].pack('m0')
+  def to_dynamodb         = { S: self }
+  def to_h_from_json(...) = JSON.parse(self, ...)
+  def to_h_from_form      = URI.decode_www_form(self).to_h
+  def utc                 = UTC.parse(self)
 end
 
 class Symbol
-  def camel_case() to_s.camel_case.to_sym end
-  def snake_case() to_s.snake_case.to_sym end
+  def camel_case  = to_s.camel_case.to_sym
+  def snake_case  = to_s.snake_case.to_sym
+  def to_dynamodb = { S: to_s }
 end
 
 class UTC < Time
-  def initialize(...) super.utc end
-  def self.at(...) super.utc end
-  def self.now() super.utc end
+  def initialize(...) = super.utc
+  def self.at(...)    = super.utc
+  def self.now        = super.utc
 end

data/lib/yake/version.rb

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

data/lib/yake.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "yake/version"
-require_relative "yake/logger"
-require_relative "yake/errors"
-require_relative "yake/dsl"
+require_relative 'yake/version'
+require_relative 'yake/logger'
+require_relative 'yake/errors'
+require_relative 'yake/dsl'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -22,8 +22,6 @@ 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
@@ -41,14 +39,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rake-like DSL for declaring AWS Lambda function handlers

data/lib/yake/datadog/v1.rb

@@ -1,61 +0,0 @@
-# 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

@@ -1,61 +0,0 @@
-# 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