eu_central_bank 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739f04adc1c5623cc7b81bc647aedfda0bdd3d32
-  data.tar.gz: e1856709ab6f5705100d21dda36e52a4a8f3e29d
+  metadata.gz: 4dbcc0a2aa33d3b41142677ca45615eeb9345633
+  data.tar.gz: cc9c0d602fcdbb84f904964cd3c6a5cd5d5bd0b4
 SHA512:
-  metadata.gz: 367913b58f6e98eddd33adfd0b96887b2cbf794911b13c67289edfd2ccf3ce3f4de18f2716cc05fcb14d828cde3f64314097112c1d57d2c89312c8129a2d2eab
-  data.tar.gz: 7c80e5bc1125fe13c2ca57146a780e73c6610df90430973307503bc44e852193a5b44a5655f1850dd30a396b91976ed2ada68753e66bfe0aeb696b2a4d261b25
+  metadata.gz: 096495025aa42d1e675990694465f4980a00e81622efa05d93ffc6d8b24fb24beb8b9f2db9a6aaed295bc4f9a741b5842d1761a72eb41dc1ab95275670c1bc0a
+  data.tar.gz: 2d484be4e3aa08ac418a0d2f7d0c7f3a51fa126a8269c49057df19906a237437ed2aea27641c8cb9fc2e28180eae597d732c50a1353f6b28eb98c70848b83bc3

data/CHANGELOG.md

@@ -1,10 +1,13 @@
 # eu_central_bank changelog
 
-## 1.0.0
+## 1.0.1 (May 20 2016)
+
+* Fixed compatibility with recent Money gem
+
+## 1.0.0 (Jan 15 2016)
 
 * Update to Money 6.7.0
 * Not Support for LTL
-* Update money version
 * Fix a couple of Ruby warnings found in specs
 
 ## 0.3.8 (Feb 12 2014)

data/lib/eu_central_bank.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'nokogiri'
 require 'money'
+require 'money/rates_store/eu_central_bank_historical_data_support'
 
 class InvalidCache < StandardError ; end
 
@@ -11,10 +12,17 @@ class EuCentralBank < Money::Bank::VariableExchange
   attr_accessor :historical_last_updated
   attr_accessor :historical_rates_updated_at
 
+  SERIALIZER_DATE_SEPARATOR = '_AT_'
+
   CURRENCIES = %w(USD JPY BGN CZK DKK GBP HUF ILS 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 = 'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'.freeze
   ECB_90_DAY_URL = 'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml'.freeze
 
+  def initialize(*)
+    super
+    @store.extend Money::RatesStore::EuCentralBankHistoricalDataSupport
+  end
+
   def update_rates(cache=nil)
     update_parsed_rates(doc(cache))
   end
@@ -45,13 +53,12 @@ class EuCentralBank < Money::Bank::VariableExchange
 
   def exchange_with(from, to_currency, date=nil)
     from_base_rate, to_base_rate = nil, nil
-    rate = get_rate(from, to_currency, {:date => date})
+    rate = get_rate(from.currency, to_currency, date)
 
     unless rate
-      @mutex.synchronize do
-        opts = { :date => date, :without_mutex => true }
-        from_base_rate = get_rate("EUR", from.currency.to_s, opts)
-        to_base_rate = get_rate("EUR", to_currency, opts)
+      store.transaction true do
+        from_base_rate = get_rate("EUR", from.currency.to_s, date)
+        to_base_rate = get_rate("EUR", to_currency, date)
       end
       rate = to_base_rate / from_base_rate
     end
@@ -59,26 +66,76 @@ class EuCentralBank < Money::Bank::VariableExchange
     calculate_exchange(from, to_currency, rate)
   end
 
-  def get_rate(from, to, opts = {})
-    fn = -> { @rates[rate_key_for(from, to, opts)] }
+  def get_rate(from, to, date = nil)
+    if date.is_a?(Hash)
+      # Backwards compatibility for the opts hash
+      date = date[:date]
+    end
+    store.get_rate(::Money::Currency.wrap(from).iso_code, ::Money::Currency.wrap(to).iso_code, date)
+  end
 
-    if opts[:without_mutex]
-      fn.call
-    else
-      @mutex.synchronize { fn.call }
+  def set_rate(from, to, rate, date = nil)
+    if date.is_a?(Hash)
+      # Backwards compatibility for the opts hash
+      date = date[:date]
     end
+    store.add_rate(::Money::Currency.wrap(from).iso_code, ::Money::Currency.wrap(to).iso_code, rate, date)
   end
 
-  def set_rate(from, to, rate, opts = {})
-    fn = -> { @rates[rate_key_for(from, to, opts)] = rate }
+  def rates
+    store.each_rate.each_with_object({}) do |(from,to,rate,date),hash|
+      key = [from, to].join(SERIALIZER_SEPARATOR)
+      key = [key, date.to_s].join(SERIALIZER_DATE_SEPARATOR) if date
+      hash[key] = rate
+    end
+  end
+
+  def export_rates(format, file = nil, opts = {})
+    raise Money::Bank::UnknownRateFormat unless
+      RATE_FORMATS.include? format
+
+    store.transaction true do
+      s = case format
+      when :json
+        JSON.dump(rates)
+      when :ruby
+        Marshal.dump(rates)
+      when :yaml
+        YAML.dump(rates)
+      end
+
+      unless file.nil?
+        File.open(file, "w") {|f| f.write(s) }
+      end
 
-    if opts[:without_mutex]
-      fn.call
-    else
-      @mutex.synchronize { fn.call }
+      s
     end
   end
 
+  def import_rates(format, s, opts = {})
+    raise Money::Bank::UnknownRateFormat unless
+      RATE_FORMATS.include? format
+
+    store.transaction true do
+      data = case format
+       when :json
+         JSON.load(s)
+       when :ruby
+         Marshal.load(s)
+       when :yaml
+         YAML.load(s)
+       end
+
+      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
+      end
+    end
+
+    self
+  end
+
   protected
 
   def doc(cache, url=ECB_RATES_URL)
@@ -95,13 +152,13 @@ class EuCentralBank < Money::Bank::VariableExchange
   def update_parsed_rates(doc)
     rates = doc.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube//xmlns:Cube')
 
-    @mutex.synchronize do
+    store.transaction true do
       rates.each do |exchange_rate|
         rate = BigDecimal(exchange_rate.attribute("rate").value)
         currency = exchange_rate.attribute("currency").value
-        set_rate("EUR", currency, rate, :without_mutex => true)
+        set_rate("EUR", currency, rate)
       end
-      set_rate("EUR", "EUR", 1, :without_mutex => true)
+      set_rate("EUR", "EUR", 1)
     end
 
     rates_updated_at = doc.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube/@time').first.value
@@ -113,14 +170,12 @@ class EuCentralBank < Money::Bank::VariableExchange
   def update_parsed_historical_rates(doc)
     rates = doc.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube//xmlns:Cube')
 
-    @mutex.synchronize do
+    store.transaction true do
       rates.each do |exchange_rate|
         rate = BigDecimal(exchange_rate.attribute("rate").value)
         currency = exchange_rate.attribute("currency").value
-        opts = { :without_mutex => true }
-        opts[:date] = exchange_rate.parent.attribute("time").value
-        set_rate("EUR", currency, rate, opts)
-        set_rate("EUR", "EUR", 1, opts)
+        date = exchange_rate.parent.attribute("time").value
+        set_rate("EUR", currency, rate, date)
       end
     end
 
@@ -139,10 +194,4 @@ class EuCentralBank < Money::Bank::VariableExchange
     money = (decimal_money * from.cents * rate).round
     Money.new(money, to_currency)
   end
-
-  def rate_key_for(from, to, opts)
-    key = "#{from}_TO_#{to}"
-    key << "_#{opts[:date].to_s}" if opts[:date]
-    key.upcase
-  end
 end

data/lib/money/rates_store/eu_central_bank_historical_data_support.rb

@@ -0,0 +1,70 @@
+module Money::RatesStore
+  module EuCentralBankHistoricalDataSupport
+    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 }
+    end
+
+    def get_rate(currency_iso_from, currency_iso_to, date = nil)
+      transaction { index[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
+  end
+
+    # Iterate over rate tuples (iso_from, iso_to, rate)
+    #
+    # @yieldparam iso_from [String] Currency ISO string.
+    # @yieldparam iso_to [String] Currency ISO string.
+    # @yieldparam rate [Numeric] Exchange rate.
+    # @yieldparam date [Date] Historical date for the exchange rate. Nil if the rate is not historical rate.
+    #
+    # @return [Enumerator]
+    #
+    # @example
+    #   store.each_rate do |iso_from, iso_to, rate, date|
+    #     puts [iso_from, iso_to, rate, date].join
+    #   end
+    def each_rate(&block)
+      enum = Enumerator.new do |yielder|
+        index.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
+          yielder.yield iso_from, iso_to, rate, date
+        end
+      end
+
+      block_given? ? enum.each(&block) : enum
+    end
+
+    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
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eu_central_bank
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 description: This gem reads exchange rates from the european central bank website.
   It uses it to calculates exchange rates. It is compatible with the money gem
 email:
@@ -64,6 +64,7 @@ files:
 - LICENSE
 - README.md
 - lib/eu_central_bank.rb
+- lib/money/rates_store/eu_central_bank_historical_data_support.rb
 homepage: https://github.com/RubyMoney/eu_central_bank
 licenses: []
 metadata: {}
@@ -83,10 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Calculates exchange rates based on rates from european central bank. Money
   gem compatible.
 test_files: []
-has_rdoc: