pubnub 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073b843850f0f7ef524956d1790888537dd85d1b
-  data.tar.gz: 78d98c67a1d37bdea2ebeca38a89483e6cff8c0b
+  metadata.gz: 1ec69e2f934994f13ad892fa9bb99c5170d0fa3e
+  data.tar.gz: 02ecad4661a1d1186bd42e08de10ff90c90399c0
 SHA512:
-  metadata.gz: c89703845876a25e3c67d84313b9d0679905fd83cae885048c0d9c590693a1853fcac9ed3d408f71322a0164df36594f194d06819603f5ce07efb4fc48471229
-  data.tar.gz: 6b04ae9b1f799c28053170dfe39f9d097f2055a42b56f3c9535d904f7219d02fb369a29bcf148bd0bfadcae7be89a0ddd682b08c439564411402a03663fb193d
+  metadata.gz: cdd4fd80ca70e5465061f1b689e328ea13056163b021eb2cfaf94d3634dcfb712297fbb5bf858c281f0621080614b11497d6c058914a24847d4488b484839664
+  data.tar.gz: 60b29f531f05c0df780a007f98dd9729339709724c3e9747f2d2e16614a5ce3263045649139cc375f045ac911b4d65f22a7866ea73591daa6572cf4a835b2eeb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (4.0.2)
+    pubnub (4.0.4)
       celluloid (~> 0.17)
       dry-validation (~> 0.8)
       httpclient (~> 2.8)
@@ -148,4 +148,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.12.3
+   1.12.5

data/VERSION

@@ -1 +1 @@
-4.0.3
+4.0.4

data/lib/pubnub/events/channel_registration.rb

@@ -103,7 +103,7 @@ module Pubnub
         error_envelope(parsed_response, error, request: request, response: response)
       else
         valid_envelope(parsed_response, request: request, response: response)
-                 end
+      end
     end
 
     def valid_envelope(parsed_response, req_res_objects)
@@ -141,68 +141,28 @@ module Pubnub
     end
 
     def error_envelope(parsed_response, error, req_res_objects)
-      if error
-        Pubnub::ErrorEnvelope.new(
-          event: @event,
-          event_options: @given_options,
-          timetoken: nil,
-          status: {
-            code: req_res_objects[:response].code,
-            operation: define_operation,
-            client_request: req_res_objects[:request],
-            server_response: req_res_objects[:response],
-            data: nil,
-            category: :json_parse_error,
-            error: true,
-            auto_retried: false,
-
-            current_timetoken: nil,
-            last_timetoken: nil,
-            subscribed_channels: nil,
-            subscribed_channel_groups: nil,
-
-            config: get_config
-          },
-
-          result: {
-            data: parsed_response['payload'],
-            code: req_res_objects[:response].code,
-            operation: define_operation,
-            client_request: req_res_objects[:request],
-            server_response: req_res_objects[:response]
-          }
-        )
-      else
-        ErrorEnvelope.new(
+      Pubnub::ErrorEnvelope.new(
           event: @event,
           event_options: @given_options,
           timetoken: nil,
           status: {
-            code: req_res_objects[:response].code,
-            client_request: req_res_objects[:request],
-            server_response: req_res_objects[:response],
-            category: nil,
-            error: true,
-            auto_retried: false,
-
-            current_timetoken: nil,
-            last_timetoken: nil,
-            subscribed_channels: nil,
-            subscribed_channel_groups: nil,
-
-            config: get_config
-
-          },
-
-          result: {
-            data: parsed_response['payload'],
-            code: req_res_objects[:response].code,
-            operation: define_operation,
-            client_request: req_res_objects[:request],
-            server_response: req_res_objects[:response]
+              code: req_res_objects[:response].code,
+              operation: define_operation,
+              client_request: req_res_objects[:request],
+              server_response: req_res_objects[:response],
+              data: nil,
+              category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
+              error: true,
+              auto_retried: false,
+
+              current_timetoken: nil,
+              last_timetoken: nil,
+              subscribed_channels: nil,
+              subscribed_channel_groups: nil,
+
+              config: get_config
           }
-        )
-      end
+      )
     end
 
     def define_operation

data/lib/pubnub/version.rb

@@ -1,4 +1,4 @@
 # Toplevel Pubnub module.
 module Pubnub
-  VERSION = '4.0.3'
+  VERSION = '4.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -10585,7 +10585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: PubNub Official Ruby gem.