shark-on-lambda 2.0.0.rc1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642998e593034c083639724031920edfe7568de50d276cc3c58932c099d94a0e
-  data.tar.gz: 8101e725e3ef4f710422625726f87c7a324e986b9eb6184a988e0fdd3812bdda
+  metadata.gz: 60c364794145282c0c04213abbf976f245f696442d827b2149e0ccaa1fe95d08
+  data.tar.gz: b1360ec675a7267f41ce6d2d385f2a5c5cae8cb87c93a958c79b8c326b4a635e
 SHA512:
-  metadata.gz: d23eac59ce2797aac609444509d571a54ffb22024f11070a54dd43d600ceeeb2b527e421c1c9463ac08cceb4fa2b9ad6a366e496cebb47c2873276e9abf4a9ec
-  data.tar.gz: 8932eeb3134b88fb0da09b35a3a70eb1b4d1bfb5b2a1f522b9f4bc23c07890b4c6c9cd061374aebf4eb80c09695ef69420da95cc7f608c415b81692724f41e56
+  metadata.gz: 48d8ef1d01c5cfd04fc2c40effca3c53f29bb2b3deaecb8f240a545829425e279274e570e9ace27948a4ec738da115ed5c69cef4418e2023aa8dc99eedf240e2
+  data.tar.gz: ec1d9ce4bcb7b62be4f986be8763f31c3879ffc9b1eb800fe676a03df6a93f9313657696486a6a5fe993784fd8c5f601ed398d4c052b350fc02dde2d86f4624b

data/.rubocop.yml

@@ -10,10 +10,15 @@ Metrics/BlockLength:
 Layout/LineLength:
   Max: 80
 
+Lint/EmptyClass:
+  Enabled: false
+
 Naming/FileName:
   Exclude:
     - lib/shark-on-lambda.rb
     - spec/shark-on-lambda_spec.rb
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
 
 # TODO: Add documentation and remove the Style/Documentation exception.
 Style/Documentation:

data/{changelog.md → CHANGELOG.md}

@@ -2,6 +2,10 @@
 
 #### Unreleased
 
+#### 2.1.0
+- [Fix] `SharkOnLambda::BaseController#render` does not set content type `application/vnd.api+json`
+- [Fix] `:jsonapi` Renderer sets content type `application/vnd.api+json` correctly
+
 #### 2.0.0
 - [Deprecate] Requiring `shark-on-lambda` is marked as deprecated in favour of requiring `shark_on_lambda`.
 - [Break] `SharkOnLambda::Dispatcher` was removed in favour of routing via `ActionDispatch::Routing`.
@@ -9,6 +13,8 @@
 - [Break] `SharkOnLambda::JsonapiController` was removed.
 - [Break] Support for `path_parameters` in RSpec helpers was removed.
 - [Break] Configuration files are not loaded automatically anymore.
+- Added `SharkOnLambda::Cacheable`.
+- Added `SharkOnLambda.cache` and `SharkOnLambda.global_cache`.
 - Added support for routing.
 - Use `rack-on-lambda` as an adapter for events from the (REST API flavoured) API Gateway.
 
@@ -22,7 +28,7 @@
 - [Break] Remove the `ApiGateway` namespace, move all items from that namespace up by one level.
 - [Break] Remove build rake tasks.
 - [Added `SharkOnLambda::LambdaLogger`](https://www.pivotaltracker.com/story/show/169573932)
-- Added support for Rack-compatible middleware. 
+- Added support for Rack-compatible middleware.
 - `SharkOnLambda::BaseController` now acts more like `ActionController::BaseController`.
 - Support `ActiveModel::Errors` nested validation errors.
 - Added `SharkOnLambda::RSpec::Helpers` and `SharkOnLambda::RSpec::JsonapiHelpers`.

data/lib/shark-on-lambda.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/string'
 require 'active_support/deprecation'
 
 deprecation_message = <<-MESSAGE.squish
-  Requiring `shark-on-lambda` is deprecated and will be removed in version 3.0. 
+  Requiring `shark-on-lambda` is deprecated and will be removed in version 3.
   Please require `shark_on_lambda` instead.
 MESSAGE
 ActiveSupport::Deprecation.warn(deprecation_message, caller(2))

data/lib/shark_on_lambda.rb

@@ -38,7 +38,7 @@ module SharkOnLambda
   class << self
     extend Forwardable
 
-    attr_writer :application, :env, :logger
+    attr_writer :application, :cache, :env, :global_cache, :logger
 
     def_instance_delegators :application, :initialize!, :root
 
@@ -50,10 +50,18 @@ module SharkOnLambda
       application.config
     end
 
+    def cache
+      @cache ||= ActiveSupport::Cache::NullStore.new
+    end
+
     def env
       @env || ENV['STAGE'].presence || 'development'
     end
 
+    def global_cache
+      @global_cache ||= ActiveSupport::Cache::NullStore.new
+    end
+
     def logger
       @logger ||= Logger.new($stdout)
     end

data/lib/shark_on_lambda/application.rb

@@ -37,7 +37,7 @@ module SharkOnLambda
     end
 
     def config_for(name, env: SharkOnLambda.env)
-      config = load_config_file(name, env: env)
+      config = load_config_file(name, env: env, fail_with_exception: true)
       config.deep_merge(load_config_file("#{name}.local", env: env))
     end
 
@@ -53,10 +53,12 @@ module SharkOnLambda
       @routes = ActionDispatch::Routing::RouteSet.new_with_config(router_config)
     end
 
-    def load_config_file(name, env:)
+    def load_config_file(name, env:, fail_with_exception: false)
       filename = "#{name}.yml"
       config_file = SharkOnLambda.root.join('config', filename)
       unless config_file.exist?
+        return {} unless fail_with_exception
+
         raise ArgumentError,
               "Could not load configuration. No such file - #{config_file}"
       end

data/lib/shark_on_lambda/base_controller.rb

@@ -22,7 +22,7 @@ module SharkOnLambda
     end
 
     ActionController::Renderers.add :jsonapi do |object, options|
-      response.set_header('content-type', 'application/vnd.api+json')
+      response.content_type = 'application/vnd.api+json; charset=utf-8'
       return { data: {} }.to_json if object.nil?
 
       jsonapi_renderer = JsonapiRenderer.new(object)
@@ -52,15 +52,6 @@ module SharkOnLambda
       self.response_body = no_body? ? nil : { data: {} }.to_json
     end
 
-    def render(object, options = {})
-      options.merge!(
-        jsonapi: object,
-        content_type: 'application/vnd.api+json'
-      )
-
-      super(options)
-    end
-
     private
 
     def no_body?

data/lib/shark_on_lambda/cacheable.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SharkOnLambda
+  module Cacheable
+    delegate :cache, :global_cache, to: SharkOnLambda
+
+    def cache_duration(item)
+      cache_durations[item] || cache_durations[:default]
+    end
+
+    private
+
+    def cache_durations
+      return @cache_durations if defined?(@cache_durations)
+
+      settings = SharkOnLambda.application.config_for(:settings) || {}
+      @cache_durations = settings.fetch(:cache_durations, {})
+      @cache_durations = @cache_durations.with_indifferent_access
+    end
+  end
+end

data/lib/shark_on_lambda/errors/base.rb

@@ -36,7 +36,7 @@ module SharkOnLambda
       end
       class_name_parts = message.to_s.split(/\s+/)
       class_name_parts.map! { |word| word.gsub(/[^a-z]/i, '').capitalize }
-      class_name = class_name_parts.join('')
+      class_name = class_name_parts.join
       const_set(class_name, error_class)
 
       [status_code, error_class]

data/lib/shark_on_lambda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SharkOnLambda
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.1.0'
 end

data/shark-on-lambda.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '~> 6.0.0'
   spec.add_dependency 'jsonapi-rb', '~> 0.5.0'
   spec.add_dependency 'rack', '>= 2.0.8', '< 3'
-  spec.add_dependency 'rack-on-lambda', '~> 1.0'
+  spec.add_dependency 'rack-on-lambda', '~> 1.0', '>= 1.0.1'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 
   # TODO: Do we really need `activemodel`?
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '1.11.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shark-on-lambda
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.1.0
 platform: ruby
 authors:
 - Huy Dinh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -79,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -202,16 +208,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -253,13 +259,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- changelog.md
 - doc/upgrade-from-0.6.x-to-1.x.md
 - gems.rb
 - lib/shark-on-lambda.rb
@@ -267,6 +273,7 @@ files:
 - lib/shark_on_lambda/api_gateway_handler.rb
 - lib/shark_on_lambda/application.rb
 - lib/shark_on_lambda/base_controller.rb
+- lib/shark_on_lambda/cacheable.rb
 - lib/shark_on_lambda/configuration.rb
 - lib/shark_on_lambda/errors/base.rb
 - lib/shark_on_lambda/errors/base_serializer.rb
@@ -301,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6.2