tww 1.1.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9550febce380bcdc14eba253d6920146710368ef2203074b27bdea15b60f744
-  data.tar.gz: cea5441f61216d759dd701d5dbbf51cb5e6d242cbf3385330f5cf8c3b60a75f9
+  metadata.gz: 409f5d11b108ae845371fff98d5b45bf147f982f3fabd757bf20d95a15b4f39a
+  data.tar.gz: c8dab98c88d72179107135386bebea8b721c856c5078d5898f7d33342df08cdd
 SHA512:
-  metadata.gz: b663c9b21d83fc95a9a44fe224a2952cb0f3529e8e9b811c225f3cefc91c6a211baa9d002fad2c33544b738298dc4eb255c306261cc35e2eeb1844f39f495f6c
-  data.tar.gz: 6981a9d9fcf42fd8c40cc91a2e4ac500a1dd3115dfcffcc73b3e057c36d61d15bfaaaad7dd191fa5c3f10cf03b7430a00650931094f1e0773a71e277f1902ed9
+  metadata.gz: 0f9c950ba027965f9c68cf1114682865b41fe60b5cd7de8a955cd2997ff6a7cf353a314ee11528070f2333f0d95c86ad1eb5f7860e0229eb7753bfb276d2f03c
+  data.tar.gz: 59724bbb9ef70f108aad4c9128846c0f5607d258f35e4e0274a039afd24d289ec0bd23f543458c7ec66851e8ccc286dd9813fcc2ab17f7eefc0af2b943dc6cc1

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.5
   - 2.6
   - 2.7
+  - 3.0
 
 before_install:
   - gem update --system

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# v2.0.1
+
+## Changes
+- Update bundler version
+- Update ruby version
+- Update dependency version
+
+# v2.0.0
+
+## Changes
+- Remove rest-client dependency
+- Optimize symbols as keys
+
+# v1.2.0
+
+## Changes
+- Add timeout to TWW gem request

data/README.md

@@ -28,16 +28,16 @@ To send SMS:
 
 ```ruby
 TWW.config do |config|
-  config.username = 'you username goes here'
-  config.password= 'you password goes here'
-  config.from = 'Your identification (OPTIONAL)'
-  config.layout = 'Layout ID (JUST FOR VOICE MESSAGES)'
+  config[:username] = 'you username goes here'
+  config[:password]= 'you password goes here'
+  config[:from] = 'Your identification (OPTIONAL)'
+  config[:layout] = 'Layout ID (JUST FOR VOICE MESSAGES)'
+  config[:endpoint] = :secondary # :primary is default
 end
 
 client = TWW.client
 
 client.deliver('11987654321', 'Hello World using old fashioned SMS')
-client.call('11987654321', 'I just called to say I love you')
 ```
 
 You can inspect TWW response:
@@ -58,13 +58,6 @@ when resp.error?
 end
 ```
 
-You can use obscure parameters from TWW API.
-
-```ruby
-# Previous setup
-client.call('11987654321', 'Var 1 value', var2: 'Var 2 value', retry: 3)
-```
-
 To fake SMS:
 
 ```ruby
@@ -92,7 +85,7 @@ end
 
 ## Support
 
-It supports Ruby version 2.1.x, 2.2.x and 2.3.x.
+It supports Ruby version 2.6 and later
 
 ## Development
 

data/lib/tww/client.rb

@@ -4,27 +4,14 @@ require 'tww/response'
 
 module TWW
   class Client
-    attr_reader :config, :sent
+    attr_reader :config
 
     def initialize(config)
       @config = config
-      @sent = []
-    end
-
-    def clear!
-      sent.clear
-    end
-
-    def size
-      sent.size
     end
 
     def deliver(_phone, _message, _extras = {})
       raise 'Need to be implemented'
     end
-
-    def call(_phone, _message, _extras = {})
-      raise 'Need to be implemented'
-    end
   end
 end

data/lib/tww/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 
 module TWW

data/lib/tww/rest.rb

@@ -1,57 +1,48 @@
-require 'restclient'
+# frozen_string_literal: true
+
+require 'net/http'
 require 'tww/client'
 
 module TWW
   class REST < Client
-    SMS = 'https://webservices.twwwireless.com.br' +
-      '/reluzcap/wsreluzcap.asmx/EnviaSMS'
-
-    CALL = 'http://webservices.fonadas.tww.com.br' +
-      '/ws/Fonadas.asmx/EnviaFonada'
+    ENDPOINTS = {
+      primary: 'https://webservices.twwwireless.com.br' \
+        '/reluzcap/wsreluzcap.asmx/EnviaSMS',
+      secondary: 'https://webservices2.twwwireless.com.br' \
+        '/reluzcap/wsreluzcap.asmx/EnviaSMS'
+    }.freeze
 
     def deliver(phone, message, extras = {})
-      request(SMS, deliver_params(phone, message, extras))
-    end
-
-    def call(phone, message, extras = {})
-      request(CALL, call_params(phone, message, extras))
+      request(endpoint, deliver_params(phone, message, extras))
     end
 
     private
-    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)
+    def endpoint
+      ENDPOINTS[config.fetch(:endpoint, :primary)]
     end
 
     def deliver_params(phone, message, extras)
       {
-        NumUsu: config.username,
-        Senha: config.password,
-        SeuNum: config.from,
+        NumUsu: config[:username],
+        Senha: config[:password],
+        SeuNum: config[:from],
         Celular: phone,
         Mensagem: message
       }.merge(extras)
     end
 
     def request(url, params)
-      xml = RestClient.post(url, params)
-      Response.parse(xml)
+      uri = URI(url)
+      use_ssl = uri.scheme == 'https'
+
+      Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+        post = Net::HTTP::Post.new(uri)
+        post.set_form_data(params)
+        res = http.request(post)
+
+        Response.parse(res.body)
+      end
     end
   end
 end

data/lib/tww/testing.rb

@@ -1,7 +1,24 @@
+# frozen_string_literal: true
+
 require 'tww/client'
 
 module TWW
   class Testing < Client
+    attr_reader :sent
+
+    def initialize(config)
+      super
+      @sent = []
+    end
+
+    def clear!
+      sent.clear
+    end
+
+    def size
+      sent.size
+    end
+
     def deliver(phone, message, extras = {})
       request(phone, message, extras)
     end
@@ -11,8 +28,9 @@ module TWW
     end
 
     private
-    def request(phone, message, extras)
-      Response.parse("<string>#{ status(phone) }</string>").tap do |response|
+
+    def request(phone, message, _extras)
+      Response.parse("<string>#{status(phone)}</string>").tap do |response|
         sent.push(phone: phone, message: message, response: response)
       end
     end

data/lib/tww/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TWW
-  VERSION = '1.1.0'
+  VERSION = '2.0.2'
 end

data/lib/tww.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 require 'tww/version'
-require 'tww/config'
 require 'tww/client'
 require 'tww/rest'
 require 'tww/testing'
 
 module TWW
+  @config = {}
+  @factory = TWW::REST
+
   class << self
+    attr_accessor :factory
+
     def config
-      @config ||= Config.new
       @config.tap { |config| yield(config) if block_given? }
     end
 
@@ -25,6 +28,4 @@ module TWW
       @factory = TWW::REST
     end
   end
-
-  disable_testing!
 end

data/tww.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tww/version'
@@ -7,10 +6,10 @@ Gem::Specification.new do |spec|
   spec.name          = 'tww'
   spec.version       = TWW::VERSION
   spec.authors       = ['Daniel Libanori']
-  spec.email         = ['daniellibanori@gmail.com']
+  spec.email         = ['daniel.libanori@clicksign.com']
 
   spec.summary       = 'Send SMS from TWW provider'
-  spec.homepage      = 'https://github.com/dlibanori/tww'
+  spec.homepage      = 'https://github.com/clicksign/tww'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -18,13 +17,14 @@ 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', '~> 2.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_runtime_dependency 'rexml', '~> 3.2'
+
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'cucumber', '~> 3.1'
-  spec.add_development_dependency 'coveralls', '~> 0.8.0'
-  spec.add_development_dependency 'webmock', '~> 3.8'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'cucumber', '~> 6.1'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'webmock', '~> 3.13'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tww
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Libanori
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,59 +58,59 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-description: 
+        version: '3.13'
+description:
 email:
-- daniellibanori@gmail.com
+- daniel.libanori@clicksign.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,6 +119,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,17 +128,16 @@ files:
 - bin/setup
 - lib/tww.rb
 - lib/tww/client.rb
-- lib/tww/config.rb
 - lib/tww/response.rb
 - lib/tww/rest.rb
 - lib/tww/testing.rb
 - lib/tww/version.rb
 - tww.gemspec
-homepage: https://github.com/dlibanori/tww
+homepage: https://github.com/clicksign/tww
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Send SMS from TWW provider
 test_files: []

data/lib/tww/config.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module TWW
-  Config = Struct.new(:username, :password, :from, :layout) do
-    def merge(attributes = {})
-      attributes.empty? ? self : dup.copy(attributes)
-    end
-
-    def copy(attributes)
-      tap { attributes.each { |k, v| self[k] = v } }
-    end
-  end
-end