pubnub 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa7b4365a3a38c4ace1a66d651caed11d23ea0e
-  data.tar.gz: a93f4efe277b2901958afed568d0c0a57f449e90
+  metadata.gz: 768a2d3986e2ec06209a0d5c7e230b06b8faedfb
+  data.tar.gz: d87f33805d875aedc89ebd7f6217549fd3bf04fd
 SHA512:
-  metadata.gz: ddbbad877b0300aac3738b91fe505a2ae9f51ecb1b6246eaae80b581a325f7b25ce441af1223b1b0eb0934bc2344b75bd0e41805b45e794e6d6bb2b517702306
-  data.tar.gz: 58bed32220e7fa7173ea52ebc6b724afb4ea572ea76f2eae24aff1a31cdf599e396bbaa65b8ef179eada7db9ff298c1b2fed03a9b9222781eb4bb15521d6420f
+  metadata.gz: ca31a6b9ba2d4010202a1781b4c166009d13d45266e27c321ccb4e065f4709968507bed3eb4dd215f9ad815757941dcb0b2efdcfc0d2842580326e0e747194e9
+  data.tar.gz: 17b248c0103838208a7cf96fc2764a29c298ae71ae529183ed9921b4a87d955c3115cf50cf81ffe8c09db07f3927b2d0f03d1b74ca0f8cbd2aaac0684d33ff5f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 4.0.6
+* channel and channels are the same argument
+* channel_group and channel_groups are the same argument
+* added `with_presence` flag for subscibe, default false.
+
 ##### 4.0.5
 * Required CGI
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (4.0.4)
+    pubnub (4.0.5)
       celluloid (~> 0.17)
       dry-validation (~> 0.8)
       httpclient (~> 2.8)
@@ -42,7 +42,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dry-configurable (0.1.6)
+    dry-configurable (0.1.7)
       concurrent-ruby (~> 1.0)
     dry-container (0.3.4)
       concurrent-ruby (~> 1.0)
@@ -52,7 +52,7 @@ GEM
       dry-container (~> 0.2, >= 0.2.6)
       dry-equalizer (~> 0.2)
     dry-monads (0.0.2)
-    dry-types (0.8.0)
+    dry-types (0.8.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
@@ -61,16 +61,16 @@ GEM
       dry-monads (>= 0.0.1)
       ice_nine (~> 0.11)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.8.0)
+    dry-validation (0.9.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-container (~> 0.2, >= 0.2.8)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.3, >= 0.3.0)
-      dry-types (~> 0.8, >= 0.8.0)
+      dry-types (~> 0.8, >= 0.8.1)
     ffi (1.9.10-java)
     hitimes (1.2.4)
-    httpclient (2.8.0)
+    httpclient (2.8.1)
     ice_nine (0.11.2)
     inflecto (0.0.2)
     json (1.8.3)

data/VERSION

@@ -1 +1 @@
-4.0.5
+4.0.6

data/fixtures/vcr_cassettes/lib/events/subscribe-channel-groups.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f/,/0?auth=ruby-test-auth&channel-group=demo&pnsdk=PubNub-Ruby/4.0.5&t=%7B%22r%22:0,%22t%22:0%7D&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.1, ruby 2.3.1 (2016-04-26))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 10 Aug 2016 20:56:18 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 10 Aug 2016 20:56:19 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '44'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '{"t":{"t":"14708625795088197","r":2},"m":[]}'
+    http_version: 
+  recorded_at: Wed, 10 Aug 2016 20:56:19 GMT
+- request:
+    method: get
+    uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f/,/0?auth=ruby-test-auth&channel-group=demo&pnsdk=PubNub-Ruby/4.0.5&t=%7B%22r%22:2,%22t%22:%2214708625795088197%22%7D&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.1, ruby 2.3.1 (2016-04-26))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 10 Aug 2016 20:56:19 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 10 Aug 2016 20:56:23 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '260'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '{"t":{"t":"14708625831727907","r":2},"m":[{"a":"5","f":0,"i":"53a9d412-e062-4c9b-9d0f-63661107a3eb","s":1,"o":{"t":"14708625829775958"},"p":{"t":"14708625831717419","r":2},"k":"sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f","c":"demo","d":"whatever","b":"demo"}]}'
+    http_version: 
+  recorded_at: Wed, 10 Aug 2016 20:56:23 GMT
+recorded_with: VCR 3.0.1

data/fixtures/vcr_cassettes/lib/events/subscribe-with-presence.yml

@@ -0,0 +1,78 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f/demo,demo-pnpres,demo.*,demo.*-pnpres,demo1,demo1-pnpres/0?auth=ruby-test-auth&pnsdk=PubNub-Ruby/4.0.5&t=%7B%22r%22:0,%22t%22:0%7D&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.1, ruby 2.3.1 (2016-04-26))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 10 Aug 2016 13:00:56 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 10 Aug 2016 13:00:57 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '44'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '{"t":{"t":"14708340574849564","r":2},"m":[]}'
+    http_version: 
+  recorded_at: Wed, 10 Aug 2016 13:00:57 GMT
+- request:
+    method: get
+    uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f/demo,demo-pnpres,demo.*,demo.*-pnpres,demo1,demo1-pnpres/0?auth=ruby-test-auth&pnsdk=PubNub-Ruby/4.0.5&t=%7B%22r%22:2,%22t%22:%2214708340574849564%22%7D&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.1, ruby 2.3.1 (2016-04-26))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 10 Aug 2016 13:00:57 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 10 Aug 2016 13:00:58 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '272'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '{"t":{"t":"14708340581394476","r":2},"m":[{"a":"5","f":0,"p":{"t":"14708340580815003","r":1},"k":"sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f","c":"demo1-pnpres","d":{"action":
+        "join", "timestamp": 1470834058, "uuid": "ruby-test-uuid", "occupancy": 1},"b":"demo1-pnpres"}]}'
+    http_version: 
+  recorded_at: Wed, 10 Aug 2016 13:00:58 GMT
+recorded_with: VCR 3.0.1

data/lib/pubnub/client.rb

@@ -24,7 +24,6 @@ require 'pubnub/subscriber'
 require 'pubnub/envelope'
 require 'pubnub/error_envelope'
 
-require 'pubnub/client/connections'
 require 'pubnub/client/events'
 require 'pubnub/client/paged_history'
 require 'pubnub/client/helpers'
@@ -68,7 +67,6 @@ module Pubnub
   # Pubnub client Class.
   class Client
     include Configuration
-    include Connections
     include Events
     include PagedHistory
     include Helpers

data/lib/pubnub/event.rb

@@ -3,12 +3,13 @@ module Pubnub
   # Event module holds most basic and required infrastructure for every pubnub
   # event, there are also SingleEvent module and SubscribeEvent module
   class Event
-    attr_reader :origin, :callback, :channel, :fresh_clone,
+    attr_reader :origin, :callback, :channel, :channel_group, :fresh_clone,
                 :open_timeout, :read_timeout, :idle_timeout, :group,
                 :presence_callback, :wildcard_channel, :ssl, :state,
-                :given_options
+                :given_options, :with_presence
 
     alias_method :channels, :channel
+    alias_method :channel_groups, :channel_group
 
     def initialize(options, app)
       @app = app
@@ -73,8 +74,9 @@ module Pubnub
     end
 
     def format_channels
-      @channel = Formatter.format_channel(@channel || @channels)
+      @channel =  Formatter.format_channel(@channel || @channels)
       @channel += Formatter.format_presence_channel(@presence)
+      @channel += Formatter.format_presence_channel(@channel || @channels) if @with_presence
       @wildcard_channel = @channel.select { |e| e.index('.*') } || []
     end
 
@@ -104,9 +106,9 @@ module Pubnub
       @envelopes = format_envelopes response, request
     end
 
-    def connection
-      @app.connection_for(self)
-    end
+    # def connection
+    #   @app.connection_for(self)
+    # end
 
     def create_variables_from_options(options)
       variables = %w(channel channels message http_sync callback
@@ -115,8 +117,8 @@ module Pubnub
                      open_timeout read_timeout idle_timeout heartbeat
                      group action read write manage ttl presence start
                      end count reverse presence_callback store skip_validate
-                     state channel_group compressed meta customs include_token
-                     replicate)
+                     state channel_group channel_groups compressed meta customs include_token
+                     replicate with_presence)
 
       options = options.each_with_object({}) { |option, obj| obj[option.first.to_sym] = option.last }
 
@@ -130,7 +132,7 @@ module Pubnub
     end
 
     def format_group
-      @group = @channel_group if @channel_group && @group.blank?
+      @group = (@channel_group || @channel_groups) if (@channel_group || @channel_groups) && @group.blank?
       @group = Formatter.format_group(@group)
 
       if @group.first.to_s.count(':') > 0

data/lib/pubnub/version.rb

@@ -1,4 +1,4 @@
 # Toplevel Pubnub module.
 module Pubnub
-  VERSION = '4.0.5'
+  VERSION = '4.0.6'
 end

data/spec/lib/events/subscribe_spec.rb

@@ -15,9 +15,9 @@ describe Pubnub::Subscribe do
       @statuses = []
 
       @callbacks = Pubnub::SubscribeCallback.new(
-        message: ->(envelope) { @messages << envelope },
-        presence: ->(_envelope) { },
-        status: ->(envelope) { @statuses << envelope }
+          message: ->(envelope) { @messages << envelope },
+          presence: ->(_envelope) {},
+          status: ->(envelope) { @statuses << envelope }
       )
     end
 
@@ -117,7 +117,7 @@ describe Pubnub::Subscribe do
 
         VCR.use_cassette('lib/events/subscribe-cipher-async', record: :once) do
           @pubnub.subscribe(channel: :whatever, http_sync: true)
-          @messages =  @pubnub.subscribe(channel: :whatever, http_sync: true)
+          @messages = @pubnub.subscribe(channel: :whatever, http_sync: true)
           eventually do
             expect(@messages.first.result[:data][:message]).to eq('text' => 'hey')
           end
@@ -165,5 +165,69 @@ describe Pubnub::Subscribe do
         end
       end
     end
+
+    context 'aliases' do
+      it 'pass channels to channel' do
+        VCR.use_cassette('lib/events/subscribe-sync', record: :once) do
+          @pubnub = Pubnub::Client.new(
+              subscribe_key: 'sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f',
+              publish_key: 'pub-c-b42cec2f-f468-4784-8833-dd2b074538c4',
+              secret_key: 'sec-c-OWIyYmVlYWYtYWMxMS00OTcxLTlhZDAtZDBlYTM4ODE1MWUy',
+              auth_key: 'ruby-test-auth',
+              uuid: 'ruby-test-uuid'
+          )
+
+          @pubnub.subscribe(channels: :demo, http_sync: true)
+          envelopes = @pubnub.subscribe(channels: :demo, http_sync: true)
+
+
+          envelope = envelopes.first
+          expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+          expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema
+
+        end
+      end
+
+      it 'pass channel_groups to channel_group' do
+        VCR.use_cassette('lib/events/subscribe-channel-groups', record: :once) do
+
+          @pubnub = Pubnub::Client.new(
+              subscribe_key: 'sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f',
+              publish_key: 'pub-c-b42cec2f-f468-4784-8833-dd2b074538c4',
+              secret_key: 'sec-c-OWIyYmVlYWYtYWMxMS00OTcxLTlhZDAtZDBlYTM4ODE1MWUy',
+              auth_key: 'ruby-test-auth',
+              uuid: 'ruby-test-uuid'
+          )
+
+          @pubnub.subscribe(channel_groups: :demo, http_sync: true)
+          envelopes = @pubnub.subscribe(channel_groups: :demo, http_sync: true)
+
+          envelope = envelopes.first
+          expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+          expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema
+        end
+      end
+    end
+
+    context 'flags' do
+      it 'with with_presence' do
+        VCR.use_cassette('lib/events/subscribe-with-presence', record: :once) do
+          @pubnub = Pubnub::Client.new(
+            subscribe_key: 'sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f',
+            publish_key: 'pub-c-b42cec2f-f468-4784-8833-dd2b074538c4',
+            secret_key: 'sec-c-OWIyYmVlYWYtYWMxMS00OTcxLTlhZDAtZDBlYTM4ODE1MWUy',
+            auth_key: 'ruby-test-auth',
+            uuid: 'ruby-test-uuid'
+          )
+
+          @pubnub.subscribe(channels: [:demo, :demo1, 'demo.*'], with_presence: true, http_sync: true)
+          envelopes = @pubnub.subscribe(channels: [:demo, :demo1, 'demo.*'], with_presence: true, http_sync: true)
+
+          envelope = envelopes.first
+          expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+          expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -10453,10 +10453,12 @@ files:
 - fixtures/vcr_cassettes/lib/events/state.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-async-error.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-async.yml
+- fixtures/vcr_cassettes/lib/events/subscribe-channel-groups.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-cipher-async.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-playing-async.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-sync-error.yml
 - fixtures/vcr_cassettes/lib/events/subscribe-sync.yml
+- fixtures/vcr_cassettes/lib/events/subscribe-with-presence.yml
 - fixtures/vcr_cassettes/lib/events/time-error.yml
 - fixtures/vcr_cassettes/lib/events/time.yml
 - fixtures/vcr_cassettes/lib/events/where-now-error.yml
@@ -10464,7 +10466,6 @@ files:
 - fixtures/vcr_cassettes/test_examples/audit-158_http_sync_true_callback_block_channel_channel_auth-key_key.yml
 - lib/pubnub.rb
 - lib/pubnub/client.rb
-- lib/pubnub/client/connections.rb
 - lib/pubnub/client/events.rb
 - lib/pubnub/client/helpers.rb
 - lib/pubnub/client/paged_history.rb

data/lib/pubnub/client/connections.rb

@@ -1,80 +0,0 @@
-# Toplevel Pubnub module.
-module Pubnub
-  # Pubnub client Class
-  class Client
-    # Module that holds methods that helps us with connections
-    # management. Must be plugged into Client class, uses @env
-    module Connections
-      def setup_conn_for(event)
-        if event.is_a? SingleEvent
-          setup_conn_for_single_event(event)
-        elsif event.is_a? SubscribeEvent
-          setup_conn_for_subscribe_event(event)
-        end
-      end
-
-      private
-
-      def setup_conn_for_single_event(event)
-        conn = Net::HTTP::Persistent.new "pn_client_v#{Pubnub::VERSION}"
-        conn.proxy_from_env
-        conn.read_timeout       = event.read_timeout || @env[:read_timeout]
-        conn.open_timeout       = event.open_timeout || @env[:open_timeout]
-        conn.idle_timeout       = event.idle_timeout || @env[:idle_timeout]
-        @env[:single_event_conn_pool][event.origin] = conn
-      end
-
-      def setup_conn_for_subscribe_event(event)
-        conn = Net::HTTP::Persistent.new "pn_client_v#{Pubnub::VERSION}"
-        conn.proxy_from_env
-        conn.read_timeout       = event.read_timeout || @env[:s_read_timeout]
-        conn.open_timeout       = event.open_timeout || @env[:s_open_timeout]
-        conn.idle_timeout       = event.idle_timeout || @env[:s_idle_timeout]
-        @env[:subscribe_event_conn_pool][event.origin] = conn
-      end
-
-      def setup_conn_for_heartbeat_event(event)
-        conn = Net::HTTP::Persistent.new "pn_client_v#{Pubnub::VERSION}"
-        conn.proxy_from_env
-        conn.read_timeout       = event.read_timeout || @env[:h_read_timeout]
-        conn.open_timeout       = event.open_timeout || @env[:h_open_timeout]
-        conn.idle_timeout       = event.idle_timeout || @env[:h_idle_timeout]
-        @env[:heartbeat_event_conn_pool][event.origin] = conn
-      end
-
-      def connection_for(event)
-        case event.class
-        when SingleEvent then single_event_connection
-        when SubscribeEvent then subscribe_event_connection
-        when HeartbeatEvent then heartbeat_event_connection
-        else rise_connection_for_error
-        end
-      end
-
-      def rise_connection_for_error
-        fail(Pubnub::Error.new(
-               env: @env,
-               operation: 'Pubnub.client#connection_for',
-               app: self,
-               error_type: 'Internal Error',
-               message: 'Can\'t recognize event'
-        ), 'Can\'t recognize event')
-      end
-
-      def single_event_connection
-        @env[:single_event_conn_pool][event.origin] ||
-          setup_conn_for(event)
-      end
-
-      def subscribe_event_connection
-        @env[:subscribe_event_conn_pool][event.origin] ||
-          setup_conn_for(event)
-      end
-
-      def heartbeat_event_connection
-        @env[:heartbeat_event_conn_pool][event.origin] ||
-          setup_conn_for(event)
-      end
-    end
-  end
-end