apia 3.0.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33cb0099fcbfe56a47b0c3f6253252a7fbe64963627695d8580936f72731ee37
-  data.tar.gz: 9744e82b89172cad5f5eac2870484f43dfe0cf23e793e2db6265b7dcbdd20f12
+  metadata.gz: f9eccaade7623f6fc8ecae88bb8c87da23d4a436a2d76801ac6dbd2d57db9efe
+  data.tar.gz: c77009793790064a1f6219b6a362128359d2e98a0ccc7c8215d184f7afa36b5b
 SHA512:
-  metadata.gz: 195b2874b6deeeb9d52f8fd568cf553da7fd09f43a10e04a4302736eae62ea3ecd4272077e8b7d446cfb46a74d9023ba6af69c6d6d5796ecf3036fcb95bde9d2
-  data.tar.gz: 8f37aca1ff128cbe3d3fe6b0341a64b68df34ba273f6eb7503c8c3b8ec6e672fb14efe24f589e40f81c1d3fb325e6f0649dc5ccdb0a55925bcf68f9818d995c7
+  metadata.gz: 3dc391ac5e8ad44636978220ceeb55bef47b10ba03f5826e371ed4041e428873ed59d351447d3345817e3bbb8b25bfafc6ecd01f4f86745ddc1d0851c2bc19a2
+  data.tar.gz: 2f92e720ce247b4408c21bc5a4096137ef75433b10c8712c4d2d115f8d4a33def15509bd5a7af05fd1bfffed9e465e57dac6cd4f5422e3aa2278e12aa0727664

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.2.0

data/lib/apia/argument_set.rb

@@ -122,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/definitions/endpoint.rb

@@ -36,6 +36,19 @@ module Apia
         @potential_errors ||= Apia::ErrorSet.new
       end
 
+      def fields=(fieldset)
+        unless @fields.empty?
+          raise Apia::StandardError, 'Cannot set the fieldset on an endpoint that already has fields defined'
+        end
+
+        @fields = fieldset
+        @fields_overriden = true
+      end
+
+      def fields_overriden?
+        @fields_overriden == true
+      end
+
       def dsl
         @dsl ||= DSLs::Endpoint.new(self)
       end

data/lib/apia/dsls/endpoint.rb

@@ -41,6 +41,10 @@ module Apia
       end
 
       def field(name, *args, type: nil, **options, &block)
+        if @definition.fields_overriden?
+          raise Apia::StandardError, 'Cannot add fields to an endpoint that has a separate fieldset'
+        end
+
         if pagination_options = options.delete(:paginate)
 
           unless @definition.paginated_field.nil?
@@ -64,6 +68,10 @@ module Apia
         super(name, *args, type: type, **options, &block)
       end
 
+      def fields(fieldset)
+        @definition.fields = fieldset
+      end
+
       def scopes(*names)
         names.each { |name| scope(name) }
       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

@@ -50,7 +50,9 @@ module Apia
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,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