currency-rate 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb6b70c3806073d72b5199d009f115eba98e776
-  data.tar.gz: bcee4a20aa44098a8591477dc5c3dc73759a2b8a
+  metadata.gz: 6a7717da50f7013b0f430545b761e05f6fa88ea8
+  data.tar.gz: f0e499bed1863467e640448da5f23eb9219bc53d
 SHA512:
-  metadata.gz: bc27091d644a2125ae608b4e468bd3b8452862bc745ddc6cc38b1a2abaad5da458a29fd4d2f63a4e94da757d7a469158a0c804efef5f1bbd7ebd5f292b89c531
-  data.tar.gz: 78e9164106299808e4d5488b6d7d5d0127e23ddd4bddd772c19e2b10b1303582b6af31f3375648bd6114f531690bdb2966cf6437006112568f700d845afa539e
+  metadata.gz: 8cedcc1c71864a83e88ce7ae444b139d469f628897ab411ae4c64b517e57c9af81a35531313beb8b712994d3a8f01a4ff28d9ef26c319264a6f53ac4093bd384
+  data.tar.gz: f8be39baeccb40a9a6ebe0e1de6bfb0403499b1978c201e9bbd87bc98590f5ae1719d09ddd16a3bfea31201920ad73b50f34e032d0a584f51e0d0f99f0dc61cf

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/currency-rate.gemspec

@@ -6,12 +6,12 @@
 
 Gem::Specification.new do |s|
   s.name = "currency-rate"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2017-02-06"
+  s.date = "2017-03-29"
   s.description = "Fetches exchange rates from various sources and does the conversion"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [

data/lib/adapter.rb

@@ -6,9 +6,10 @@ module CurrencyRate
     class CurrencyNotSupported < Exception; end
 
     attr_accessor :try_storage_on_fetching_failed
+    attr_reader   :storage
 
     def initialize
-      @storage = Storage.new
+      @storage = Storage.new(adapter_name: self.class.to_s)
     end
 
     def fetch_rates!
@@ -34,16 +35,18 @@ module CurrencyRate
     def rate_for(from,to)
 
       begin
-        @storage.fetch(self.class.to_s) { self.fetch_rates! }
+        @rates = self.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]
+          @rates = self.storage.data[self.class.to_s][:content]
         else
           raise e
         end
       end
 
-      raise CurrencyNotSupported unless supports_currency_pair?(from,to)
+      unless supports_currency_pair?(from,to)
+        raise CurrencyNotSupported, "Unsupported currencies (one or both) are: #{from} -> #{to}"
+      end
 
       # This method is further reloaded in Adapter classes, that's why
       # here it doesn't really return anything useful!

data/lib/storage.rb

@@ -3,9 +3,10 @@ module CurrencyRate
 
     attr_reader :data
 
-    def initialize(timeout: 1800)
-      @timeout = timeout
-      @data    = {}
+    def initialize(adapter_name: nil, timeout: 1800)
+      @timeout      = timeout
+      @data         = {}
+      @adapter_name = adapter_name
     end
 
     def fetch(key)

data/spec/currency_rate_spec.rb

@@ -2,35 +2,51 @@ require 'spec_helper'
 
 describe CurrencyRate do
 
-  before :each do
-    allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('BTC', 'USD').and_return(550)
-    allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('USD', 'BTC').and_return(1.to_f/550.to_f)
-    allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('BTC', 'RUB').and_return(33100)
-    allow(CurrencyRate::YahooAdapter.instance).to receive('rate_for').with('USD', 'RUB').and_return(60)
-    allow(CurrencyRate::YahooAdapter.instance).to receive('rate_for').with('RUB', 'USD').and_return(1.to_f/60.to_f)
-  end
+  describe "stubbed requests" do
 
-  it "fetches currency rate from a specified exchange" do
-    expect(CurrencyRate.get('Bitstamp', 'BTC', 'USD')).to eq(550)
-    expect(CurrencyRate.get('Bitstamp', 'USD', 'BTC')).to eq(1.to_f/550.to_f)
-    expect(CurrencyRate.get('Bitstamp', 'USD', 'RUB').round(2)).to eq(60.18)
-  end
-  
-  it "converts one currency into another" do
-    expect(CurrencyRate.convert('Bitstamp', amount: 5, from: 'BTC', to: 'USD')).to eq(2750)
-    expect(CurrencyRate.convert('Bitstamp', amount: 2750, from: 'USD', to: 'BTC')).to eq(5)
-    expect(CurrencyRate.convert('Yahoo', amount: 300, from: 'USD', to: 'RUB')).to eq(18000)
-    expect(CurrencyRate.convert('Yahoo', amount: 19500, from: 'RUB', to: 'USD')).to eq(325)
-  end
+    before :each do
+      allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('BTC', 'USD').and_return(550)
+      allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('USD', 'BTC').and_return(1.to_f/550.to_f)
+      allow(CurrencyRate::BitstampAdapter.instance).to receive('rate_for').with('BTC', 'RUB').and_return(33100)
+      allow(CurrencyRate::YahooAdapter.instance).to receive('rate_for').with('USD', 'RUB').and_return(60)
+      allow(CurrencyRate::YahooAdapter.instance).to receive('rate_for').with('RUB', 'USD').and_return(1.to_f/60.to_f)
+    end
+
+    it "fetches currency rate from a specified exchange" do
+      expect(CurrencyRate.get('Bitstamp', 'BTC', 'USD')).to eq(550)
+      expect(CurrencyRate.get('Bitstamp', 'USD', 'BTC')).to eq(1.to_f/550.to_f)
+      expect(CurrencyRate.get('Bitstamp', 'USD', 'RUB').round(2)).to eq(60.18)
+    end
+    
+    it "converts one currency into another" do
+      expect(CurrencyRate.convert('Bitstamp', amount: 5, from: 'BTC', to: 'USD')).to eq(2750)
+      expect(CurrencyRate.convert('Bitstamp', amount: 2750, from: 'USD', to: 'BTC')).to eq(5)
+      expect(CurrencyRate.convert('Yahoo', amount: 300, from: 'USD', to: 'RUB')).to eq(18000)
+      expect(CurrencyRate.convert('Yahoo', amount: 19500, from: 'RUB', to: 'USD')).to eq(325)
+    end
+
+    it "converts non-anchor currencies" do
+      expect(CurrencyRate.convert('Bitstamp', amount: 1000, from: 'USD', to: 'RUB')).to eq(60181.82)
+      expect(CurrencyRate.convert('Bitstamp', amount: 60181.81, from: 'RUB', to: 'USD')).to eq(1000)
+    end
+    
+    it "gets default currencies for an adapter" do
+      expect(CurrencyRate.default_currencies_for("Bitstamp")).to eq(["USD", "BTC"])
+    end
 
-  it "converts non-anchor currencies" do
-    expect(CurrencyRate.convert('Bitstamp', amount: 1000, from: 'USD', to: 'RUB')).to eq(60181.82)
-    expect(CurrencyRate.convert('Bitstamp', amount: 60181.81, from: 'RUB', to: 'USD')).to eq(1000)
   end
-  
-  it "gets default currencies for an adapter" do
-    expect(CurrencyRate.default_currencies_for("Bitstamp")).to eq(["USD", "BTC"])
+
+  it "uses storage to fetch data when adapter raises FetchingFailed" do
+
+    rates = { "btc_usd" => { "high" => "1177.99", "last" => "1166.89" }}
+    original_storage = CurrencyRate::BitstampAdapter.instance.storage
+    storage_mock = double("storage")
+    allow(storage_mock).to receive(:data).and_return({"CurrencyRate::BitstampAdapter" => { content: rates }})
+    allow(storage_mock).to receive(:fetch).and_raise(CurrencyRate::Adapter::FetchingFailed)
+    CurrencyRate::BitstampAdapter.instance.instance_variable_set(:@storage, storage_mock)
+    expect(CurrencyRate.get('Bitstamp', 'BTC', 'USD', try_storage_on_fetching_failed: true)).to eq(1166.89)
+
+    Singleton.__init__(CurrencyRate::BitstampAdapter) # to avoid mock leaking
   end
   
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: currency-rate
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: satoshi-unit