direct7 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9afbbf171b7e12d3472ed39168510562aaf97618d1df01346b8806f730267bb
-  data.tar.gz: ebc9d5a1820c9a691810c59ab09e223ddb622497365f9586c6212e9a0858b64a
+  metadata.gz: f8c128191bac6a5abb2d2dfed05e504a36df201d394d44fb05dde354bc4e3e16
+  data.tar.gz: 0bd62c9782fa39cceebc1110bd68b68dc000d37e0548c11788fc882c48b2c0b0
 SHA512:
-  metadata.gz: e6cb412caf09c09dffe941834a789ad32722fef46708b8e77d717d73992d054af8df4f3200e7fbf42707aee935866f0c579ff804982c31a3d89fc3431de173a8
-  data.tar.gz: d8bb0be38deb0c6e9dfba4a3b674114670f0ccb6873b992f5aa74178b415ef7ecd3a2b99762bf36c83f8efe6ebb271eeaf0568a2c01407af9d242eceb94885ad
+  metadata.gz: 34016259c47fa36daf4e3829897fb7a3a5cb38f1e4f82222d02d1eec093d36db4e10ec038276dfe238132b08bd62bb241eaf99def9fa020cebd038d9392f7f39
+  data.tar.gz: 75564fd228ff33d129220c29961e20fc9e963d760c918b0331fc002218fc66122ae1172221238c0cbdd8f98f09f0e3c7eb395d6dd35bcdb0efc8af4beccde941

data/.idea/direct7-ruby-sdk.iml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/vendor/bundle/ruby/2.7.0/doc" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/bundle/ruby/3.0.0/doc" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

data/README.md

@@ -8,7 +8,7 @@ The SDK is available on RubyGems and can be installed using two methods:
 Add this line to your application's Gemfile:
 
 ```bash
-gem 'direct7', '~> 0.0.11'
+gem 'direct7', '~> 0.0.13'
 ```
 
 And then execute:
@@ -35,7 +35,12 @@ require 'direct7'
 
 client = Direct7::Client.new('Your API token')
 
-client.sms.send_message( recipients =['+91999999XXXX'], content ='Greetings from D7 API', originator ='SignOTP', report_url ='https://the_url_to_recieve_delivery_report.com', unicode =true)
+client.sms.send_message(
+        originator='SignOTP',
+        report_url='https://the_url_to_recieve_delivery_report.com',
+        schedule_time=nil,
+        { recipients: ['+919999XXXXXX'], content: 'Greetings from D7 API', unicode: false }
+        )
 ```
 
 ### Send SMS (Unicode)
@@ -45,7 +50,12 @@ require 'direct7'
 
 client = Direct7::Client.new('Your API token')
 
-client.sms.send_message(recipients = ["+97150900XXXX","+97845900XXX"], content = "مرحبا بالعالم!", originator = "SignOTP", report_url = "https://the_url_to_recieve_delivery_report.com", unicode = True)
+client.sms.send_message(
+        originator='SignOTP',
+        report_url='https://the_url_to_recieve_delivery_report.com',
+        schedule_time=nil,
+        { recipients: ['+919999XXXXXX'], content: "مرحبا بالعالم!", unicode: true }
+        )
 ```
 
 ### Get Request Status

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.13

data/direct7.gemspec

@@ -4,7 +4,7 @@ require "direct7/version"
 
 Gem::Specification.new do |spec|
     spec.name          = "direct7"
-    spec.version       = "0.0.11"
+    spec.version       = "0.0.13"
     spec.authors       = ["Direct7 Networks"]
     spec.email         = ["support@d7networks.com"]
     spec.summary       = "Ruby SDK for Direct7 Platform REST API"
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     spec.homepage      = "https://github.com/d7networks/direct7-ruby-sdk.git"
     spec.license       = "MIT"
   
-    spec.files            = `git ls-files`.split("\n")
+    spec.files         = `git ls-files`.split("\n")
     spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
     spec.require_paths = ["lib"]
 

data/lib/direct7/sms.rb

@@ -8,23 +8,28 @@ module Direct7
         @client = client
       end
   
-      def send_message(recipients, content, originator, report_url = nil, unicode = false)
-        message = {
-          'channel' => 'sms',
-          'content' => content,
-          'msg_type' => 'text',
-          'data_coding' => unicode ? 'unicode' : 'text',
-          'recipients' => recipients
-        };
+      def send_message(originator, report_url, schedule_time, *args)
+        messages = []
+        args.each do |message|
+          messages << {
+            'channel' => 'sms',
+            'recipients' => message[:recipients] || [],
+            'content' => message[:content] || '',
+            'msg_type' => 'text',
+            'data_coding' => message[:unicode] ? 'unicode' : 'text'
+          }
+        end
         message_globals = {
           'originator' => originator,
           'report_url' => report_url,
+          'schedule_time' => schedule_time
         };
-        response = @client.post(@client.host, '/messages/v1/send', true, params= {
-          'messages' => [message],
-          'message_globals' => message_globals
-        })
-        # puts "Message sent successfully."
+        payload = {
+            'messages' => messages,
+            'message_globals' => message_globals
+        }
+        response = @client.post(@client.host, '/messages/v1/send', true,  params=payload)
+        puts "Message sent successfully."
         response
       end
   

data/lib/direct7/whatsapp.rb

@@ -10,12 +10,7 @@ module Direct7
       @log = Logger.new(STDOUT) # You can customize the log destination as needed
     end
 
-    def send_whatsapp_freeform_message(originator, recipient, message_type, message_text= nil, first_name= nil,
-                                       last_name= nil, display_name= nil, phone= nil,
-                                       email= nil, url= nil, latitude= nil, longitude= nil,
-                                       location_name= nil, location_address= nil,
-                                       attachment_type= nil, attachment_url= nil,
-                                       attachment_caption= nil)
+    def send_whatsapp_freeform_message(originator, recipient, message_type, body=nil, first_name=nil, last_name=nil, formatted_name=nil, phones=nil, emails=nil, urls=nil, latitude=nil, longitude=nil, name=nil, address=nil, type=nil, url=nil, caption=nil)
       message = {
         'originator' => originator,
         'recipients' => [{'recipient' => recipient}],
@@ -26,40 +21,44 @@ module Direct7
 
       case message_type
       when 'CONTACTS'
-        message['content']['contact'] = {
-          'first_name' => first_name,
-          'last_name' => last_name,
-          'display_name' => display_name,
-          'phone' => phone,
-          'email' => email,
-          'url' => url
-        }
+        message['content']['contacts'] = [{
+          'name' => {
+            'first_name' => first_name,
+            'last_name' => last_name,
+            'formatted_name' => formatted_name,
+          },
+          'phones' => (phones.map { |phone| { 'phone' => phone } } if phones),
+          'emails' => (emails.map { |email| { 'email' => email } } if emails),
+          'urls' => (urls.map { |url| { 'url' => url } } if urls),
+        }]
       when 'LOCATION'
         message['content']['location'] = {
           'latitude' => latitude,
           'longitude' => longitude,
-          'name' => location_name,
-          'address' => location_address
+          'name' => name,
+          'address' => address,
         }
       when 'ATTACHMENT'
         message['content']['attachment'] = {
-          'attachment_type' => attachment_type,
-          'attachment_url' => attachment_url,
-          'attachment_caption' => attachment_caption
+          'type' => type,
+          'url' => url,
+          'caption' => caption,
         }
       when 'TEXT'
-        message['content']['message_text'] = message_text
+        message['content']['text'] = {
+          'body' => body,
+        }
       end
-      puts message
-      response = @client.post(@client.host, '/whatsapp/v1/send', true, params= { 'messages' => [message] })
+
+      response = @client.post(@client.host, '/whatsapp/v2/send', params: { 'messages' => [message] })
       @log.info('Message sent successfully.')
       response
     end
 
     def send_whatsapp_templated_message(originator, recipient, template_id,
-                                        body_parameter_values, media_type= nil, media_url= nil,
-                                        latitude= nil, longitude= nil, location_name= nil,
-                                        location_address= nil)
+                                         body_parameter_values, media_type=nil, media_url=nil,
+                                         latitude=nil, longitude=nil, location_name=nil,
+                                         location_address=nil,lto_expiration_time_ms=nil, coupon_code=nil, quick_replies= nil, actions= nil, carousel_cards=nil)
       message = {
         'originator' => originator,
         'recipients' => [{'recipient' => recipient}],
@@ -87,8 +86,44 @@ module Direct7
           message['content']['template']['media'] = { 'media_type' => media_type, 'media_url' => media_url }
         end
       end
-      
-      response = @client.post(@client.host, '/whatsapp/v1/send', true, params= { 'messages' => [message] })
+
+      if lto_expiration_time_ms
+          message['content']['template']['limited_time_offer'] = {
+            'expiration_time_ms' => 'lto_expiration_time_ms',
+          }
+      end
+
+      if coupon_code
+        message['content']['template']['buttons'] = {
+          'coupon_code' => [
+            {
+                "index"=> 0,
+                "type"=> "copy_code",
+                "coupon_code"=> coupon_code
+            }
+          ]
+        }
+      end
+
+      if quick_replies
+        message['content']['template']['buttons'] = {
+          'quick_replies' => actquick_repliesions,
+        }
+      end
+
+      if actions
+        message['content']['template']['buttons'] = {
+          'actions' => actions,
+        }
+      end
+
+      if carousel_cards
+        message['content']['template']['carousel'] = {
+          'cards' => carousel_cards,
+        }
+      end
+
+      response = @client.post(@client.host, '/whatsapp/v2/send', true, params: { 'messages' => [message] })
       @log.info('Message sent successfully.')
       response
     end

data/test/test.rb

@@ -1,20 +1,19 @@
-require './lib/direct7/client'
-require './lib/direct7/errors/errors'
+require '../lib/direct7/client'
+require '../lib/direct7/errors/errors'
 require 'test/unit'
 require_relative '../lib/direct7/client'
 
 class TestSERVICES < Test::Unit::TestCase
   def setup
-    @client = Direct7::Client.new('Your API token')
+    @client = Direct7::Client.new('Your API Token')
   end
 
   def test_send_message
     response1 = @client.sms.send_message(
-        recipients =['+91999999XXXX'],
-        content ='Greetings from D7 API',
-        originator ='SignOTP',
-        report_url ='https://the_url_to_recieve_delivery_report.com',
-        unicode =true
+        originator='SignOTP',
+        report_url='https://the_url_to_recieve_delivery_report.com',
+        schedule_time=nil,
+        { recipients: ['+991999999XXXX'], content: 'Greetings from D7 API', unicode: false }
     )
     puts response1
     response2 = @client.sms.get_status(request_id= '001a1a4e-0221-4cb7-a524-a2a5b337cbe8')
@@ -59,9 +58,31 @@ class TestSERVICES < Test::Unit::TestCase
     response = @client.whatsapp.send_whatsapp_freeform_message(
         originator= "91906154XXXX",
         recipient= "+91999999XXXX",
-        message_type="CONTACTS", first_name="Amal", last_name="Anu", display_name="Amal Anu", phone="91906152XXXX", email = "amal@gmail.com"
+        message_type="CONTACTS", first_name="Amal", last_name="Anu", formatted_name="Amal Anu", phones=["91906152XXXX"], emails = ["amal@gmail.com"]
     )
     response = @client.whatsapp.get_status(request_id="81eca535-8131-4866-be18-b3d933604069")
     puts response
   end
+
+  def test_send_whatsapp_freeform_message_text
+    response = @client.whatsapp.send_whatsapp_freeform_message(
+      originator= "+XXXXXXXXXXXX",
+      recipient= "XXXXXXXXXXX",
+      message_type= "TEXT",
+      body= "Hi",
+    )
+    puts response
+  end
+
+  def test_send_whatsapp_freeform_message_attachment
+    response = @client.whatsapp.send_whatsapp_freeform_message(
+      originator= "+XXXXXXXXXXXX",
+      recipient= "XXXXXXXXXXX",
+      message_type= "ATTACHMENT",
+      type= "image",
+      url= "https=//upload.wikimedia.org",
+      caption= "Tet"
+    )
+    puts response
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: direct7
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Direct7 Networks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,6 +105,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".bundle/config"
+- ".direct7.gemspec.swo"
+- ".direct7.gemspec.swp"
 - ".gitignore"
 - ".idea/.gitignore"
 - ".idea/direct7-ruby-sdk.iml"
@@ -125,7 +127,8 @@ files:
 - Rakefile
 - VERSION
 - direct7-0.0.10.gem
-- direct7-0.0.9.gem
+- direct7-0.0.11.gem
+- direct7-0.0.12.gem
 - direct7.gemspec
 - doc/Direct7.html
 - doc/Direct7/AuthenticationError.html