whatsapp 0.1.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458e2786e1e1e5e98deadfdf790e536be4510dd1819d95dfe0e3e50ccc9c6714
-  data.tar.gz: 32861807fbb15d15b1ee9c88e64e8635d562542572cfb93eece0ffc6db798481
+  metadata.gz: 20d7b19b343c0738110ddeec50ca5ff20f686aa47241ee7504614f3a3153a193
+  data.tar.gz: f389727beacbbabf4c145cf59da2ab5bd1bb18245800e157e12b383bed7629ed
 SHA512:
-  metadata.gz: c28cec96255e41a21b72837d80664feb75a60cf1dfb640bfa304d0a582d740778d9f7bba80a66eaaca6ee974c47f62366a1f61ed49360c106dfc3ab622e8a14e
-  data.tar.gz: be9eb1faa74246b5e83fb824168d1d0a32871a527cbe76def638ee8a176ce096cd0925740d8df44497ce883c38ca00012fa641909d1d6d91e9d5e4d187bbe4fc
+  metadata.gz: a6f4ccb7064627069f645b0c9415cb219c56c51b38d26a4f75d4922c465931ad5b95ab8daab39b65598004d26cb1b5ae5d3f6e637396b87d0bc0f68072d57993
+  data.tar.gz: 6469522f916c4a95c3747d452d4993018681392a6a3aaa6ee0adbaa22d759f42ae870a011775a7d20d02a84330ae425dbc175bb1f7a411496d66fe06f53c3285

data/lib/whats/actions/login.rb

@@ -10,32 +10,26 @@ module Whats
       def initialize
         @user = Whats.configuration.user
         @password = Whats.configuration.password
+        @client = Whats::Client.new(encoded_auth, :basic)
+      end
+
+      def call
+        client.request(PATH)
       end
 
       def token
         return @token if valid?
 
-        full_path = "#{Whats.configuration.base_path}#{PATH}"
-
-        response = Typhoeus.post(
-          full_path,
-          headers: { "Authorization" => "Basic #{encoded_auth}" },
-          body: {}
-        )
-        update_atributes response
+        extract_atributes call
 
         @token
       end
 
       private
 
-      def update_atributes(response)
-        if response.failure?
-          raise Whats::Errors::RequestError.new("API request error.", response)
-        end
-
-        response = JSON.parse response.body
+      attr_reader :client
 
+      def extract_atributes(response)
         @token = response["users"].first["token"]
         @expires_after = response["users"].first["expires_after"]
       end

data/lib/whats/actions/send_hsm_message.rb

@@ -5,11 +5,12 @@ module Whats
     class SendHsmMessage
       PATH = "/v1/messages"
 
-      def initialize(client, wa_id, namespace, element_name, params)
+      def initialize(client, wa_id, namespace, element_name, language, params)
         @client       = client
         @wa_id        = wa_id
         @namespace    = namespace
         @element_name = element_name
+        @language     = language
         @params       = params
       end
 
@@ -19,16 +20,13 @@ module Whats
 
       private
 
-      attr_reader :client, :wa_id, :namespace, :element_name, :params
+      attr_reader :client, :wa_id, :namespace, :element_name, :language, :params
 
       def payload
         {
           hsm: {
             element_name: element_name,
-            language: {
-              code: :pt_BR,
-              policy: :deterministic
-              },
+            language: language.is_a?(Hash) ? language : language_options(language),
             localizable_params: params,
             namespace: namespace
           },
@@ -37,6 +35,13 @@ module Whats
           type: :hsm
         }
       end
+
+      def language_options(language)
+        {
+          code: language,
+          policy: :deterministic
+        }
+      end
     end
   end
 end

data/lib/whats/api.rb

@@ -33,12 +33,13 @@ module Whats
       Actions::SendMessage.new(client, username, body).call
     end
 
-    def send_hsm_message(username, namespace, element_name, params)
+    def send_hsm_message(username, namespace, element_name, language, params)
       Actions::SendHsmMessage.new(
         client,
         username,
         namespace,
         element_name,
+        language,
         params
       ).call
     end

data/lib/whats/client.rb

@@ -4,21 +4,22 @@ require "whats/actions/login"
 
 module Whats
   class Client
-    def initialize(login = Whats::Actions::Login.new)
+    def initialize(token = nil, token_type = :bearer)
       @base_path = Whats.configuration.base_path
-      @login = login
+      @token = token || login.token
+      @token_type = token_type
     end
 
-    def request(path, payload)
+    def request(path, payload = nil)
       full_path = "#{base_path}#{path}"
 
       response = Typhoeus.post(
         full_path,
         headers: {
-          "Authorization" => "Bearer #{login.token}",
+          "Authorization" => "#{token_name} #{token}",
           "Content-Type" => "application/json"
         },
-        body: payload.to_json
+        body: payload && payload.to_json
       )
 
       raise Whats::Errors::RequestError.new("API request error.", response) if response.failure?
@@ -28,6 +29,19 @@ module Whats
 
     private
 
-    attr_reader :base_path, :login
+    attr_reader :base_path, :token, :token_type
+
+    def token_name
+      case token_type
+      when :basic
+        "Basic"
+      when :bearer
+        "Bearer"
+      end
+    end
+
+    def login
+      Whats::Actions::Login.new
+    end
   end
 end

data/lib/whats/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whats
-  VERSION = "0.1.5"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatsapp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Bruno Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -216,8 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: WhatsApp Enterprise API interface.