eu_central_bank 1.3.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 87c3be2859e80a5b6333cd87bcf2895c653baf3a
-  data.tar.gz: a78a0dc23f3acdd61c927d8c23cac695535250e9
+SHA256:
+  metadata.gz: f8305b19d4e97311f612dff41676d21546bde2ee5bdf34ca0a11b329681f8cc1
+  data.tar.gz: 272e8a8bc25af1aca904743b5336865bb40725874a60161fe700c49ebff5e6e3
 SHA512:
-  metadata.gz: b89ae31c95e961aec67596968dc44d2c7393012b19d98b081a7c7b7c2e132f1bcbb7d4a3003398ba4d2e04a7e3658789574b265241887cbf1d7b2f682f796882
-  data.tar.gz: 555eb9d9f044f74d880e4bd6e9e58206922d6cec4682d835489ce28eefb1e8103bf36f4dea6a456fc50b82a6f82167ced83c78c383f64e803220dc95d9ec9e00
+  metadata.gz: 43df545b3f015459fd1a10065e4989afe35ab57f0dcc34c989dcf008de739e82887223d1c4fe5d995203b612f33f2ec30c3e252f6d8585f7299484c59bd0117a
+  data.tar.gz: 511ed0225001148ee8cc84a3a0e9c7d7a6f31663399a762ee98ed5a254589e791320959ef44fde7950949c8cf1274a0310d31b6963f8256cda7352f53cbd08e4

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # eu_central_bank changelog
 
+## 1.5.0 (Dec 7 2019)
+
+* Fix issue with money gem incompatibility
+* Fix thread safety of the default rates store
+* Bump money dependency to >= 6.13.6
+
+## 1.4.2 (Feb 2 2019)
+
+* Fix issue with importing exported rates
+
+## 1.4.1 (Jan 14 2019)
+
+* Relax Nokogiri dependency to `~> 1.8` on newer rubies
+
+## 1.4.0 (Dec 17 2018)
+
+* Update money dependency to 6.13.x
+* Relax money dependency to a minor version
+
 ## 1.3.1 (Sep 6 2018)
 
 * Fix HTTPS redirection error

data/lib/eu_central_bank.rb

@@ -15,7 +15,7 @@ class EuCentralBank < Money::Bank::VariableExchange
   attr_accessor :historical_rates_updated_at
 
   SERIALIZER_DATE_SEPARATOR = '_AT_'
-
+  DECIMAL_PRECISION = 5
   CURRENCIES = %w(USD JPY BGN CZK DKK GBP HUF ILS ISK PLN RON SEK CHF NOK HRK RUB TRY AUD BRL CAD CNY HKD IDR INR KRW MXN MYR NZD PHP SGD THB ZAR).map(&:freeze).freeze
   ECB_RATES_URL = 'https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'.freeze
   ECB_90_DAY_URL = 'https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml'.freeze
@@ -36,7 +36,7 @@ class EuCentralBank < Money::Bank::VariableExchange
   def save_rates(cache, url=ECB_RATES_URL)
     raise InvalidCache unless cache
     File.open(cache, "w") do |file|
-      io = open(url);
+      io = open_url(url);
       io.each_line { |line| file.puts line }
     end
   end
@@ -46,7 +46,7 @@ class EuCentralBank < Money::Bank::VariableExchange
   end
 
   def save_rates_to_s(url=ECB_RATES_URL)
-    open(url).read
+    open_url(url).read
   end
 
   def exchange(cents, from_currency, to_currency, date=nil)
@@ -145,7 +145,8 @@ class EuCentralBank < Money::Bank::VariableExchange
       data.each do |key, rate|
         from, to = key.split(SERIALIZER_SEPARATOR)
         to, date = to.split(SERIALIZER_DATE_SEPARATOR)
-        store.add_rate from, to, rate, date
+
+        store.add_rate from, to, BigDecimal(rate, DECIMAL_PRECISION), date
       end
     end
 
@@ -163,9 +164,9 @@ class EuCentralBank < Money::Bank::VariableExchange
 
   def doc(cache, url=ECB_RATES_URL)
     rates_source = !!cache ? cache : url
-    Nokogiri::XML(open(rates_source)).tap { |doc| doc.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube//xmlns:Cube') }
+    Nokogiri::XML(open_url(rates_source)).tap { |doc| doc.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube//xmlns:Cube') }
   rescue Nokogiri::XML::XPath::SyntaxError
-    Nokogiri::XML(open(url))
+    Nokogiri::XML(open_url(url))
   end
 
   def doc_from_s(content)
@@ -177,7 +178,7 @@ class EuCentralBank < Money::Bank::VariableExchange
 
     store.transaction true do
       rates.each do |exchange_rate|
-        rate = BigDecimal(exchange_rate.attribute("rate").value)
+        rate = BigDecimal(exchange_rate.attribute("rate").value, DECIMAL_PRECISION)
         currency = exchange_rate.attribute("currency").value
         set_rate("EUR", currency, rate)
       end
@@ -195,7 +196,7 @@ class EuCentralBank < Money::Bank::VariableExchange
 
     store.transaction true do
       rates.each do |exchange_rate|
-        rate = BigDecimal(exchange_rate.attribute("rate").value)
+        rate = BigDecimal(exchange_rate.attribute("rate").value, DECIMAL_PRECISION)
         currency = exchange_rate.attribute("currency").value
         date = exchange_rate.parent.attribute("time").value
         set_rate("EUR", currency, rate, date)
@@ -213,8 +214,16 @@ class EuCentralBank < Money::Bank::VariableExchange
   def calculate_exchange(from, to_currency, rate)
     to_currency_money = Money::Currency.wrap(to_currency).subunit_to_unit
     from_currency_money = from.currency.subunit_to_unit
-    decimal_money = BigDecimal(to_currency_money) / BigDecimal(from_currency_money)
+    decimal_money = BigDecimal(to_currency_money, DECIMAL_PRECISION) / BigDecimal(from_currency_money, DECIMAL_PRECISION)
     money = (decimal_money * from.cents * rate).round
     Money.new(money, to_currency)
   end
+
+  def open_url(url)
+    if RUBY_VERSION >= '2.5.0'
+      URI.open(url)
+    else
+      open(url)
+    end
+  end
 end

data/lib/money/rates_store/store_with_historical_data_support.rb

@@ -3,33 +3,16 @@ module Money::RatesStore
     INDEX_DATE_SEPARATOR = '_AT_'.freeze
 
     def add_rate(currency_iso_from, currency_iso_to, rate, date = nil)
-      transaction { index[rate_key_for(currency_iso_from, currency_iso_to, date)] = rate }
+      transaction { rates[rate_key_for(currency_iso_from, currency_iso_to, date)] = rate }
     end
 
     def get_rate(currency_iso_from, currency_iso_to, date = nil)
-      transaction { index[rate_key_for(currency_iso_from, currency_iso_to, date)] }
+      transaction { rates[rate_key_for(currency_iso_from, currency_iso_to, date)] }
     end
 
     # Wraps block execution in a thread-safe transaction
-    def transaction(force_sync = false, &block)
-      # Ruby 1.9.3 does not support @mutex.owned?
-      if @mutex.respond_to?(:owned?)
-        force_sync = false if @mutex.locked? && @mutex.owned?
-      else
-        # If we allowed this in Ruby 1.9.3, it might possibly cause recursive
-        # locking within the same thread.
-        force_sync = false
-      end
-      if !force_sync && (@in_transaction || options[:without_mutex])
-        block.call self
-      else
-        @mutex.synchronize do
-          @in_transaction = true
-          result = block.call
-          @in_transaction = false
-          result
-        end
-      end
+    def transaction(_force_sync = false, &block)
+      super(&block)
     end
 
     # Iterate over rate tuples (iso_from, iso_to, rate)
@@ -47,7 +30,7 @@ module Money::RatesStore
     #   end
     def each_rate(&block)
       enum = Enumerator.new do |yielder|
-        index.each do |key, rate|
+        rates.each do |key, rate|
           iso_from, iso_to = key.split(Memory::INDEX_KEY_SEPARATOR)
           iso_to, date = iso_to.split(INDEX_DATE_SEPARATOR)
           date = Date.parse(date) if date
@@ -60,10 +43,10 @@ module Money::RatesStore
 
     private
 
-      def rate_key_for(currency_iso_from, currency_iso_to, date = nil)
-        key = [currency_iso_from, currency_iso_to].join(Memory::INDEX_KEY_SEPARATOR)
-        key = [key, date.to_s].join(INDEX_DATE_SEPARATOR) if date
-        key.upcase
-      end
+    def rate_key_for(currency_iso_from, currency_iso_to, date = nil)
+      key = [currency_iso_from, currency_iso_to].join(Memory::INDEX_KEY_SEPARATOR)
+      key = [key, date.to_s].join(INDEX_DATE_SEPARATOR) if date
+      key.upcase
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eu_central_bank
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Shane Emmons
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.0
+        version: '6.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.13.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.0
+        version: '6.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.13.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,9 +72,10 @@ files:
 - lib/eu_central_bank.rb
 - lib/money/rates_store/store_with_historical_data_support.rb
 homepage: https://github.com/RubyMoney/eu_central_bank
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Calculates exchange rates based on rates from european central bank. Money
   gem compatible.