istox 0.1.79.pre.test2 → 0.1.79.pre.test3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e176f1517a34a5168750aecc2e64b86d497fcfafdfc03c4b301705009091f344
-  data.tar.gz: d61f64d0fa7d1792eb8f703a1abf93ff046ac770d7ef8260fadd6bbd5e110bcb
+  metadata.gz: e7d19bbdc591b22e6aab3fcd13aab425b5aff45a10ed05f9e6f8cfd032ec24a2
+  data.tar.gz: 22a4d2eca2f0b65b43ab98cf4edb5ff1865e6e0fd4724e33f9f5630bff2014ec
 SHA512:
-  metadata.gz: 1ef16f8f9c63ed330f34f695aed8cf271bebbff916d702e503fe6f269479bb31e664c960fd4523959924c2de4c689ba38cc29b6b53b81be0eaf54c013650b197
-  data.tar.gz: 9c51fd8f23dedfb380fdfe12f2a3d529cfdbc03cdace09e5e5f33e2ddd715eec52512d84dfc69a3fcf5b51a4b358d7d9da500e028d3cc1c782709fc977b1162e
+  metadata.gz: 40df563acabb16b4aceed611fe28ca8dd841d2ab5ccd8cd3bb55ebec1e3e1e56f65503f5b78094fe40d98c241049a58f6e4549e62947e5c05dd05fea7f7f2166
+  data.tar.gz: dc34763eaac873b0698cb59a6d336ae5686aba76b8480b216716346d53cde5eeff09b6a7b0c17597f76d4bd7052963479e1593dd8bdc5442932d31c88cfd8286

data/.rubocop.yml

@@ -61,7 +61,7 @@ Metrics/ModuleLength:
   Max: 200
 
 Metrics/LineLength:
-  Max: 120
+  Max: 130
   # To make it possible to copy or click on URIs in the code, we allow lines
   # containing a URI to be longer than Max.
   AllowURI: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.79.pre.test1)
+    istox (0.1.79.pre.test3)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient
@@ -88,7 +88,7 @@ GEM
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.9.1)
+    google-protobuf (3.9.1-universal-darwin)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.6)
@@ -99,7 +99,7 @@ GEM
     graphql-client (0.15.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.23.0)
+    grpc (1.23.0-universal-darwin)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.23.0)

data/lib/istox.rb

@@ -1,32 +1,34 @@
 require 'active_record'
 require 'paranoia'
-require "gruf"
-require "listen"
-require "istox/version"
+require 'gruf'
+require 'listen'
+require 'istox/version'
 
 module Istox
   # Your code goes here...
   class Test
     def self.method1
-      "abc"
+      'abc'
     end
   end
 
-  require "istox/interfaces/chainhub/transaction"
-  require "istox/helpers/publisher"
-  require "istox/helpers/bunny_boot"
-  require "istox/helpers/vault"
-  require "istox/helpers/order_book"
-  require "istox/helpers/grpc_client"
-  require "istox/helpers/graphql_client"
-  require "istox/helpers/gruf_listener_hook"
-  require "istox/helpers/message_service"
-  require "istox/helpers/blockchain_service"
-  require "istox/helpers/f_math"
-  require "istox/models/blockchain_receipt"
-  require "istox/models/concerns/blockchain_receipt_query"
-  require "istox/consumers/blockchain_status_handler"
-  require "istox/migrations/create_blockchain_receipts"
-  require "istox/logging/hash_logging"
-  require "istox/logging/log_formatter"
+  require 'istox/interfaces/chainhub/transaction'
+  require 'istox/helpers/publisher'
+  require 'istox/helpers/bunny_boot'
+  require 'istox/helpers/vault'
+  require 'istox/helpers/order_book'
+  require 'istox/helpers/grpc_client'
+  require 'istox/helpers/graphql_client'
+  require 'istox/helpers/gruf_listener_hook'
+  require 'istox/helpers/message_service'
+  require 'istox/helpers/blockchain_service'
+  require 'istox/helpers/f_math'
+  require 'istox/helpers/my_open_struct'
+  require 'istox/helpers/common_helper'
+  require 'istox/models/blockchain_receipt'
+  require 'istox/models/concerns/blockchain_receipt_query'
+  require 'istox/consumers/blockchain_status_handler'
+  require 'istox/migrations/create_blockchain_receipts'
+  require 'istox/logging/hash_logging'
+  require 'istox/logging/log_formatter'
 end

data/lib/istox/helpers/common_helper.rb

@@ -0,0 +1,69 @@
+module Istox
+  module CommonHelper
+    def self.to_open_struct(model)
+      return nil if model.blank?
+
+      if model.is_a?(Array)
+        model.map do |item|
+          hash = deep_to_h(item).deep_transform_keys { |key| key.to_s.underscore.to_sym }
+          process_hash(nil, hash)
+          to_recursive_ostruct(hash)
+        end
+      else
+        hash = deep_to_h(model).deep_transform_keys { |key| key.to_s.underscore.to_sym }
+        process_hash(nil, hash)
+        to_recursive_ostruct(hash)
+      end
+    end
+
+    def self.process_hash(_parent, my_hash)
+      my_hash.each do |key, value|
+        if value.is_a?(Hash)
+          process_hash(key, value)
+        elsif value.is_a?(Array)
+          my_hash[key] = value.map do |item|
+            process_hash(nil, item.to_h)
+          end
+        else
+          my_hash[key] = value
+        end
+      end
+    end
+
+    # def self.add_methods(ostruct)
+    #   hashmap = ostruct.to_h
+
+    #   hashmap&.each do |k, _v|
+    #     # add_method k.to_s do
+    #     ostruct.send(k.to_s)
+    #     # end
+    #   end
+    # end
+
+    def self.to_recursive_ostruct(hash)
+      ::Istox::MyOpenStruct.new(hash.each_with_object({}) do |(key, val), memo|
+        memo[key] = if val.is_a?(Hash)
+                      to_open_struct(val)
+                    elsif val.is_a?(Array)
+                      val.map do |item|
+                        to_open_struct(item)
+                      end
+                    else
+                      val
+                    end
+      end)
+    end
+
+    def add_method(name, &block)
+      (class << self; self; end).class_eval do
+        define_method name, &block
+      end
+    end
+
+    def self.deep_to_h(obj)
+      obj.to_h.transform_values do |v|
+        v.is_a?(OpenStruct) ? deep_to_h(v) : v
+      end
+    end
+  end
+end

data/lib/istox/helpers/graphql_client.rb

@@ -1,35 +1,35 @@
-require "graphlient"
+require 'graphlient'
 
 module Istox
   class GraphqlClient
-      class << self
-          def add_host(host_type, url)
-              unless defined?(@@hosts)
-                 @@hosts = {}
-              end
-              init_host(host_type, url)
-          end
-
-          def query(host_type, query, variables = {})
-            client = @@hosts[host_type]
-
-            raise "Please make sure you have initialised graphql cient for host #{host_type}" if !client
-
-            Rails.logger.info "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
-            result = client.query(query, variables)
-            Rails.logger.info "Graphql result: #{result.inspect}"
-
-            return result
-          end
-
-          private
-          
-          def init_host(host_type, url)
-            client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::HTTPAdapter)
-        
-            @@hosts[host_type] = client
-          end
+    class << self
+      def add_host(host_type, url)
+        @@hosts = {} unless defined?(@@hosts)
+        init_host(host_type, url)
+      end
+
+      def query(host_type, query, variables = {})
+        client = @@hosts[host_type]
+
+        raise "Please make sure you have initialised graphql cient for host #{host_type}" unless client
+
+        Rails.logger.info "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
+        result = client.query(query, variables)
+
+        return_values = ::Istox::CommonHelper.to_open_struct(result)
+
+        Rails.logger.info "Graphql result: #{return_values.inspect}"
+
+        return_values
+      end
+
+      private
+
+      def init_host(host_type, url)
+        client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::HTTPAdapter)
 
+        @@hosts[host_type] = client
       end
+    end
   end
-end
+end

data/lib/istox/helpers/grpc_client.rb

@@ -1,66 +1,63 @@
 module Istox
-    class GrpcClient
-        class << self
-            def add_host(host_type, url)
-                unless defined?(@@hosts)
-                   @@hosts = {}
-                end
+  class GrpcClient
+    class << self
+      def add_host(host_type, url)
+        @@hosts = {} unless defined?(@@hosts)
 
-                @@hosts[host_type] = url
-            end
+        @@hosts[host_type] = url
+      end
 
-            def call(host_type, service, method, **keyword_args)
-                execute(host_type, service, method, **keyword_args)
-            # rescue => e
-                # reinitiate service and try again, second chance
-                # reinitiate_service(host_type, service)
-                # execute(host_type, service, method, **keyword_args)
-            end
-        
-            private
+      def call(host_type, service, method, **keyword_args)
+        execute(host_type, service, method, **keyword_args)
+        # rescue => e
+        # reinitiate service and try again, second chance
+        # reinitiate_service(host_type, service)
+        # execute(host_type, service, method, **keyword_args)
+      end
 
-            def execute(host_type, service, method, **keyword_args)
-                Rails.logger.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
-                t1 = Time.now
-                
-                result = get_host(host_type, service).call(method, keyword_args)
-                Rails.logger.info "Time taken for grpc execution: #{Time.now - t1} seconds"
-                Rails.logger.info "Result: #{result.message.inspect}"
-                result
-            end
+      private
 
-            def get_host(host_type, service)
-                unless defined?(@@services)
-                   @@services = {}
-                end
+      def execute(host_type, service, method, **keyword_args)
+        Rails.logger.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
+        t1 = Time.now
 
-                grpc_client = @@services[get_key(host_type, service)]
+        result = get_host(host_type, service).call(method, keyword_args)
+        Rails.logger.info "Time taken for grpc execution: #{Time.now - t1} seconds"
 
-                if grpc_client
-                    return grpc_client
-                else
-                    reinitiate_service(host_type, service)
-                    return @@services[get_key(host_type, service)]
-                end
-            end
+        return_values = ::Istox::CommonHelper.to_open_struct(result.message)
+        Rails.logger.info "Result: #{return_values}"
 
-            def reinitiate_service(host_type, service)
-                unless defined?(@@services)
-                   @@services = {}
-                end
+        return_values
+      end
 
-                host_url = @@hosts[host_type]
-                raise StandardError, 'Unable to find host, have you forgotten to add host to grpc client?' if !host_url
-                
-                Rails.logger.info 'Reinitiating to grpc host at ' + host_url
-                t1 = Time.now
-                @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url })
-                Rails.logger.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
-            end
+      def get_host(host_type, service)
+        @@services = {} unless defined?(@@services)
 
-            def get_key(host_type, service)
-                host_type.to_s + service.to_s
-            end
+        grpc_client = @@services[get_key(host_type, service)]
+
+        if grpc_client
+          return grpc_client
+        else
+          reinitiate_service(host_type, service)
+          return @@services[get_key(host_type, service)]
         end
+      end
+
+      def reinitiate_service(host_type, service)
+        @@services = {} unless defined?(@@services)
+
+        host_url = @@hosts[host_type]
+        raise StandardError, 'Unable to find host, have you forgotten to add host to grpc client?' unless host_url
+
+        Rails.logger.info 'Reinitiating to grpc host at ' + host_url
+        t1 = Time.now
+        @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url })
+        Rails.logger.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
+      end
+
+      def get_key(host_type, service)
+        host_type.to_s + service.to_s
+      end
     end
-end
+  end
+end

data/lib/istox/helpers/my_open_struct.rb

@@ -0,0 +1,7 @@
+module Istox
+  class MyOpenStruct < OpenStruct
+    def to_json(*_args)
+      to_h.to_json
+    end
+  end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.79-test2'.freeze
+  VERSION = '0.1.79-test3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.79.pre.test2
+  version: 0.1.79.pre.test3
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -292,11 +292,13 @@ files:
 - lib/istox/consumers/blockchain_status_handler.rb
 - lib/istox/helpers/blockchain_service.rb
 - lib/istox/helpers/bunny_boot.rb
+- lib/istox/helpers/common_helper.rb
 - lib/istox/helpers/f_math.rb
 - lib/istox/helpers/graphql_client.rb
 - lib/istox/helpers/grpc_client.rb
 - lib/istox/helpers/gruf_listener_hook.rb
 - lib/istox/helpers/message_service.rb
+- lib/istox/helpers/my_open_struct.rb
 - lib/istox/helpers/order_book.rb
 - lib/istox/helpers/publisher.rb
 - lib/istox/helpers/vault.rb