istox 0.1.115 → 0.1.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf656e8345ac7129697ea2a2366a417de683989f09b627fb4d71b062678fce32
-  data.tar.gz: 959ca575d5ffa3044965cbd1224e7174cd961db3d5f6f5eb5892441cc9db124f
+  metadata.gz: f29d1b7e68de95eeefa9c2b9b6360d12df362c84c4c237157e57bda9bd93b582
+  data.tar.gz: a9f0a6349a081d0b3628cc200a5dd44e50b4a4908af8b1de8f1ee3b3f71f9d6f
 SHA512:
-  metadata.gz: 471dd7ceef7f24b765837cd0a9144c22b00cd22a422df83002890ab4706d22b502b681f161fbe1350faca263a7f95e2965438f2381142d183bc46b5cbe7e7c66
-  data.tar.gz: 695beb8e1b6b9d2de1a5c57ef6022e6d52d41bd1f890a12598fe9ef3a28df24cbbae6ce56d9dc9799c2dd4fa122d344a3d13966c36a0b0db96eac6d25b8d8e44
+  metadata.gz: aa32e45a7a16f59f6f2d65851eb403f277ff30d27bf39aaa574550725f811360f18e0fb40b5c4702bb6bce7b5762b9e6e73dffd8c89e97c9f757a7fc3e11c61e
+  data.tar.gz: 6b8cb8ab35f24ff0bb9701c8215ffefc6ed098127ed71434fec663488cc2debba2f72fb2d2331fa3fcbc24ad16c1619585ace9ca805fbc5d7cbd85b4631208fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.114)
+    istox (0.1.115)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -95,7 +95,7 @@ GEM
     ffi (1.11.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.2-universal-darwin)
+    google-protobuf (3.11.2)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -106,7 +106,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.26.0-universal-darwin)
+    grpc (1.26.0)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.26.0)

data/lib/istox.rb

@@ -24,7 +24,7 @@ module Istox
   require 'istox/helpers/grpc_client'
   require 'istox/helpers/graphql_client'
   require 'istox/helpers/gruf_listener_hook'
-  require 'istox/helpers/message_service'
+  require 'istox/helpers/messaging'
   require 'istox/helpers/blockchain_service'
   require 'istox/helpers/f_math'
   require 'istox/helpers/my_open_struct'

data/lib/istox/helpers/messaging.rb

@@ -0,0 +1,111 @@
+module Istox
+  class Messaging
+    class << self
+      # sms, numbers can be an array of multiple phone numbers or just string of single phone number
+      def sms(numbers, content, subject: nil)
+        targets = []
+        if numbers.is_a?(Array)
+          targets = numbers
+        else
+          targets << numbers
+        end
+
+        targets = targets.compact
+
+        raise ArgumentError, 'Target numbers cannot be empty or nil' if targets.empty?
+        raise ArgumentError, 'SMS message content cannot be empty' if content.blank?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'sms.message',
+          message: {
+            type: 'SEND_SMS',
+            data: {
+              to: targets,
+              subject: subject || 'Message from iSTOX',
+              body: content
+            }
+          }
+        )
+      end
+
+      # sample template data, it should be an array
+      # [{
+      #    mobile: mobile,
+      #    istoxP1: auth.first_name,
+      #    <more other sample template attributes>: <other sample template data>,
+      # }]
+      def sms_template(template_name, template_data_arr)
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil? ||
+                                                                                      template_data_arr.empty?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'sms.message',
+          message: {
+            type: 'SEND_SMS_TEMPLATE',
+            data: {
+              template_name: template_name,
+              template_data_arr: template_data_arr
+            }
+          }
+        )
+      end
+
+      # email, email can be an array of multiple emails or just string of single email address
+      def email(emails, subject:, content:)
+        targets = []
+        if emails.is_a?(Array)
+          targets = emails
+        else
+          targets << emails
+        end
+
+        targets = targets.compact
+
+        raise ArgumentError, 'Target emails cannot be empty or nil' if targets.empty?
+        raise ArgumentError, 'Email subject and content cannot be empty' if content.blank? || subject.blank?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'email.message',
+          message: {
+            type: 'SEND_EMAIL',
+            data: {
+              to: targets,
+              subject: subject,
+              body: content
+            }
+          }
+        )
+      end
+
+      # sample template data, it should be an array
+      # [{
+      #    email: email,
+      #    istoxP1: auth.first_name,
+      #    <more other sample template attributes>: <other sample template data>,
+      # }]
+      def email_template(template_name, template_data_arr)
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil? ||
+                                                                                      template_data_arr.empty?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'email.message',
+          message: {
+            type: 'SEND_EMAIL_TEMPLATE',
+            data: {
+              template_name: template_name,
+              template_data_arr: template_data_arr
+            }
+          }
+        )
+      end
+    end
+  end
+end

data/lib/istox/helpers/rate_limit.rb

@@ -85,7 +85,7 @@ module Istox
       !exceeded?(subject, options)
     end
 
-    # Check if next execution will cause the rate limit to be exceeded, raise error if exceeded
+    # Raise error if exceeded the limit
     #
     # @param [String] subject Subject to check
     # @param [Hash] options Options hash
@@ -97,7 +97,7 @@ module Istox
       add(subject)
     end
 
-    # Check if next execution will cause the rate limit to be exceeded, return false if exceeded, else return true
+    # Return false if exceeded the limit, else return true
     #
     # @param [String] subject Subject to check
     # @param [Hash] options Options hash

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.115'.freeze
+  VERSION = '0.1.116'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.115
+  version: 0.1.116
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -383,7 +383,7 @@ files:
 - lib/istox/helpers/grpc_client.rb
 - lib/istox/helpers/gruf_listener_hook.rb
 - lib/istox/helpers/logger.rb
-- lib/istox/helpers/message_service.rb
+- lib/istox/helpers/messaging.rb
 - lib/istox/helpers/my_open_struct.rb
 - lib/istox/helpers/order_book_price_time.rb
 - lib/istox/helpers/order_book_prorate.rb

data/lib/istox/helpers/message_service.rb

@@ -1,51 +0,0 @@
-module Istox
-  class MessageService
-    class << self
-      def send_sms(number, subject, content)
-        publish('sms', data: {
-                  to: number,
-                  subject: subject,
-                  body: content
-                },
-                       type: __method__.to_s.upcase!)
-      end
-
-      def send_sms_template(number, template)
-        publish('sms', data: {
-                  to: number,
-                  template: template
-                },
-                       type: __method__.to_s.upcase!)
-      end
-
-      def send_email(email, subject, content)
-        publish('email', data: {
-                  to: email,
-                  subject: subject,
-                  type: 'text/plain',
-                  body: content
-                },
-                         type: __method__.to_s.upcase!)
-      end
-
-      def send_email_template(email, template)
-        publish('email', data: {
-                  to: email,
-                  template: template
-                },
-                         type: __method__.to_s.upcase!)
-      end
-
-      private
-
-      def publish(type, payload)
-        ::Istox::Publisher.manual_publish(
-          exchange: 'message',
-          exchange_type: 'direct',
-          routing_key: "#{type}.message",
-          message: payload
-        )
-      end
-    end
-  end
-end