pubnub 4.0.17 → 4.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0e79f6ac4faeec09e93fb91f5bbce45ead08bf
-  data.tar.gz: dccfe30cc0a0de83d632ba4b0de87f85e193b026
+  metadata.gz: cd98cbabfdb8253cf9b3b94f2a0e801821af9fc4
+  data.tar.gz: 6b43eea77ca8d70700aeb249ddab17093d63eac9
 SHA512:
-  metadata.gz: 4ca4e26825a1936c36d84b85b743d1e17383ee58e61f9af206454df9867435b97b9902e2e43d0ad1246b2e98ce49ed4a1d5b10d73324733a1edfe99735605991
-  data.tar.gz: a573a70edd1d4711ed3d0117210b0dd8c5eba51c938b3246e49c055d8518fec4f8d3d259fb6e40cc43333a5c19a9156207337aafc0f8293891c3e169b2a8faa5
+  metadata.gz: 0a8ee98eb6c0ebd498b30a97d98e2ddc16bd65d32e0c6467ca9bcdc0e0576d30d38eb37de990cbd3ca03290910b37a783731a9ff32a8d476653add7cc708dce7
+  data.tar.gz: 6c12d9dbfd762df7ec1be0cf7a8d334e7d95a3fc70b097714f225378230d2f5c4e86157d4d295e95070b13678dd24381518c8fb65bc8e3b1f225cff85f201d55

data/.pubnub.yml

@@ -14,14 +14,14 @@ changelog:
     changes:
       -
         text: "Fixed missing channel group parameter in leave event"
-        type: bugfix
+        type: bug
     date: ~
     version: v4.0.16
   -
     changes:
       -
         text: "Fixed PAM signature when some special characters are present"
-        type: bugfix
+        type: bug
     date: ~
     version: v4.0.15
   -

data/.travis.yml

@@ -13,6 +13,7 @@ script: bundle exec rspec
 
 matrix:
   include:
+    - rvm: 2.4.0
     - rvm: 2.3.1
     - rvm: 2.2.5
     - rvm: 2.1.9

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :test do
   gem 'rubocop'
   gem 'simplecov', '>= 0.12', require: false
-  gem 'codecov', require: false
+  gem 'codacy-coverage', :require => false
   gem 'rspec'
   gem 'rspec-wait'
   gem 'vcr'

data/Gemfile.lock

@@ -32,47 +32,46 @@ GEM
       timers (>= 4.1.1)
     celluloid-supervision (0.20.6)
       timers (>= 4.1.1)
-    codecov (0.1.4)
-      json
+    codacy-coverage (1.1.6)
       simplecov
-      url
     coderay (1.1.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.4-java)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dry-configurable (0.3.0)
+    dry-configurable (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-container (0.5.0)
+    dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.2.0)
+    dry-core (0.2.4)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
-    dry-logic (0.4.0)
+    dry-logic (0.4.1)
       dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.1)
+      dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.9.2)
+    dry-types (0.9.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2)
+      dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.10.3)
+    dry-validation (0.10.5)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-      dry-container (~> 0.2, >= 0.2.8)
-      dry-core (~> 0.1)
+      dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
       dry-types (~> 0.9, >= 0.9.0)
     ffi (1.9.10-java)
     hitimes (1.2.4)
-    httpclient (2.8.2.4)
+    hitimes (1.2.4-java)
+    httpclient (2.8.3)
     inflecto (0.0.2)
     json (2.0.2)
     json (2.0.2-java)
@@ -122,9 +121,8 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    timers (4.1.1)
+    timers (4.1.2)
       hitimes
-    url (0.3.2)
     vcr (3.0.1)
     webmock (1.21.0)
       addressable (>= 2.3.6)
@@ -137,7 +135,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.7)
-  codecov
+  codacy-coverage
   pry
   pubnub!
   rr
@@ -149,4 +147,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.6
+   1.14.4

data/README.md

@@ -6,7 +6,7 @@
 # Complete Documentation
 Available at https://www.pubnub.com/docs/ruby/pubnub-ruby-sdk-v4 **v4.x**
 
-## PubNub Gem version 4.0.17
+## PubNub Gem version 4.0.18
 
 ##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
 ##### http://www.pubnub.com/account

data/VERSION

@@ -1 +1 @@
-4.0.17
+4.0.18

data/fixtures/vcr_cassettes/lib/ssl-error.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/publish/pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11/sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe/0/demo/0/%22demo%22?ortt=%7B%22t%22:14803435605315392%7D&pnsdk=PubNub-Ruby/4.0.16&seqn=1&signature=w6a0brZPuamCk5CKFft527nPqGL7ikXocnW2eGdXhfc=&timestamp=1480343560&uuid=ruby-test
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.2.4, ruby 2.3.2 (2016-11-15))
+      Accept:
+      - "*/*"
+      Date:
+      - Mon, 28 Nov 2016 14:32:40 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Nov 2016 14:32:40 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '30'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[1,"Sent","14803435607606028"]'
+    http_version: 
+  recorded_at: Mon, 28 Nov 2016 14:32:40 GMT
+recorded_with: VCR 3.0.1

data/lib/pubnub/constants.rb

@@ -26,13 +26,14 @@ module Pubnub
     STATUS_TIMEOUT           = :timeout
     STATUS_NON_JSON_RESPONSE = :non_json_response
     STATUS_ERROR             = :error
+    SSL_ERROR                = :ssl_error
     STATUS_API_KEY_ERROR     = :api_key_error
     STATUS_REQUEST_MESSAGE_COUNT_EXCEEDED = :request_message_count_exceeded
 
     # Successes
     STATUS_ACK = :ack
 
-    STATUS_CATEGORY_ERRORS    = [STATUS_ACCESS_DENIED, STATUS_TIMEOUT, STATUS_NON_JSON_RESPONSE, STATUS_API_KEY_ERROR]
+    STATUS_CATEGORY_ERRORS    = [STATUS_ACCESS_DENIED, STATUS_TIMEOUT, STATUS_NON_JSON_RESPONSE, STATUS_API_KEY_ERROR, SSL_ERROR]
     STATUS_CATEGORY_SUCCESSES = [STATUS_ACK]
 
     # Operations

data/lib/pubnub/event.rb

@@ -149,6 +149,8 @@ module Pubnub
     def format_envelopes(response, request)
       if response.is_a? HTTPClient::ReceiveTimeoutError
         return error_envelope(nil, response, request: request, response: response)
+      elsif response.is_a? OpenSSL::SSL::SSLError
+        return error_envelope(nil, response, request: request, response: response)
       else
         parsed_response, error = Formatter.parse_json(response.body)
       end
@@ -231,6 +233,9 @@ module Pubnub
         when HTTPClient::ReceiveTimeoutError
           error_category = Pubnub::Constants::STATUS_TIMEOUT
           code = 408
+        when OpenSSL::SSL::SSLError
+          error_category = Pubnub::Constants::SSL_ERROR
+          code = nil
         else
           error_category = Pubnub::Constants::STATUS_ERROR
           code = req_res_objects[:response].code

data/lib/pubnub/pam.rb

@@ -84,15 +84,27 @@ module Pubnub
     end
 
     def error_envelope(parsed_response, error, req_res_objects)
+      case error
+        when JSON::ParserError
+          error_category = Pubnub::Constants::STATUS_NON_JSON_RESPONSE
+          code = req_res_objects[:response].code
+        when HTTPClient::ReceiveTimeoutError
+          error_category = Pubnub::Constants::STATUS_TIMEOUT
+          code = 408
+        else
+          error_category = Pubnub::Constants::STATUS_ERROR
+          code = req_res_objects[:response].code
+      end
+
       ErrorEnvelope.new(
         event: @event,
         event_options: @given_options,
         timetoken: nil,
         status: {
-          code: req_res_objects[:response].code,
+          code: code,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::ERROR),
+          category: error_category,
           error: true,
           auto_retried: false,
 
@@ -106,7 +118,7 @@ module Pubnub
           config: get_config
         },
         result: {
-          code: req_res_objects[:response].code,
+          code: code,
           operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],

data/lib/pubnub/version.rb

@@ -1,4 +1,4 @@
 # Toplevel Pubnub module.
 module Pubnub
-  VERSION = '4.0.17'
+  VERSION = '4.0.18'
 end

data/spec/lib/events/grant_spec.rb

@@ -45,6 +45,19 @@ describe Pubnub::Grant do
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema
       end
     end
+
+    it 'forms valid ErrorEnvelope on timeout error' do
+      HTTPClient.any_instance.stub(get: HTTPClient::ReceiveTimeoutError.new)
+
+      envelope = @pubnub.grant(
+          channel: :demo
+      ).value
+
+      expect(envelope.is_a?(Pubnub::ErrorEnvelope)).to eq true
+      expect(envelope.status[:code]).to eq 408
+      expect(envelope.status[:category]).to eq Pubnub::Constants::STATUS_TIMEOUT
+      expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+    end
   end
 
-end
+end

data/spec/lib/ssl_error_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'Super admin mode' do
+
+  around :each do |example|
+    Celluloid.boot
+    example.run
+    Celluloid.shutdown
+  end
+
+  before(:each) do
+    Pubnub::Client.any_instance.stub(:sdk_version).and_return('PubNub-Ruby/4.0.16')
+
+    @pubnub = Pubnub.new(
+        subscribe_key: 'sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe',
+        publish_key: 'pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11',
+        secret_key: 'sec-c-MjZkYmQyMDUtYmRhZi00ZDY3LThjZGQtNjU2NmNjNmJkODM3',
+        uuid: 'ruby-test',
+        reconnect_interval: 0,
+        ssl: true
+    )
+  end
+
+  describe 'OpenSSL error' do
+    it 'is caught' do
+      Pubnub::Publish.any_instance.stub(:current_time).and_return(1480343560)
+      Pubnub::Publish.any_instance.stub(:send_request).and_return(OpenSSL::SSL::SSLError.new)
+      Pubnub::Client.any_instance.stub(:generate_ortt).and_return(14803435605315392)
+
+      VCR.use_cassette('lib/ssl-error', record: :once) do
+        pub = @pubnub.publish(channel: :demo, message: :demo)
+        expect(pub.value.status[:category]).to eq Pubnub::Constants::SSL_ERROR
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@ end
 require 'pubnub'
 
 if ENV['CI'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  require 'codacy-coverage'
+  Codacy::Reporter.start
 end
 
 Celluloid.task_class = Celluloid::Task::Threaded
@@ -69,6 +69,8 @@ end
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = false
+  c.ignore_hosts 'api.codacy.com'
   c.default_cassette_options = {
     match_requests_on: [:method,
                         VCR.request_matchers.uri_without_param(:pnsdk, :uuid, :ortt, :seqn)]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 4.0.17
+  version: 4.0.18
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -10473,6 +10473,7 @@ files:
 - fixtures/vcr_cassettes/lib/events/time.yml
 - fixtures/vcr_cassettes/lib/events/where-now-error.yml
 - fixtures/vcr_cassettes/lib/events/where-now.yml
+- fixtures/vcr_cassettes/lib/ssl-error.yml
 - fixtures/vcr_cassettes/lib/super_admin/cg.yml
 - fixtures/vcr_cassettes/lib/super_admin/here_now.yml
 - fixtures/vcr_cassettes/lib/super_admin/history.yml
@@ -10583,6 +10584,7 @@ files:
 - spec/lib/events/timeout_handling_spec.rb
 - spec/lib/events/where_now_spec.rb
 - spec/lib/pubnub_spec.rb
+- spec/lib/ssl_error_spec.rb
 - spec/lib/super_admin_spec.rb
 - spec/lib/uuid_spec.rb
 - spec/spec_expectations.rb
@@ -10652,6 +10654,7 @@ test_files:
 - spec/lib/events/timeout_handling_spec.rb
 - spec/lib/events/where_now_spec.rb
 - spec/lib/pubnub_spec.rb
+- spec/lib/ssl_error_spec.rb
 - spec/lib/super_admin_spec.rb
 - spec/lib/uuid_spec.rb
 - spec/spec_expectations.rb