money-currencylayer-bank 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2954dfb52185c910cfed6a3f3b1def920c80c847
-  data.tar.gz: 408ba3963b1c258ce322e69237c951f34988ba1e
+  metadata.gz: cc97450bce8ac6e02fc906a21ca0c10860428557
+  data.tar.gz: 371c75e3794e3a7c2be6babd222845eda7cb1ac6
 SHA512:
-  metadata.gz: f1696528b4ac735817a8fc476b1b5a3e87512ce4e167baf36601a794ef6de6a521c0496a05f943e0ca9f643ab2f3a1361f4e5a663d32a4a684df27f1894a62fa
-  data.tar.gz: a58368adeb7bbc501e5ef1e13f55e9deff90084b7b45f9021c1f49b9bb4241b4acfee44303e28f7002efdfc56c230547b98b149c59b3c4bcf34633a597c2e0cc
+  metadata.gz: f69464174caabd8f18da9077f579d252f77b5b751bf4032117fbc575efd04a4740f84cf1be1fdb39e1f42791dc1540d5911b168324938108a339facef6bcdce0
+  data.tar.gz: e81c35792af291b86f106ed2c2f1efacc78ffcf035ffa01f70d4e030bb9de77de6f41983ccd0052dc61bf105cf4fde668256c1b5b87566bea6cb7e0017ec122e

data/Gemfile

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
 group :test, :development do
   platforms :ruby_19, :jruby_19 do
-    gem 'tins', '~> 1.6.0'
+    gem 'tins', '~> 1.6'
   end
 end

data/lib/money/bank/currencylayer_bank.rb

@@ -1,10 +1,26 @@
 # encoding: UTF-8
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'money'
 require 'json'
 
 # Money gem class
 class Money
+  # Build in memory rates store
+  module RatesStore
+    # Memory class
+    class Memory
+      # Add method to reset the build in memory store
+      # @param [Hash] rt Optional initial exchange rate data.
+      #
+      # @return [Object] store.
+      def reset!(rt = {})
+        transaction { @index = rt }
+      end
+    end
+  end
+
   # https://github.com/RubyMoney/money#exchange-rate-stores
   module Bank
     # Invalid cache, file not found or cache empty
@@ -14,14 +30,13 @@ class Money
     class NoAccessKey < StandardError; end
 
     # CurrencylayerBank base class
-    # rubocop:disable Metrics/ClassLength
     class CurrencylayerBank < Money::Bank::VariableExchange
       # CurrencylayerBank url
-      CL_URL = 'http://apilayer.net/api/live'.freeze
+      CL_URL = 'http://apilayer.net/api/live'
       # CurrencylayerBank secure url
-      CL_SECURE_URL = CL_URL.gsub('http:', 'https:').freeze
+      CL_SECURE_URL = CL_URL.gsub('http:', 'https:')
       # Default base currency
-      CL_SOURCE = 'USD'.freeze
+      CL_SOURCE = 'USD'
 
       # Use https to fetch rates from CurrencylayerBank
       # CurrencylayerBank only allows http as connection
@@ -49,6 +64,10 @@ class Money
       # Parsed CurrencylayerBank result as Hash
       attr_reader :rates
 
+      # Get the timestamp of rates in memory
+      # @return [Time] time object or nil
+      attr_reader :rates_mem_timestamp
+
       # Set the seconds after than the current rates are automatically expired
       # by default, they never expire.
       #
@@ -90,6 +109,7 @@ class Money
       # Update all rates from CurrencylayerBank JSON
       # @return [Array] array of exchange rates
       def update_rates(straight = false)
+        store.reset!
         exchange_rates(straight).each do |exchange_rate|
           currency = exchange_rate.first[3..-1]
           rate = exchange_rate.last
@@ -97,11 +117,23 @@ class Money
           add_rate(source, currency, rate)
           add_rate(currency, source, 1.0 / rate)
         end
+        @rates_mem_timestamp = rates_timestamp
+      end
+
+      # Override Money `add_rate` method for caching
+      # @param [String] from_currency Currency ISO code. ex. 'USD'
+      # @param [String] to_currency Currency ISO code. ex. 'CAD'
+      # @param [Numeric] rate Rate to use when exchanging currencies.
+      #
+      # @return [Numeric] rate.
+      def add_rate(from_currency, to_currency, rate)
+        super
       end
 
       # Override Money `get_rate` method for caching
       # @param [String] from_currency Currency ISO code. ex. 'USD'
       # @param [String] to_currency Currency ISO code. ex. 'CAD'
+      # @param [Hash] opts Options hash to set special parameters.
       #
       # @return [Numeric] rate.
       def get_rate(from_currency, to_currency, opts = {}) # rubocop:disable all
@@ -135,12 +167,15 @@ class Money
         rate
       end
 
-      # Fetch new rates if cached rates are expired
+      # Fetch new rates if cached rates are expired or stale
       # @return [Boolean] true if rates are expired and updated from remote
       def expire_rates!
         if expired?
           update_rates(true)
           true
+        elsif stale?
+          update_rates
+          true
         else
           false
         end
@@ -152,6 +187,14 @@ class Money
         Time.now > rates_expiration
       end
 
+      # Check if rates are stale
+      # Stale is true if rates are updated straight by another thread.
+      # The actual thread has always old rates in memory store.
+      # @return [Boolean] true if rates are stale
+      def stale?
+        rates_timestamp != rates_mem_timestamp
+      end
+
       # Source url of CurrencylayerBank
       # defined with access_key and secure_connection
       # @return [String] the remote API url

data/test/currencylayer_bank_test.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+# frozen_string_literal: true
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 describe Money::Bank::CurrencylayerBank do
@@ -208,9 +210,12 @@ describe Money::Bank::CurrencylayerBank do
         delimiter: ','
       }
       Money::Currency.register(wtf)
-      subject.add_rate('USD', 'WTF', 2)
-      subject.add_rate('WTF', 'USD', 2)
-      subject.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
+      Timecop.freeze(subject.rates_timestamp) do
+        subject.add_rate('USD', 'WTF', 2)
+        subject.add_rate('WTF', 'USD', 2)
+        subject.exchange_with(5000.to_money('WTF'), 'USD').cents
+        subject.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
+      end
     end
   end
 
@@ -232,9 +237,10 @@ describe Money::Bank::CurrencylayerBank do
       @old_usd_eur_rate = 0.655
       # see test/live.json +54
       @new_usd_eur_rate = 0.886584
-      subject.add_rate('USD', 'EUR', @old_usd_eur_rate)
       subject.cache = temp_cache_path
       stub(subject).source_url { data_path }
+      subject.update_rates
+      subject.add_rate('USD', 'EUR', @old_usd_eur_rate)
     end
 
     after do

data/test/test_helper.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+# frozen_string_literal: true
+
 require 'minitest/autorun'
 require 'rr'
 require 'money/bank/currencylayer_bank'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-currencylayer-bank
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Egon Zemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -42,14 +42,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A gem that calculates the exchange rate using published rates from currencylayer.com.