istox 0.1.57 → 0.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74986318625bd49e64d68450b48269eb1b4e5e725ed4632107336993cbbc0687
-  data.tar.gz: 160afe2adcea113955c0ebc93097dbd0d692b4ebd392eed59f3b240839d02cd7
+  metadata.gz: 4d76f139bc204f75de31580c218d9bc5261b62f73ae56d7296510ce9e74fbf8b
+  data.tar.gz: b63f7d722ef5441ba09e7dd659587f6a4a1b217ed5eb376346895f3df265d754
 SHA512:
-  metadata.gz: dbb06aabe851464e3a3e57fcfeaaffe8bfb7c34c9542def8c33f66d81c102884b848eb5378ea7493968718de11d6ae6a710b3dce57ee03f7414b23e1ae129fe7
-  data.tar.gz: 24dcb4dd7fa9331fd37ef7ef067978c307b67d551b50cff9f8f1a22e8f5bb5afbe3d8c2327ae7049c7b87fbc2003f68a2c05dc4815d86d161b36f89883a431b2
+  metadata.gz: 447446bba295270c40b16fef8be8ea2ac8a2016cac58eee414c3bf57988bf3ccba32f15fa9910da5cb47689c8bacaf0e850f51dace9dab151bb9fa45c1fce023
+  data.tar.gz: 8316a7fac0f570e3a868c86c4772228e4653a0ababdb64ac222da3d0e68c93fbe94359be1c506bc2d6f9c1ea137091b86748a640f42002a5046eca8d6524948c

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    istox (0.1.44)
+    istox (0.1.48.5)
       bunny (>= 2.12.0)
       graphlient
-      gruf
+      istox_gruf
+      listen (~> 3.0.5)
       paranoia (~> 2.2)
 
 GEM
@@ -57,7 +58,7 @@ GEM
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.14.1)
+    bunny (2.14.2)
       amq-protocol (~> 2.3, >= 2.3.0)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
@@ -75,31 +76,35 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
+    ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.7.0-universal-darwin)
-    googleapis-common-protos-types (1.0.3)
+    google-protobuf (3.8.0)
+    googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.5)
       faraday
       faraday_middleware
       graphql-client
-    graphql (1.9.3)
+    graphql (1.9.6)
     graphql-client (0.14.0)
       activesupport (>= 3.0, < 6.0)
       graphql (~> 1.6)
-    grpc (1.19.0-universal-darwin)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-    grpc-tools (1.19.0)
-    gruf (2.5.2)
-      activesupport
-      concurrent-ruby
+    grpc (1.21.0)
+      google-protobuf (~> 3.7)
+      googleapis-common-protos-types (~> 1.0)
+    grpc-tools (1.21.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    istox_gruf (2.7.1)
+      activesupport (> 4)
+      concurrent-ruby (> 1)
       grpc (~> 1.10)
       grpc-tools (~> 1.10)
       slop (~> 4.6)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -112,12 +117,12 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    paranoia (2.4.1)
-      activerecord (>= 4.0, < 5.3)
+    paranoia (2.4.2)
+      activerecord (>= 4.0, < 6.1)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -146,6 +151,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/README.md

@@ -2,8 +2,6 @@ to publish new version
 
 1. Change version number in version.rb
 
-2. `gem build istox`
+2. gem build istox
 
-3. `gem push istox-<VERSION>.gem`
-
-4. in local repo: `bundle install istox --full-index`
+3. gem push istox-<VERSION>.gem

data/istox.gemspec

@@ -32,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bunny", ">= 2.12.0"
-  spec.add_dependency "gruf"
-  spec.add_dependency 'vault', '~> 0.1'
+  spec.add_dependency "istox_gruf"
   spec.add_dependency "paranoia", "~> 2.2"
   spec.add_dependency "graphlient"
+  spec.add_dependency 'listen', '~> 3.0.5'
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/istox.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'paranoia'
+require "gruf"
 require "istox/version"
 
 module Istox
@@ -13,10 +14,10 @@ module Istox
   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_receipt_service"
   require "istox/models/blockchain_receipt"

data/lib/istox/helpers/gruf_listener_hook.rb

@@ -0,0 +1,21 @@
+module Istox
+    class GrufListenerHook < ::Gruf::Hooks::Base
+        def before_server_start(server:)
+            # do my thing before the server starts  
+
+            @listener = Listen.to('app/rpc') do |modified, added, removed|
+                puts "modified absolute path: #{modified}"
+                puts "added absolute path: #{added}"
+                puts "removed absolute path: #{removed}"
+                
+                server.init_restart
+            end
+            @listener.start # not blocking
+        end
+        
+        def after_server_stop(server:)
+            # do my thing after the server stops
+            @listener.stop
+        end
+    end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.57"
+  VERSION = "0.1.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.57
+  version: 0.1.58
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: gruf
+  name: istox_gruf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vault
+  name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: paranoia
+  name: graphlient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: graphlient
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -243,10 +243,10 @@ files:
 - lib/istox/helpers/bunny_boot.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/order_book.rb
 - lib/istox/helpers/publisher.rb
-- lib/istox/helpers/vault.rb
 - lib/istox/interfaces/chainhub/transaction.rb
 - lib/istox/migrations/create_blockchain_receipts.rb
 - lib/istox/models/blockchain_receipt.rb
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem

data/lib/istox/helpers/vault.rb

@@ -1,96 +0,0 @@
-require 'vault'
-
-module Istox
-  module Vault
-    module TOTP
-      class << self
-
-        def create(sid, params={})
-          Rails.logger.debug { "Generate vault TOTP for key #{totp_key(sid).inspect}" }
-
-          write_data(totp_key(sid),
-                     generate: true,
-                     issuer: params[:host],
-                     account_name: sid,
-                     qr_size: 300)
-        end
-
-        def generate_code(sid)
-          Rails.logger.debug { "Generate 6-digit OTP code: key #{totp_code_key(sid)}" }
-          code = read_data(totp_code_key(sid)).data[:code]
-          code
-        end
-
-        def validate?(sid, code)
-          return false unless exist?(sid)
-          Rails.logger.debug { "Validate TOTP code: key #{totp_code_key(sid)}, code: #{code}" }
-          result = write_data(totp_code_key(sid), code: code).data[:valid]
-
-          unless result
-            code = read_data(totp_code_key(sid)).data[:code]
-            Rails.logger.debug { "Code is not valid, it should be #{code}" }
-          end
-
-          result
-        end
-
-        private
-
-        def read_data(key)
-          ::Vault.logical.read(key)
-        end
-
-        def write_data(key, params)
-          Rails.logger.debug { "in write data method" }
-          Rails.logger.debug { ::Vault }
-          ::Vault.logical.write(key, params)
-        end
-
-        def totp_key(sid)
-          "totp/keys/#{sid}"
-        end
-
-        def totp_code_key(sid)
-          "totp/code/#{sid}"
-        end
-      end
-    end
-
-    class << self
-
-      def logical
-        Rails.logger.debug { 'in logical method' }
-        ::Vault.logical
-      end
-
-      def initialize(secret_key, file_location)
-        ::Vault.configure do |config|
-          config.address = secret_key
-
-          if File.exist?(file_location)
-            token = File.read(file_location).strip
-            config.token = token
-            config.ssl_verify = false
-            config.timeout = 60
-          else
-            Rails.logger.info 'Vault token not found, OTP will not be able to use'
-          end
-        end
-      end
-
-      def get_otp(sid, host)
-        ::Istox::Vault::TOTP.create(sid, host)
-        otp = Istox::Vault::TOTP.generate_code(sid)
-
-        return otp
-      end
-
-      def validate_otp(sid, otp)
-        return ::Istox::Vault::TOTP.validate?(sid, otp)
-      rescue => e
-        raise e
-        false
-      end
-    end
-  end
-end