wialon 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37bef448770643db031153bab5ad33b5ad30dd25
-  data.tar.gz: c0a2ab27ecf772c15a91c2e49fb94542d0469cba
+SHA256:
+  metadata.gz: 4283353117672ce224554a65bdcd7ca86e93f887fb7fd1508d26a0e92334104f
+  data.tar.gz: 24d7d1123a83c6f18d526b27b24dfbfc66bb88bdf4aee5cf641c20f903b7b58d
 SHA512:
-  metadata.gz: 5a951cf4cb4e809f4a47e0b4fc46eee9f4a798b0a72639871c8ecde142518540a08a5dc476ab45b703987ca8f23d916404d565f0c4ac6ed50c0041a44b87b101
-  data.tar.gz: 94eb30173c3b297ee419b78ff920ec75d8b95acf1c956b04cdfda5e4f18de296aac65bfbde05e620b8ea9bf77af4dca8a916e6505cbecd0cf3259cc2878c7c33
+  metadata.gz: 981599957855829ec11183f33a1c5cb737000fc0ee7d7205b4c7812abf86a51698084b4cf457dd25f8290aa5fc25fb762a972655adb09b3c62b4436ee8925b25
+  data.tar.gz: e0f4242e244bf01b6e6ac4ba6d149548fcad2a7c776a662d50c1394065e4f16f19417ecea49e84323225502cff48c4d45d695ce89b890de80f0411d518ece235

data/lib/wialon.rb

@@ -4,10 +4,11 @@ class Wialon
   require 'uri'
 
   # Variables
-  attr_accessor :sid, :base_api_url, :default_params, :uid, :host, :scheme
+  attr_accessor :sid, :base_api_url, :default_params, :uid, :host, :scheme, :debug
 
   # Class constructor
-  def initialize(scheme = 'https', host = 'hst-api.wialon.com', port = '', sid = '', extra_params = {})
+  def initialize(debug = false, scheme = 'https', host = 'hst-api.wialon.com', port = '', sid = '', extra_params = {})
+    self.debug = debug
     self.sid = ''
     self.scheme = scheme
     self.default_params = {}
@@ -17,8 +18,11 @@ class Wialon
     self.uid = ''
   end
 
-  def get_address(lat, lon)
-    uri = URI.parse('https://geocode-maps.wialon.com/' + self.host + '/gis_geocode?coords=[' + JSON.generate({"lon": lon,"lat": lat}) + ']&flags=1255211008&uid=' + self.uid.to_s)
+  def get_address(lat, lon, flags = 1255211008)
+    if self.debug
+      puts "URL: #{'https://geocode-maps.wialon.com/' + self.host + '/gis_geocode?coords=[' + JSON.generate({"lon": lon,"lat": lat}) + ']&flags=' + flags.to_s + '&uid=' + self.uid.to_s}"
+    end
+    uri = URI.parse('https://geocode-maps.wialon.com/' + self.host + '/gis_geocode?coords=[' + JSON.generate({"lon": lon,"lat": lat}) + ']&flags=' + flags.to_s + '&uid=' + self.uid.to_s)
     request = Net::HTTP::Post.new(uri)
     req_options = { use_ssl: uri.scheme == self.scheme }
     response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
@@ -43,6 +47,46 @@ class Wialon
     return JSON.parse(response.body) 
   end 
 
+  def call_without_svc_parse(action, args)
+    # Set local variable with base url
+    url = self.base_api_url
+
+    # Set params
+    params = {'svc': action.to_s, 'params': JSON.generate(args), 'sid': self.sid}
+    
+    # Replacing global params with local params
+    all_params = self.default_params.replace(params)
+
+    if self.debug
+      puts "========="
+      puts "Query URL: #{url} - Params: #{all_params}"
+      puts "========="
+      puts "#{url}&svc=#{action.to_s}&params=#{JSON.generate(args)}&sid=#{self.sid}"
+      puts "========="
+    end
+
+    uri = URI.parse(url)
+    
+    # Curl request
+    request = Net::HTTP::Post.new(uri)
+
+    request.set_form_data(
+      "svc" => action.to_s,
+      "params" => JSON.generate(args),
+      "sid" => self.sid
+    )
+
+    req_options = { use_ssl: uri.scheme == self.scheme }
+
+    response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
+      http.request(request)
+    end
+
+    response = JSON.parse(response.body)
+
+    return response
+  end
+
   # RemoteAPI request performer
   # action: RemoteAPI command name
   # args: JSON string with request parameters
@@ -56,23 +100,25 @@ class Wialon
     # Replacing global params with local params
     all_params = self.default_params.replace(params)
 
-    # Initializing string
-    str = ""
-    # Params each cycle with index
-    all_params.each do |slug, param|
-      # If string length is upper to 0, include "&" to include all params
-      if str.length > 0
-        str += "&"  
-      end
-      str += slug.to_s + "=" + param
+    if self.debug
+      puts "========="
+      puts "Query URL: #{url} - Params: #{all_params}"
+      puts "========="
+      puts "#{url}&svc=#{action.to_s.sub('_', '/')}&params=#{JSON.generate(args)}&sid=#{self.sid}"
+      puts "========="
     end
 
-    # Curl request
-    puts url + str
-    uri = URI.parse(url + str)
+    uri = URI.parse(url)
     
+    # Curl request
     request = Net::HTTP::Post.new(uri)
 
+    request.set_form_data(
+      "svc" => action.to_s.sub('_', '/'),
+      "params" => JSON.generate(args),
+      "sid" => self.sid
+    )
+
     req_options = { use_ssl: uri.scheme == self.scheme }
 
     response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
@@ -85,17 +131,20 @@ class Wialon
   end
 
   def login(token)
-    data = {token: token}
-    result = self.token_login(data)
+    result = self.token_login({token: token})
     if !result['eid'].nil?
       self.sid = result['eid']
     end
 
-    if !result['user']['id'].nil?
-      self.uid = result['user']['id']
+    begin
+      if !result['user']['id'].nil?
+        self.uid = result['user']['id']
+      end
+    rescue Exception => e
+      if self.debug
+        puts "Error in login: #{e}"
+      end
     end
-
-    puts "Here"
     return result
   end
 
@@ -109,7 +158,10 @@ class Wialon
 
   # Unknonwn methods handler
   def method_missing(name, *args)
-    puts "#{name}"
+    if self.debug
+      puts "Query method: #{name}"
+    end
+
     return self.call(name, ((args.count === 0) ? '{}' : args[0]))
   end
 

data/lib/wialon_error.rb

@@ -0,0 +1,39 @@
+class WialonError
+  attr_accessor :error
+  def initialize(error)
+    self.error = error
+  end
+
+  def message
+    @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"
+    }
+
+    response = {
+      original_message: self.error,
+      message: @errors[self.error['error'].to_s]
+    }
+
+    return response
+  end
+end

metadata

@@ -1,25 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wialon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kenny Mochizuki
+- Golden M
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-08-26 00:00:00.000000000 Z
 dependencies: []
-description: Wialon class for Wialon Remote API
-email: kenny.mochiuki@gmail.com
+description: Wialon gem wrapper for Remote API
+email: support@goldenmcorp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/wialon.rb
-homepage: http://rubygems.org/gems/wialon-ruby
+- lib/wialon_error.rb
+homepage: http://rubygems.org/gems/wialon
 licenses:
-- MIT
+- CC-BY-NC-4.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -37,8 +39,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Wialon Remote API Gem
+summary: Wialon gem wrapper for Remote API
 test_files: []