carrot_rpc 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0a0dee401c7064c07550c3c601e23353d2a88c
-  data.tar.gz: 6994fbf5613108aed02b583bfa4f900ac2311ea5
+  metadata.gz: b572d5d0139ae2c92283f32b320f917135f44dfd
+  data.tar.gz: 26e9cf234ef9c0f34c2856735424e2ffa43aa9b7
 SHA512:
-  metadata.gz: 96d9d94ac495890858a71d5cf6bb5fb87390c123217c40220070cc2c56a27a67757fcd79b66041db1a9f588976b9135289b48a6c92e30f67d350f7affc47ec30
-  data.tar.gz: c57f379c26ea30abf880ea0c0b44d1303ab5635aad92bb7ecef87ac9e1ed6cee4e8ef1c1e8f8b49d8571481ca1792b1db5c658416ad70516136fa39de34702c3
+  metadata.gz: db094e71f16fed9739c59444b294121db35813ccab080569779da8c63593f3d2732007fceb4efd955542a988896514c3c2b5dac06a5a51aa4005321140eec46a
+  data.tar.gz: 9f3a627db5a911aa7a8171ff0acf0671624d7c832f6de2420448493d3e19f4b6b05912e53511b0fed3b76535637f4f43755b602bc9475f9f5233e24557632d3f

data/CHANGELOG.md

@@ -3,25 +3,30 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Changelog](#changelog)
-  - [v0.3.0](#v030)
-    - [Enhancements](#enhancements)
+  - [v0.4.1](#v041)
     - [Bug Fixes](#bug-fixes)
-  - [v0.2.3](#v023)
-    - [Enhancements](#enhancements-1)
+  - [v0.4.0](#v040)
+    - [Enhancements](#enhancements)
     - [Bug Fixes](#bug-fixes-1)
-    - [Upgrading](#upgrading)
-  - [v0.2.1](#v021)
+  - [v0.3.0](#v030)
+    - [Enhancements](#enhancements-1)
     - [Bug Fixes](#bug-fixes-2)
-  - [v0.2.0](#v020)
+  - [v0.2.3](#v023)
     - [Enhancements](#enhancements-2)
     - [Bug Fixes](#bug-fixes-3)
+    - [Upgrading](#upgrading)
+  - [v0.2.1](#v021)
+    - [Bug Fixes](#bug-fixes-4)
+  - [v0.2.0](#v020)
+    - [Enhancements](#enhancements-3)
+    - [Bug Fixes](#bug-fixes-5)
     - [Incompatible Changes](#incompatible-changes)
   - [v0.1.2](#v012)
-    - [Enhancements](#enhancements-3)
-    - [Bug Fixes](#bug-fixes-4)
-  - [v0.1.1](#v011)
     - [Enhancements](#enhancements-4)
-    - [Bug Fixes](#bug-fixes-5)
+    - [Bug Fixes](#bug-fixes-6)
+  - [v0.1.1](#v011)
+    - [Enhancements](#enhancements-5)
+    - [Bug Fixes](#bug-fixes-7)
     - [Incompatible Changes](#incompatible-changes-1)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -29,6 +34,12 @@
 # Changelog
 All significant changes in the project are documented here.
 
+## v0.4.1
+### Bug Fixes
+* [#23](https://githb.com/C-S-D/carrot_rpc/pull/23) - [shamil614](https://github.com/shamil614)
+  * Fixes errors for non-hash results being called with hash methods.
+  * RPC client parses response to account for jsonrpc error object as well as jsonrpc result object.
+
 ## v0.4.0
 
 ### Enhancements
@@ -38,6 +49,9 @@ All significant changes in the project are documented here.
 * [#19](https://githb.com/C-S-D/carrot_rpc/pull/19) - [KronicDeth](http://github.com/kronicdeth)
   * Put JSONAPI errors documents into the JSONRPC error fields instead of returning as normal results as consumers, such as `Rpc.Generic.Client` are expecting all errors to be in JSONRPC's error field and not have to check if the non-error `result` contains a JSONAPI level error.  This achieves parity with the behavior in the Elixir `Rpc.Generic.Server`.
   * Scrub JSONAPI error fields that are `nil` so they don't get transmitted as `null`.  JSONAPI spec is quite clear that `null` columns shouldn't be transmitted except in the case of `null` data to signal a missing singleton resource.  This achieves compatibility with the error parsing in `Rpc.Generic.Client` in Elixir.
+  
+### Incompatible Changes
+* [#20](https://githb.com/C-S-D/carrot_rpc/pull/20) - `base_url`, which must be implemented by any RPC server that `include CarrotRpc::RpcServer::JSONAPIResources`, changes from `base_url() :: String` to `base_url(JSONAPI::OperationResult, JSONAPI::Request) :: String` - [shamil614](https://github.com/shamil614)
 
 ## v0.3.0
 

data/lib/carrot_rpc/rpc_client.rb

@@ -45,8 +45,10 @@ class CarrotRpc::RpcClient
     # setup subscribe block to Service
     # block => false is a non blocking IO option.
     @reply_queue.subscribe(block: false) do |_delivery_info, properties, payload|
-      result = JSON.parse(payload).rename_keys("-", "_").with_indifferent_access
-      @results[properties[:correlation_id]].push(result[:result])
+      response = JSON.parse(payload).rename_keys("-", "_").with_indifferent_access
+
+      result = parse_response(response)
+      @results[properties[:correlation_id]].push(result)
     end
   end
 
@@ -125,4 +127,21 @@ class CarrotRpc::RpcClient
   def update(params)
     remote_call("update", params)
   end
+
+  private
+
+  # Logic to find the data from the RPC response.
+  # @param [Hash] response from rpc call
+  # @return [Hash,nil]
+  def parse_response(response)
+    # successful response
+    if response.key?(:result)
+      response[:result]
+    # data is the key holding the error information
+    elsif response.key?(:error)
+      response[:error][:data]
+    else
+      response
+    end
+  end
 end

data/lib/carrot_rpc/rpc_server.rb

@@ -67,7 +67,7 @@ class CarrotRpc::RpcServer
 
   # See http://www.jsonrpc.org/specification#response_object
   def reply_result(result, properties:, request_message:)
-    if result["errors"]
+    if result && result.is_a?(Hash) && result["errors"]
       reply_result_with_errors(result, properties: properties, request_message: request_message)
     else
       reply_result_without_errors(result, properties: properties, request_message: request_message)

data/lib/carrot_rpc/version.rb

@@ -1,3 +1,3 @@
 module CarrotRpc
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrot_rpc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Scott Hamilton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -180,3 +180,4 @@ signing_key:
 specification_version: 4
 summary: Remote Procedure Call (RPC) using the Bunny Gem over RabbitMQ
 test_files: []
+has_rdoc: