jsonapi-utils 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17de793a78cef4a0b86e1fc100ebae4333ed18f6
-  data.tar.gz: 5a46049114450f913cddd2e2c7679a809772847b
+  metadata.gz: 9e79dcc432ea412e938f711f040d12c70cb5196f
+  data.tar.gz: e34a24d48a769016f737c156311523935b4714a7
 SHA512:
-  metadata.gz: 2dc69b2394872cf5e66317f4719f03fafcd1be2ec24e14a99ed57416ec128fcfc24430a444c3365306cf139595124581aca369dc1c14721340974783b269f929
-  data.tar.gz: 1a19b7118d7396bdb61f12f0c134cc503ac8906952d627740ed7d3da66053230547c1724e68ab5069662bc33138cdbdf33d180d65c9c0c5866726c6ab288d86d
+  metadata.gz: 9b4222af57feada6a8c45b7385e8c889535e8000e229093e4053ce2812ef041aaf799216267e5105195282b027d516cf5b01db12204697f33d92c169a3b2ecd1
+  data.tar.gz: 4accdb7433731907f5cd9121c8e8227d916dae0480e1decf56b727208b7ef1537ef765236c4058130c21f74e77e09aceefcc4f1ed18c3d9d152c200b0f773030

data/lib/jsonapi/utils/request.rb

@@ -1,48 +1,87 @@
-module JSONAPI
-  module Utils
-    module Request
-      def jsonapi_request_handling
-        setup_request
-        check_request
-      end
+module JSONAPI::Utils
+  module Request
+    # Setup and check request before action gets actually evaluated.
+    #
+    # @api public
+    def jsonapi_request_handling
+      setup_request
+      check_request
+    end
 
-      def setup_request
-        @request ||=
-          JSONAPI::Request.new(
-            params.dup,
-            context: context,
-            key_formatter: key_formatter,
-            server_error_callbacks: (self.class.server_error_callbacks || [])
-          )
-      end
+    # Instantiate the request object.
+    #
+    # @return [JSONAPI::RequestParser]
+    #
+    # @api public
+    def setup_request
+      @request ||= JSONAPI::RequestParser.new(
+        params,
+        context: context,
+        key_formatter: key_formatter,
+        server_error_callbacks: (self.class.server_error_callbacks || [])
+      )
+    end
 
-      def check_request
-        @request.errors.blank? || jsonapi_render_errors(json: @request)
-      end
+    # Render an error response if the parsed request got any error.
+    #
+    # @api public
+    def check_request
+      @request.errors.blank? || jsonapi_render_errors(json: @request)
+    end
 
-      def resource_params
-        build_params_for(:resource)
-      end
+    # Override the JSONAPI::ActsAsResourceController#process_request method.
+    #
+    # It might be removed when the following line on JR is fixed:
+    # https://github.com/cerebris/jsonapi-resources/blob/release-0-8/lib/jsonapi/acts_as_resource_controller.rb#L62
+    #
+    # @return [String]
+    #
+    # @api public
+    def process_request
+      process_operations
+      render_results(@operation_results)
+    rescue => e
+      handle_exceptions(e)
+    end
 
-      def relationship_params
-        build_params_for(:relationship)
-      end
+    # Helper to get params for the main resource.
+    #
+    # @return [Hash]
+    #
+    # @api public
+    def resource_params
+      build_params_for(:resource)
+    end
+
+    # Helper to get params for relationship params.
+    #
+    # @return [Hash]
+    #
+    # @api public
+    def relationship_params
+      build_params_for(:relationship)
+    end
 
-      private
+    private
 
-      def build_params_for(param_type)
-        return {} if @request.operations.empty?
+    # Extract params from request and build a Hash with params
+    # for either the main resource or relationships.
+    #
+    # @return [Hash]
+    #
+    # @api private
+    def build_params_for(param_type)
+      return {} if @request.operations.empty?
 
-        keys      = %i(attributes to_one to_many)
-        operation = @request.operations.find { |e| e.data.keys & keys == keys }
+      keys = %i(attributes to_one to_many)
+      operation = @request.operations.find { |e| e.options[:data].keys & keys == keys }
 
-        if operation.nil?
-          {}
-        elsif param_type == :relationship
-          operation.data.values_at(:to_one, :to_many).compact.reduce(&:merge)
-        else
-          operation.data[:attributes]
-        end
+      if operation.nil?
+        {}
+      elsif param_type == :relationship
+        operation.options[:data].values_at(:to_one, :to_many).compact.reduce(&:merge)
+      else
+        operation.options[:data][:attributes]
       end
     end
   end

data/lib/jsonapi/utils/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Utils
-    VERSION = '0.4.8'
+    VERSION = '0.4.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Tiago Guedes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement