istox 0.1.128 → 0.1.129

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.127)
+    istox (0.1.129)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -97,7 +97,7 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.11.4-universal-darwin)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -108,7 +108,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.27.0)
+    grpc (1.27.0-universal-darwin)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)

data/lib/istox/helpers/blockchain_service.rb

@@ -23,7 +23,7 @@ module Istox
         # create blockchain receipt first
         klass = blockchain_receipt_class
         uuid = ::SecureRandom.uuid
-        receipt = klass.create!(
+        @receipt = klass.create!(
           txid: uuid,
           sid: sid,
           is_request: is_request,
@@ -40,7 +40,7 @@ module Istox
           klass.where(resource_name: model.class.name, resource_id: model.id).destroy_all
 
           # then update receipt
-          receipt.update!(resource_id: model.id, resource_name: model.class.name)
+          @receipt.update!(resource_id: model.id, resource_name: model.class.name)
 
           # execute the actual call to chainhub
           result = execute.call(uuid)
@@ -50,7 +50,7 @@ module Istox
             count = result.send('txn_count')
 
             if count.to_i <= 0
-              receipt&.destroy!
+              @receipt&.destroy!
               chainhub_processing = false
             end
           end
@@ -58,7 +58,7 @@ module Istox
 
         chainhub_processing
       rescue StandardError => e
-        receipt&.destroy
+        @receipt&.destroy
         raise e
       end
 
@@ -67,7 +67,9 @@ module Istox
 
         blockchain_receipt_klass = get_blockchain_receipt_klass
         klass = class_eval("::#{blockchain_receipt_klass.name}", __FILE__, __LINE__)
-        raise "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt" unless klass <= ::Istox::BlockchainReceipt
+        unless klass <= ::Istox::BlockchainReceipt
+          raise "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
+        end
 
         klass
       end

data/lib/istox/helpers/bunny_boot.rb

@@ -44,6 +44,19 @@ module Istox
         nil
       end
 
+      def binding_exchange_id(id)
+        data[:binding][id][:exchange] || :default
+      rescue
+        nil
+      end
+
+      def binding_routing_key(id)
+        queue = data[:binding][id][:queue]
+        data[:queues][queue][:queue_name]
+      rescue
+        nil
+      end
+
       def confirm_mode(eid)
         data[:exchanges][eid][:confirm] || -1
       rescue
@@ -225,9 +238,9 @@ module Istox
         # But each retry, there is new delivery_tag that should be updated
         id = "#{channel_id.to_s}:#{delivery_tag.to_s}"
 
-        ::Istox::RedisBoot.sets("#{id}:payload", payload.to_s)
-        ::Istox::RedisBoot.sets("#{id}:eid", eid.to_s)
-        ::Istox::RedisBoot.sets("#{id}:options", options.to_s)
+        ::Istox::RedisBoot.sets("#{id}:payload", payload.to_s, 4)
+        ::Istox::RedisBoot.sets("#{id}:eid", eid.to_s, 4)
+        ::Istox::RedisBoot.sets("#{id}:options", options.to_s, 4)
       end
 
       def find_tracker_on_channel(channel_id, delivery_tag, key)
@@ -239,16 +252,16 @@ module Istox
       def del_tracker_on_channel(channel_id)
         trackers = find_trackers "#{channel_id}*"
         trackers.each do |k|
-          ::Istox::RedisBoot.del k
+          ::Istox::RedisBoot.del k, 4
         end
       end
 
       def rename_tracker(channel_id, old_delivery_tag, new_delivery_tag)
         old_id = "#{channel_id}:#{old_delivery_tag}"
         new_id = "#{channel_id}:#{new_delivery_tag}"
-        ::Istox::RedisBoot.rename("#{old_id}:payload", "#{new_id}:payload")
-        ::Istox::RedisBoot.rename("#{old_id}:eid", "#{new_id}:eid")
-        ::Istox::RedisBoot.rename("#{old_id}:options", "#{new_id}:options")
+        ::Istox::RedisBoot.rename("#{old_id}:payload", "#{new_id}:payload", 4)
+        ::Istox::RedisBoot.rename("#{old_id}:eid", "#{new_id}:eid", 4)
+        ::Istox::RedisBoot.rename("#{old_id}:options", "#{new_id}:options", 4)
       end
 
       def eid(ex)
@@ -295,11 +308,11 @@ module Istox
       end
 
       def find_trackers(pattern)
-        ::Istox::RedisBoot.keys(pattern)
+        ::Istox::RedisBoot.keys(pattern, 4)
       end
 
       def get_tracker(key)
-        ::Istox::RedisBoot.get(key)
+        ::Istox::RedisBoot.get(key, 4)
       end
     end
   end

data/lib/istox/helpers/messaging.rb

@@ -26,6 +26,9 @@ module Istox
               subject: subject || 'Message from iSTOX',
               body: content
             }
+          },
+          options: {
+            confirm: 0
           }
         )
       end
@@ -51,6 +54,9 @@ module Istox
               template_name: template_name,
               template_data_arr_json: template_data_arr.to_json
             }
+          },
+          options: {
+              confirm: 0
           }
         )
       end
@@ -86,6 +92,9 @@ module Istox
               body: content,
               attachments_json: attachments&.to_json
             }
+          },
+          options: {
+            confirm: 0
           }
         )
       end
@@ -117,6 +126,9 @@ module Istox
               template_data_arr_json: template_data_arr.to_json,
               attachments_json: attachments&.to_json
             }
+          },
+          options: {
+            confirm: 0
           }
         )
       end

data/lib/istox/helpers/publisher.rb

@@ -12,8 +12,15 @@ module Istox
       # extra publish options: {
       #   publish_confirm: true/false
       # }
-      def publish(exchange: nil, routing_key: nil, message:, options: {})
-        raise 'Exchange and routing key cannot be nil at the same time.' if exchange.nil? && routing_key.nil?
+      def publish(exchange: nil, routing_key: nil, binding:nil, binding_suffix:nil, message:, options: {})
+
+        if exchange.nil? && routing_key.nil?
+          raise 'Exchange and routing key cannot be nil at the same time.' if binding.nil?
+          exchange = ::Istox::BunnyBoot.binding_exchange_id(binding)
+          raise "Can not find exchange for binding it #{binding}" if exchange.nil?
+          routing_key = ::Istox::BunnyBoot.binding_routing_key(binding)
+          routing_key = "#{routing_key}.#{binding_suffix}" unless binding_suffix.nil?
+        end
 
         exchange = ::Istox::BunnyBoot.search_exchange_of_routing_key!(routing_key) if routing_key.present? && exchange.nil?
         ex = exchange(exchange)

data/lib/istox/helpers/redis.rb

@@ -4,49 +4,49 @@ module Istox
   class RedisBoot
     class << self
 
-      def sets(k,v, options = {})
-        redis.set(k,v, options)
+      def sets(k,v, options = {}, db)
+        redis(db).set(k,v, options)
       end
 
-      def keys(p)
-        redis.keys p
+      def keys(p, db)
+        redis(db).keys p
       end
 
-      def del(k)
-        redis.del(k)
+      def del(k, db)
+        redis(db).del(k)
       end
 
-      def get(k)
-        redis.get(k)
+      def get(k, db)
+        redis(db).get(k)
       end
 
-      def flushdb
-        redis.flushdb
+      def flushdb(db)
+        redis(db).flushdb
       end
 
-      def incr(k)
-        redis.incr(k)
+      def incr(k, db)
+        redis(db).incr(k)
       end
 
-      def rename(old, new)
-        redis.rename old, new
+      def rename(old, new, db)
+        redis(db).rename old, new
       end
 
-      def lock(key, timeout = 3600)
+      def lock(key, timeout = 3600, db)
         loop do
-          break if set(key, 1, nx: true, px: timeout)
+          break if sets(key, 1, {nx: true, px: timeout}, db)
         end
 
         begin
           yield
         ensure
-          del key
+          del key, db
         end
       end
 
       private
 
-      def redis(db = 4)
+      def redis(db)
         @redis ||= Redis.new(
             url: ENV["REDIS_URL"] || 'redis://127.0.0.1',
             db: db

data/lib/istox/helpers/subscriber.rb

@@ -105,7 +105,7 @@ module Istox
           break unless ::Istox::BunnyBoot.queue_single_consumer? consumer_key
 
           flag = false
-          ::Istox::RedisBoot.lock("peatio:#{consumer_key}:locking") do
+          ::Istox::RedisBoot.lock("peatio:#{consumer_key}:locking", 4) do
             flag = ::Istox::BunnyBoot.queue_ok? @conn, queue.name
           end
           break if flag

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.128'.freeze
+  VERSION = '0.1.129'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.128
+  version: 0.1.129
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -445,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem