orange_push_sms 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69a3e1e7c1117911542f46a7fbf3363d115a185
-  data.tar.gz: 4b87844d5c4a3ad74d1717956a1c8036fde51a9f
+  metadata.gz: 2e23e086a46a98a23227b0ff26fba3a11a252b9e
+  data.tar.gz: bdab4d718b9a142cd8e641c7cd210eb97957bede
 SHA512:
-  metadata.gz: d50cef004a27be03c919b90ea3f160dd214da4661a3d37c782fb056767e1ed3538aeeeeb352f5f5fd7c9ebf726f6fabe35f01807a56092c9658c1f2d72b26f46
-  data.tar.gz: d1a8ca2167f810ec6e07f8d559d50d3e09ddddcb8365437d2045af9de8d8daff45471d9a818220a74ed79f283632315c2cc1d45bcf067d904dd5b6579c7ab1bb
+  metadata.gz: 4c12acac855ac70c577eb0e5d382f49f787f939fae596257efafa969a99a07e2618651b0e6a02a00c32a980ec7435ff1915cb766e9a5ea40f2f4a6c289b63b0c
+  data.tar.gz: a3cc2f55caa9ecf6c1d66845b299609125bcf75227d1f4e8fc39d5835987b2a9af2c1b647daa341e2170c71b8c02687fbbcec2d1f5dd218d553b3749dccc9778

data/README.md

@@ -18,21 +18,26 @@ Or install it yourself as:
 
     $ gem install orange_push_sms
 
-## Usage
+## Configuration
 
-To send an SMS to single recipient use:
+In config/initializers create a file orange_push_sms.rb:
 
 ```ruby
-message = OrangePushSMS::Message.new msisdn: '22177XXXXXXX', wording: 'Your message here', tpoa: 'SENDER', is_xml: true
-message.send #returns true if successful 
+OrangePushSMS.configure do |config|
+	config.user   = 'LOGIN'
+	config.token  = 'TOKEN'
+	config.secret = 'API KEY'
+end
 ```
-To multiple recipients
+
+## Usage
+
+To send an SMS :
 
 ```ruby
-message = OrangePushSMS::Message.new numbers: ['22177XXXXXXX', '22177YYYYYYY', '22176ZZZZZZZ'], wording: "Sending to multiple recipients", tpoa: 'SENDER'
-message.send
+message = OrangePushSMS::Message.new recipients: ['22177XXXXXXX'], content: 'Your message here', signature: 'SENDER', subject: 'Subject'
+message.send #returns true if successful 
 ```
-
 ## Contributing
 
 1. Fork it ( https://github.com/divinwind/orange_push_sms/fork )

data/lib/orange_push_sms/configuration.rb

@@ -1,12 +1,12 @@
 module OrangePushSMS
   class Configuration
 
-    attr_accessor :login
-    attr_accessor :pass
+    attr_accessor :user, :token, :secret
 
     def initialize
-      @login = ''
-      @pass  = ''
+      @user   = ''
+      @token  = ''
+      @secret = ''
     end
   end
 end

data/lib/orange_push_sms/message.rb

@@ -4,69 +4,53 @@ require 'http'
 module OrangePushSMS
   class Message
 
-    BASE_URL     = 'https://gsm.orange.sn/push_flux/http.php'
-    BASE_URL_XML = 'http://213.154.64.47/push_flux/xml.php'
+    BASE_URL     = 'https://api.orangesmspro.sn:8443/api/xml'
 
     def initialize(options = {})
-      @msisdn   = options.fetch(:msisdn, '221770000000')
-      @wording  = options.fetch(:wording, '')
-      @tpoa     = options.fetch(:tpoa, 'Aphia')
-      @numbers  = options.fetch(:numbers, [])
-      @is_xml   = options.has_key?(:is_xml) and options.delete(:is_xml)
-      @campaign = 'TESTPUSH'
+      @recipients = options.fetch(:recipients, [])
+      @content    = options.fetch(:content, '')
+      @signature  = options.fetch(:signature, 'Aphia')
+      @subject    = options.fetch(:subject, '')
     end
 
-    def send
-      if @is_xml or @numbers.size > 0
-        xml = Nokogiri::XML HTTP.post( BASE_URL_XML, form: {xml: to_xml}).to_s
-        xml.xpath("//STATUS_CODE").first.text == "100"
-      else
-        !(/Return:1/ =~ HTTP.get(BASE_URL, params: to_h).to_s).nil?
-      end
+    def config
+      OrangePushSMS.configuration
+    end
+
+    def timestamp
+      @timestamp ||= Time.now.to_i
     end
 
-    def to_h
-      pass = Digest::MD5.hexdigest(OrangePushSMS.configuration.pass)
-      {login: OrangePushSMS.configuration.login,
-       pass: pass,
-       tpoa: @tpoa,
-       msisdn: @msisdn,
-       wording: @wording,
-       campaign: @campaign}
+    def digest
+      d = OpenSSL::Digest.new('sha1')
+      OpenSSL::HMAC.hexdigest d,
+                              config.secret,
+                              "#{config.token}#{to_xml}#{timestamp}"
     end
 
     def to_xml
-      pass = Digest::MD5.hexdigest(OrangePushSMS.configuration.pass)
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.SESSION(login: OrangePushSMS.configuration.login, pass: pass) do
-          xml.CREATE do
-            xml.CAMPAIGN(type: '3') do
-              xml.NAME @campaign
-              xml.START DateTime.now.strftime('%Y-%m-%d-%H-%M')
-              xml.END DateTime.now.strftime('%Y-%m-%d-%H-%M')
-              xml.TPOA @tpoa
-              if @numbers.size > 0
-                xml.GEN do
-                  xml.WORDING @wording
-                  xml.NUMBERS do
-                    @numbers.each do |number|
-                      xml.NUMBER number
-                    end
-                  end
-                end
-              else
-                xml.PERSO do
-                  xml.MESSAGE do
-                    xml.NUMBER @msisdn
-                    xml.WORDING @wording
-                  end
-                end
-              end
+      @builder ||= Nokogiri::XML::Builder.new do |xml|
+        xml.session do
+          xml.type 1
+          xml.content @content
+          xml.recipients do
+            @recipients.each do |recipient|
+              xml.recipient recipient
             end
           end
+          xml.signature @signature
+          xml.subject @subject
         end
-      end
-      builder.to_xml
+      end.to_xml
+    end
+
+    def send
+      uri = "#{BASE_URL}?token=#{config.token}&key=#{digest}&timestamp=#{timestamp}"
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      xml = Nokogiri::XML HTTP.basic_auth(user: config.user, pass: config.token)
+                              .post(uri, body: to_xml, ssl_context: ctx)
+      puts xml
     end
   end
 end

data/lib/orange_push_sms/version.rb

@@ -1,3 +1,3 @@
 module OrangePushSMS
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orange_push_sms
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mustafa Sall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Une gem pour envoyer des sms via l'api d'orange sénégal