currency-rate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65d7412d5bdf082fb39bc670010cf88aaf83ace
-  data.tar.gz: 7fc7e9af03abb1747d6f1fc01c6f880d64433a31
+  metadata.gz: 3840cff6b0d67d1daba2cf2a74231d2c8655311e
+  data.tar.gz: 9057b69eeef323940d40e0f127abe91cc902e949
 SHA512:
-  metadata.gz: 1844ba52a93f9cdf1d5c3d6b2ecc7b8516ef8678f32771499fdb3c3c52785b3c5ed2dd3d9b1215e38256308ad19a58bc4e85d05cd87eab7cb9e92ed9c4586ac9
-  data.tar.gz: bc1a32af222d5555c8b7d1fe6cac660df64a512dee62c6ce7fd6d8995b7abd29bea28169edfbbe5dc8a6c17b5b81399143e57100eb73f6d85ac699aaf31ec632
+  metadata.gz: 64b511ad2f1a37c491a0e3d805c0053130dfeceb9e19874a8a3a981b175840098abbb529d9a89881b466ed15bd4364eeecfc9be04b3aefa6b8d05b7851f798d4
+  data.tar.gz: 9b4708166f703fb4ebc34563073dd846e593fe87b2a17716ee5b76f1a0d60800caf1efcd1a75f94f869d381b448ba4123a0fae54de26f351720cbcef933b30bf

data/README.md

@@ -30,6 +30,19 @@ simply pass it as another argument, for example:
 
     CurrencyRate.convert('Bitstamp', amount: 1000, from: 'USD', to: 'EUR', anchor_currency: 'BTC')
 
+You can also use `#get` method to get just the rate. It basically works as `#convert`, but only returns the rate and the method signature (attributes passed) is different - attributes are not named:
+
+    CurrencyRate.get('Bitstamp', 'BTC', 'USD') # => 750
+    CurrencyRate.get('Bitstamp', 'USD', 'BTC') # => 0.001818182
+
+In the second case, we are trying to get the exchange rate for USD/BTC pair, which literally means
+"how much in BTC would 1 USD be?". If the source (Bitstamp, in this case) doesn't provide the
+inverted rate, the Adapter inverts the rate itself using the exchange rate for BTC/USD.
+
+You can also using `anchor_currency` with `#get`:
+
+    CurrencyRate.get('Bitstamp', 'USD', 'EUR', anchor_currency: 'BTC')
+
 For a list of available adapters, please see
 [lib/btc_adapters](https://github.com/snitko/currency-rate/tree/master/lib/btc_adapters)
 and [lib/fiat_adapters](https://github.com/snitko/currency-rate/tree/master/lib/fiat_adapters).

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/currency-rate.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: currency-rate 0.1.1 ruby lib
+# stub: currency-rate 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "currency-rate"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   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 = "2016-06-18"
+  s.date = "2016-06-20"
   s.description = "Fetches exchange rates from various sources and does the conversion"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
@@ -31,10 +31,13 @@ Gem::Specification.new do |s|
     "lib/adapter.rb",
     "lib/btc_adapter.rb",
     "lib/btc_adapters/average_rate_adapter.rb",
+    "lib/btc_adapters/bitfinex_adapter.rb",
     "lib/btc_adapters/bitpay_adapter.rb",
     "lib/btc_adapters/bitstamp_adapter.rb",
+    "lib/btc_adapters/btcchina_adapter.rb",
     "lib/btc_adapters/btce_adapter.rb",
     "lib/btc_adapters/coinbase_adapter.rb",
+    "lib/btc_adapters/huobi_adapter.rb",
     "lib/btc_adapters/kraken_adapter.rb",
     "lib/btc_adapters/localbitcoins_adapter.rb",
     "lib/btc_adapters/okcoin_adapter.rb",
@@ -46,12 +49,28 @@ Gem::Specification.new do |s|
     "lib/fiat_adapters/yahoo_adapter.rb",
     "lib/storage.rb",
     "spec/currency_rate_spec.rb",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/average_rate_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/bitfinex_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/bitpay_adapter_yml.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/bitstamp_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/btcchina_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/btce_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/coinbase_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/huobi_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/kraken_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/localbitcoins_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/okcoin_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/fiat_adapters/fixer_adapter.yml",
+    "spec/fixtures/vcr/exchange_rate_adapters/fiat_adapters/yahoo_adapter.yml",
     "spec/lib/btc_adapter_spec.rb",
     "spec/lib/btc_adapters/average_rate_adapter_spec.rb",
+    "spec/lib/btc_adapters/bitfinex_adapter_spec.rb",
     "spec/lib/btc_adapters/bitpay_adapter_spec.rb",
     "spec/lib/btc_adapters/bitstamp_adapter_spec.rb",
+    "spec/lib/btc_adapters/btcchina_adapter_spec.rb",
     "spec/lib/btc_adapters/btce_adapter_spec.rb",
     "spec/lib/btc_adapters/coinbase_adapter_spec.rb",
+    "spec/lib/btc_adapters/huobi_adapter_spec.rb",
     "spec/lib/btc_adapters/kraken_adapter_spec.rb",
     "spec/lib/btc_adapters/localbitcoins_adapter_spec.rb",
     "spec/lib/btc_adapters/okcoin_adapter_spec.rb",

data/lib/adapter.rb

@@ -2,8 +2,8 @@ module CurrencyRate
   class Adapter
     include Singleton
 
-    class FetchingFailed       < Exception; end
-    class CurrencyNotSupported < Exception; end
+    class FetchingFailed          < Exception; end
+    class CurrencyNotSupported    < Exception; end
 
     def initialize
       @storage = Storage.new
@@ -11,26 +11,34 @@ module CurrencyRate
 
     def fetch_rates!
       raise "FETCH_URL is not defined!" unless self.class::FETCH_URL
-      uri = URI.parse(self.class::FETCH_URL)
       begin
-        @rates            = JSON.parse(uri.read(read_timeout: 4))
+        if self.class::FETCH_URL.kind_of?(Hash)
+          @rates = {}
+          self.class::FETCH_URL.each do |name, url|
+            uri = URI.parse(url)
+            @rates[name] = JSON.parse(uri.read(read_timeout: 4))
+          end
+        else
+          uri = URI.parse(self.class::FETCH_URL)
+          @rates = JSON.parse(uri.read(read_timeout: 4))
+        end
         @rates_updated_at = Time.now
       rescue OpenURI::HTTPError => e
         raise FetchingFailed
       end
     end
 
-    def rate_for(currency_code)
+    def rate_for(from,to)
       @storage.fetch(self.class.to_s) do
         self.fetch_rates!
       end
       nil # this should be changed in descendant classes
     end
 
-    # This method will get value we are interested in from hash and
-    # prevent failing with 'undefined method [] for Nil' if at some point hash doesn't have such key value pair
-    def get_rate_value_from_hash(rates_hash, *keys)
-      rates_hash.deep_get(*keys) || raise(CurrencyNotSupported)
+    # Must be implemented inside every descendant class
+    # because storage format may be completely different
+    def get_rate_value_from_source(rates_hash, *keys)
+      raise "Please implement this method in your Adapter"
     end
 
     # We dont want to have false positive rate, because nil.to_f is 0.0

data/lib/btc_adapter.rb

@@ -2,14 +2,12 @@ module CurrencyRate
 
   class BtcAdapter < Adapter
 
-    def convert_from_currency(amount_in_currency, btc_denomination: :satoshi, currency: 'USD')
-      btc_amount = amount_in_currency.to_f/rate_for(currency)
-      Satoshi.new(btc_amount, from_unit: :btc, to_unit: btc_denomination).to_unit
+    def rate_for(from,to)
+      super
     end
 
-    def convert_to_currency(amount, btc_denomination: :satoshi, currency: 'USD')
-      amount_in_btc = Satoshi.new(amount.to_f, from_unit: btc_denomination).to_btc
-      amount_in_btc*rate_for(currency)
+    def invert_rate(from,to,rate)
+      to == 'BTC' ? 1/rate.to_f : rate
     end
 
   end

data/lib/btc_adapters/average_rate_adapter.rb

@@ -20,11 +20,11 @@ module CurrencyRate
       end
     end
 
-    def rate_for(currency_code)
+    def rate_for(from, to)
       rates = []
       @adapters.each do |adapter|
         begin
-          rates << adapter.rate_for(currency_code)
+          rates << adapter.rate_for(from,to)
         rescue CurrencyNotSupported
           rates << nil
         end
@@ -32,7 +32,8 @@ module CurrencyRate
 
       unless rates.select(&:nil?).size == @adapters.size
         rates.compact!
-        rates.inject {|sum, rate| sum + rate} / rates.size
+        rate = rates.inject {|sum, rate| sum + rate} / rates.size
+        invert_rate(from,to, rate)
       else
         raise CurrencyNotSupported
       end

data/lib/btc_adapters/bitfinex_adapter.rb

@@ -0,0 +1,30 @@
+module CurrencyRate
+  class BitfinexAdapter < BtcAdapter
+
+    FETCH_URL = {
+      'btc_usd' => 'https://api.bitfinex.com/v1/pubticker/btcusd',
+      'ltc_usd' => 'https://api.bitfinex.com/v1/pubticker/ltcusd'
+    }
+
+    def rate_for(from,to)
+      super
+      rate = rate_to_f(currency_pair_rate(to,from))
+      invert_rate(from,to,rate)
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates["#{currency1.downcase}_#{currency2.downcase}"] || @rates["#{currency2.downcase}_#{currency1.downcase}"]
+      raise CurrencyNotSupported unless rate
+      rate['last_price']
+    end
+
+    def invert_rate(from,to,rate)
+      if ['BTC', 'LTC'].include?(to)
+        1/rate.to_f
+      else
+        rate
+      end
+    end
+
+  end
+end

data/lib/btc_adapters/bitpay_adapter.rb

@@ -3,16 +3,23 @@ module CurrencyRate
 
     FETCH_URL = 'https://bitpay.com/api/rates'
 
-    def rate_for(currency_code)
+    def rate_for(from,to)
       super
+      rate = nil
       @rates.each do |rt|
-        if rt['code'] == currency_code
-          rate = get_rate_value_from_hash(rt, 'rate')
+        if rt['code'] == to
+          rate = invert_rate(from,to, currency_pair_rate(to,from,rt))
           return rate_to_f(rate)
         end
       end
       raise CurrencyNotSupported
     end
 
+    def currency_pair_rate(currency1, currency2, rt)
+      rate = rt['rate'] if [currency1, currency2].include?(rt['code'])
+      raise CurrencyNotSupported if !rate || !([currency1, currency2].include?('BTC'))
+      rate
+    end
+
   end
 end

data/lib/btc_adapters/bitstamp_adapter.rb

@@ -1,13 +1,32 @@
 module CurrencyRate
   class BitstampAdapter < BtcAdapter
 
-    FETCH_URL = 'https://www.bitstamp.net/api/ticker/'
+    FETCH_URL = {
+      'btc_usd' => 'https://www.bitstamp.net/api/v2/ticker/btcusd/',
+      'btc_eur' => 'https://www.bitstamp.net/api/v2/ticker/btceur/',
+      'eur_usd' => 'https://www.bitstamp.net/api/v2/ticker/eurusd/'
+    }
 
-    def rate_for(currency_code)
+    def rate_for(from,to)
+      raise CurrencyNotSupported unless ["BTC", "USD", "EUR"].include?(to) && ["BTC", "USD", "EUR"].include?(from)
       super
-      raise CurrencyNotSupported if currency_code != 'USD'
-      rate = get_rate_value_from_hash(@rates, "last")
-      rate_to_f(rate)
+      rate = rate_to_f(currency_pair_rate(to,from))
+      invert_rate(from,to,rate)
+    end
+
+    # Because Bitstamp has USD/EUR pair
+    def invert_rate(from,to,rate)
+      if to == 'BTC' || (from == 'USD' && to == 'EUR')
+        1/rate.to_f
+      else
+        rate
+      end
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates["#{currency1.downcase}_#{currency2.downcase}"] || @rates["#{currency2.downcase}_#{currency1.downcase}"]
+      raise CurrencyNotSupported unless rate
+      rate['last']
     end
 
   end

data/lib/btc_adapters/btcchina_adapter.rb

@@ -0,0 +1,13 @@
+module CurrencyRate
+  class BTCChinaAdapter < BtcAdapter
+
+    FETCH_URL = 'https://data.btcchina.com/data/ticker'
+
+    def rate_for(from,to)
+      super
+      rate = rate_to_f(@rates['ticker']['last'])
+      invert_rate(from,to,rate)
+    end
+
+  end
+end

data/lib/btc_adapters/btce_adapter.rb

@@ -1,13 +1,34 @@
 module CurrencyRate
   class BtceAdapter < BtcAdapter
 
-    FETCH_URL = 'https://btc-e.com/api/2/btc_usd/ticker'
+    FETCH_URL = {
+      'btc_usd' => 'https://btc-e.com/api/2/btc_usd/ticker',
+      'btc_eur' => 'https://btc-e.com/api/2/btc_eur/ticker',
+      'btc_rub' => 'https://btc-e.com/api/2/btc_rur/ticker',
+      'usd_rub' => 'https://btc-e.com/api/2/usd_rur/ticker',
+      'eur_rub' => 'https://btc-e.com/api/2/eur_rur/ticker'
+    }
 
-    def rate_for(currency_code)
+
+    def rate_for(from,to)
+      raise CurrencyNotSupported unless ["BTC", "USD", "EUR", "RUB"].include?(to) && ["BTC", "USD", "EUR", "RUB"].include?(from)
       super
-      raise CurrencyNotSupported if !FETCH_URL.include?("btc_#{currency_code.downcase}")
-      rate = get_rate_value_from_hash(@rates, 'ticker', 'last')
-      rate_to_f(rate)
+      rate = rate_to_f(currency_pair_rate(to,from))
+      invert_rate(from,to,rate)
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates["#{currency1.downcase}_#{currency2.downcase}"] || @rates["#{currency2.downcase}_#{currency1.downcase}"]
+      raise CurrencyNotSupported unless rate
+      rate['ticker']['last']
+    end
+
+    def invert_rate(from,to,rate)
+      if to == 'BTC' || (from == 'RUB' && to == 'USD') || (from == 'RUB' && to == 'EUR')
+        1/rate.to_f
+      else
+        rate
+      end
     end
 
   end

data/lib/btc_adapters/coinbase_adapter.rb

@@ -3,9 +3,9 @@ module CurrencyRate
 
     FETCH_URL = 'https://coinbase.com/api/v1/currencies/exchange_rates'
 
-    def rate_for(currency_code)
+    def rate_for(from,to)
       super
-      rate = get_rate_value_from_hash(@rates, "btc_to_#{currency_code.downcase}")
+      rate = @rates["#{from.downcase}_to_#{to.downcase}"]
       rate_to_f(rate)
     end
 

data/lib/btc_adapters/huobi_adapter.rb

@@ -0,0 +1,30 @@
+module CurrencyRate
+  class HuobiAdapter < BtcAdapter
+
+    FETCH_URL = {
+      'btc_cny' => 'http://api.huobi.com/staticmarket/ticker_btc_json.js',
+      'ltc_cny' => 'http://api.huobi.com/staticmarket/ticker_ltc_json.js'
+    }
+
+    def rate_for(from,to)
+      super
+      rate = rate_to_f(currency_pair_rate(to,from))
+      invert_rate(from,to,rate)
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates["#{currency1.downcase}_#{currency2.downcase}"] || @rates["#{currency2.downcase}_#{currency1.downcase}"]
+      raise CurrencyNotSupported unless rate
+      rate["ticker"]['last']
+    end
+
+    def invert_rate(from,to,rate)
+      if ['BTC', 'LTC'].include?(to)
+        1/rate.to_f
+      else
+        rate
+      end
+    end
+
+  end
+end

data/lib/btc_adapters/kraken_adapter.rb

@@ -1,13 +1,22 @@
 module CurrencyRate
   class KrakenAdapter < BtcAdapter
 
-    FETCH_URL = 'https://api.kraken.com/0/public/Ticker?pair=xbtusd'
+    FETCH_URL = {
+      "usd_btc" => 'https://api.kraken.com/0/public/Ticker?pair=xbtusd',
+      "eur_btc" => 'https://api.kraken.com/0/public/Ticker?pair=xbteur'
+    }
 
-    def rate_for(currency_code)
+    def rate_for(to,from)
       super
-      rate = get_rate_value_from_hash(@rates, 'result', 'XXBTZ' + currency_code.upcase, 'c')
-      rate = rate.kind_of?(Array) ? rate.first : raise(CurrencyNotSupported)
-      rate_to_f(rate)
+      rate = rate_to_f(currency_pair_rate(to,from))
+      invert_rate(to,from,rate)
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates["#{currency1.downcase}_#{currency2.downcase}"] || @rates["#{currency2.downcase}_#{currency1.downcase}"]
+      raise CurrencyNotSupported unless rate || [currency1, currency2].include?("BTC")
+      currency = currency1 == "BTC" ? currency2 : currency1
+      rate['result']["XXBTZ#{currency}"]['c'].first
     end
 
   end

data/lib/btc_adapters/localbitcoins_adapter.rb

@@ -3,10 +3,17 @@ module CurrencyRate
 
     FETCH_URL = 'https://localbitcoins.com/bitcoinaverage/ticker-all-currencies/'
 
-    def rate_for(currency_code)
+    def rate_for(from,to)
       super
-      rate = get_rate_value_from_hash(@rates, currency_code.upcase, 'rates', 'last')
-      rate_to_f(rate)
+      rate = currency_pair_rate(to,from)
+      rate = rate_to_f(rate)
+      invert_rate(from,to,rate)
+    end
+
+    def currency_pair_rate(currency1, currency2)
+      rate = @rates[currency1] || @rates[currency2]
+      raise CurrencyNotSupported if !rate || !([currency1, currency2].include?('BTC'))
+      rate['rates']['last']
     end
 
   end