shark-on-lambda 1.0.0.rc4 → 2.0.0.rc3

data/lib/shark_on_lambda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SharkOnLambda
-  VERSION = '1.0.0.rc4'
+  VERSION = '2.0.0.rc3'
 end

data/shark-on-lambda.gemspec

@@ -30,18 +30,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'actionpack'
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'jsonapi-rb'
+  spec.required_ruby_version = '>= 2.5'
+
+  spec.add_dependency 'actionpack', '~> 6.0.0'
+  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 'zeitwerk', '~> 2.2'
+  spec.add_dependency 'rack-on-lambda', '~> 1.0'
+  spec.add_dependency 'zeitwerk', '~> 2.3'
 
   # TODO: Do we really need `activemodel`?
   #       Or can we get away with mocking out ActiveModel::Errors?
   spec.add_development_dependency 'activemodel'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'fasterer'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: shark-on-lambda
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Huy Dinh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: jsonapi-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -73,35 +73,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: rack-on-lambda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fasterer
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -260,36 +260,31 @@ files:
 - bin/console
 - bin/setup
 - changelog.md
+- doc/upgrade-from-0.6.x-to-1.x.md
 - gems.rb
 - lib/shark-on-lambda.rb
 - lib/shark_on_lambda.rb
 - 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/concerns/resettable_singleton.rb
-- lib/shark_on_lambda/concerns/yaml_config_loader.rb
+- lib/shark_on_lambda/cacheable.rb
 - lib/shark_on_lambda/configuration.rb
-- lib/shark_on_lambda/dispatcher.rb
 - lib/shark_on_lambda/errors/base.rb
 - lib/shark_on_lambda/errors/base_serializer.rb
-- lib/shark_on_lambda/inferrers/name_inferrer.rb
 - lib/shark_on_lambda/inferrers/serializer_inferrer.rb
-- lib/shark_on_lambda/jsonapi_controller.rb
 - lib/shark_on_lambda/jsonapi_parameters.rb
 - lib/shark_on_lambda/jsonapi_renderer.rb
 - lib/shark_on_lambda/middleware/base.rb
 - lib/shark_on_lambda/middleware/honeybadger.rb
 - lib/shark_on_lambda/middleware/jsonapi_rescuer.rb
 - lib/shark_on_lambda/middleware/lambda_logger.rb
-- lib/shark_on_lambda/middleware/rescuer.rb
-- lib/shark_on_lambda/query.rb
-- lib/shark_on_lambda/rack_adapters/api_gateway.rb
+- lib/shark_on_lambda/rake_tasks.rb
 - lib/shark_on_lambda/request.rb
 - lib/shark_on_lambda/response.rb
 - lib/shark_on_lambda/rspec/env_builder.rb
 - lib/shark_on_lambda/rspec/helpers.rb
-- lib/shark_on_lambda/rspec/jsonapi_helpers.rb
-- lib/shark_on_lambda/secrets.rb
+- lib/shark_on_lambda/rspec/request_helpers.rb
+- lib/shark_on_lambda/rspec/response_helpers.rb
 - lib/shark_on_lambda/version.rb
 - shark-on-lambda.gemspec
 homepage: https://github.com/Skudo/shark-on-lambda
@@ -304,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/shark_on_lambda/concerns/resettable_singleton.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  module Concerns
-    module ResettableSingleton
-      def self.included(base)
-        base.include(Singleton)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def reset
-          @singleton__instance__ = nil
-        end
-      end
-    end
-  end
-end

data/lib/shark_on_lambda/concerns/yaml_config_loader.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  module Concerns
-    module YamlConfigLoader
-      def load_yaml_files(stage:, fallback: :default, paths:)
-        result = HashWithIndifferentAccess.new
-        paths.each do |path|
-          data = load_yaml_file(stage: stage, fallback: fallback, path: path)
-          result.deep_merge!(data)
-        end
-        result
-      end
-
-      protected
-
-      def load_yaml_file(stage:, fallback:, path:)
-        return {} unless File.exist?(path)
-
-        data = YAML.load_file(path)
-        return {} unless data.is_a?(Hash)
-
-        data = data.with_indifferent_access
-        data[stage] || data[fallback] || {}
-      end
-    end
-  end
-end

data/lib/shark_on_lambda/dispatcher.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  class Dispatcher
-    def call(env)
-      request = Request.new(env)
-      response = Response.new
-
-      controller = controller_class(env)
-      action = controller_action(env)
-      controller.dispatch(action, request, response)
-
-      response.prepare!
-    end
-
-    private
-
-    def controller_action(env)
-      env['shark.action']
-    end
-
-    def controller_class(env)
-      env['shark.controller'].camelize.constantize
-    end
-  end
-end

data/lib/shark_on_lambda/inferrers/name_inferrer.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  module Inferrers
-    class NameInferrer
-      class << self
-        def from_controller_name(class_name)
-          from_name(:controller, class_name)
-        end
-
-        def from_deserializer_name(class_name)
-          from_name(:deserializer, class_name)
-        end
-
-        def from_handler_name(class_name)
-          from_name(:handler, class_name)
-        end
-
-        def from_model_name(class_name)
-          from_name(:model, class_name)
-        end
-
-        def from_serializer_name(class_name)
-          from_name(:serializer, class_name)
-        end
-
-        protected
-
-        def from_name(type, class_name)
-          base = class_name.underscore
-          base = case type
-                 when :controller, :deserializer, :handler, :serializer
-                   base.sub(/_#{type}\z/, '')
-                 when :model
-                   base
-                 end
-          new(base)
-        end
-      end
-
-      def initialize(base)
-        @base = base
-      end
-
-      def controller
-        "#{@base}_controller".camelize
-      end
-
-      def deserializer
-        "#{@base}_deserializer".camelize
-      end
-
-      def handler
-        "#{@base}_handler".camelize
-      end
-
-      def model
-        @base.camelize
-      end
-
-      def serializer
-        "#{@base}_serializer".camelize
-      end
-    end
-  end
-end

data/lib/shark_on_lambda/jsonapi_controller.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  class JsonapiController < BaseController
-    ActionController::Renderers.add :jsonapi do |object, options|
-      response.set_header('content-type', 'application/vnd.api+json')
-      return { data: {} }.to_json if object.nil?
-
-      jsonapi_params = JsonapiParameters.new(params)
-      jsonapi_renderer = JsonapiRenderer.new
-      render_options = jsonapi_params.to_h.deep_merge(options)
-
-      jsonapi_renderer.render(object, render_options)
-    end
-
-    def redirect_to(options = {}, response_status = {})
-      super
-      return if response_status[:status] == 304
-
-      self.response_body = { data: {} }.to_json
-    end
-
-    def render(object, options = {})
-      options.merge!(jsonapi: object, content_type: 'application/vnd.api+json')
-
-      super(options)
-    end
-  end
-end

data/lib/shark_on_lambda/middleware/rescuer.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  module Middleware
-    class Rescuer < Base
-      private
-
-      def _call(env)
-        app.call(env)
-      rescue Errors::Base => e
-        rescue_shark_error(e)
-      rescue StandardError => e
-        rescue_standard_error(e)
-      end
-
-      def error_response(status, headers, message)
-        response_body = Rack::BodyProxy.new([message]) do
-          message.close if message.respond_to?(:close)
-        end
-
-        [status, headers, response_body]
-      end
-
-      def rescue_shark_error(error)
-        status = error.status || 500
-        error_response(status, {}, error.message)
-      end
-
-      def rescue_standard_error(error)
-        SharkOnLambda.logger.error(error.message)
-        SharkOnLambda.logger.error(error.backtrace.join("\n"))
-
-        error_response(500, {}, error.message)
-      end
-    end
-  end
-end

data/lib/shark_on_lambda/query.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module SharkOnLambda
-  # The `multiValueQueryStringParameters` object from the API Gateway event
-  # keeps _all_ values in an array, regardless of the actual size of the array
-  # and regardless of the "intent" of the query string parameter.
-  #
-  # In order to normalise this behaviour, we treat the query strings
-  #
-  #   `key=value1&key=value2`
-  #
-  # and
-  #
-  #   `key[]=value1&key[]=value2`
-  #
-  # the same. Both are to be serialised to the query string
-  #
-  #   `key[]=value1&key[]=value2`
-  #
-  # However, the query strings
-  #
-  #   `key=value`
-  #
-  # and
-  #
-  #   `key[]=value`
-  #
-  # are _not_ to be treated the same.
-  class Query
-    def initialize(data = {})
-      @params = HashWithIndifferentAccess.new.merge(data)
-    end
-
-    def add(key, values)
-      if key.to_s.end_with?('[]')
-        actual_key = key[0..-3]
-        add_list(actual_key, values)
-      else
-        values.each { |value| add_item(key, value) }
-      end
-    end
-
-    def to_h
-      @params
-    end
-
-    def to_s
-      Rack::Utils.build_nested_query(to_h)
-    end
-
-    private
-
-    def add_item(key, value)
-      if @params[key].nil?
-        @params[key] = value
-      else
-        @params[key] = Array(@params[key])
-        @params[key] << value
-      end
-    end
-
-    def add_list(key, value)
-      @params[key] ||= []
-      @params[key].concat(value)
-    end
-  end
-end