pubnub 3.5.14 → 3.6.7

data/lib/pubnub/events/audit.rb

@@ -35,4 +35,4 @@ module Pubnub
       ].join('/')
     end
   end
-end
+end

data/lib/pubnub/events/grant.rb

@@ -56,4 +56,4 @@ module Pubnub
     end
 
   end
-end
+end

data/lib/pubnub/events/heartbeat.rb

@@ -31,9 +31,13 @@ module Pubnub
     end
 
     def parameters(app)
-      params = super(app)
-      params.merge!({ :state => URI.encode_www_form_component({}) })
-      params
+      parameters = super(app)
+      parameters.merge!({:state => encode_state(app.env[:state][@origin])}) if app.env[:state] && app.env[:state][@origin]
+      parameters
+    end
+
+    def encode_state(state)
+      URI.encode_www_form_component(state.to_json).gsub('+', '%20')
     end
 
     def format_envelopes(response, app, error)

data/lib/pubnub/events/here_now.rb

@@ -49,9 +49,12 @@ module Pubnub
       envelopes = Array.new
       envelopes << Envelope.new(
           {
-              :message           => parsed_response,
-              :channel           => @channel,
-              :response_message  => parsed_response
+              :parsed_response => parsed_response,
+              :occupancy       => (parsed_response['occupancy'] if parsed_response),
+              :service         => (parsed_response['service']   if parsed_response),
+              :message         => (parsed_response['message']   if parsed_response),
+              :uuid            => (parsed_response['uuids']     if parsed_response),
+              :status          => (parsed_response['status']    if parsed_response)
           },
           app
       )
@@ -61,4 +64,4 @@ module Pubnub
       envelopes
     end
   end
-end
+end

data/lib/pubnub/events/history.rb

@@ -107,4 +107,4 @@ module Pubnub
 
     end
   end
-end
+end

data/lib/pubnub/events/leave.rb

@@ -41,7 +41,9 @@ module Pubnub
           @left = true
         end unless @skip_remove
       end
-      super
+      envelopes = super
+      app.start_subscribe
+      envelopes
     end
 
     private
@@ -65,8 +67,12 @@ module Pubnub
       envelopes = Array.new
       envelopes << Envelope.new(
           {
-              :message           => parsed_response,
-              :response_message  => parsed_response
+              :parsed_response => parsed_response,
+              :action  => (parsed_response['action']   if parsed_response),
+              :message => (parsed_response['message']  if parsed_response),
+              :uuid    => (parsed_response['uuid']     if parsed_response),
+              :status  => (parsed_response['status']   if parsed_response),
+              :service => (parsed_response['service']  if parsed_response)
           },
           app
       )
@@ -78,4 +84,4 @@ module Pubnub
     end
 
   end
-end
+end

data/lib/pubnub/events/presence.rb

@@ -32,4 +32,4 @@ module Pubnub
 
 
   end
-end
+end

data/lib/pubnub/events/publish.rb

@@ -12,7 +12,10 @@ module Pubnub
       @event = 'publish'
       @allow_multiple_channels = false
 
-      raise ArgumentError.new(:object => self, :message => ':message argument is too big, encoded uri would excess 32k size limit') if uri(app).to_s.bytesize > 32000
+      $logger.info('Pubnub'){ "Bytesize: #{uri(app).to_s.bytesize}" }
+      $logger.info('Pubnub'){ "Lenght:   #{uri(app).to_s.length}" }
+
+      # raise ArgumentError.new(:object => self, :message => ':message argument is too big, encoded uri would excess 32k size limit') if uri(app).to_s.bytesize > 32000
     end
 
     def validate!
@@ -54,6 +57,7 @@ module Pubnub
       envelopes = Array.new
       envelopes << Envelope.new(
         {
+            :parsed_response => parsed_response,
             :message           => @message,
             :published_message => @message,
             :channel           => @channel,
@@ -69,4 +73,4 @@ module Pubnub
 
     end
   end
-end
+end

data/lib/pubnub/events/revoke.rb

@@ -53,4 +53,4 @@ module Pubnub
     end
 
   end
-end
+end

data/lib/pubnub/events/set_state.rb

@@ -0,0 +1,77 @@
+module Pubnub
+  class SetState
+    include Pubnub::Event
+    include Pubnub::SingleEvent
+    include Pubnub::Formatter
+    include Pubnub::Validator
+
+    def initialize(options, app)
+      super
+      @state = options[:state]
+
+      app.env[:state] = Hash.new          if app.env[:state].nil?
+      app.env[:state][@origin] = Hash.new if app.env[:state][@origin].nil?
+      @channel.each do |channel|
+        app.env[:state][@origin][channel.to_s] = @state
+      end
+
+      @allow_multiple_channels = true
+      @event = 'set_state'
+    end
+
+    def validate!
+      super
+      # check state
+      raise 'You can set state only as hash' unless (@state.is_a?(Hash) || @state.is_a?(NilClass))
+
+      # check channel/channels
+      raise ArgumentError.new(:object => self, :message => 'SetState requires :channel or :channels argument') unless @channel
+      raise ArgumentError.new(:object => self, :message => 'Invalid channel(s) format! Should be type of: String, Symbol, or Array of both') unless valid_channel?
+    end
+
+    private
+
+    def parameters(app)
+      parameters = super(app)
+      parameters.merge!({:state => encode_state(@state)})
+      parameters
+    end
+
+    def path(app)
+      '/' + [
+          'v2',
+          'presence',
+          'sub-key',
+          @subscribe_key,
+          'channel',
+          @channel,
+          'uuid',
+          app.env[:uuid],
+          'data'
+      ].join('/')
+    end
+
+    def format_envelopes(response, app, error)
+
+      parsed_response = Parser.parse_json(response.body) if Parser.valid_json?(response.body)
+
+      envelopes = Array.new
+      envelopes << Envelope.new({
+          :parsed_response => parsed_response,
+          :payload => (parsed_response['payload'] if parsed_response),
+          :service => (parsed_response['service'] if parsed_response),
+          :message => (parsed_response['message'] if parsed_response),
+          :status  => (parsed_response['status']  if parsed_response)
+      }, app)
+
+      envelopes = add_common_data_to_envelopes(envelopes, response, app, error)
+
+      envelopes
+
+    end
+
+    def encode_state(state)
+      URI.encode_www_form_component(state.to_json).gsub('+', '%20')
+    end
+  end
+end

data/lib/pubnub/events/state.rb

@@ -0,0 +1,63 @@
+module Pubnub
+  class State
+    include Pubnub::Event
+    include Pubnub::SingleEvent
+    include Pubnub::Formatter
+    include Pubnub::Validator
+
+    def initialize(options, app)
+      super
+
+      @uuid_looking_for = options[:uuid]
+      @uuid = app.uuid
+    end
+
+    def validate!
+      super
+
+      # check channel/channels
+      raise ArgumentError.new(:object => self, :message => 'State requires :channel argument') unless @channel
+      raise ArgumentError.new(:object => self, :message => 'Invalid channel format! Should be type of: String or Symbol') unless @channel.is_a?(String) or @channel.is_a?(Symbol)
+    end
+
+    private
+
+    def path(app)
+      '/' + [
+          'v2',
+          'presence',
+          'sub_key',
+          @subscribe_key,
+          'channel',
+          @channel,
+          'uuid',
+          @uuid_looking_for
+      ].join('/')
+    end
+
+    def format_envelopes(response, app, error)
+
+      parsed_response = Parser.parse_json(response.body) if Parser.valid_json?(response.body)
+
+      envelopes = Array.new
+      envelopes << Envelope.new(
+        {
+            :parsed_response => parsed_response,
+            :channel => (parsed_response['channel']  if parsed_response),
+            :payload => (parsed_response['payload']  if parsed_response),
+            :service => (parsed_response['service']  if parsed_response),
+            :message => (parsed_response['message']  if parsed_response),
+            :uuid    => (parsed_response['uuid']     if parsed_response),
+            :status  => (parsed_response['status']   if parsed_response),
+            :status  => (parsed_response['channel']  if parsed_response)
+        },
+        app
+      )
+
+      envelopes = add_common_data_to_envelopes(envelopes, response, app, error)
+
+      envelopes
+
+    end
+  end
+end

data/lib/pubnub/events/subscribe.rb

@@ -10,11 +10,13 @@ module Pubnub
       super
       @event = 'subscribe'
       @allow_multiple_channels = true
+      @state = options[:state]
 
     end
 
     def fire(app)
       app.update_timetoken(0)
+      add_state(@state, app) if @state
       super
     end
 
@@ -30,5 +32,10 @@ module Pubnub
 
     private
 
+    def add_state(state, app)
+      app.env[:state]          = {} unless app.env[:state]
+      app.env[:state][@origin] = {} unless app.env[:state][@origin]
+      app.env[:state][@origin][@channel] = state
+    end
   end
 end

data/lib/pubnub/events/where_now.rb

@@ -0,0 +1,55 @@
+module Pubnub
+  class WhereNow
+    include Pubnub::Event
+    include Pubnub::SingleEvent
+    include Pubnub::Formatter
+    include Pubnub::Validator
+
+    def initialize(options, app)
+      @uuid_looking_for = options[:uuid]
+      @uuid = app.uuid
+      @event = 'where_now'
+      super
+    end
+
+    def validate!
+      super
+
+      # check uuid
+      raise ArgumentError.new(:object => self, :message => 'where_now requires :uuid argument') unless @uuid_looking_for
+    end
+
+    private
+
+    def path(app)
+      '/' + [
+          'v2',
+          'presence',
+          'sub-key',
+          @subscribe_key,
+          'uuid',
+          @uuid_looking_for
+      ].join('/')
+    end
+
+    def format_envelopes(response, app, error)
+      parsed_response = Parser.parse_json(response.body) if Parser.valid_json?(response.body)
+
+      envelopes = Array.new
+      envelopes << Envelope.new(
+          {
+              :parsed_response => parsed_response,
+              :payload => (parsed_response['payload'] if parsed_response),
+              :service => (parsed_response['service'] if parsed_response),
+              :message => (parsed_response['message'] if parsed_response),
+              :status  => (parsed_response['status']  if parsed_response)
+          },
+          app
+      )
+
+      envelopes = add_common_data_to_envelopes(envelopes, response, app, error)
+
+      envelopes
+    end
+  end
+end

data/lib/pubnub/pam.rb

@@ -2,6 +2,9 @@ module Pubnub
   module PAM
     def initialize(options, app)
       super
+      if options[:presence].present?
+        @channel += format_channels(options[:presence]).map { |c| c + '-pnpres' }
+      end
       @auth_key = options[:auth_key]
     end
 
@@ -11,18 +14,6 @@ module Pubnub
       Base64.urlsafe_encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), @secret_key.to_s, message)).strip
     end
 
-    def payload(parsed_response)
-      parsed_response['payload'] if parsed_response
-    end
-
-    def message(parsed_response)
-      parsed_response['message'] if parsed_response
-    end
-
-    def channel(_parsed_response)
-      @channel.first
-    end
-
     def parameters(app, signature = false)
       params = super(app)
       params.merge!({ :timestamp => @timestamp })
@@ -48,9 +39,12 @@ module Pubnub
       envelopes = Array.new
       envelopes << Envelope.new(
           {
-              :payload => payload(parsed_response),
-              :message => message(parsed_response),
-              :channel => channel(parsed_response)
+              :parsed_response => parsed_response,
+              :payload => (parsed_response['payload'] if parsed_response),
+              :message => (parsed_response['message'] if parsed_response),
+              :channel => (parsed_response['channel'] if parsed_response),
+              :service => (parsed_response['service'] if parsed_response),
+              :status  => (parsed_response['status']  if parsed_response)
           },
           app
       )
@@ -61,4 +55,4 @@ module Pubnub
 
     end
   end
-end
+end

data/lib/pubnub/version.rb

@@ -1,3 +1,3 @@
 module Pubnub
-  VERSION = '3.5.14'
-end
+  VERSION = '3.6.7'
+end

data/pubnub.gemspec

@@ -1,23 +1,25 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pubnub/version'
 
-Gem::Specification.new do |s|
-  s.name = 'pubnub'
-  s.version = '3.5.14'
+Gem::Specification.new do |spec|
+  spec.name          = 'pubnub'
+  spec.version       = Pubnub::VERSION
+  spec.authors       = ['PubNub']
+  spec.email         = ['support@pubnub.com']
+  spec.summary       = %q{PubNub Official Ruby gem.}
+  spec.description   = %q{Ruby anywhere in the world in 250ms with PubNub!}
+  spec.homepage      = 'http://github.com/pubnub/ruby'
+  spec.license       = 'MIT'
 
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.authors = ['PubNub']
-  s.date = '2014-10-14'
-  s.description = 'Ruby anywhere in the world in 250ms with PubNub!'
-  s.email = 'support@pubnub.com'
-  s.files = `git ls-files`.split("\n")
-  s.homepage = 'http://github.com/pubnub/ruby'
-  s.licenses = ['MIT']
-  s.require_paths = ['lib']
-  s.rubygems_version = '1.7.2'
-  s.summary = 'PubNub Official Ruby gem'
-
-  s.add_dependency 'eventmachine'
-  s.add_dependency 'net-http-persistent'
-  s.add_dependency 'json'
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
 
+  spec.add_dependency 'eventmachine',        '~> 1.0'
+  spec.add_dependency 'json',                '~> 1.8'
+  spec.add_dependency 'net-http-persistent', '~> 2.9'
+  spec.add_development_dependency 'bundler', '~> 1.6'
 end