dolar-bna 1.0.8.1 → 1.0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8d51459187279a89320164459851615e7de64e1ff9dd75d106a7322845eef0
-  data.tar.gz: 3427e7161337aa661489939e0b9e85c4c99748e3e3fefdbbce13f3153d5eab70
+  metadata.gz: 2d9343fee1ffa21bb51f2aad7ef448281dc129a73b5b0118080fff7d036f1e21
+  data.tar.gz: 83568ea830cfeecf9b602402bec919b404c33e7c6e98a890b29b13e528c93772
 SHA512:
-  metadata.gz: 7a4edad7f7449555932c395cdc9c8821af89e3ffe4935f0fbe361c04a251969b4b035ffac0e2953f045c6156c9d0ac0d59765fd2d963c7ce60a09de5e064752e
-  data.tar.gz: 82a44c06971f40161f48450fa2b2641fe32498e06ce0063121231c5a768eb4bd954dd452e4a91df78baed90fc8fbd6fcfffe12cb4177b646e62de4d4437dab18
+  metadata.gz: add15d42604754a0c3ef1514322bf9504f17d86f7703235fb422f70f319d01c607ceb585925dea1ec4b72b0751454adcb0f97ee24386f82840d95ddf2576fcc5
+  data.tar.gz: acc6e416e7a9a89090924c855eec56b8f66da19ab2243984b2106107f73230016463090e53808c4bead23418cb9e73abe44870cfdcc341a8651a623287a81138

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

@@ -63,7 +63,7 @@ module Dolar
             ddolar = get_dolar()
           end
         else
-          ddolar = {compra: query.dolar_buy, venta: query.dolar_sell, fecha: query.date}
+          ddolar = {compra: query.dolar_buy, venta: query.dolar_sell}
         end
         return ddolar
       end
@@ -103,35 +103,30 @@ module Dolar
       end
 
       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, fecha: dolar_fecha}
+        return {compra: dolar_compra, venta: dolar_venta}
       end
 
       def save_in_db data, dolar_type
-        Dolar::Bna::DolarCotization.create(date: data[:fecha], dolar_type: dolar_type, dolar_buy: data[:compra], dolar_sell: data[:venta])
+        dr = Dolar::Bna::DolarCotization.where(date: @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.8.1"
+    VERSION = "1.0.9.4"
   end
 end

metadata

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