dolar-bna 1.0.5.2 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc7c446528f2f88b135c756e2973e244985e710273297289969f2b155894943
-  data.tar.gz: 7fa7fac2aeeeedd5a0c792629bb6e2f7e299d8dcbf2a17f6c26cc652e529fb18
+  metadata.gz: 9415ba9ecbbe666424e079f7042c703b74577bd78040bb28b6fdaafd945455b3
+  data.tar.gz: '095b8f8807a688601e6f9716fca09a13f15cd099bef84be26559de0857eb1284'
 SHA512:
-  metadata.gz: da78151094495e91fbb90633cb9ea72f922a2908d120a785c192f2d037397b559b0bb32530d9b94799248e5b6a0d4340b5f6bae2f851160fcd2f99757f17eb50
-  data.tar.gz: 602bfcc0785c1bc7bcc45c4d886d6385ccf6b1bd2254e401f974a7467db9e1296e6f340220d3ec0142c810b0003442223c164a39cab885a7d76267b205a48be5
+  metadata.gz: 40dad803b63dee909d07e65ce4d90f6781cfe230e270a1884f6d1f6bfcf0082745050a2cc525456b061848d6f69c0b99ad18e228e00d3f6844be668a73408fc8
+  data.tar.gz: 6cd796da0ce319a9c74025f4207a52aafa63ec19f4a1f0675c5c1b10c511ccd22fb558b2b0ad86639ed1c6e3eadc89f4beb29307f7091093997810ec19ed3b79

data/lib/dolar/app/models/dolar_cotization.rb

@@ -6,6 +6,8 @@ module Dolar
       validates_presence_of :dolar_type, message: 'Indicar tipo de cotizacion'
       validates_presence_of :dolar_buy, message: 'Indicar cotizacion de compra'
       validates_presence_of :dolar_sell, message: 'Indicar cotizacion de venta'
+      validates_numericality_of :dolar_buy, greater_than: 0, message: 'La cotizacion debe ser mayor a 0'
+      validates_numericality_of :dolar_sell, greater_than: 0, message: 'La cotizacion debe ser mayor a 0'
       validates_uniqueness_of :date, scope: :dolar_type, message: 'Ya existe una cotización de ese tipo para la fecha ingresada'
       DOLAR_TYPES = ["Divisa", "Billete"]
 

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,22 +20,22 @@ module Dolar
 
       private
 
-      def set_dolar
+      def set_dolar date
         dolar_buy = 0
         dolar_sell = 0
         intents = 0
         while intents < 5
-          dolar_query =  Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).first
+          dolar_query =  Dolar::Bna::DolarCotization.where(date: date, dolar_type: @dolar_type).first
           if dolar_query.nil?
             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::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.nil?
               dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
             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::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.nil?
               dolar_sell = dolar_query.dolar_sell unless dolar_query.nil?
             else

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])).round(2)
-          porcentual_variation = "#{porcentual_variation * 100}%"
-          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,36 @@ 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])
+        Dolar::Bna::DolarCotization.create(date: data[:fecha], dolar_type: dolar_type, dolar_buy: data[:compra], dolar_sell: data[:venta])
       end
 
     end

data/lib/dolar/bna/version.rb

@@ -1,5 +1,5 @@
 module Dolar
   module Bna
-    VERSION = "1.0.5.2"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolar-bna
 version: !ruby/object:Gem::Version
-  version: 1.0.5.2
+  version: 1.0.9
 platform: ruby
 authors:
 - LITECODE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -92,8 +92,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 'Gema para obtener cotización de dolar divisa y dolar billete desde el
-  sitio web del Banco Nación de Argentina '
+description: Gema para obtener cotización de dolar divisa y dolar billete, obtener
+  variaciones respecto al día anterior y realizar conversiones. Valores obtenidos
+  del sitio web del Banco Nación Argentina
 email:
 - lorenzoezequiel30@gmail.com
 executables: []
@@ -108,12 +109,12 @@ files:
 - lib/dolar/bna/version.rb
 - lib/generators/dolar/bna/install/install_generator.rb
 - lib/generators/dolar/bna/install/templates/create_dolar_cotizations.rb
-homepage: http://litecode.com.ar/
+homepage: https://github.com/elorenzo368/dolar-bna
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: http://litecode.com.ar/
+  homepage_uri: https://github.com/elorenzo368/dolar-bna
 post_install_message: 
 rdoc_options: []
 require_paths: