textveloper 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e5661ebae07a5d06455e310099e6423e09e384
-  data.tar.gz: 6cafa7251f0c04ec359bb8355e9aeddf6cf39fea
+  metadata.gz: 73e6c36f3f3594e0b5f1821c0791fe15335c66f8
+  data.tar.gz: 2ef5f5233cf4860e4295b62e424baff3f8e3c7be
 SHA512:
-  metadata.gz: 2276a163fd52175f4b3ced6c747ed42f66675a386a8f4ff2b185f5530a61dae46791ae240768d0ab17753cba2480c0045508cff45e122f1386fa09f3b5f1ea31
-  data.tar.gz: 84ca58c55c24a260e04180a5377e540b4b33ed1b86407037f4a0f43a118ddaa4deaf43b3ac37c154aacb5a7e734810894a175f1060e0e362a8c38626f70a6144
+  metadata.gz: f314b95655d086b8a1b1a07d8b8fe5ea3d956aa01099fdeb38b9896d7e31c673016efa5dc98f06c10a3ce1eabb37f3ca218e62323dd355bcb129f03dd7940f45
+  data.tar.gz: e6475cfbbcaa3ad36456df2882f79e939c9c40a073ebdc731de2116f5b130e0940d41063829bae3ac58dcf7d40ae7ec74b9ea7767a945a1d28880a0ef36a6925

data/lib/textveloper.rb

@@ -29,7 +29,7 @@ module Textveloper
         :telefono => format_phone(number),
         :mensaje => message
       }
-      return Curl.post(url + api_actions[:enviar] + '/', data ).body_str
+      return Curl.post(url + api_actions[:enviar] + '/', data )
     end
 
     #Servicio SMS
@@ -81,23 +81,23 @@ module Textveloper
     end
 
     def account_balance
-      hash_contructor(Curl.post(url + api_actions[:puntos_cuenta] + '/', account_data).body_str)
+      hash_contructor(Curl.post(url + api_actions[:puntos_cuenta] + '/', account_data))
     end
 
     def buy_history
-      hash_contructor(Curl.post(url + api_actions[:compras] + '/', account_data).body_str)
+      hash_contructor(Curl.post(url + api_actions[:compras] + '/', account_data))
     end
 
     def subaccount_balance
-      hash_contructor(Curl.post(url + api_actions[:puntos_subcuenta] + '/', transactional_data).body_str)
+      hash_contructor(Curl.post(url + api_actions[:puntos_subcuenta] + '/', transactional_data))
     end
 
     def account_history
-      hash_contructor(Curl.post(url + api_actions[:envios] + '/',transactional_data).body_str)
+      hash_contructor(Curl.post(url + api_actions[:envios] + '/',transactional_data))
     end
 
     def transfer_history
-      hash_contructor(Curl.post(url + api_actions[:transferencias] + '/',transactional_data).body_str)
+      hash_contructor(Curl.post(url + api_actions[:transferencias] + '/',transactional_data))
     end
 
     #metodos de formato de data
@@ -114,14 +114,22 @@ module Textveloper
       data
     end
 
-    private
+    #private
 
     def format_phone(phone_number)
       phone_number.nil? ? "" : phone_number.gsub(/\W/,"").sub(/^58/,"").sub(/(^4)/, '0\1')
     end
 
+    def valid_content_types
+      ["application/json", "application/x-javascript", "text/javascript", "text/x-javascript", "text/x-json"]
+    end
+
     def hash_contructor(response)
-      JSON.parse(response)
+      if valid_content_types.any? { |type| response.content_type.match(type) }
+        JSON.parse(response.body_str)
+      else
+        {"transaccion"=>"error", "mensaje_transaccion"=>"ERROR_EN_SERVICIO"}
+      end
     end
 
     def chunck_message(message)

data/lib/textveloper/version.rb

@@ -1,3 +1,3 @@
 module Textveloper
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/spec/lib/textveloper_spec.rb

@@ -18,42 +18,72 @@ describe Textveloper do
   it "consulta de puntos" do
       stub_request(:post, "http://api.textveloper.com/saldo-subcuenta/").
          with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token").
-         to_return(:status => 200, :body => points, :headers => {})
-    notificator.subaccount_balance.should == hash_response_points  
+         to_return(:status => 200, :body => points, :headers => {"Content-Type" => "application/json"})
+    notificator.subaccount_balance.should == hash_response_points
+  end
+
+  it 'Api no responde sin envía algo distinto a JSON' do
+    stub_request(:post, "http://api.textveloper.com/enviar/").
+      with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=04121234567&mensaje=Enviado+desde+textveloper+plataform").
+      to_return(:status => 200, :body => "<html><head></head><body><h1>To Many Request</h1></body></html>", :headers => {"Content-Type" => "application/html"})
+    notificator.send_sms("04121234567", mensaje).should == {:"04121234567"=>{"transaccion"=>"error", "mensaje_transaccion"=>"ERROR_EN_SERVICIO"}}
   end
 
 
   it 'envio de mensaje simple' do
     stub_request(:post, "http://api.textveloper.com/enviar/").
          with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=04121234567&mensaje=Enviado+desde+textveloper+plataform").
-         to_return(:status => 200, :body => response, :headers => {})
+         to_return(:status => 200, :body => response, :headers => {"Content-Type" => "application/json"})
 
     notificator.send_sms("04121234567",mensaje).should == {:"04121234567"=>hash_response}
-  end 
+  end
 
   it 'envio masivo de mensajes' do
     tel_numbers.each do |number|
         stub_request(:post, "http://api.textveloper.com/enviar/").
          with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=#{number}&mensaje=Enviado+desde+textveloper+plataform").
-         to_return(:status => 200, :body => response, :headers => {})
-    end     
+         to_return(:status => 200, :body => response, :headers => {"Content-Type" => "application/json"})
+    end
     notificator.mass_messages(tel_numbers,mensaje).should == {:"04147890123"=>hash_response, :"04141234567"=>hash_response, :"04161234567"=>hash_response}
   end
 
   context "asociacion de numeros de telefono con data recibida" do
     let(:numero){["04146578904"]}
     let(:numeros){["04147890123","04141234567"]}
-    
+
+
     it "un telefono" do
-      notificator.hash_constructor_with_numbers(numero,[response]).should == {:"04146578904"=>hash_response}
+      responses = []
+      numero.each do |number|
+        stub_request(:post, "http://api.textveloper.com/enviar/").
+         with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=#{number}&mensaje=Enviado+desde+textveloper+plataform").
+         to_return(:status => 200, :body => response, :headers => {"Content-Type" => "application/json"})
+         responses << notificator.core_operation(number, mensaje)
+       end
+      notificator.hash_constructor_with_numbers(numero,responses).should == {:"04146578904"=>hash_response}
     end
 
-    it "varios numeros" do 
-      notificator.hash_constructor_with_numbers(numeros,[response,response]).should == {:"04147890123"=>hash_response,:"04141234567"=>hash_response}
+    it "varios numeros" do
+      responses = []
+      numeros.each do |number|
+        stub_request(:post, "http://api.textveloper.com/enviar/").
+         with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=#{number}&mensaje=Enviado+desde+textveloper+plataform").
+         to_return(:status => 200, :body => response, :headers => {"Content-Type" => "application/json"})
+         responses << notificator.core_operation(number, mensaje)
+       end
+      notificator.hash_constructor_with_numbers(numeros,responses).should == {:"04147890123"=>hash_response,:"04141234567"=>hash_response}
     end
 
   end
 
+  it "Error en servicio, respuesta del firewall formato HTML" do
+    stub_request(:post, "http://api.textveloper.com/enviar/").
+      with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=04121234567&mensaje=Enviado+desde+textveloper+plataform").
+      to_return(:status => 200, :body => "<html><head></head><body><h1>To Many Request</h1></body></html>", :headers => {"Content-Type" => "application/html"})
+    response = notificator.core_operation("04121234567", mensaje)
+    notificator.send(:hash_contructor, response).should == {"transaccion"=>"error", "mensaje_transaccion"=>"ERROR_EN_SERVICIO"}
+  end
+
   it "formatear el numero de telefono a la forma 04xxxxxxxx" do
     notificator.send(:format_phone,"+584121234567").should eq("04121234567")
     notificator.send(:format_phone,"+58-412.123.45.67").should eq("04121234567")
@@ -67,7 +97,11 @@ describe Textveloper do
   end
 
   it "formatear response a hash " do
-    notificator.send(:hash_contructor,points).should eq(hash_response_points)
+  stub_request(:post, "http://api.textveloper.com/enviar/").
+      with(:body => "cuenta_token=account_token&subcuenta_token=subaccount_token&telefono=04121234567&mensaje=Enviado+desde+textveloper+plataform").
+      to_return(:status => 200, :body => response, :headers => {"Content-Type" => "application/json"})
+    rspn = notificator.core_operation("04121234567", mensaje)
+    notificator.send(:hash_contructor,rspn).should eq(hash_response)
   end
 
   it "Divisor de mensajes" do
@@ -79,4 +113,4 @@ describe Textveloper do
   end
 
 
-end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 require 'textveloper'
-require 'webmock/rspec'
+require 'webmock/rspec'
+require 'curb'
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textveloper
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Gustavo Gimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Gema para el envío de sms en Venezuela a tráves del servicio de Textveloper