money-open-exchange-rates 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0a9252d989a1593a4dc9af24c8789f17eb9ec15cc2e0bfa09b2d44c719e8b1
-  data.tar.gz: d45842e216378fb1dd04d477b1c203482f955d9607397eb570c0612606211ce8
+  metadata.gz: 3da9d4f9bab38eaccb4fb18b6c9349006fdaadc4d90ffe4cd241223040f5a3df
+  data.tar.gz: 34c5b0d94aba549eb659f1d7db6f232a17aa73409f554f7126a63a8057ec7628
 SHA512:
-  metadata.gz: c69afba4a53c236836ea72c27e4e095c48cc09fb95584e14f9912e6e7c0de43fedf03204e1a62a56558d054b83bc32b18ddc1cbbff8a2672917765e9774d136a
-  data.tar.gz: 97fc884e5e97ab688d7d6480a88540e5a308c1d838b85ad0c19c63c41b6f73230f92b000ed09daa618727a4bd2a22e714b1006966339545013d956da749e6b50
+  metadata.gz: 513b47e7cb4d9c05b80e2614956aa733ab07ec9d50f3dde8c008fdf1c522d8c17d0184fcb2f9e0f6d5c3aa03edfb193e9a4454974f7c6d0299eec2cf6baca4c2
+  data.tar.gz: a10d04d150d208e1e8b5fa43a7a656622f675b7284c53ce28c21192196bdaed17eef59dda1530fe83c8255e1412008ccf3cde55c00e8491c80b79144e39437a7

data/History.md

@@ -1,4 +1,10 @@
 
+v1.1.0 / 2018-03-28
+===================
+
+  * Force refresh when ttl is expire and cache invalid (issue #47)
+  * Less strict dependency version for money/monetize
+
 v1.0.2 / 2018-03-27
 ===================
 

data/README.md

@@ -43,6 +43,7 @@ gem install money-open-exchange-rates
 ~~~ ruby
 require 'money/bank/open_exchange_rates_bank'
 oxr = Money::Bank::OpenExchangeRatesBank.new
+# see https://github.com/spk/money-open-exchange-rates#cache for more info
 oxr.cache = 'path/to/file/cache.json'
 oxr.app_id = 'your app id from https://openexchangerates.org/signup'
 oxr.update_rates
@@ -65,7 +66,7 @@ oxr.source = 'USD'
 # rates. By default, false is used
 # see: https://docs.openexchangerates.org/docs/alternative-currencies
 oxr.show_alternative = true
-
+# (optional)
 # Store in cache
 # Force rates storage in cache, this is done automaticly after TTL is expire.
 # If you are using unicorn-worker-killer gem or on Heroku like platform,
@@ -78,6 +79,8 @@ Money.default_bank = oxr
 Money.default_bank.get_rate('USD', 'CAD')
 ~~~
 
+## Cache
+
 You can also provide a `Proc` as a cache to provide your own caching mechanism
 perhaps with Redis or just a thread safe `Hash` (global). For example:
 
@@ -96,33 +99,27 @@ With `Rails` cache example:
 
 ~~~ ruby
 OXR_CACHE_KEY = 'money:exchange_rates'.freeze
-OXR_CACHE_TTL = 86400
-# using same ttl with refreshing current rates and cache
-oxr.ttl_in_seconds = OXR_CACHE_TTL
+oxr.ttl_in_seconds = 86400
 oxr.cache = Proc.new do |text|
-  if text && !Rails.cache.exist?(OXR_CACHE_KEY)
-    Rails.cache.write(OXR_CACHE_KEY, text, expires_in: OXR_CACHE_TTL)
+  if text
+    Rails.cache.write(OXR_CACHE_KEY, text)
   else
     Rails.cache.read(OXR_CACHE_KEY)
   end
 end
 ~~~
 
-Unknown pair rates are transparently calculated: using inverse rate (if known),
-or using base currency rate to both currencies forming the pair.
-
 ## Full example configuration initializer with Rails and cache
 
 ~~~ ruby
 require 'money/bank/open_exchange_rates_bank'
 
 OXR_CACHE_KEY = 'money:exchange_rates'.freeze
-OXR_CACHE_TTL = 86400
 oxr = Money::Bank::OpenExchangeRatesBank.new
-oxr.ttl_in_seconds = OXR_CACHE_TTL
+oxr.ttl_in_seconds = 86400
 oxr.cache = Proc.new do |text|
-  if text && !Rails.cache.exist?(OXR_CACHE_KEY)
-    Rails.cache.write(OXR_CACHE_KEY, text, expires_in: OXR_CACHE_TTL)
+  if text
+    Rails.cache.write(OXR_CACHE_KEY, text)
   else
     Rails.cache.read(OXR_CACHE_KEY)
   end
@@ -133,6 +130,11 @@ oxr.update_rates
 Money.default_bank = oxr
 ~~~
 
+## Pair rates
+
+Unknown pair rates are transparently calculated: using inverse rate (if known),
+or using base currency rate to both currencies forming the pair.
+
 ## Tests
 
 ~~~

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -177,6 +177,7 @@ class Money
       def expire_rates
         return unless ttl_in_seconds
         return if rates_expiration > Time.now
+        read_from_url
         update_rates
         refresh_rates_expiration
       end
@@ -251,11 +252,12 @@ class Money
       #
       # @return [String] Raw string from file or cache proc
       def read_from_cache
-        if cache.is_a?(Proc)
-          cache.call(nil)
-        elsif cache.is_a?(String) && File.exist?(cache)
-          open(cache).read
-        end
+        result = if cache.is_a?(Proc)
+                   cache.call(nil)
+                 elsif cache.is_a?(String) && File.exist?(cache)
+                   open(cache).read
+                 end
+        result if valid_rates?(result)
       end
 
       # Read from url
@@ -276,6 +278,7 @@ class Money
       # @param [String] text is JSON content
       # @return [Boolean] valid or not
       def valid_rates?(text)
+        return false unless text
         parsed = JSON.parse(text)
         parsed && parsed.key?('rates')
       rescue JSON::ParserError

data/lib/open_exchange_rates_bank/version.rb

@@ -2,5 +2,5 @@
 
 # Module for version constant
 module OpenExchangeRatesBank
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/test/open_exchange_rates_bank_test.rb

@@ -306,6 +306,15 @@ describe Money::Bank::OpenExchangeRatesBank do
         end
       end
 
+      it 'should save rates and refresh it when cache is invalid' do
+        subject.get_rate('USD', 'EUR').must_equal @old_usd_eur_rate
+        Timecop.freeze(Time.now + 1001) do
+          @global_rates = []
+          subject.get_rate('USD', 'EUR').must_equal @new_usd_eur_rate
+          @global_rates.wont_be_empty
+        end
+      end
+
       it 'updates the next expiration time' do
         Timecop.freeze(Time.now + 1001) do
           exp_time = Time.now + 1000
@@ -318,8 +327,8 @@ describe Money::Bank::OpenExchangeRatesBank do
     describe 'when the ttl has not expired' do
       it 'not should update the rates' do
         exp_time = subject.rates_expiration
+        dont_allow(subject).read_from_url
         dont_allow(subject).update_rates
-        dont_allow(subject).save_rates
         dont_allow(subject).refresh_rates_expiration
         subject.expire_rates
         subject.rates_expiration.must_equal exp_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '6.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement