dolar-bna 1.0.7 → 1.0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe21a0c2c587369d0cc7ba9b8cecead44949a4ce0ce21b39b6ac8cf2db4efb5
-  data.tar.gz: c96a1e4cc48f9200be848e29d780a26c493299e94f04316793778071058b3e1b
+  metadata.gz: 87544d1d540d3e6488aa9759efbb44898a20d724a13c88249587068d22616b7b
+  data.tar.gz: f7fd726bd19f1a97491e7b1185c31615ebbb3428a36cdbf68d74cf1172ed2114
 SHA512:
-  metadata.gz: ff0b1db2aebaa03322314d248829603c4ef1f1a8ec8dac47453e0b5f74912afa70512a5a0dfe93d68ba0a0e367883decfcedde32167263ceee847d6e26cd2b91
-  data.tar.gz: 8e3959749858041a66017badc1b1c0c18f7af237887e5de7f352fe3e119b2a5abed4907fcf8c41eccb4b261793cc91b1fc8249b91847b03c6b830b9203c27758
+  metadata.gz: 52ac5fc5dd9b571edea2b562584d4c69991b583a4d2cafaa773f3913359ed620762c734163ee04accbfa6c4c7f0e0b83c6cc12abaf5392ea1f122293cde54683
+  data.tar.gz: 804fa06d6cf7f851c70a2d8cd1ca9127b6dc28bbf460ebc8a7cc581e2e069050a01c9b8068ef3348fec68922648bbda3fdf80650ff4b8411c671913c938ebd91

data/lib/dolar/bna/convert.rb

@@ -1,15 +1,16 @@
 module Dolar
   module Bna
     class Convert
-      def initialize(value=0, conversion="ars_to_usd", dolar_type="Divisa")
+      def initialize(value=0, conversion="ars_to_usd", dolar_type="Divisa", date=Date.today)
         @value ||= value
         @conversion ||= conversion
         @dolar_type ||= dolar_type
+        @date ||= date
       end
 
       def perform
         #dolar_query =  Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).first
-        dolar_buy, dolar_sell = set_dolar()
+        dolar_buy, dolar_sell = set_dolar(@date)
         if @conversion == "ars_to_usd"
           ars_to_dolar(dolar_sell)
         else
@@ -19,32 +20,33 @@ module Dolar
 
       private
 
-      def set_dolar
+      def set_dolar date
         dolar_buy = 0
         dolar_sell = 0
         intents = 0
+        date = date.to_date
         while intents < 5
-          dolar_query =  Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).first
-          if dolar_query.nil?
+          dolar_query =  Dolar::Bna::DolarCotization.where(date: date, dolar_type: @dolar_type).first
+          if dolar_query.blank?
             intents += 1
             if @dolar_type.downcase == "divisa"
-              Dolar::Bna::Exchange.new(Date.today).perform_bna_divisa
-              dolar_query =  Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).first
-              dolar_buy = dolar_query.dolar_buy unless dolar_query.nil?
-              dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
+              Dolar::Bna::Exchange.new(date).perform_bna_divisa
+              dolar_query =  Dolar::Bna::DolarCotization.where(date: date, dolar_type: @dolar_type).first
+              dolar_buy = dolar_query.dolar_buy unless dolar_query.blank?
+              dolar_sell = dolar_query.dolar_sell unless dolar_query.blank?
             elsif @dolar_type.downcase == "billete"
-              Dolar::Bna::Exchange.new(Date.today).perform_bna_billete
-              dolar_query =  Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).first
-              dolar_buy = dolar_query.dolar_buy unless dolar_query.nil?
-              dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
+              Dolar::Bna::Exchange.new(date).perform_bna_billete
+              dolar_query =  Dolar::Bna::DolarCotization.where(date: date, dolar_type: @dolar_type).first
+              dolar_buy = dolar_query.dolar_buy unless dolar_query.blank?
+              dolar_sell = dolar_query.dolar_sell unless dolar_query.blank?
             else
-              dolar_buy = 0
-              dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
+              dolar_buy = dolar_query.dolar_buy unless dolar_query.blank?
+              dolar_sell = dolar_query.dolar_sell unless dolar_query.blank?
               break
             end
           else
-            dolar_buy = dolar_query.dolar_buy
-            dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
+            dolar_buy = dolar_query.dolar_buy unless dolar_query.blank?
+            dolar_sell = dolar_query.dolar_sell unless dolar_query.blank?
             break
           end
         end

data/lib/dolar/bna/exchange.rb

@@ -7,26 +7,47 @@ module Dolar
       end
 
       def perform_bna_billete
-        data = check_cotization("Billete", @fecha)
-        save_in_db(data, "Billete") unless data.blank?
-        return data
+        begin
+          Timeout.timeout(15) do
+            data = check_cotization("Billete", @fecha)
+            save_in_db(data, "Billete") unless data.blank?
+            return data
+          end
+        rescue => ex
+          pp ex.message
+          return nil
+        end
       end
 
       def perform_bna_divisa
-        data = check_cotization("Divisa", @fecha)
-        save_in_db(data, "Divisa") unless data.blank?
-        return data
+        begin
+          Timeout.timeout(15) do
+            data = check_cotization("Divisa", @fecha)
+            save_in_db(data, "Divisa") unless data.blank?
+            return data
+          end
+        rescue => ex
+          pp ex.message
+          return nil
+        end
       end
 
       def variation_billete
-        today_dolar = check_cotization("Billete", @fecha)
-        yesterday_dolar = check_cotization("Billete", (@fecha - 1.days))
-        unless (today_dolar.nil? || yesterday_dolar.nil?)
-          porcentual_variation = ((today_dolar[:venta] - yesterday_dolar[:venta]) / (yesterday_dolar[:venta]))
-          porcentual_variation = "#{(porcentual_variation * 100).round(2)}%"
-          return porcentual_variation
-        else
-          return "0%"
+        begin
+          Timeout.timeout(15) do
+            today_dolar = check_cotization("Billete", @fecha)
+            yesterday_dolar = check_cotization("Billete", (@fecha - 1.days))
+            unless (today_dolar.nil? || yesterday_dolar.nil?)
+              porcentual_variation = ((today_dolar[:venta] - yesterday_dolar[:venta]) / (yesterday_dolar[:venta]))
+              porcentual_variation = "#{(porcentual_variation * 100).round(2)}%"
+              return porcentual_variation
+            else
+              return "0%"
+            end
+          end
+        rescue => ex
+          pp ex.message
+          return nil
         end
       end
 
@@ -42,7 +63,7 @@ module Dolar
             ddolar = get_dolar()
           end
         else
-          ddolar = {compra: query.dolar_buy, venta: query.dolar_sell}
+          ddolar = {compra: query.dolar_buy, venta: query.dolar_sell, fecha: query.date}
         end
         return ddolar
       end
@@ -53,9 +74,9 @@ module Dolar
         mechanize = Mechanize.new
         mechanize.user_agent_alias = "Android"
         begin
-          Timeout.timeout(20) do
+          Timeout.timeout(15) do
             url = "http://www.bna.com.ar/Cotizador/HistoricoPrincipales?id=billetes&fecha=#{@fecha.day}%2F#{@fecha.month}%2F#{@fecha.year}&filtroEuro=0&filtroDolar=1"
-            value = obtain_dolar_from_html(url, mechanize, data)
+            value = obtain_dolar_from_html(url, mechanize, data, "billete")
             return value
           end
         rescue => ex
@@ -70,9 +91,9 @@ module Dolar
         mechanize = Mechanize.new
         mechanize.user_agent_alias = "Android"
         begin
-          Timeout.timeout(20) do
+          Timeout.timeout(15) do
             url = "http://www.bna.com.ar/Cotizador/MonedasHistorico"
-            value = obtain_dolar_from_html(url, mechanize, data)
+            value = obtain_dolar_from_html(url, mechanize, data, "billete")
             return value
           end
         rescue => ex
@@ -81,27 +102,41 @@ module Dolar
         end
       end
 
-      def obtain_dolar_from_html(url, mechanize, data)
-
+      def obtain_dolar_from_html(url, mechanize, data, d_type)
+        dolar_fecha = nil
         page = mechanize.get(url)
         doc = Nokogiri::HTML(page.body, "UTF-8")
         doc.xpath("//td").each_with_index do |node, index|
           data[index] = node.text
         end
+        if d_type == "divisa"
+          divs_data = {}
+          doc.xpath("//div").each_with_index do |node, index|
+            divs_data[index] = node.text
+          end
+          dolar_fecha = divs_data[1]
+        end
         correct_date = "#{@fecha.day.to_i}/#{@fecha.month.to_i}/#{@fecha.year.to_i}"
         i = data.key(correct_date)
         if !i.nil?
+          dolar_fecha = data[i - 3]
           dolar_compra = BigDecimal(data[i - 2].tr(",", ".")).truncate(3).to_f
           dolar_venta = BigDecimal(data[i - 1].tr(",", ".")).truncate(3).to_f
         else
+          dolar_fecha = dolar_fecha.nil? ? data[3] : dolar_fecha
           dolar_compra = BigDecimal(data[1].tr(",", ".")).truncate(3).to_f
           dolar_venta = BigDecimal(data[2].tr(",", ".")).truncate(3).to_f
         end
-        return {compra: dolar_compra, venta: dolar_venta}
+        return {compra: dolar_compra, venta: dolar_venta, fecha: dolar_fecha}
       end
 
       def save_in_db data, dolar_type
-        Dolar::Bna::DolarCotization.create(date: @fecha, dolar_type: dolar_type, dolar_buy: data[:compra], dolar_sell: data[:venta])
+        dr = Dolar::Bna::DolarCotization.where(date: data[:fecha], dolar_type: dolar_type, dolar_buy: data[:compra], dolar_sell: data[:venta]).first_or_initialize
+        if dr.save
+          pp "todo ok"
+        else
+          pp dr.errors
+        end
       end
 
     end

data/lib/dolar/bna/version.rb

@@ -1,5 +1,5 @@
 module Dolar
   module Bna
-    VERSION = "1.0.7"
+    VERSION = "1.0.9.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolar-bna
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9.2
 platform: ruby
 authors:
 - LITECODE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot