currency-rate 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056017ba095ed7c0a12d48dd98ece18793bdaba4
-  data.tar.gz: 9c633f17e7a7ce37e3405597b56a42fd99146e51
+  metadata.gz: 5cb6b70c3806073d72b5199d009f115eba98e776
+  data.tar.gz: bcee4a20aa44098a8591477dc5c3dc73759a2b8a
 SHA512:
-  metadata.gz: 927a4f023ac052b62501b55c0caa3bbdbaa279b892f322af6eb8ffdbba0b905e60364769c26cbcffafce77692478787516bd37365f68fcb89b4ccf07141c6a11
-  data.tar.gz: 1d110cdffb8e532db7bb55eabdc4dba9c156531a34e0e1a17c1c183900375dad60679dbfbfa222d5f9d06f12c552dd01457ec53ee6f972a999cec8a1d9e319b1
+  metadata.gz: bc27091d644a2125ae608b4e468bd3b8452862bc745ddc6cc38b1a2abaad5da458a29fd4d2f63a4e94da757d7a469158a0c804efef5f1bbd7ebd5f292b89c531
+  data.tar.gz: 78e9164106299808e4d5488b6d7d5d0127e23ddd4bddd772c19e2b10b1303582b6af31f3375648bd6114f531690bdb2966cf6437006112568f700d845afa539e

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/currency-rate.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "currency-rate"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/adapter.rb

@@ -5,6 +5,8 @@ module CurrencyRate
     class FetchingFailed       < Exception; end
     class CurrencyNotSupported < Exception; end
 
+    attr_accessor :try_storage_on_fetching_failed
+
     def initialize
       @storage = Storage.new
     end
@@ -23,6 +25,7 @@ module CurrencyRate
           @rates = JSON.parse(uri.read(read_timeout: 4))
         end
         @rates_updated_at = Time.now
+        @rates
       rescue Exception => e
         raise FetchingFailed
       end
@@ -30,12 +33,21 @@ module CurrencyRate
 
     def rate_for(from,to)
 
-      @storage.fetch(self.class.to_s) do
-        self.fetch_rates!
+      begin
+        @storage.fetch(self.class.to_s) { self.fetch_rates! }
+      rescue FetchingFailed => e
+        if @try_storage_on_fetching_failed
+          @rates = @storage.data[self.class.to_s][:content]
+        else
+          raise e
+        end
       end
 
       raise CurrencyNotSupported unless supports_currency_pair?(from,to)
 
+      # This method is further reloaded in Adapter classes, that's why
+      # here it doesn't really return anything useful!
+
     end
 
     def supports_currency_pair?(c1,c2)

data/lib/currency_rate.rb

@@ -12,9 +12,10 @@ Dir["#{File.expand_path File.dirname(__FILE__)}/**/*.rb"].each { |f| require f }
 
 module CurrencyRate
 
-  def self.get(adapter_name, from, to, anchor_currency: nil)
+  def self.get(adapter_name, from, to, anchor_currency: nil, try_storage_on_fetching_failed: false)
 
     a = adapter_class(adapter_name)
+    a.try_storage_on_fetching_failed = try_storage_on_fetching_failed
 
     # Setting default values for anchor currency depending on
     # which adapter type is un use.
@@ -35,8 +36,8 @@ module CurrencyRate
     end
   end
 
-  def self.convert(adapter_name, amount:, from:, to:, anchor_currency: nil)
-    result = BigDecimal.new(amount.to_s)*BigDecimal.new(get(adapter_name, from, to, anchor_currency: nil).to_s)
+  def self.convert(adapter_name, amount:, from:, to:, anchor_currency: nil, try_storage_on_fetching_failed: false)
+    result = BigDecimal.new(amount.to_s)*BigDecimal.new(get(adapter_name, from, to, anchor_currency: nil, try_storage_on_fetching_failed: try_storage_on_fetching_failed).to_s)
     to == 'BTC' ? result.round(9) : result.round(2)
   end
 

data/lib/storage.rb

@@ -1,16 +1,18 @@
 module CurrencyRate
   class Storage
 
+    attr_reader :data
+
     def initialize(timeout: 1800)
-      @timeout     = timeout
-      @mem_storage = {}
+      @timeout = timeout
+      @data    = {}
     end
 
-    def fetch(key, force_from_storage: false)
-      if !force_from_storage && (@mem_storage[key].nil? || (@mem_storage[key][:timestamp] < (Time.now.to_i - @timeout)))
-        @mem_storage[key] = { content: yield, timestamp: Time.now.to_i }
+    def fetch(key)
+      if @data[key].nil? || (@data[key][:timestamp] < (Time.now.to_i - @timeout))
+        @data[key] = { content: yield, timestamp: Time.now.to_i }
       end
-      @mem_storage[key][:content]
+      @data[key][:content]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: currency-rate
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Roman Snitko