dolar-bna 1.0.9.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48daeb550b18a3f2713a53e63bd6b377231f7193d348232a89ee865f96a69757
-  data.tar.gz: 2f6f9df1f10c1cb412082da404f2ffd737218040b83b6137baf6a3f082621469
+  metadata.gz: 302342d00c6510b6bdcb88ca9290c33e4bbae54739b6935e6137aba38abe7611
+  data.tar.gz: '068f48a13e196c7b0ff2ec1f0e55825e5aa69b43ed5bbfe3a43d958856f333f8'
 SHA512:
-  metadata.gz: af1803e45c7fa6f0611e39c0791ac1a8f52658b73ce24fcdfa57c0df14513b62ae1b995b84912114e2822621c5add471b10ae0852ecc7995f638d068fcb37be4
-  data.tar.gz: dd267f7ef03a3da2d63a1c7ce42d84286cdf626128e82316c24dc27f137419ab59a4ad10bafb897e60ee27e3628a67f50a57a8a8c2f89435f000a509080f0573
+  metadata.gz: e10b2d65892123beb66dd2f6d8cba8194c0201397bc8c568061bd531bbfce72f06cb39aefce898500824676b49af71eac359d27c7f8f571982f7def4cbd0e4e5
+  data.tar.gz: 54c4d1aa132e2c406f8aaa6fc63b62f3fb6adcc3e7d51409e44d9e782a6a20207252d308df8199f9e5ba0ce13455b408953f40ca4b6b1157e5fd165b68a44f7a

data/lib/dolar/bna/convert.rb

@@ -27,26 +27,26 @@ module Dolar
         date = date.to_date
         while intents < 5
           dolar_query =  Dolar::Bna::DolarCotization.where(date: date, dolar_type: @dolar_type).first
-          if dolar_query.nil?
+          if dolar_query.blank?
             intents += 1
             if @dolar_type.downcase == "divisa"
               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?
+              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).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?
+              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

@@ -2,6 +2,9 @@ module Dolar
   module Bna
     class Exchange
 
+      require 'openssl'
+      OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
       def initialize(fecha=Date.today)
         @fecha ||= fecha
       end
@@ -54,7 +57,7 @@ module Dolar
       private
 
       def check_cotization dolar_type, date
-        query = Dolar::Bna::DolarCotization.where(date: date, dolar_type: dolar_type).first
+        query = Dolar::Bna::DolarCotization.where(date: date.to_date, dolar_type: dolar_type).first
         ddolar = nil
         if query.nil?
           if dolar_type == "Divisa"
@@ -63,7 +66,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,37 +106,37 @@ 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.to_date, 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
 
+      # def get_last_dolar dolar_type
+      #   last_usd = Dolar::Bna::DolarCotization.where(dolar_type: dolar_type).last
+      #   return last_usd
+      # end
+
     end
   end
 end

data/lib/dolar/bna/version.rb

@@ -1,5 +1,5 @@
 module Dolar
   module Bna
-    VERSION = "1.0.9.1"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolar-bna
 version: !ruby/object:Gem::Version
-  version: 1.0.9.1
+  version: 1.1.1
 platform: ruby
 authors:
 - LITECODE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Cotizador de USD/ARS