ringcentral_sdk 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877b510cfc9ecc5864c9b07a4597addcd39d2adc
-  data.tar.gz: d4f64600c0d5097a9a33ff29b691625d9c4c3917
+  metadata.gz: f3cbfb92bc00009e9575a0f41d2115bbf1d6964e
+  data.tar.gz: 38a3ec34ad844bbc18d6f42c48ac0d46348630c0
 SHA512:
-  metadata.gz: 84d0277bd3762c77b9ba31955488ec9eed1f3916d7727a0ecb1711abb56221d6d6cd03ff3c07b066b482181055a0403b7cc2a33fdf34672dbab3d6dbc062773a
-  data.tar.gz: 3655cc0b68e7ba2af7d453e492bd7042752900d2490106f064a57e2597851b674c17f8c78c71eb9fdcc53632472fd2dffc8f936cada92228ecacc39d35ee79f7
+  metadata.gz: 8f832f2188822a1a38e28a981a4eb1ee196e8e7a92be7fbd2f1026ce12e7c8a3377c48dc621a9a62a8df6286010fc86fb9876a0c6582fb2bdf70c79f82c53518
+  data.tar.gz: 76b5ad230db8d102ea314054339209f38f6c617b77038785d73aa6bc8bdfd65a5ee9356dc8f13234aa06a611548de42a22afb4f14cdca409b8981e9f1b680791

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+- **2016-09-04**: 1.3.2
+  - Bugfixes
+    - Fix `RingCentralSdk::REST::Subscription` renewal bug
 - **2016-08-24**: 1.3.1
   - Updates
     - Lock PubNub dependency to 3.x due to back compat issue with 4.x

data/lib/ringcentral_sdk.rb

@@ -1,5 +1,5 @@
 module RingCentralSdk
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
   RC_SERVER_PRODUCTION = 'https://platform.ringcentral.com'
   RC_SERVER_SANDBOX    = 'https://platform.devtest.ringcentral.com'

data/lib/ringcentral_sdk/rest/subscription.rb

@@ -4,9 +4,6 @@ require 'multi_json'
 require 'observer'
 require 'openssl'
 require 'pubnub'
-require 'timers'
-
-require 'pp'
 
 module RingCentralSdk::REST
   class Subscription
@@ -25,7 +22,7 @@ module RingCentralSdk::REST
     end
 
     def nil_subscription()
-      subscription        =  {
+      return {
         'eventFilters'    => [],
         'expirationTime'  => '', # 2014-03-12T19:54:35.613Z
         'expiresIn'       => 0,
@@ -41,7 +38,6 @@ module RingCentralSdk::REST
         'status'          => '', # Active
         'uri'             => ''
       }
-      return subscription
     end
 
     def pubnub()
@@ -49,25 +45,25 @@ module RingCentralSdk::REST
     end
 
     def register(events = nil)
-      return alive?() ? renew(events) : subscribe(events)
+      return alive? ? renew(events) : subscribe(events)
     end
 
     def add_events(events)
-      unless events.is_a?(Array)
+      unless events.is_a? Array
         raise 'Events is not an array.'
       end
       @event_filters.push(events) if events.length > 0
     end
 
     def set_events(events)
-      unless events.is_a?(Array)
+      unless events.is_a? Array
         raise 'Events is not an array.'
       end
       @event_filters = events
     end
 
     def subscribe(events=nil)
-      set_events(events) if events.is_a?(Array)
+      set_events(events) if events.is_a? Array
 
       if !@event_filters.is_a?(Array) || @event_filters.length == 0
         raise 'Events are undefined'
@@ -84,10 +80,10 @@ module RingCentralSdk::REST
             }
           }
         end
-        set_subscription(response.body)
+        set_subscription response.body
         _subscribe_at_pubnub()
         changed
-        notify_observers(response)
+        notify_observers response
         return response
       rescue StandardError => e
         reset()
@@ -98,9 +94,9 @@ module RingCentralSdk::REST
     end
 
     def renew(events = nil)
-      set_events(events) if events.is_a?(Array)
+      set_events(events) if events.is_a? Array
 
-      unless alive?()
+      unless alive?
         raise 'Subscription is not alive'
       end
 
@@ -113,25 +109,26 @@ module RingCentralSdk::REST
       begin
         response = @_client.http.put do |req|
           req.url 'subscription/' + @_subscription['id'].to_s
+          req.headers['Content-Type'] = 'application/json'
           req.body = {
             eventFilters: @_client.create_urls(@event_filters)
           }
         end
 
-        set_subscription(response.body)
+        set_subscription response.body
         changed
-        notify_observers(response)
+        notify_observers response
         return response
       rescue StandardError => e
         reset()
         changed
-        notify_observers(e)
+        notify_observers e
         raise 'Renew HTTP Request Error'
       end
     end
 
     def remove()
-      unless alive?()
+      unless alive?
         raise 'Subscription is not alive'
       end
 
@@ -141,16 +138,16 @@ module RingCentralSdk::REST
         end
         reset()
         changed
-        notify_observers(response.body)
+        notify_observers response.body
         return response
       rescue StandardError => e
         reset()
         changed
-        notify_observers(e)
+        notify_observers e
       end
     end
 
-    def alive?()
+    def alive?
       s = @_subscription
       return (s.has_key?('deliveryMode') && s['deliveryMode']) && \
         (s['deliveryMode'].has_key?('subscriberKey') && s['deliveryMode']['subscriberKey']) && \
@@ -160,7 +157,7 @@ module RingCentralSdk::REST
         ? true : false
     end
 
-    def subscription()
+    def subscription
       return @_subscription
     end
 
@@ -170,18 +167,18 @@ module RingCentralSdk::REST
       _set_timeout()
     end
 
-    def reset()
+    def reset
       _clear_timeout()
       _unsubscribe_at_pubnub()
       @_subscription = nil_subscription()
     end
 
-    def destroy()
+    def destroy
       reset()
     end
 
-    def _subscribe_at_pubnub()
-      if ! alive?()
+    def _subscribe_at_pubnub
+      unless alive?
         raise 'Subscription is not alive'
       end
 
@@ -192,8 +189,6 @@ module RingCentralSdk::REST
       callback = lambda { |envelope|
       	_notify(envelope.msg)
       	changed
-        #notify_observers {}
-      	#notify_observers('GOT_PUBNUB_MESSAGE_NOTIFY')
       }
 
       @_pubnub.subscribe(
@@ -207,13 +202,13 @@ module RingCentralSdk::REST
     end
 
     def _notify(message)
-      message = _decrypt(message)
+      message = _decrypt message
       changed
-      notify_observers(message)
+      notify_observers message
     end
 
     def _decrypt(message)
-      unless alive?()
+      unless alive?
         raise 'Subscription is not alive'
       end
 
@@ -233,7 +228,7 @@ module RingCentralSdk::REST
       return message
     end
 
-    def _encrypted?()
+    def _encrypted?
       delivery_mode = @_subscription['deliveryMode']
       is_encrypted  = delivery_mode.has_key?('encryption') && \
         delivery_mode['encryption']                        && \
@@ -242,7 +237,7 @@ module RingCentralSdk::REST
       return is_encrypted
     end
 
-    def _unsubscribe_at_pubnub()
+    def _unsubscribe_at_pubnub
       if @_pubnub && alive?()
         @_pubnub.unsubscribe(channel: @_subscription['deliveryMode']['address']) do |envelope|
           # puts envelope.message
@@ -250,18 +245,18 @@ module RingCentralSdk::REST
       end
     end
 
-    def _set_timeout()
+    def _set_timeout
       time_to_expiration = @_subscription['expiresIn'] - RENEW_HANDICAP
-      @_timeout = Timers::Group.new
-      @_timeout.after(time_to_expiration) do
-        renew()
+      time_to_expiration = 5
+
+      @_timeout = Thread.new do
+        sleep time_to_expiration
+        renew
       end
     end
 
-    def _clear_timeout()
-      if @_timeout.is_a? Timers::Group
-        @_timeout.cancel()
-      end
+    def _clear_timeout
+      @_timeout = nil
     end
 
     def new_pubnub(subscribe_key='', ssl_on=false, publish_key='', my_logger=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ringcentral_sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - John Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -306,7 +306,6 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ringcentral_sdk (1.3.1)
-      dotenv (~> 2.1, >= 2.1.0)
-      faraday (~> 0.9, >= 0.9)
-      faraday_middleware (~> 0, >= 0)
-      faraday_middleware-oauth2_refresh (~> 0)
-      jsondoc (~> 0.1, >= 0.1.0)
-      logger
-      mime (~> 0.4, >= 0.4.3)
-      mime-types (~> 3.1)
-      mime_builder (~> 0)
-      multi_json (~> 1.3)
-      oauth2 (~> 1.0, >= 1.0.0)
-      pubnub (~> 3.8)
-      timers (~> 4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.17.3)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.6)
-      timers (>= 4.1.1)
-    coveralls (0.8.15)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
-    docile (1.1.5)
-    dotenv (2.1.1)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    faraday_middleware-oauth2_refresh (0.0.3)
-      faraday (~> 0.9, >= 0.9)
-      faraday_middleware (~> 0, >= 0)
-    hitimes (1.2.4)
-    httpclient (2.8.2.2)
-    json (1.8.3)
-    jsondoc (0.1.3)
-    jwt (1.5.4)
-    logger (1.2.8)
-    metaclass (0.0.4)
-    mime (0.4.3)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mime_builder (0.0.3)
-      mime
-      mime-types (>= 1.25)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.12.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    power_assert (0.3.0)
-    pubnub (3.8.2)
-      celluloid (~> 0.17)
-      httpclient (~> 2.6)
-      json (~> 1.8)
-    rack (2.0.1)
-    rake (11.2.2)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    test-unit (3.2.1)
-      power_assert
-    thor (0.19.1)
-    timers (4.1.1)
-      hitimes
-    tins (1.12.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls
-  mocha
-  rake
-  ringcentral_sdk!
-  simplecov
-  test-unit
-
-BUNDLED WITH
-   1.12.5