apia 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834322a8dd87426fd34415e096964a331ca3fefd5101e05e23a216da197e1820
-  data.tar.gz: d422b240f990920a61e520e360d15414aef1b8c0f39021684fa32d31d0aaf1a9
+  metadata.gz: e5db442aede360ce867a790d610a1fd52ca99149fae66d7122d18061cb2ac389
+  data.tar.gz: 30d3c64645a15f11b6e2d96326e987f31b0623e500a56c49194e80589e7303d1
 SHA512:
-  metadata.gz: 6a42e4aaf195d8bd6dc7053a473bbc107ff4303d184bfae3c5bf1e7bb25ef618f57dbc86436c697b06786847f67077d9a06ae9451c6211fbf6072a5cfd6b755e
-  data.tar.gz: 73762ac070550ec052ffa79f2a5e8fdbb0317b8cdb62020b74d494706a1f2e63a65d52691fed82da4f2ba60ed2d66a2572686d3e0c9fef237ec2632a67bc339b
+  metadata.gz: 70b9295d1b016210832c30b2d233683efa045797c5113e80bd959dfa6a6888c414f3a60e01ded946f63d50d51cd79cdae58514c2d8b483bfec29be71a89b83bd
+  data.tar.gz: af2fa9e9322ed357a2074336a2e536d8ebb3c955692bd1b6a85812fe788fc4d5f19b0b1ecc57ce99c82b118fb7b5024a276d54edbb3560ab594b718c80e88ccd

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/lib/apia/argument_set.rb

@@ -5,6 +5,7 @@ require 'apia/definitions/argument_set'
 require 'apia/errors/invalid_argument_error'
 require 'apia/errors/missing_argument_error'
 require 'apia/helpers'
+require 'apia/deep_merge'
 
 module Apia
   class ArgumentSet
@@ -46,7 +47,11 @@ module Apia
       # @param request [Apia::Request]
       # @return [Apia::ArgumentSet]
       def create_from_request(request)
-        new(request.json_body || request.params || {}, request: request)
+        json_body = request.json_body || {}
+        params = request.params || {}
+        merged_params = DeepMerge.merge(params, json_body)
+
+        new(merged_params, request: request)
       end
 
     end
@@ -117,6 +122,13 @@ module Apia
       @source.key?(key.to_sym)
     end
 
+    # Return whether the argument set has no arguments within?
+    #
+    # @return [Boolean]
+    def empty?
+      @source.empty?
+    end
+
     # Validate an argument set and return any errors as appropriate
     #
     # @param argument [Apia::Argument]

data/lib/apia/deep_merge.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Apia
+  module DeepMerge
+
+    class << self
+
+      def merge(hash_a, hash_b, &block)
+        hash_a.merge!(hash_b) do |key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            merge(this_val, other_val, &block)
+          elsif block_given?
+            block.call(key, this_val, other_val)
+          else
+            other_val
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/apia/dsls/route_group.rb

@@ -34,6 +34,10 @@ module Apia
         @group.description = description
       end
 
+      def no_schema
+        @group.schema = false
+      end
+
       def controller(controller)
         @group.default_controller = controller
       end

data/lib/apia/notifications.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Apia
+  class Notifications
+
+    class << self
+
+      def handlers
+        @handlers ||= []
+      end
+
+      def notify(event, args = {})
+        handlers.each do |handler|
+          handler.call(event, args)
+        end
+      end
+
+      def add_handler(&block)
+        handlers.push(block)
+      end
+
+      def clear_handlers
+        @handlers = nil
+      end
+
+    end
+
+  end
+end

data/lib/apia/rack.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'apia/rack_error'
 require 'apia/request'
 require 'apia/response'
+require 'apia/notifications'
 
 module Apia
   class Rack
@@ -91,19 +92,28 @@ module Apia
       request.endpoint = route.endpoint
       request.route = route
 
+      start_time = Time.now
       response = request.endpoint.execute(request)
+      end_time = Time.now
+
+      Apia::Notifications.notify(:request, { request: request, response: response, time: (end_time - start_time).to_f })
+
       response.rack_triplet
     rescue ::StandardError => e
       if e.is_a?(RackError) || e.is_a?(Apia::ManifestError)
         return e.triplet
       end
 
+      request_or_nil = defined?(request) ? request : nil
+
       api.definition.exception_handlers.call(e, {
         env: env,
         api: api,
-        request: defined?(request) ? request : nil
+        request: request_or_nil
       })
 
+      Apia::Notifications.notify(:request_error, { exception: e, request: request_or_nil, api: api, env: env })
+
       if development?
         return triplet_for_exception(e)
       end

data/lib/apia/request.rb

@@ -39,12 +39,20 @@ module Apia
       has_header?('rack.input')
     end
 
+    def params
+      return {} unless body?
+
+      super
+    end
+
     private
 
     def parse_json_from_string(body)
       return {} if body.empty?
 
-      JSON.parse(body)
+      response = JSON.parse(body)
+      response = {} unless response.is_a?(Hash)
+      response
     rescue JSON::ParserError => e
       raise InvalidJSONError, e.message
     end

data/lib/apia/route_group.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
 module Apia
-  class RouteGroup
+  class RouteGroup < Definition
 
-    attr_reader :id
     attr_reader :parent
-    attr_accessor :name
-    attr_accessor :description
     attr_accessor :default_controller
     attr_reader :groups
 
+    # rubocop:disable Lint/MissingSuper
     def initialize(id, parent)
       @id = id
       @parent = parent
       @groups = []
     end
+    # rubocop:enable Lint/MissingSuper
 
   end
 end

data/lib/apia/schema/controller_schema_type.rb

@@ -18,8 +18,10 @@ module Apia
       end
       field :endpoints, type: [ControllerEndpointSchemaType] do
         backend do |c|
-          c.endpoints.map do |key, endpoint|
-            {
+          c.endpoints.each_with_object([]) do |(key, endpoint), array|
+            next unless endpoint.definition.schema?
+
+            array << {
               name: key.to_s,
               endpoint: endpoint.definition.id
             }

data/lib/apia/schema/route_set_schema_type.rb

@@ -10,10 +10,15 @@ module Apia
 
       field :routes, [RouteSchemaType] do
         backend do |o|
-          o.routes.select { |r| r.endpoint&.definition&.schema? }
+          o.routes.select { |r| r.group&.schema? && r.endpoint&.definition&.schema? }
+        end
+      end
+
+      field :groups, [RouteGroupSchemaType] do
+        backend do |o|
+          o.groups.select { |g| g.schema? }
         end
       end
-      field :groups, [RouteGroupSchemaType]
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,6 +52,7 @@ files:
 - lib/apia/authenticator.rb
 - lib/apia/callable_with_environment.rb
 - lib/apia/controller.rb
+- lib/apia/deep_merge.rb
 - lib/apia/defineable.rb
 - lib/apia/definition.rb
 - lib/apia/definitions/api.rb
@@ -115,6 +116,7 @@ files:
 - lib/apia/lookup_environment.rb
 - lib/apia/manifest_errors.rb
 - lib/apia/mock_request.rb
+- lib/apia/notifications.rb
 - lib/apia/object.rb
 - lib/apia/object_set.rb
 - lib/apia/pagination_object.rb
@@ -164,7 +166,8 @@ files:
 - lib/apia/schema/scope_type.rb
 - lib/apia/version.rb
 homepage: https://github.com/krystal/apia
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []