ringcentral_sdk 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0dc5f696b31adcc5394fc871e99b53dc8588fd1
-  data.tar.gz: d939e5b3744d2ca8c208feed38e559621f0db388
+  metadata.gz: a1a2876be06d2d3859a901c48e2fb82e8f20dbab
+  data.tar.gz: d5880e56002faeb10805a63e46495983684ac048
 SHA512:
-  metadata.gz: 9a3bf45edd9e57e70de115b83664ba00fd865bf745a4d961d7b8de6630fdc7500983052b5794c836cca06899c1a8e28a3e8cd374393beaf390fae8d0d11ec708
-  data.tar.gz: 239ccfe42900f49209c6f50e4d6b031ad4f7e5ede3be9a56ce59a8aeda11c3acc5fbabdaa13e21dcb34ffda530e1161a1a7d36890745a0b63b60aa394749ac3d
+  metadata.gz: 67094c9631d3e4f3a7836912e5888b0e227993332bab6a162feb872a70971903ed83743e47f80af185be595c01a2a391f71b30abfee87438af10705fc5d1f54c
+  data.tar.gz: 96d30902643ddd0f038bc04d8fd81ed1a7c5354f711e589f619f6b35ca3ef7626b34149ed04a1f4408ad62520d279cd8256222a5c880f914f5b85e244b86a88a

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 CHANGELOG
 ---------
-- **2016-09-04**: 1.3.2
+- **2016-09-05**: 1.3.4
+  - Bugfixes
+    - Fix `RingCentralSdk::REST::Subscription` renewal bug
+- **2016-09-04**: 1.3.2 & 1.3.3
   - Bugfixes
     - Fix `RingCentralSdk::REST::Subscription` renewal bug
 - **2016-08-24**: 1.3.1

data/Gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    ringcentral_sdk (1.3.3)
+      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)
+
+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.3)
+    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

data/lib/ringcentral_sdk.rb

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

data/lib/ringcentral_sdk/rest/client.rb

@@ -22,6 +22,7 @@ module RingCentralSdk::REST
 
     attr_reader :app_config
     attr_reader :http
+    attr_reader :logger
     attr_reader :oauth2client
     attr_reader :user_agent
     attr_reader :messages
@@ -39,6 +40,12 @@ module RingCentralSdk::REST
       end
 
       @instance_headers = opts[:headers] || {}
+      if opts.key? :logger
+        @logger = opts[:logger]
+      else
+        @logger = Logger.new(STDOUT)
+        @logger.level = :info
+      end
 
       @messages = RingCentralSdk::REST::Messages.new self
     end
@@ -205,6 +212,7 @@ module RingCentralSdk::REST
       else
         fail "method [#{method}] not supported"
       end
+
       return res
     end
 

data/lib/ringcentral_sdk/rest/subscription.rb

@@ -19,6 +19,7 @@ module RingCentralSdk::REST
       @_timeout = nil
       @_subscription = nil_subscription()
       @_pubnub = nil
+      @_logger_prefix = " -- #{self.class.name}: "
     end
 
     def nil_subscription()
@@ -103,23 +104,21 @@ module RingCentralSdk::REST
       if !@event_filters.is_a?(Array) || @event_filters.length ==0
         raise 'Events are undefined'
       end
- 
-      _clear_timeout()
+      _clear_timeout
 
       begin
-        response = @_client.http.put do |req|
-          req.url 'subscription/' + @_subscription['id'].to_s
+        response = @_client.http.post do |req|
+          req.url uri_join(@_subscription['uri'], 'renew')
           req.headers['Content-Type'] = 'application/json'
-          req.body = {
-            eventFilters: @_client.create_urls(@event_filters)
-          }
         end
 
         set_subscription response.body
         changed
         notify_observers response
+
         return response
       rescue StandardError => e
+        puts "RingCentralSdk::REST::Subscription: RENEW_ERROR #{e}"
         reset()
         changed
         notify_observers e
@@ -162,9 +161,9 @@ module RingCentralSdk::REST
     end
 
     def set_subscription(data)
-      _clear_timeout()
+      _clear_timeout
       @_subscription = data
-      _set_timeout()
+      _set_timeout
     end
 
     def reset
@@ -202,6 +201,10 @@ module RingCentralSdk::REST
     end
 
     def _notify(message)
+      count = count_observers
+      count_string = " -- RingCentralSdk::REST::Subscription: Notify #{count.to_s} observers"
+      puts count_string
+
       message = _decrypt message
       changed
       notify_observers message
@@ -246,6 +249,8 @@ module RingCentralSdk::REST
     end
 
     def _set_timeout
+      _clear_timeout
+
       time_to_expiration = @_subscription['expiresIn'] - RENEW_HANDICAP
 
       @_timeout = Thread.new do
@@ -255,10 +260,13 @@ module RingCentralSdk::REST
     end
 
     def _clear_timeout
-      unless @_timeout.nil?
-        @_timeout.exit
-        @_timeout = nil
-      end
+      @_timeout.exit if @_timeout.is_a?(Thread) && @_timeout.status == 'sleep'
+      @_timeout = nil
+    end
+
+    def uri_join(*args)
+      url = args.join('/').gsub(/\/+/, '/')
+      return url.gsub(/^(https?:\/)/i, '\1/')
     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.3
+  version: 1.3.4
 platform: ruby
 authors:
 - John Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -292,6 +292,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile