wialon 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d74c3470a60f74763662c5e0a6108c00fc0860224a0b8c91e1319c0782392f
-  data.tar.gz: 7c3cd4d9828eeaa0e3d43f5f861db58daa256816bec1700375d51bdd527c422c
+  metadata.gz: 36654cb91e1206daa424c26f13f67e53419d33a0ed351153aea5e74fd1fdf67a
+  data.tar.gz: 5bdf4a446e3056c3c1ebbccbc94f2ee10bdc95732413a03a4217f3db5d44f69c
 SHA512:
-  metadata.gz: d9dbaa3e26b06ef263108828d4e2a2073ae4d0fae89bbcfff5f743e09dd818491c8114450b8744724b048652512ddacaf13c3282e4eed2c4207a88a98e009223
-  data.tar.gz: c3d7c7491006b91a9963c15e527f8cbfa4e8a37ed0a243f89c5a6e889e36b9659bcf4cb8e1c4c6a89e367145eaf861bedc910177d40b81ed8e08569abf716756
+  metadata.gz: 5a7149e8f8c12b07db044ab2008c679cd60ddc4b176e841ef1b80999ca254c357bc826dc4584f2ec86a41527eef9fc3194a8da20d5f3e902cca9688b22c7d5c1
+  data.tar.gz: 414da12ec731d120474ed170b75f6f2d0ad901de1d52c5d9d97756e32c5d97dda6f6eff26d34b9c17fccf8408a2c84cdd5682a118c89e93437e8ce9beff2d5e9

data/lib/wialon.rb

@@ -125,20 +125,33 @@ class Wialon
       http.request(request)
     end
 
-    response = JSON.parse(response.body)
+    response = JSON.parse(response.body, symbolize_names: true)
+
+    if response.class == Hash
+      if !response[:error].nil?
+        return {
+          status: 400,
+          reason: self.parse_errors(response[:error]),
+          result: response
+        }
+      end
+    end
 
-    return response
+    return {
+      status: 200,
+      result: response
+    }
   end
 
   def login(token)
     result = self.token_login({token: token})
-    if !result['eid'].nil?
-      self.sid = result['eid']
+    if !result[:eid].nil?
+      self.sid = result[:eid]
     end
 
     begin
-      if !result['user']['id'].nil?
-        self.uid = result['user']['id']
+      if !result[:user][:id].nil?
+        self.uid = result[:user][:id]
       end
     rescue Exception => e
       if self.debug
@@ -150,7 +163,7 @@ class Wialon
 
   def logout
     result = self.core_logout()
-    if result.empty? && result['error'] == 0
+    if result.empty? && result[:error] == 0
       self.sid = ""
     end
     return result
@@ -166,6 +179,37 @@ class Wialon
   end
 
   private 
+    def parse_errors(code)
+      errors = {
+        '1' => "Invalid session",
+        '2' => "Invalid service name",
+        '3' => "Invalid result",
+        '4' => "Invalid input",
+        '5' => "Error performing request",
+        '6' => "Unknown error",
+        '7' => "Access denied",
+        '8' => "Invalid user name or password",
+        '9' => "Authorization server is unavailable",
+        '10' => "Reached limit of concurrent requests",
+        '11' => "Password reset error",
+        '14' => "Billing error",
+        '1001' => "No messages for selected interval",
+        '1002' => "Item with such unique property already exists or Item cannot be created according to billing restrictions",
+        '1003' => "Only one request is allowed at the moment",
+        '1004' => "Limit of messages has been exceeded",
+        '1005' => "Execution time has exceeded the limit",
+        '1006' => "Exceeding the limit of attempts to enter a two-factor authorization code",
+        '1011' => "Your IP has changed or session has expired",
+        '2014' => "Selected user is a creator for some system objects, thus this user cannot be bound to a new account",
+        '2015' => "Sensor deleting is forbidden because of using in another sensor or advanced properties of the unit"
+      }
+
+      if errors[code.to_s].nil?
+        return "Unknown error"
+      else
+        return errors[code.to_s]
+      end
+    end
     # SID setter
     def set_sid(sid)
       self.sid = sid

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wialon
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Golden M Software
+- Kenny Mochizuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Wialon gem wrapper for Remote API
 email: software@goldenmcorp.com
@@ -36,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Wialon gem wrapper for Remote API