imperituroard 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b3e174ab86faf541db078e594c9a5910a3ccb1
-  data.tar.gz: ba7fa9723abb400f77b7ae99b43313514fc72e62
+  metadata.gz: a58bf2fa580d9302c52298f16753d340dd112c4f
+  data.tar.gz: d7446a4395ebd1a5a5b0e562e12fa32891a636a6
 SHA512:
-  metadata.gz: 60e8fe64d72851a8a09ba3fd74a5a8917587e09fb03cf427289aa543237f5c9e7e8e6162c6f405ea93220d48044d40b619fbaa6d1f73c46c337c5cdb39757863
-  data.tar.gz: 9939203fac5d5fc902a9c1abf361a02d3bccb883d3442bf7117d1d3198d6b21fd7d6eeba532b0c01df3803d576c2790bf849b63fe9f580a2911bbe457b41e11b
+  metadata.gz: 714c9ed22c6d3d3da51cc56c61d07e80c5975fcf72e845f9df96be024c05d747a3c8135275eb39552fc06d9b89757f7bde4ed343ea1b4a79ce5ecb16b01170a7
+  data.tar.gz: bc9f2bcd2e26fc3729a966f13a45ed18eb0b20ff8eea68adda966f3c7af348c78c020c6b3be034093acbc140bef03abeeb4aae2ce2f0ef00952f19d8cd758013

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

@@ -14,14 +14,14 @@ class InternalFunc
 
   def check_pass_format(passw)
     if passw!=nil && passw!=""
-      {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+      {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
     else
-      {:code=>500, :result=>"Request completed", :body=>"invalid password"}
+      {:code => 500, :result => "Request completed", :body => "invalid password"}
     end
   end
 
   def printer_texter(text, log_level)
-    mess = {:datetime => datetimenow, :sdk=> "imperituroard", :sdk_version=> Imperituroard::VERSION, :message => text}
+    mess = {:datetime => datetimenow, :sdk => "imperituroard", :sdk_version => Imperituroard::VERSION, :message => text}
     p mess
   end
 
@@ -34,7 +34,6 @@ class InternalFunc
   end
 
 
-
   def type_id_list_transform_mongo(id_list)
     res = []
     for gh in id_list
@@ -51,8 +50,8 @@ class InternalFunc
     output_params = {}
 
     data = data.to_s
-    str_incr = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
-                'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+    str_incr = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
     ]
     d_a_t_a = data.split('')
     is_string = 0
@@ -73,43 +72,54 @@ class InternalFunc
   #make answer in format that soapgw receive
   def iot_create_dev_soapgw_answer(input_params, output_answer)
 
+    printer_texter({:input_params => input_params, :output_answer => output_answer, :function => "iot_create_dev_soapgw_answer"}, "debug")
+
     output_info = {}
     begin
 
-    if output_answer[:code] != 200
-      deviceserr = []
-      failednum = input_params[:imei_list].length
-      for gg in input_params[:imei_list]
-        deviceserr.append({:failedimei => gg["imei"]})
+      if output_answer[:code] != 200
+        deviceserr = []
+        failednum = input_params[:imei_list].length
+        for gg in input_params[:imei_list]
+          if gg.key?(:imei)
+            deviceserr.append({:failedimei => gg[:imei]})
+          else
+            deviceserr.append({:failedimei => gg["imei"]})
+          end
+        end
+
+        output_info = {:code => output_answer[:code],
+                       :result => output_answer[:result],
+                       :processednum => 0,
+                       :failednum => failednum,
+                       :deviceserr => deviceserr
+        }
+
+      else
+        deviceserr = []
+        failednum = output_answer[:body][:error_list].length
+        processednum = output_answer[:body][:imei_processed].length
+        for gg in output_answer[:body][:error_list]
+          if gg.key?(:imei)
+            deviceserr.append({:failedimei => gg[:imei]})
+          else
+            deviceserr.append({:failedimei => gg["imei"]})
+          end
+        end
+        output_info = {:code => output_answer[:code],
+                       :result => output_answer[:result],
+                       :processednum => processednum,
+                       :failednum => failednum,
+                       :deviceserr => deviceserr
+        }
       end
-      output_info = { :code => output_answer[:code],
-                      :result => output_answer[:result],
-                      :processednum => 0,
-                      :failednum => failednum,
-                      :deviceserr => deviceserr
-      }
-
-    else
-      deviceserr = []
-      failednum = output_answer[:body][:error_list].length
-      processednum = output_answer[:body][:imei_processed].length
-      for gg in output_answer[:body][:error_list]
-        deviceserr.append({:failedimei => gg["imei"]})
-      end
-      output_info = { :code => output_answer[:code],
-                      :result => output_answer[:result],
-                      :processednum => processednum,
-                      :failednum => failednum,
-                      :deviceserr => deviceserr
-      }
-    end
 
     rescue
-      output_info = { :code => 500,
-                      :result => "iot_create_dev_soapgw_answer: Unknown SDK error",
-                      :processednum => 0,
-                      :failednum => 0,
-                      :deviceserr => []
+      output_info = {:code => 500,
+                     :result => "iot_create_dev_soapgw_answer: Unknown SDK error",
+                     :processednum => 0,
+                     :failednum => 0,
+                     :deviceserr => []
       }
     end
 
@@ -119,6 +129,8 @@ class InternalFunc
     #   :failednum => :integer,
     #   :deviceserr => [{:failedimei=>:integer}]
     # }
+
+    printer_texter(output_info, "debug")
     output_info
   end
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

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