shrine-aws-lambda 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57be08878d86a78c04deae0d470e17d442c5c8f0c94b6abf3436c27697314f3
-  data.tar.gz: 87437b1050b4d5b095811d409af005ba5f9ce80921fa4ff09c2349f5f2ac6303
+  metadata.gz: 171dc0f2dc4d0e578d3318fbe784c9ea3f7b54ce44492ff957c18aa6ffc302c7
+  data.tar.gz: fb725564eb46f01f5f3c226d7cd216798ce64afed2ff4c2720e2b9f977c7ea06
 SHA512:
-  metadata.gz: 38b075d8edbec8c1309ed0eea89961a3bc3ac3628c0073ed2f1339acc9db7a56160b61435c7624b7c02cd67bd8f113629fb08281fd2c74c09c270c09ee76371d
-  data.tar.gz: 22d612ad85d247ca52f0f1e2ad65132052190e8b9d94927045ac66135e1d1d13cc900009f2273db9f31abf75c8b94dc3e426eb34808ca34e137bcffc79f2d1b1
+  metadata.gz: bdf72fb943347acecf82e462b0fdca2b1767b58d060ad18f769565e72e59b7bbbf2700900ab187b3ac6297c15320ac3486013567e9986da77fe0869076332009
+  data.tar.gz: 0105132b06a275f116045c7f371aaeec54b5e2f29cb583d3ac03fa01a6f0540022e1fd67b70b0e5021f429f0278cde496ac2ed1fe0e2301e9b808dacc56b4263

data/CHANGELOG.md

@@ -1,21 +1,29 @@
 # Changelog
 
-## [v0.1.2](https://github.com/texpert/shrine-aws-lambda/tree/v0.1.2) (2022-07-03)
+## [v0.2.1](https://github.com/texpert/shrine-aws-lambda/tree/v0.2.1) (2023-05-15)
 
-[Full Changelog](https://github.com/texpert/shrine-aws-lambda/compare/88f53efc0436de444f438d36b8a831b4013f5778...v0.1.2)
+[Full Changelog](https://github.com/texpert/shrine-aws-lambda/compare/v0.2.0...v0.2.1)
 
 **Merged pull requests:**
 
-- Initial, compatible with shrine-lambda, release [\#1](https://github.com/texpert/shrine-aws-lambda/pull/1) ([texpert](https://github.com/texpert))
+- Fix generate\_location method call to be Shrine 3.x and Ruby 3.x compliant [\#5](https://github.com/texpert/shrine-aws-lambda/pull/5) ([texpert](https://github.com/texpert))
+- Bump asdf Ruby to 2.7.8, use bundler 2.3.26 [\#4](https://github.com/texpert/shrine-aws-lambda/pull/4) ([texpert](https://github.com/texpert))
 
-## Changes:
+## [v0.2.0](https://github.com/texpert/shrine-aws-lambda/tree/v0.2.0) (2022-08-27)
 
-- **Breaking:** Change gem name to shrine-aws-lambda
-- **Breaking:** Change class name from Shrine::Plugins::Lambda to Shrine::Plugins::AwsLambda
-- **Breaking:** Change plugin registration symbol from `:lambda` to `:aws_lambda`
+[Full Changelog](https://github.com/texpert/shrine-aws-lambda/compare/v0.1.2...v0.2.0)
 
-- Add `.tools-version` file and specified Ruby 2.7.6 version
-- Add rubocop-rspec and rubocop-performane as development dependencies and fix the arised issues
+**Merged pull requests:**
+
+- Upgrade to work with Shrine version 3 [\#3](https://github.com/texpert/shrine-aws-lambda/pull/3) ([texpert](https://github.com/texpert))
+
+## [v0.1.2](https://github.com/texpert/shrine-aws-lambda/tree/v0.1.2) (2022-07-03)
+
+[Full Changelog](https://github.com/texpert/shrine-aws-lambda/compare/88f53efc0436de444f438d36b8a831b4013f5778...v0.1.2)
+
+**Merged pull requests:**
+
+- Initial, compatible with shrine-lambda, release [\#1](https://github.com/texpert/shrine-aws-lambda/pull/1) ([texpert](https://github.com/texpert))
 
 
 

data/README.md

@@ -1,8 +1,7 @@
 # Shrine::Plugins::AwsLambda
-Provides [AWS Lambda] integration for [Shrine] File Attachment toolkit for Ruby applications
+Provides [AWS Lambda] integration for the [Shrine] File Attachment toolkit for Ruby applications
 
-This is a gem, renamed from initial [shrine-lambda](https://github.com/texpert/shrine-lambda) to [shrine-aws-lambda](https://github.com/texpert/shrine-aws-lambda) 
-for clarity
+This is a gem, renamed from the initial [shrine-lambda](https://github.com/texpert/shrine-lambda) to [shrine-aws-lambda](https://github.com/texpert/shrine-aws-lambda) for clarity
 
 ## Description
 
@@ -53,7 +52,7 @@ either in the [Shrine] initializer, or in [default profile][AWS profiles] in the
                  region:            'your AWS bucket region' }
 ```
 
-Also, for Lamda functions to work, various [AWS Lamda permissions] should be managed on the [Amazon Web Services] side.
+Also, for Lambda functions to work, various [AWS Lambda permissions] should be managed on the [Amazon Web Services] side.
 
 Add to the [Shrine]'s initializer file the Shrine-AWS-Lambda plugin registration with the `:callback_url` parameter, 
 and the [AWS Lambda] functions list retrieval call (which will retrieve the functions list on application initialization 
@@ -71,11 +70,11 @@ and will store the list into the `Shrine.opts[:lambda_function_list]` for furthe
 By default, Shrine-AWS-Lambda is using the S3 bucket named `:cache` for retrieving the original file, and the `:store` 
 named S3 bucket for storing the resulting files.
 
-Srine-Lamda uses the [Shrine backgrounding plugin] for asynchronous operation, so this plugin should be also included
- into the Shrine's initializer.
+Shrine-AWS-Lambda uses the [Shrine backgrounding plugin] for asynchronous operation, so this plugin should be also 
+included into the Shrine's initializer.
 
-Here is a full example of a Shrine initializer of a [Rails] application using [Roda] endpoints for presigned_url's 
-(used for direct file uploads to [AWS S3]) and [AWS Lambda] callbacks:
+Here is a full example of a Shrine initializer of a [Rails] application using a [Roda] endpoint for presigned_url 
+(used for direct file uploads to [AWS S3]) and [AWS Lambda] callbacks):
 
 ```ruby
 # config/initializers/shrine.rb:
@@ -94,72 +93,78 @@ if Rails.env.test?
 else
   require 'shrine/storage/s3'
 
-  secrets = Rails.application.secrets
+  aws_credentials = Rails.application.credentials.aws
 
-  s3_options = { access_key_id:     secrets.aws_access_key_id,
-                 secret_access_key: secrets.aws_secret_access_key,
+  s3_options = { access_key_id:     aws_credentials[:access_key_id],
+                 secret_access_key: aws_credentials[:secret_access_key],
                  region:            'us-east-2' }
 
   if Rails.env.production?
-    cache_bucket = store_bucket = secrets.aws_s3_bucket
+    cache_bucket = store_bucket = aws_credentials.aws_s3_bucket
   else
     cache_bucket = 'texpert-test-cache'
     store_bucket = 'texpert-test-store'
   end
 
-  Shrine.storages = {
-    cache: Shrine::Storage::S3.new(prefix: 'cache', **s3_options.merge(bucket: cache_bucket)),
-    store: Shrine::Storage::S3.new(prefix: 'store', **s3_options.merge(bucket: store_bucket))
-  }
-
-  lambda_callback_url = if Rails.env.development?
-                          "http://#{ENV['USER']}.localtunnel.me/rapi/lambda"
-                        else
-                          "https://#{ENV.fetch('APP_HOST')}/rapi/lambda"
-                        end
+  Shrine.storages = { cache: Shrine::Storage::S3.new(prefix: 'cache', **s3_options.merge!(bucket: cache_bucket)), 
+                      store: Shrine::Storage::S3.new(prefix: 'store', **s3_options.merge!(bucket: store_bucket)) }
 
-  shrine.plugin :aws_lambda, s3_options.merge(callback_url: lambda_callback_url)
-  Shrine.lambda_function_list
-
-  Shrine.plugin :presign_endpoint, presign_options: ->(request) do
-    filename     = request.params['filename']
-    extension    = File.extname(filename)
-    content_type = Rack::Mime.mime_type(extension)
+  ActiveSupport::Reloader.to_prepare do
+   lambda_callback_url = if Rails.env.development? && NGROK_ENABLED
+                          "#{NGROK_URL}/rapi/lambda"
+                         else
+                          "https://#{ENV['APP_HOST'] || 'localhost'}/rapi/lambda"
+                         end
 
-    {
-      content_length_range: 0..1.gigabyte,                         # limit filesize to 1 GB
-      content_disposition: "attachment; filename=\"#{filename}\"", # download with original filename
-      content_type:        content_type,                           # set correct content type
-    }
+   Shrine.plugin :aws_lambda, s3_options.merge!(callback_url: lambda_callback_url)
+   Shrine.lambda_function_list
   end
 end
 
 Shrine.plugin :activerecord
 Shrine.plugin :backgrounding
 Shrine.plugin :cached_attachment_data # for forms
-Shrine.plugin :logging, logger: Rails.logger
+
+Shrine.logger = Rails.logger
+Shrine.plugin :instrumentation
+
+Shrine.plugin :presign_endpoint, presign_options: lambda { |request|
+ filename     = request.params['filename']
+ extension    = File.extname(filename)
+ content_type = Rack::Mime.mime_type(extension)
+
+ { content_length_range: 0..1.gigabyte,                         # limit filesize to 1 GB
+   content_disposition: "attachment; filename=\"#{filename}\"", # download with original filename
+   content_type:        content_type }                          # set correct content type
+}
+
 Shrine.plugin :rack_file # for non-Rails apps
 Shrine.plugin :remote_url, max_size: 1.gigabyte
 
-Shrine::Attacher.promote { |data| PromoteJob.perform_later(data) }
-Shrine::Attacher.delete { |data| DeleteJob.perform_later(data) }
+Shrine::Attacher.promote_block { PromoteJob.enqueue(self.class.name, record.class.name, record.id, name, file_data) }
+Shrine::Attacher.destroy_block { DeleteJob.enqueue(self.class.name, data) }
+```
+
+Take notice that the promote job is a default, not AWS Lambda job: 
 
+```
+Shrine::Attacher.promote_block { PromoteJob.enqueue(self.class.name, record.class.name, record.id, name, file_data) }
 ```
 
-Take notice that the promote job is a default `Shrine::Attacher.promote { |data| PromoteJob.perform_later(data) }`. 
 This is made to be able to use other than AWS storages in the test environment (like Shrine's `FileSystem` storage) 
-and, also, other uploaders which are not using [AWS Lambda]. This job better to be overrided to a `LambdaPromoteJob` 
- directly in the uploaders' classes which will use [AWS Lambda]. 
+and, also, other uploaders which are not using [AWS Lambda]. To use an AWS Lambda job, this job must be overridden 
+to a `LambdaPromoteJob` directly in the uploaders' classes which will use [AWS Lambda] - see below in the **Usage** 
+chapter. 
  
-Another thing used in this initializer is the [localtunnel] application for exposing the localhost to the world for 
+Another thing used in this initializer is the [ngrok-wrapper] gem for exposing the localhost to the world for 
 catching the Lambda callback requests.
 
 #### How it works
 
-Shrine-Lamnda works in such a way that an "assembly" should be created in the `LambdaUploader`, which contains all 
+Shrine-AWS-Lambda works in such a way that an "assembly" should be created in the `LambdaUploader`, which contains all 
 the information about how the file should be processed. A random generated string is appended to the assembly, stored 
 into the cached file metadata, and used by the Lambda function to sign the requests to the `:lambda_callback_url`, 
-along with the `:access_key_id` from the temporary credentials Lambda function is running with.
+along with the AWS `:access_key_id` from the AWS credentials Lambda function is running with.
 
 Processing itself happens asynchronously - the invoked Lambda function will issue a PUT HTTP request to the  
 `:lambda_callback_url`, specified in the Shrine's initializer, with the request's payload containing the processing  
@@ -168,9 +173,9 @@ results.
 The request should be intercepted by a endpoint at the `:lambda_callback_url`, and its payload transferred to the 
 `lambda_save` method on successful request authorization. 
 
-The authorization is calculatating the HTTP request signature using the random string stored in the cached file and 
-the Lambda function's `:access_key_id` received in the request authorization header. Then, the calculated signature is
- compared to the received in the same authorization header Lambda signature.
+The authorization is calculating the HTTP request signature using the random string stored in the cached file and 
+the AWS Lambda function's `:access_key_id` received in the request authorization header. Then, the calculated 
+signature is compared to the received in the same authorization header AWS Lambda signature.
 
 #### Usage
 
@@ -182,7 +187,11 @@ Shrine-AWS-Lambda assemblies are built inside the `#lambda_process_versions` met
 # frozen_string_literal: true
 
 class LambdaUploader < Uploader
-  Attacher.promote { |data| LambdaPromoteJob.perform_later(data) } unless Rails.env.test?
+  unless Rails.env.test?
+    Attacher.promote_block do
+      LambdaPromoteJob.enqueue(self.class.name, record.class.name, record.id, name, file_data)
+    end
+  end
 
   plugin :upload_options, store: ->(_io, context) do
     if %i[avatar logo].include?(context[:name])
@@ -219,7 +228,6 @@ class LambdaUploader < Uploader
     assembly
   end
 end
-
 ```
 
 The above example is built to interact with the [lambda-image-resize] function, which is using the [Sharp] Javascript
@@ -240,14 +248,13 @@ The default options used by Shrine-AWS-Lambda plugin are the following:
     target_storage: :store }
 ```
 
-These options could be overrided in the `LambdaUploader` specifying them as the `assembly` keys:
+These options could be overridden in the `LambdaUploader` specifying them as the `assembly` keys:
 
 ```ruby
-  assembly[:callbackURL]    = some_callback_url]
-  assembly[:copy_original   = false               # If this is `false`, only the processed file versions will be stored     
+  assembly[:callbackURL]    = some_callback_url
+  assembly[:copy_original]  = false               # If this is `false`, only the processed file versions will be stored     
   assembly[:storages]       = Shrine.buckets_to_use(%i[cache store other_store])
   assembly[:target_storage] = :other_store
-
 ```
 
 Any S3 buckets could be specified, as long as the buckets are defined in the Shrine's initializer file.
@@ -294,7 +301,6 @@ module RAPI
     end
   end
 end
-
 ```
 
 #### Backgrounding
@@ -302,7 +308,13 @@ end
 Even though submitting a Lambda assembly doesn't require any uploading, it still does a HTTP request, so it is better 
 to put it into a background job. This is configured in the `LambdaUploader` class:
 
-`Attacher.promote { |data| LambdaPromoteJob.perform_later(data) } unless Rails.env.test?`
+```ruby
+unless Rails.env.test?
+  Attacher.promote_block do
+    LambdaPromoteJob.enqueue(self.class.name, record.class.name, record.id, name, file_data)
+  end
+end
+```
 
 Then the job file should be implemented:
 
@@ -311,9 +323,11 @@ Then the job file should be implemented:
 
 # frozen_string_literal: true
 
-class LambdaPromoteJob < ApplicationJob
-  def perform(data)
-    Timeout.timeout(30) { Shrine::Attacher.lambda_process(data) }
+class LambdaPromoteJob < Que::Job
+  def run(...)
+    ActiveRecord::Base.transaction do
+     Shrine::Attacher.lambda_process(...)
+    end
   end
 end
 ```
@@ -360,7 +374,7 @@ by the following command:
 $ gem build shrine-aws-lambda.gemspec
 ```
 
-Assuming the version was set to `0.1.2`, a `shrine-aws-lambda-0.1.2.gem` binary file will be generated at the root of 
+Assuming the version was set to `0.2.0`, a `shrine-aws-lambda-0.2.0.gem` binary file will be generated at the root of 
 the app (repo).
 
 - The binary file shouldn't be added into the `git` tree, it will be pushed into the RubyGems and to the GitHub releases
@@ -368,7 +382,7 @@ the app (repo).
 #### Pushing a new gem release to RubyGems
 
 ```bash
-$ gem push shrine-aws-lambda-0.1.2.gem # don't forget to specify the correct version number
+$ gem push shrine-aws-lambda-0.2.0.gem # don't forget to specify the correct version number
 ```
 
 #### Crafting the new release on GitHub
@@ -403,12 +417,12 @@ article], which pointed me to use the [Sharp] library for image resizing.
 [Amazon Web Services]: https://aws.amazon.com
 [AWS blog article]: https://aws.amazon.com/blogs/compute/resize-images-on-the-fly-with-amazon-s3-aws-lambda-and-amazon-api-gateway/
 [AWS Lambda]: https://aws.amazon.com/lambda
-[AWS Lamda permissions]: https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html
+[AWS Lambda permissions]: https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html
 [AWS profiles]: https://docs.aws.amazon.com/cli/latest/userguide/cli-multiple-profiles.html
 [AWS S3]: https://aws.amazon.com/s3/
 [Janko]: https://github.com/janko-m
 [lambda-image-resize]: https://github.com/texpert/lambda-image-resize.js
-[localtunnel]: https://github.com/localtunnel/localtunnel
+[ngrok-wrapper]: https://github.com/texpert/ngrok-wrapper
 [Rails]: http://rubyonrails.org
 [Roda]: http://roda.jeremyevans.net
 [Sharp]: https://github.com/lovell/sharp

data/lib/shrine/plugins/aws_lambda/version.rb

@@ -3,7 +3,7 @@
 class Shrine
   module Plugins
     module AwsLambda
-      VERSION = '0.1.2'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/shrine/plugins/aws_lambda.rb

@@ -59,9 +59,12 @@ class Shrine
       module AttacherClassMethods
         # Loads the attacher from the data, and triggers its instance AWS Lambda
         # processing method. Intended to be used in a background job.
-        def lambda_process(data)
-          attacher = load(data)
-          attacher.lambda_process(data)
+        def lambda_process(attacher_class, record_class, record_id, name, file_data)
+          attacher_class = Object.const_get(attacher_class)
+          record         = Object.const_get(record_class).find(record_id) # if using Active Record
+
+          attacher = attacher_class.retrieve(model: record, name: name, file: file_data)
+          attacher.lambda_process
           attacher
         end
 
@@ -85,12 +88,28 @@ class Shrine
         # @return [false] if signature in received headers does't match locally computed AWS signature
         def lambda_authorize(headers, body)
           result = JSON.parse(body)
-          attacher = load(result.delete('context'))
+          context = result['context']
+
+          context_record = context['record']
+          record_class   = context_record[0]
+          record_id      = context_record[1]
+          record         = Object.const_get(record_class).find(record_id)
+          attacher_name  = context['name']
+          attacher       = record.__send__(:"#{attacher_name}_attacher")
+
+          return false unless signature_matched?(attacher, headers, body)
+
+          [attacher, result]
+        end
+
+        private
+
+        def signature_matched?(attacher, headers, body)
           incoming_auth_header = auth_header_hash(headers['Authorization'])
 
           signer = build_signer(
             incoming_auth_header['Credential'].split('/'),
-            JSON.parse(attacher.record.__send__(:"#{attacher.data_attribute}") || '{}').dig('metadata', 'key') || 'key',
+            JSON.parse(attacher.record.__send__(:"#{attacher.attribute}") || '{}').dig('metadata', 'key') || 'key',
             headers['x-amz-security-token']
           )
           signature = signer.sign_request(http_method: 'PUT',
@@ -98,13 +117,10 @@ class Shrine
                                           headers:     { 'X-Amz-Date' => headers['X-Amz-Date'] },
                                           body:        body)
           calculated_signature = auth_header_hash(signature.headers['authorization'])['Signature']
-          return false if incoming_auth_header['Signature'] != calculated_signature
 
-          [attacher, result]
+          incoming_auth_header['Signature'] == calculated_signature
         end
 
-        private
-
         def build_signer(headers, secret_access_key, security_token = nil)
           Aws::Sigv4::Signer.new(
             service:               headers[3],
@@ -141,8 +157,8 @@ class Shrine
         # errors. No more response analysis is performed, because Lambda is invoked asynchronously (note the
         # `invocation_type`: 'Event' in the `invoke` call). The results will be sent by Lambda by HTTP requests to
         # the specified `callbackUrl`.
-        def lambda_process(data)
-          cached_file = uploaded_file(data['attachment'])
+        def lambda_process
+          cached_file = uploaded_file(file)
           assembly = lambda_default_values
           assembly.merge!(store.lambda_process_versions(cached_file, context))
           function = assembly.delete(:function)
@@ -150,13 +166,16 @@ class Shrine
           raise Error, "Function #{function} not available on Lambda!" unless function_available?(function)
 
           prepare_assembly(assembly, cached_file, context)
-          assembly[:context] = data.except('attachment', 'action', 'phase')
+          assembly[:context] = { 'record'       => [record.class.name, record.id],
+                                 'name'         => name,
+                                 'shrine_class' => self.class.name }
           response = lambda_client.invoke(function_name:   function,
                                           invocation_type: 'Event',
                                           payload:         assembly.to_json)
           raise Error, "#{response.function_error}: #{response.payload.read}" if response.function_error
 
-          swap(cached_file) || _set(cached_file)
+          set(cached_file)
+          atomic_persist(cached_file)
         end
 
         # Receives the `result` hash after Lambda request was authorized. The result could contain an array of
@@ -164,7 +183,7 @@ class Shrine
         # attached file was just moved to the target storage bucket.
         #
         # Deletes the signing key, if it is present in the original file's metadata, converts the result to a JSON
-        # string, and writes this string into the `data_attribute` of the Shrine attacher's record.
+        # string, and writes this string into the `attribute` of the Shrine attacher's record.
         #
         # Chooses the `save_method` either for the ActiveRecord or for Sequel, and saves the record.
         # @param [Hash] result
@@ -179,7 +198,7 @@ class Shrine
                            result.to_json
                          end
 
-          record.__send__(:"#{data_attribute}=", attr_content)
+          record.__send__(:"#{attribute}=", attr_content)
           save_method = case record
                         when ActiveRecord::Base
                           :save
@@ -217,7 +236,7 @@ class Shrine
         end
 
         def prepare_assembly(assembly, cached_file, context)
-          assembly[:path] = store.generate_location(cached_file, context)
+          assembly[:path] = store.generate_location(cached_file, metadata: cached_file.metadata, context: context)
           assembly[:storages].each do |s|
             upload_options = get_upload_options(cached_file, context, s)
             s[1][:upload_options] = upload_options if upload_options

data/shrine-aws-lambda.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'aws-sdk-lambda', '~> 1.0'
   gem.add_dependency 'aws-sdk-s3', '~> 1.2'
-  gem.add_dependency 'shrine', '~> 2.6'
+  gem.add_dependency 'shrine', '~> 3.4'
 
   gem.add_development_dependency 'activerecord', '>= 4.2.0'
   gem.add_development_dependency 'dotenv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-aws-lambda
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Aurel Branzeanu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-lambda
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement