iletimerkezisms 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6ca34154ad2c88f2f87b1625ff520ca07452d9
-  data.tar.gz: 7f676c72179a23c7571def3d2e363fae50bb6aca
+  metadata.gz: 896b36243ef7d407b3ac0a384f1717e09f34afaa
+  data.tar.gz: 7a8d6e41b888cf44ac578df72876fe9d0499c9ed
 SHA512:
-  metadata.gz: 0a9b261ddc626e80d9ca99282f6b0527f0078c1341c3b35c58b6c13728891cd0591764fc3ce221507cda6dec865819b8a850f7d595991677a64674890233ceee
-  data.tar.gz: bc25ed597531267b0ff1818b4b365b22e96f3998645905735877e53f610540aa570bbdaf5e024c7ddf20eb16b510ed982af8e902d15ff1f00a118841a1d67f55
+  metadata.gz: 19007b1ccc4f0f7d8b82f31a236ce805abb776315b0df380514103f1e3ded8615752f0b62c2114b70765811fceda243db7de3107f43fbe37ea60996fabb0e7ce
+  data.tar.gz: 0cab9438c038e41f4b3499e5aa517f9961ebe6a9ef1da63d7f3f3258402a306872866b3cbae58127ea39d6c77fe44c4752dd3b0bb287cdd134fcfee395b8e81c

data/lib/iletimerkezisms.rb

@@ -5,12 +5,23 @@ require File.expand_path('../iletimerkezisms/report', __FILE__)
 require File.expand_path('../iletimerkezisms/request', __FILE__)
 
 module IletimerkeziSMS
-  # argv: {sender: "ILETI MRKZI", message: "Lorem Ipsum ...",
+  # argv: {api_gateway: true, sender: "ILETI MRKZI", message: "Lorem Ipsum ...",
   #        numbers: ["905xxxxxxxxx"," +90 5xx xxx xx xx", "5xxxxxxxxx"]
   #   }
-  def self.send(username, password, argv)
+  # Varsayılan api_gateway false. 
+  # ap_gateway true ise kpublic, ksecret ile authentication; false ise username, password
+  def self.send(username, password, argv = {})
+    argv = {
+      api_gateway: false
+    }.merge(argv)
+
     sms = SMS.new(username, password)
-    sms.send(argv)
+
+    if argv[:api_gateway]
+      sms.send_via_gateway(argv)
+    else
+      sms.send_via_http(argv)
+    end
   end
 
   # argv: {sender: "ILETI MRKZI",
@@ -21,23 +32,47 @@ module IletimerkeziSMS
   #         ]
   #     }
   def self.multi_send(username, password, argv)
+    argv = {
+      api_gateway: false
+    }.merge(argv)
+
     sms = SMS.new(username, password)
-    sms.multi_send(argv)
+
+    if argv[:api_gateway]
+      sms.multi_send_via_gateway(argv)
+    else
+      sms.multi_send_via_http(argv)
+    end
   end
 
-  def self.cancel(username, password, order_id)
+  def self.cancel(username, password, order_id, api_gateway = false)
     sms = SMS.new(username, password)
-    sms.cancel(order_id)
+    if api_gateway
+      sms.cancel_via_gateway(order_id)
+    else
+      sms.cancel_via_http(order_id)
+    end
   end
 
-  def self.balance(username, password)
+  def self.balance(username, password, api_gateway = false)
     sms = REPORT.new(username, password)
-    sms.balance
+    if api_gateway
+      sms.balance_via_gateway
+    else
+      sms.balance_via_http
+    end
   end
 
   # argv:
   def self.report(username, password, argv)
+    argv = {
+      api_gateway: false
+    }.merge(argv)
     sms = REPORT.new(username, password)
-    sms.report(argv)
+    if argv[:api_gateway]
+      sms.report_via_gateway(argv)
+    else
+      sms.report_via_http(argv)
+    end
   end
 end

data/lib/iletimerkezisms/report.rb

@@ -10,7 +10,7 @@ module IletimerkeziSMS
       @password = password
     end
 
-    def report(argv)
+    def report_via_http(argv)
       argv = {
         page: 1,
         rowCount: 1000
@@ -35,7 +35,35 @@ module IletimerkeziSMS
       return r.request
     end
 
-    def balance
+    def report_via_gateway(argv)
+      argv = {
+        page: 1,
+        rowCount: 1000
+        }.merge(argv)
+
+        path = "get-report"
+
+        digest = OpenSSL::Digest.new('sha256')
+        hcmac = OpenSSL::HMAC.hexdigest(digest, @password, @username)
+
+        xml_build = Nokogiri::XML::Builder.new do |xml|
+          xml.request {
+            xml.authentication {
+              xlm.key @username
+              xlm.hash_ hcmac
+            }
+            xml.order{
+              xml.id_ argv[:id]
+              xml.page argv[:page]
+              xml.rowCount argv[:rowCount]
+            }
+          }
+        end
+        r = REQUEST.new(path,xml_build.to_xml)
+        return r.request
+      end
+
+    def balance_via_http
       path = "get-balance"
       xml_build = Nokogiri::XML::Builder.new do |xml|
         xml.request {
@@ -48,5 +76,21 @@ module IletimerkeziSMS
       r = REQUEST.new(path,xml_build.to_xml)
       return r.request
     end
+
+    def balance_via_gateway
+      digest = OpenSSL::Digest.new('sha256')
+      hcmac = OpenSSL::HMAC.hexdigest(digest, @password, @username)
+      path = "get-balance"
+      xml_build = Nokogiri::XML::Builder.new do |xlm|
+        xlm.request {
+          xlm.authentication {
+            xlm.key @username
+            xlm.hash_ hcmac
+          }
+        }
+      end
+      r = REQUEST.new(path,xml_build.to_xml)
+      return r.request
+    end
   end
 end

data/lib/iletimerkezisms/sms.rb

@@ -14,7 +14,7 @@ module IletimerkeziSMS
     #        sms.send({sender: "ILETI MRKZI", message: "Lorem Ipsum ...",
     #                 numbers: ["905xxxxxxxxx"," +90 5xx xxx xx xx", "5xxxxxxxxx"]})
     # Description: Single Message => Multi Number
-    def send(argv)
+    def send_via_http(argv)
       path = "send-sms"
       argv = {sendDateTime: Time.now.strftime("%d/%m/%Y %H:%M")}.merge(argv)
       xml_build = Nokogiri::XML::Builder.new do |xlm|
@@ -41,6 +41,39 @@ module IletimerkeziSMS
       return r.request
     end
 
+    # Usage: sms = IletimerkeziSMS::SMS.new("keypublic","keysecret")
+    #        sms.send({sender: "ILETI MRKZI", message: "Lorem Ipsum ...",
+    #                 numbers: ["905xxxxxxxxx"," +90 5xx xxx xx xx", "5xxxxxxxxx"]})
+    # Description: Single Message => Multi Number
+
+    def send_via_gateway(argv)
+      digest = OpenSSL::Digest.new('sha256')
+      hcmac = OpenSSL::HMAC.hexdigest(digest, @password, @username)
+      path = "send-sms"
+      xml_build = Nokogiri::XML::Builder.new do |xlm|
+        xlm.request {
+          xlm.authentication {
+            xlm.key @username
+            xlm.hash_ hcmac
+          }
+          xlm.order {
+            xlm.sender argv[:sender]
+            xlm.sendDateTime Time.now.strftime("%d/%m/%Y %H:%M")
+            xlm.message {
+              xlm.text_ argv[:message]
+              xlm.receipents{
+                argv[:numbers].each do |n|
+                  xlm.number n
+                end
+              }
+            }
+          }
+        }
+      end
+      r = REQUEST.new(path,xml_build.to_xml)
+      return r.request
+    end
+
     # Usage: sms = IletimerkeziSMS::SMS.new("5545967632","5173539")
     #        sms.send({sender: "ILETI MRKZI",
     #                   messages: [
@@ -50,7 +83,7 @@ module IletimerkeziSMS
     #                   ]
     #                 })
     # Description: Multi Message => Multi Number (Birden fazla farklı mesajı birden fazla farklı kişiye göndermeye yarar.)
-    def multi_send(argv)
+    def multi_send_via_http(argv)
       path = "send-sms"
       argv = {sendDateTime: Time.now.strftime("%d/%m/%Y %H:%M")}.merge(argv)
       xml_build = Nokogiri::XML::Builder.new do |xlm|
@@ -78,11 +111,41 @@ module IletimerkeziSMS
       r = REQUEST.new(path,xml_build.to_xml)
       return r.request
     end
+    
+    def multi_send_via_gateway(argv)
+      digest = OpenSSL::Digest.new('sha256')
+      hcmac = OpenSSL::HMAC.hexdigest(digest, @password, @username)
+      path = "send-sms"
+      xml_build = Nokogiri::XML::Builder.new do |xlm|
+        xlm.request {
+          xlm.authentication {
+            xlm.key @username
+            xlm.hash_ hcmac
+          }
+          xlm.order {
+            xlm.sender argv[:sender]
+            xlm.sendDateTime argv[:sendDateTime]
+            argv[:messages].each do |message|
+              xlm.message {
+                xlm.text_ message[:text]
+                xlm.receipents{
+                  message[:numbers].each do |n|
+                    xlm.number n
+                  end
+                }
+              }
+            end
+          }
+        }
+      end
+      r = REQUEST.new(path,xml_build.to_xml)
+      return r.request
+    end
 
     # Usage: sms = IletimerkeziSMS::SMS.new("5545967632","5173539")
     #        sms.cancel("4152")
     # Description: Gönderilen sms paketini iptal etmeye yarar.
-    def cancel(order_id)
+    def cancel_via_http(order_id)
       path = "cancel-order"
       xml_build = Nokogiri::XML::Builder.new do |xlm|
         xlm.request {
@@ -98,5 +161,24 @@ module IletimerkeziSMS
       r = REQUEST.new(path,xml_build.to_xml)
       return r.request
     end
+
+    def cancel_via_gateway(order_id)
+      digest = OpenSSL::Digest.new('sha256')
+      hcmac = OpenSSL::HMAC.hexdigest(digest, @password, @username)
+      path = "send-sms"
+      xml_build = Nokogiri::XML::Builder.new do |xlm|
+        xlm.request {
+          xlm.authentication {
+            xlm.key @username
+            xlm.hash_ hcmac
+          }
+          xlm.order {
+            xlm.id_ order_id.to_s
+          }
+        }
+      end
+      r = REQUEST.new(path,xml_build.to_xml)
+      return r.request
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iletimerkezisms
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Irfan SUBAS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.8.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6.3
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.8.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6.3
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: api.iletimerkezi.com API Ruby SMS GEM