pubnub 4.1.2 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc7c6dd7f233dd372e76fe0917b38906ec040295
-  data.tar.gz: a4066619d242cc01a496c201c260be44d6500041
+SHA256:
+  metadata.gz: 242c68a87d13a592b515cb79a777a446dd116c1c695572ff380f6cf4dad7cfa3
+  data.tar.gz: bced3ce328f2d1f5c19c99c07046d55805a9d2518b812c42a77b629e6094eb61
 SHA512:
-  metadata.gz: 0538ad194245dc17b4a1e68860f30fa0d773e7ce74bd2b9de1b5d242a04f2612015e43db893e229b42cf98b31f4a297e2b80b24547a1dd419a5b13c4f7684ab3
-  data.tar.gz: c8512b8ebd757605b2037921f2832cd2891eaf9a3d034a2ca82903e5d9d986aa2182594e39eae0e6ec472a46d03bccb6ccb278b677b12711055c2e077dcae22e
+  metadata.gz: c99236e15a94867504dd45f3992d1cc5fb7dacd8bba2a81ec69c8cb5cec15b6a62c14a0116e439ce25a840f624299fdde1a41ab999547493fd12bfb9312d284a
+  data.tar.gz: 71d4d5f51af2032fa75a93e0541bc4dc3e17cf60309c54ec49f852d7dd61166988888e68948e06b2aef5500902dfd260d05bbbd2219d25d6845c5c83cb8b9842

data/.pubnub.yml

@@ -1,6 +1,13 @@
 ---
-version: "4.1.2"
+version: "4.1.5"
 changelog:
+  -
+    changes:
+      -
+        text: "Updated dependencies"
+        type: improvement
+    date: 29-7-2019
+    version: "4.1.5"
   -
     changes:
       -

data/.rubocop.yml

@@ -22,4 +22,6 @@ Metrics/PerceivedComplexity:
   Max: 10
 
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Enabled: false
+
+TargetRubyVersion: 2.4

data/.travis.yml

@@ -6,6 +6,7 @@ addons:
 
 before_install:
   # See https://github.com/travis-ci/travis-ci/issues/5861
+  - gem update --system
   - gem install bundler
   - gem update bundler
 
@@ -14,9 +15,9 @@ bundler_args: --without development
 script: bundle exec rspec
 
 rvm:
+  - 2.6.3
   - 2.5.1
   - 2.4.4
-  - 2.3.7
 
 matrix:
   include:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 4.1.5
+* Update dependency dry-validation
+* Includes minimum Ruby version requirement of 2.4+
+
 ##### 4.0.28
 * Added Concurrent-ruby Gem
 * Removed Celluloid

data/Gemfile.lock

@@ -1,131 +1,137 @@
 PATH
   remote: .
   specs:
-    pubnub (4.1.2)
-      concurrent-ruby (~> 1.0.5)
-      concurrent-ruby-edge (~> 0.3.1)
-      dry-validation (~> 0.10)
+    pubnub (4.1.5)
+      concurrent-ruby (~> 1.1.5)
+      concurrent-ruby-edge (~> 0.5.0)
+      dry-validation (~> 1.0)
       httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.8, < 3)
-      timers (>= 4.1.1)
+      json (>= 2.2.0, < 3)
+      timers (>= 4.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     awesome_print (1.8.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    codacy-coverage (1.1.8)
+    codacy-coverage (2.1.0)
       simplecov
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby-edge (0.3.1)
-      concurrent-ruby (= 1.0.5)
+    concurrent-ruby (1.1.5)
+    concurrent-ruby-edge (0.5.0)
+      concurrent-ruby (~> 1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.3.1)
-    dry-configurable (0.7.0)
+    docile (1.3.2)
+    dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
-    dry-container (0.6.0)
+      dry-core (~> 0.4, >= 0.4.7)
+    dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+    dry-core (0.4.8)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.1)
+    dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
-    dry-logic (0.4.2)
-      dry-container (~> 0.2, >= 0.2.6)
+    dry-initializer (3.0.1)
+    dry-logic (1.0.2)
+      concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.13.2)
+    dry-schema (1.3.1)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.8, >= 0.8.3)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.0)
+    dry-types (1.1.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
+      dry-equalizer (~> 0.2, >= 0.2.2)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 0.4, >= 0.4.2)
-    dry-validation (0.12.1)
+      dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.2.1)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.13.1)
-    ffi (1.9.25-java)
-    hashdiff (0.3.7)
-    hitimes (1.3.0)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.0, >= 1.3.1)
+    ffi (1.11.1-java)
+    hashdiff (1.0.0)
     httpclient (2.8.3)
     interception (0.5)
-    jaro_winkler (1.5.1)
-    jaro_winkler (1.5.1-java)
-    json (2.1.0)
-    json (2.1.0-java)
-    method_source (0.9.0)
-    parallel (1.12.1)
-    parser (2.5.1.0)
+    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.3-java)
+    json (2.2.0)
+    json (2.2.0-java)
+    method_source (0.9.2)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry (0.11.3-java)
+    pry (0.12.2-java)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
       spoon (~> 0.0)
-    pry-rescue (1.4.5)
+    pry-rescue (1.5.0)
       interception (>= 0.5)
-      pry
-    pry-stack_explorer (0.4.9.2)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.0.2)
+    public_suffix (3.1.1)
     rainbow (3.0.0)
     rr (1.2.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
-    rspec-support (3.7.1)
-    rubocop (0.57.2)
+    rspec-support (3.8.2)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     spoon (0.0.6)
       ffi
-    timers (4.1.2)
-      hitimes
-    unicode-display_width (1.4.0)
-    vcr (4.0.0)
-    webmock (3.4.2)
+    timers (4.3.0)
+    unicode-display_width (1.6.0)
+    vcr (5.0.0)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   java
@@ -149,4 +155,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/README.md

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

data/VERSION

@@ -1,2 +1 @@
-4.1.2
-
+4.1.5

data/lib/pubnub/events/add_channels_to_push.rb

@@ -6,9 +6,10 @@ module Pubnub
     include Pubnub::Validator::Push
 
     def initialize(options, app)
-      @event = current_operation
-      @params = options
       super
+      @event = current_operation
+      @auth_key = options[:auth_key]
+      @params = @given_options
     end
 
     private

data/lib/pubnub/events/list_push_provisions.rb

@@ -6,9 +6,9 @@ module Pubnub
     include Pubnub::Validator::Push
 
     def initialize(options, app)
-      @event = current_operation
-      @params = options
       super
+      @event = current_operation
+      @params = @given_options
     end
 
     private

data/lib/pubnub/events/remove_channels_from_push.rb

@@ -6,9 +6,10 @@ module Pubnub
     include Pubnub::Validator::Push
 
     def initialize(options, app)
-      @event = current_operation
-      @params = options
       super
+      @event = current_operation
+      @params = @given_options
+      @auth_key = options[:auth_key]
     end
 
     private

data/lib/pubnub/events/remove_device_from_push.rb

@@ -6,9 +6,9 @@ module Pubnub
     include Pubnub::Validator::Push
 
     def initialize(options, app)
-      @event = current_operation
-      @params = options
       super
+      @event = current_operation
+      @params = @given_options
     end
 
     private

data/lib/pubnub/schemas/envelope_schema.rb

@@ -1,57 +1,84 @@
+# frozen_string_literal: true
+
 module Pubnub
   module Schemas
     module Envelope
-      DataSchema = Dry::Validation.Schema do
+      DataSchema = Dry::Schema.Params do
         required(:message)
         required(:subscribed_channel).filled(:str?)
         required(:actual_channel).filled(:str?)
         optional(:publish_time_object).maybe(:hash?)
         optional(:message_meta_data).maybe(:hash?)
         optional(:presence_event).maybe(:str?)
-        optional(:presence).maybe.schema do
-          optional(:uuid).filled(:str?)
-          optional(:timestamp).filled(:int?)
-          optional(:state).maybe(:hash?)
-          optional(:occupancy).filled(:int?)
+        optional(:presence).maybe do
+          hash do
+            optional(:uuid).filled(:str?)
+            optional(:timestamp).filled(:int?)
+            optional(:state).maybe(:hash?)
+            optional(:occupancy).filled(:int?)
+          end
         end
       end
 
-      ConfigSchema = Dry::Validation.Schema do
+      PresenceSchema = Dry::Schema.Params do
+        required(:channels).maybe(:array?)
+      end
+
+      ConfigSchema = Dry::Schema.Params do
         required(:tls).filled(:bool?)
         required(:uuid).filled(:str?)
         optional(:auth_key).maybe(:str?)
         required(:origin).filled(:str?)
       end
 
-      StatusSchema = Dry::Validation.Schema do
-        required(:code).filled(:int?)
-        required(:client_request).filled
-        required(:server_response).filled
-        optional(:data).maybe
+      CategorySchema = Dry::Schema.Params do
         required(:category).filled
         required(:error).filled(:bool?)
-        required(:auto_retried).filled(:bool?)
+      end
 
-        optional(:current_timetoken).maybe(:int?)
-        optional(:last_timetoken).maybe(:int?)
-        optional(:subscribed_channels).maybe(:array?)
-        optional(:subscribed_channel_groups).maybe(:array?)
+      # The schema for status response on subscribe listener
+      class StatusSchema < Dry::Validation::Contract
+        params do
+          required(:code).filled(:int?)
+          required(:category).filled
+          required(:error).filled(:bool?)
+          required(:client_request).filled
+          required(:server_response).filled
+          required(:auto_retried).filled(:bool?)
 
-        required(:config).schema(ConfigSchema)
+          optional(:data).maybe(:hash?)
+          optional(:current_timetoken).maybe(:int?)
+          optional(:last_timetoken).maybe(:int?)
+          optional(:subscribed_channels).maybe(:array?)
+          optional(:subscribed_channel_groups).maybe(:array?)
 
-        rule(category_value: %i[error category]) do |error, category|
-          error.true?.then(category.included_in?(Pubnub::Constants::STATUS_CATEGORY_ERRORS))
-          error.false?.then(category.included_in?(Pubnub::Constants::STATUS_CATEGORY_SUCCESSES))
+          required(:config).hash(ConfigSchema)
+        end
+
+        rule(:category, :error) do
+          key.failure('Invalid error category') if values[:error] && Pubnub::Constants::STATUS_CATEGORY_ERRORS.include?(values[:category].to_s)
+          key.failure('Invalid success category') if !values[:error] && Pubnub::Constants::STATUS_CATEGORY_SUCCESSES.include?(values[:category].to_s)
         end
       end
 
-      ResultSchema = Dry::Validation.Schema do
-        required(:code).filled(:int?)
-        required(:operation) { included_in?(Pubnub::Constants::OPERATIONS) }
-        required(:client_request).filled
-        required(:server_response).filled
+      # The schema for the publish result on a subscribe listener
+      class ResultSchema < Dry::Validation::Contract
+        params do
+          required(:code).filled(:int?)
+          required(:operation) { included_in?(Pubnub::Constants::OPERATIONS) }
+          required(:client_request).filled
+          required(:server_response).filled
+
+          optional(:data).maybe(:hash?)
+        end
 
-        required(:data).maybe.schema(DataSchema)
+        rule(:operation, :data) do
+          if values[:operation] == Pubnub::Constants::OPERATION_PRESENCE
+            PresenceSchema.call(values[:data])
+          else
+            DataSchema.call(values[:data])
+          end
+        end
       end
     end
   end