pubnub 3.4 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221358338157dbb82bbda8b746e0a48029a27d3a
-  data.tar.gz: 99d0e9f83f0b2c0a503fa03fa6e34b7571d0fef1
+  metadata.gz: d36c99c090137e15da39515489f5487e3d07c028
+  data.tar.gz: a49d8b178508761e055c4105665e265fded9f1f7
 SHA512:
-  metadata.gz: 0b8a1ca3bbbbb9da4a2cd307e6b28627153be01180f4933204d982e72cdbee11017c1ba57d78ad941c6152f1aac0eed32152fb7929bead852e0a33fe0c73c2ae
-  data.tar.gz: 6abee24d18724fc5d4aa50fa3ae614e2db757ea2015f8d207bfa7f723cd46ed2d0c06b37aa8a64447cf892abc272e65d9cbf2fb2dac2c6551343471f9102766d
+  metadata.gz: 9c25b97f6ee76a24ecb39a314f0499051d650ebf6f61a692291c15213190bca473a2cd3d994c9e551844593c791b292edd499c4f634b4ef4dca21ca4f7dadf20
+  data.tar.gz: ed0f70d2bdf78eb0091df1d61de33cdea41d46c2782d7a2c8e512f8829691dfbc990abb5a8edc43927948d3b8db0ba86fb23d32147e07a05c70102f8565b751f

data/CHANGELOG

@@ -0,0 +1,3 @@
+3.4.0
+- Async vs Sync
+- Block, Return, and Callback options

data/README.md

@@ -37,6 +37,10 @@ require 'pubnub'
 #### Init and instantiate a new PubNub instance
 
 ```ruby
+
+# If you wish to override the default logger, create one and pass it in.
+my_logger = Logger.new(STDOUT)
+
 pubnub = Pubnub.new(
     :subscribe_key    => 'demo',
     :publish_key      => 'demo',
@@ -46,7 +50,8 @@ pubnub = Pubnub.new(
     },
     :connect_callback => lambda { |msg|
       puts "CONNECTED: #{msg.inspect}"
-    }
+    },
+    :logger => my_logger
 )
 ```
 
@@ -170,7 +175,7 @@ When publishing, send a string, number, array, or hash. PubNub automatically ser
 @my_callback = lambda { |envelope| puts(envelope.msg) }
 
 pubnub.publish(
-    :channel  => "hello_world"",
+    :channel  => "hello_world",
     :message  => "hi",
     :callback => @my_callback
 )

data/lib/pubnub.rb

@@ -9,7 +9,6 @@
 ## PubNub 3.4 Real-time Push Cloud API
 ## -----------------------------------
 
-require 'uuid'
 require 'json'
 require 'base64'
 require 'open-uri'
@@ -18,7 +17,7 @@ require 'openssl'
 require 'eventmachine'
 require 'em-http-request'
 
-require 'version.rb'
+require 'pubnub/version.rb'
 
 require 'pubnub/client.rb'
 require 'pubnub/request.rb'

data/lib/pubnub/client.rb

@@ -4,6 +4,7 @@ require 'em-http-request'
 require 'httparty'
 require 'persistent_httparty'
 require 'timeout'
+require 'pubnub/uuid'
 
 module Pubnub
   class PubNubHTTParty
@@ -59,7 +60,7 @@ module Pubnub
       @timetoken        = options[:timetoken]
       @session_uuid     = options[:uuid] || options[:session_uuid] || UUID.new.generate
 
-          @history_count    = options[:count]
+      @history_count    = options[:count]
       @history_start    = options[:start]
       @history_end      = options[:end]
       @history_reverse  = options[:reverse]
@@ -232,7 +233,6 @@ module Pubnub
           @subscription_request.channel = get_channels_for_subscription.join(',')
 
           @subscription_running = EM.add_periodic_timer(PERIODIC_TIMER) do
-
             unless @wait_for_response || get_channels_for_subscription.empty?
               @wait_for_response = true
               $log.debug 'SETTING CHANNELS'
@@ -242,8 +242,8 @@ module Pubnub
 
               http.callback do
                 $log.debug 'GOT SUBSCRIBE RESPONSE'
-                @wait_for_response = false
                 if http.response_header.status.to_i == 200
+                  $log.debug 'STATUS 200'
                   if is_valid_json?(http.response)
                     $log.debug 'GOT VALID JSON'
                     @subscription_request.handle_response(http)
@@ -273,10 +273,20 @@ module Pubnub
                   end
 
                 end
+
+                @wait_for_response = false
               end
+
               http.errback do
                 $log.error 'GOT SUBSCRIBE ERROR'
-                @error_callback.call [0, http.error]
+                @error_callback.call Pubnub::Response.new(
+                                       :error_init => true,
+                                       :message =>  [0, http.error].to_json,
+                                       :response =>  [0, http.error].to_json
+                                     )
+                $log.error 'CALLED ERROR CALLBACK'
+
+                @wait_for_response = false
               end
             end
           end unless @subscription_running
@@ -451,11 +461,9 @@ module Pubnub
         unless @subscribe_connection
           @subscribe_connection = EM::HttpRequest.new(request.origin, :connect_timeout => 370, :inactivity_timeout => 370)
           connection = @subscribe_connection.get :path => '/time/0', :keepalive => true, :query => request.query
-          #EM.next_tick do
-            connection.callback do
-              EM.defer do @connect_callback.call 'ASYNC SUBSCRIBE CONNECTION' end
-            end
-          #end
+          connection.callback do
+            @connect_callback.call 'ASYNC SUBSCRIBE CONNECTION'
+          end
         end
 
         @subscribe_connection.get :path => request.path, :query => request.query, :keepalive => true

data/lib/pubnub/configuration.rb

@@ -9,7 +9,7 @@ module Pubnub
     DEFAULT_PATH               = '/'
     DEFAULT_PARAMS             = {}
     DEFAULT_HEADERS            = {}
-    DEFAULT_USER_AGENT         = "Pubnub Ruby #{PUBNUB_VERSION}"
+    DEFAULT_USER_AGENT         = "Pubnub Ruby #{VERSION}"
     DEFAULT_SSL_SET            = false
     DEFAULT_TIMEOUT            = 5
     DEFAULT_ENCODING           = nil

data/lib/pubnub/uuid.rb

@@ -0,0 +1,10 @@
+module Pubnub
+  class UUID
+    def generate
+      ary = Random.new.bytes(16).unpack("NnnnnN")
+      ary[2] = (ary[2] & 0x0fff) | 0x4000
+      ary[3] = (ary[3] & 0x3fff) | 0x8000
+      "%08x-%04x-%04x-%04x-%04x%08x" % ary
+    end
+  end
+end

data/lib/pubnub/version.rb

@@ -0,0 +1,3 @@
+module Pubnub
+  VERSION = "3.4.1"
+end

data/pubnub.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'pubnub'
-  s.version = '3.4'
+  s.version = '3.4.1'
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['PubNub']
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'httparty'
   s.add_dependency 'persistent_httparty'
   s.add_dependency 'em-http-request'
-  s.add_dependency 'uuid', '~> 2.3.5'
   s.add_dependency 'json'
 
 end

data/spec/lib/subscribe_timeout_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe '#subscribe' do
+  context 'got timeout' do
+
+    before(:each) do
+      @after_callback = false
+      @after_error_callback = false
+      @output = StringIO.new
+      @error_output = StringIO.new
+      @msg_output = StringIO.new
+
+      @callback = lambda { |envelope|
+        $log.debug 'FIRE CALLBACK'
+        @after_callback = true
+        @output.write envelope.response
+        @msg_output.write envelope.msg
+        EM.stop if EM.reactor_running?
+      }
+
+      @error_callback = lambda { |envelope|
+        if envelope.is_a? Array
+          $log.error envelope
+        else
+          @error_output.write envelope.response
+        end
+        @after_error_callback = true
+      }
+
+      @pn = Pubnub.new(:publish_key => :demo, :subscribe_key => :demo, :error_callback => @error_callback)
+      @pn.session_uuid = nil
+    end
+
+    before(:each) do
+      stub_request(:get, /http[s]?:\/\/pubsub.pubnub.com\/subscribe\/demo\/demo\/0\/\d+/).
+          to_timeout.
+          to_return(lambda { |request|
+            {
+                :body => [[{"text" => "hey"}],"#{/\d+$/.match(request.uri.path).to_s.to_i + 1}"].to_json,
+                :status => '200',
+                :headers => {
+                    'Content-Type' => 'text/javascript; charset="UTF-8"'
+                }
+            }
+          })
+
+      stub_request(:get, /http[s]?:\/\/pubsub.pubnub.com\/time\/0/).
+          to_return(
+          {
+              :body => '[13804562752311765]',
+              :status => 200,
+              :headers => {
+                  'Content-Type' => 'text/javascript; charset="UTF-8"'
+              }
+          }
+      )
+    end
+
+    it 'raises error callback with proper message and continue' do
+      #binding.pry
+      @pn.subscribe(:channel => :demo, :callback => @callback)
+      until @after_callback do end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: '3.4'
+  version: 3.4.1
 platform: ruby
 authors:
 - PubNub
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +91,7 @@ files:
 - .yardoc/object_types
 - .yardoc/objects/root.dat
 - .yardoc/proxy_types
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
@@ -217,8 +204,9 @@ files:
 - lib/pubnub/request.rb
 - lib/pubnub/response.rb
 - lib/pubnub/subscription.rb
+- lib/pubnub/uuid.rb
+- lib/pubnub/version.rb
 - lib/tasks/examples.rake
-- lib/version.rb
 - pubnub.gemspec
 - spec/lib/client_spec.rb
 - spec/lib/crypto_spec.rb
@@ -228,6 +216,7 @@ files:
 - spec/lib/pubnub_spec.rb
 - spec/lib/request_spec.rb
 - spec/lib/subscribe_integration_spec.rb
+- spec/lib/subscribe_timeout_spec.rb
 - spec/lib/time_integration_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/pubnub/ruby
@@ -255,3 +244,4 @@ signing_key:
 specification_version: 4
 summary: PubNub Official Ruby gem
 test_files: []
+has_rdoc: 

data/lib/version.rb

@@ -1 +0,0 @@
-PUBNUB_VERSION = '3.4'