tww 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c8c99e1eb3d3a0fc42449db0b84a8aa7d2aef2
-  data.tar.gz: ea0314a02f6e28f1b824ef2a9293aaccea6214e8
+  metadata.gz: c229b656d63517736b191911f58672c329b6500c
+  data.tar.gz: a935eca2ba11c854232ae68ae6aa4e2a0c024c30
 SHA512:
-  metadata.gz: 0d41e585ec0d1c5f812868d3c81c032bda2c4a5f4a4006054cddb77a2f049e1663cf6e49ebc00c5cd7c3a3f46784fe67d1cc70f6899ab1941d92d76ae1283f63
-  data.tar.gz: b819ce7be98649e6b39e51aa4d133995db6225f2302ac184b7a987e21163d978ab5364435a287f280f9bee775bafc11ada8ef4f7ac5bf9edbd98acc9148aedba
+  metadata.gz: 1ab238c592a2ed3df9b526eff630dc289c5c1ec720bf04ae419e57c52401a8cdaeed91bf9fce495c8ccb3e9f6056e533fb052af1d472872f8e70022b9ad42af8
+  data.tar.gz: 7522d847b8caecf8d6cf23e03a59c126ba77353774878d33d2978859a9269ca8dfd91129618285269949b2f0737ca3b7c0a462307388e09c21648198b9c0aeee

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
+
 rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+
+before_install:
+  - gem update --system
+  - gem update bundler
+
 notifications:
   email: false

data/README.md

@@ -34,7 +34,15 @@ TWW.config do |config|
 end
 
 client = TWW.client
-resp = client.deliver('11987654321', 'Hello World from TWW Gem')
+
+client.sms('11987654321', 'Hello World using old fashioned SMS')
+client.call('11987654321', 'I just called to say I love you')
+```
+
+You can inspect TWW response:
+```
+# Previous setup
+resp = client.sms('11987654321', 'Hello World using old fashioned SMS')
 
 case
 when resp.ok?
@@ -52,14 +60,14 @@ To fake SMS:
 
 ```ruby
 require 'rspec'
-require 'tww
+require 'tww'
 
 TWW.enable_testing!
 
 RSpec.describe 'TWW Testing' do
   before
     client = TWW.client
-    resp = client.deliver('11987654321', 'Hello World from TWW Gem')
+    resp = client.sms('11987654321', 'Hello World from TWW Gem')
   end
 
   it 'is not empty' do
@@ -73,6 +81,10 @@ RSpec.describe 'TWW Testing' do
 end
 ```
 
+## Support
+
+It supports Ruby version 2.1.x, 2.2.x and 2.3.x.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/tww/client.rb

@@ -8,7 +8,19 @@ module TWW
       @config, @sent = TWW.config, []
     end
 
-    def deliver(phone, message)
+    def clear!
+      sent.clear
+    end
+
+    def size
+      sent.size
+    end
+
+    def sms(phone, message, extras = {})
+      raise 'Need to be implemented'
+    end
+
+    def call(phone, message, extras = {})
       raise 'Need to be implemented'
     end
   end

data/lib/tww/config.rb

@@ -1,3 +1,3 @@
 class TWW::Config
-  attr_accessor :username, :password, :from
+  attr_accessor :username, :password, :from, :layout
 end

data/lib/tww/rest.rb

@@ -3,28 +3,55 @@ require 'tww/client'
 
 module TWW
   class REST < Client
-    def deliver(phone, message)
-      xml = RestClient.post endpoint,
-        NumUsu: config.username,
-        Senha: config.password,
-        SeuNum: config.from,
-        Celular: phone,
-        Mensagem: message
+    SMS = 'https://webservices.twwwireless.com.br' +
+      '/reluzcap/wsreluzcap.asmx/EnviaSMS'
 
-      Response.parse(xml)
+    CALL = 'http://webservices.fonadas.tww.com.br' +
+      '/ws/Fonadas.asmx/EnviaFonada'
+
+    def sms(phone, message, extras = {})
+      request(SMS, sms_params(phone, message, extras))
+    end
+
+    def call(phone, message, extras = {})
+      request(CALL, call_params(phone, message, extras))
     end
 
     private
-    def host
-      'https://webservices.twwwireless.com.br'
+    def call_params(phone, message, extras)
+      now = Time.now.strftime('%Y-%m-%d %H:%M:%S')
+
+      {
+        numusu: config.username,
+        senha: config.password,
+        seunum: config.from,
+        idlayout: config.layout,
+        telefone: phone,
+        dataagendamento: now,
+        retry: 0,
+        retrytime: 0,
+        var1: message,
+        var2: nil,
+        var3: nil,
+        var4: nil,
+        var5: nil,
+        var6: nil
+      }.merge(extras)
     end
 
-    def action
-      '/reluzcap/wsreluzcap.asmx/EnviaSMS'
+    def sms_params(phone, message, extras)
+      {
+        NumUsu: config.username,
+        Senha: config.password,
+        SeuNum: config.from,
+        Celular: phone,
+        Mensagem: message
+      }.merge(extras)
     end
 
-    def endpoint
-      host + action
+    def request(url, params)
+      xml = RestClient.post(url, params)
+      Response.parse(xml)
     end
   end
 end

data/lib/tww/testing.rb

@@ -2,17 +2,21 @@ require 'tww/client'
 
 module TWW
   class Testing < Client
-    def deliver(phone, message)
-      Response.parse("<string>#{ status(phone) }</string>").tap do |response|
-        sent.push(phone: phone, message: message, response: response)
-      end
+    def sms(phone, message, extras = {})
+      request(phone, message, extras)
     end
 
-    def clear
-      sent.clear
+    def call(phone, message, extras = {})
+      request(phone, message, extras)
     end
 
     private
+    def request(phone, message, extras)
+      Response.parse("<string>#{ status(phone) }</string>").tap do |response|
+        sent.push(phone: phone, message: message, response: response)
+      end
+    end
+
     def status(phone)
       phone =~ /^\d{10,}$/ ? 'OK' : 'NOK'
     end

data/lib/tww/version.rb

@@ -1,3 +1,3 @@
 module TWW
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/tww.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.1.0'
   spec.add_dependency 'rest-client', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
@@ -26,7 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'cucumber', '~> 2.0'
   spec.add_development_dependency 'coveralls', '~> 0.8.0'
   spec.add_development_dependency 'webmock', '~> 1.0'
-  spec.add_development_dependency 'byebug', '~> 8.0'
-  spec.add_development_dependency 'guard', '~> 2.0'
-  spec.add_development_dependency 'guard-rake', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tww
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Libanori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -108,48 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: 
 email:
 - daniellibanori@gmail.com
@@ -186,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="