imperituroard 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeca304c427cdbe347a566fc39138f8a58da945d
-  data.tar.gz: 4708274c23856b68e63d040d1a66b784840a5933
+  metadata.gz: b9caa5ad1572dee6c98500f3f462d24b1e33c380
+  data.tar.gz: ad4f914e0ecaa6d3d2ad289af39d72d8d17d6b2a
 SHA512:
-  metadata.gz: 224628db3fef071736cc068fda2310dc0d5c47131387148481060f3bcd6de8ff1eb8cc4c66324ca6fd00ed62d36b2f7d1031fa145ae4af6012f14cc154a3245d
-  data.tar.gz: af0d5294b40f4149d1260136549804e610c4259f3ae16b92cba39a523c9ed8c2b17e292b9bf35260ed004f4f46c8404b1f0aa2fae0dbedf58b7034dde1dac010
+  metadata.gz: d25801d9cebc2a5ac5f1e4c80939f98187b9021424a3818a7ebd89f5b27e30cb74c4b0f01dff9a268c5489a5dbe9e628abdda7aac21edcde7f74419fe3c5f96d
+  data.tar.gz: 1761bc8bd8a6fea80075c0de0616e3c3777a9f9b333cce4e38176e7ebb3307b392abf03d7693134412f84efb84ec89fdac5b3b8681223250abf509b3ff5aacf2

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -90,6 +90,7 @@ class HuaIot
 
 #2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
   def dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
+    out_resp = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
     path = "/iocm/app/reg/v2.0.0/deviceCredentials?appId=" + app_id
     url_string = "https://" + platformip + ":" + platformport + path
@@ -106,13 +107,16 @@ class HuaIot
     request.body = {deviceInfo: {nodeId: node_id, name: name_p, description: description_p, deviceType: device_type}}.to_json
     res = https.request(request)
     p res.body.to_s
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    p out_resp
+    out_resp
   end
 
 
 
   #2.2.12 Deleting a Directly Connected Device
   def dev_delete(app_id, secret, dev_id)
+    out_resp = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
     path = "/iocm/app/dm/v1.1.0/devices/" + dev_id + "?app_Id=" + app_id + "&cascade=true"
     url_string = "https://" + platformip + ":" + platformport + path
@@ -130,11 +134,14 @@ class HuaIot
     p res.code
     p res.body
     if res.body != nil
-      {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+      out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
     else
-      {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
+      out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
     end
 
+    p out_resp
+    out_resp
+
   end
 
 

data/lib/imperituroard/projects/iot/mongoconnector.rb

@@ -19,6 +19,7 @@ class MongoIot
   end
 
   def audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
+    out_resp = {}
     begin
       d = DateTime.now
       current = d.strftime("%d/%m/%Y %H:%M:%S")
@@ -31,15 +32,18 @@ class MongoIot
           :output_params => output_json
       }
       result = collection.insert_one(doc)
-      return {:code => 200, :result => "Request completed successfully", :body => result}
+      out_resp = {:code => 200, :result => "audit_logger: Request completed successfully", :body => result}
     rescue
-      return {:code => 507, :result => "Unknown SDK error"}
+      out_resp = {:code => 507, :result => "audit_logger: Unknown SDK error"}
     end
+    p out_resp
+    out_resp
   end
 
   #:code => 507, :result => "Unknown SDK error"
   #{:code => 200, :result => "Request completed successfully", :body => result_ps}
   def get_profiles_by_login(login)
+    out_resp = {}
     begin
       p "get_profiles_by_login get_profiles_by_login"
       login_profiles = []
@@ -58,17 +62,20 @@ class MongoIot
         collection2.find({:$or => req2}, {:_id => 0}).each {|row|
           result_ps.append(row)
         }
-        return {:code => 200, :result => "Request completed successfully", :body => result_ps}
+        out_resp = {:code => 200, :result => "get_profiles_by_login: Request completed successfully", :body => result_ps}
       else
-        return {:code => 404, :result => "Access denied. Incorrect login"}
+        out_resp = {:code => 404, :result => "get_profiles_by_login: Access denied. Incorrect login"}
       end
 
     rescue
-      return {:code => 507, :result => "Unknown SDK error"}
+      out_resp = {:code => 507, :result => "get_profiles_by_login: Unknown SDK error"}
     end
+    p out_resp
+    out_resp
   end
 
   def get_imei_info_from_db(imeilist)
+    out_resp = {}
     p imeilist
     p "imeilist"
     begin
@@ -81,10 +88,12 @@ class MongoIot
       collection.find({:$or => req2}, {:_id => 0}).each {|row|
         result_ps.append(row)
       }
-      return {:code => 200, :result => "Request completed successfully", :body => result_ps}
+      out_resp = {:code => 200, :result => "get_imei_info_from_db: Request completed successfully", :body => result_ps}
     rescue
-      return {:code => 507, :result => "Unknown SDK error"}
+      out_resp = {:code => 507, :result => "get_imei_info_from_db: Unknown SDK error"}
     end
+    p out_resp
+    out_resp
   end
 
   def get_profile_id_by_name(profile_name)
@@ -114,6 +123,7 @@ class MongoIot
   end
 
   def check_login_profile_permiss(login, profile)
+    out_resp = {}
     p "profile"
     p profile
     get_login_info = get_profiles_by_login(login)
@@ -123,38 +133,40 @@ class MongoIot
     if get_login_info[:code]==200
 
 
-
-    dst_profile = get_profile_id_by_name(profile)
-    p "dst_profile"
-    p dst_profile
-    access=1
-    if get_login_info[:body]!=[]
-      if dst_profile!=[]
-        p "sgsgsd"
-        for j in get_login_info[:body]
-          p j
-          if j["profile_id"].to_i==dst_profile["profile_id"].to_i
-            access=0
-          end
-          if access==0
-            return {:code => 200, :result => "Permission granted"}
-          else
-            return {:code => 400, :result => "Access denied. This incident will be reported."}
+      dst_profile = get_profile_id_by_name(profile)
+      p "dst_profile"
+      p dst_profile
+      access=1
+      if get_login_info[:body]!=[]
+        if dst_profile!=[]
+          p "sgsgsd"
+          for j in get_login_info[:body]
+            p j
+            if j["profile_id"].to_i==dst_profile["profile_id"].to_i
+              access=0
+            end
+            if access==0
+              out_resp = {:code => 200, :result => "check_login_profile_permiss: Permission granted"}
+            else
+              out_resp = {:code => 400, :result => "check_login_profile_permiss: Access denied. This incident will be reported."}
+            end
           end
+        else
+          out_resp = {:code => 501, :result => "check_login_profile_permiss: Profile not found"}
         end
       else
-        return {:code => 501, :result => "Profile not found"}
+        out_resp = {:code => 500, :result => "check_login_profile_permiss: Access denied. Login not found"}
       end
     else
-      return {:code => 500, :result => "Access denied. Login not found"}
-    end
-    else
-      {:code => 500, :result => "Access denied. Login not found"}
+      out_resp = {:code => 500, :result => "check_login_profile_permiss: Access denied. Login not found"}
     end
+    p out_resp
+    out_resp
   end
 
 
   def check_login_prof_perm_id_one(login, profile_id)
+    out_resp = {}
     p "profile"
     p profile_id
     get_login_info = get_profiles_by_login(login)
@@ -169,17 +181,20 @@ class MongoIot
           access=0
         end
         if access==0
-          return {:code => 200, :result => "Permission granted"}
+          out_resp = {:code => 200, :result => "check_login_prof_perm_id_one: Permission granted"}
         else
-          return {:code => 400, :result => "Access denied. This incident will be reported."}
+          out_resp = {:code => 400, :result => "check_login_prof_perm_id_one: Access denied. This incident will be reported."}
         end
       end
     else
-      {:code => 500, :result => "Login not found"}
+      out_resp = {:code => 500, :result => "check_login_prof_perm_id_one: Login not found"}
     end
+    p out_resp
+    out_resp
   end
 
   def check_imei_exists(imei_list)
+    out_resp = {}
     res_exists = []
     imei_list_res = get_imei_info_from_db(imei_list)
     p imei_list_res
@@ -195,8 +210,11 @@ class MongoIot
     p "not_ex"
     p not_ex
     p res_exists
-    {:code => 200, :result => "check_imei_exists: Request completed successfully",
+    out_resp = {:code => 200, :result => "check_imei_exists: Request completed successfully",
      :body => {:exists => res_exists, :not_exists => not_ex}}
+
+    p out_resp
+    out_resp
   end
 
 
@@ -248,47 +266,52 @@ class MongoIot
   end
 
   def get_profile_name_from_imei(imei)
+    out_resp = {}
     begin
+      id = ""
       begin
         info = get_imei_info_from_db([imei])
         if info[:body]==[]
-          return {:code => 505, :result => "get_profile_name_from_imei: get_imei_info_from_db returned empty list from database. IMEIS not found"}
+          out_resp = {:code => 505, :result => "get_profile_name_from_imei: get_imei_info_from_db returned empty list from database. IMEIS not found"}
         else
           p "fshhsdf"
           p info
           id = info[:body][0]["profile"]
         end
       rescue
-        return {:code => 506, :result => "get_profile_name_from_imei: Function get_imei_info_from_db not processed correctly and returned: #{info.to_s}"}
+        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_imei_info_from_db not processed correctly and returned: #{info.to_s}"}
       end
       begin
         res = get_profile_name_by_id(id)
         if res.key?("profile")
           res=res
         else
-          return {:code => 505, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not returned profile. Invalid data in database and returned: #{res.to_s}"}
+          out_resp = {:code => 505, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not returned profile. Invalid data in database and returned: #{res.to_s}"}
         end
 
       rescue
-        return {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
 
       end
       begin
         if res["profile"]!=nil
-          return {:code => 200, :result => "get_profile_name_from_imei: Request completed successfully", :body => res}
+          out_resp = {:code => 200, :result => "get_profile_name_from_imei: Request completed successfully", :body => res}
         end
       rescue
-        return {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
       end
     rescue
-      return {:code => 507, :result => "get_profile_name_from_imei: Unknown SDK error"}
+      out_resp = {:code => 507, :result => "get_profile_name_from_imei: Unknown SDK error"}
     end
 
+    p out_resp
+    out_resp
+
   end
 
 
   def device_remove_single_mongo(imei)
-
+    out_resp = {}
     begin
       collection = client[:device_imei]
       doc = {
@@ -296,14 +319,17 @@ class MongoIot
       }
       result = collection.delete_many(doc)
       p result
-      return {:code => 200, :result => "device_remove_single_mongo: Request completed successfully"}
+      out_resp = {:code => 200, :result => "device_remove_single_mongo: Request completed successfully"}
     rescue
-      return {:code => 507, :result => "device_remove_single_mongo: Unknown SDK error"}
+      out_resp = {:code => 507, :result => "device_remove_single_mongo: Unknown SDK error"}
     end
+    p out_resp
+    out_resp
 
   end
 
   def device_modify_attr_mongo(imei, address)
+    out_resp = {}
     begin
       collection = client[:device_imei]
       doc = {
@@ -311,13 +337,16 @@ class MongoIot
       }
       sett = {'$set' => {address: address}}
       result = collection.update_one(doc, sett)
-      return {:code => 200, :result => "device_modify_attr_mongo: Request completed successfully"}
+      out_resp = {:code => 200, :result => "device_modify_attr_mongo: Request completed successfully"}
     rescue
-      return {:code => 507, :result => "device_remove_single_mongo: Unknown SDK error"}
+      out_resp = {:code => 507, :result => "device_modify_attr_mongo: Unknown SDK error"}
     end
+    p out_resp
+    out_resp
   end
 
   def device_modify_any_attr_mongo(imei, attr_list)
+    out_resp = {}
     begin
       collection = client[:device_imei]
       doc = {
@@ -333,6 +362,7 @@ class MongoIot
 
 
   def get_iot_oceanconnect_credent(login)
+    out_resp = {}
     begin
       result_ps = []
       collection = client[:users]
@@ -342,12 +372,14 @@ class MongoIot
       p result_ps[0]
       app_id = result_ps[0][:iot_data][:app_id]
       secret = result_ps[0][:iot_data][:secret]
-      return {:code => 200, :result => "get_iot_oceanconnect_credent: Request completed successfully", :body => {:app_id => app_id, :secret => secret}}
+      out_resp = {:code => 200, :result => "get_iot_oceanconnect_credent: Request completed successfully", :body => {:app_id => app_id, :secret => secret}}
     rescue
-      {:code => 500, :result => "get_iot_oceanconnect_credent: Process failed"}
+      out_resp = {:code => 500, :result => "get_iot_oceanconnect_credent: Process failed"}
     end
+    p out_resp
+    out_resp
 
-      end
+  end
 
 
   def ttt

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Dzmitry Buynovskiy