onlyoffice_api 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58536681a16a0e9cd5d20506a8d6549f87747914d0252cd5c6fed30165eaa022
-  data.tar.gz: 1ea712d7ee0f71a79f1a8390dd6ce31e06f1ad250ac044ada511562ccbb4b746
+  metadata.gz: 4da6935cc3d256a7b5b39d6b02f7a4a038e908cd8a7949c34f89e124da984a9a
+  data.tar.gz: f7baefc1910689ff41da8deaab16c70a8776a1cd40878876993ab072cfbd2c20
 SHA512:
-  metadata.gz: 5c835194dba1d3d8edb26e3559065fcabed8698a4242ed825ecbf2119447af11f59705315e11cf03c295f8d7e2ab8449b61a18822f8a237ce8d8ef31ce90d950
-  data.tar.gz: 2ff09f5ab0e21ee974ecb7b5dedee3c929ac620686ed47bf02c6aa4fbcdd454a8c97562ffdbf9ec61f084a8f7364faba7565c599da0385fff7d1b12953c71ab2
+  metadata.gz: a3e475df99ffaaef22bb7d140d3e18968f735a666142cf6722909402e43c54d5bb26a3efc3db6964434d8499afef36fa449549d248c477c29c9e9d77464b641c
+  data.tar.gz: 036ac1d16df32299bf439f5e04c4e5b4dd5f31d1bbb27d8dca654d98c6a1c3b1c59b176aa650d63b3ab97f8daf050e4a7bbba2fa19964a30f3023129177e39d4

data/lib/teamlab/responce/custom_exceptions.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Teamlab
+  # Exception if in response no JSON body
+  class NoJsonInResponce < StandardError; end
+end

data/lib/teamlab/response.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'responce/custom_exceptions'
+
 module Teamlab
   class Response
     attr_reader :body, :error, :code, :success
@@ -9,7 +11,7 @@ module Teamlab
       @success = @code < 400
       err_msg = generate_err_msg(http_response) if @code >= 400
       if @success
-        @body = http_response.to_hash
+        handle_success_responce(http_response)
       else
         raise TimeoutError, 'Portal is warming up' if http_response.parsed_response.include?('portal is being warmed')
         raise "Error #{@code}\n#{err_msg}" if @code >= 400
@@ -37,5 +39,42 @@ module Teamlab
     def data
       @body['response']
     end
+
+    private
+
+    # Sometime in strange situation, like maybe nginx errors
+    # API requests return not JSON, but html or other data
+    # @param [Teamlab::Responce] responce to check
+    # @return [Nil] is body responce correct and raise exception in any other situation
+    def check_responce_body(responce)
+      return if stream_data_request?(responce)
+
+      JSON.parse(responce.body)
+    rescue JSON::ParserError => e
+      request_info = "#{responce.request.http_method} #{responce.request.uri}"
+      raise NoJsonInResponce, "Request `#{request_info}` responce body is not a json\n "\
+                              "Parsing error: \n#{e}\n"
+    end
+
+    # Handle success responce
+    # @param [Teamlab::Responce] responce to handle
+    # @return [nil] if everything is fine or exception
+    def handle_success_responce(responce)
+      check_responce_body(responce)
+      @body = responce.to_hash
+    end
+
+    # Check if request for stream data
+    # Those request has no body, but data stream in responce
+    # @param [Teamlab::Responce] responce to check
+    # @return [Boolean] result of check
+    def stream_data_request?(responce)
+      calendar_ical_request_regexp = %r{.*/calendar/\d*/ical/\S*}
+      uri = responce.request.uri.to_s
+
+      return true if calendar_ical_request_regexp.match?(uri)
+
+      false
+    end
   end
 end

data/lib/teamlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Teamlab
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_api
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -236,6 +236,7 @@ files:
 - lib/teamlab/modules/settings.rb
 - lib/teamlab/name.rb
 - lib/teamlab/request.rb
+- lib/teamlab/responce/custom_exceptions.rb
 - lib/teamlab/response.rb
 - lib/teamlab/version.rb
 homepage: https://github.com/ONLYOFFICE/onlyoffice_api_gem