currency-rate 1.2.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b0e8bee0c0bcace06ab89c9ec67491980d95bba
-  data.tar.gz: fc7ec5d1b2423564e5cacb74b2355eb36b8f2e44
+SHA256:
+  metadata.gz: 7ba5e25c02543d961b4806289dbe718957c31cf1350af31a0b19898fd409841c
+  data.tar.gz: 53f4d584d115d88bfb62ed75679a60e5aa2c46b20e48c6ebd5bfe168bda3c100
 SHA512:
-  metadata.gz: f8a235cb9561e1f804a17e786a49a7c858702eaed7ee4a90334cf9c1840133984b4b2b21685c5c0d7d4960734cf90b1cb7f04512e339b2d7b4bd95b8f436202a
-  data.tar.gz: 28988218d07dac5bfb30d9bd6a27be95ebbe4e477614304d475a707622ec8cbf884e75a6707c06c6bb468736b3a6f2fff108ea5c04a8318b529cecf1b5b57dc3
+  metadata.gz: 44fceddd1f172848b0c67506d061a24f3b80cdb494a752acbd40a72e82e66f5b7524debff9c96bcdef3153efe6601e12d1dc75f4b5db96d7c1414a50091061a9
+  data.tar.gz: 96a8c935a0dba5d299501898e052c098b4db93dcaa727ed4bb45ad167e88b3213372775eca21abcfe6b24005de65309d22bf37b7c2d6c1cd44a2e2c79f649925

data/Gemfile

@@ -3,8 +3,9 @@ source "https://rubygems.org"
 gem "http"
 
 group :development do
+  gem "byebug"
   gem "jeweler", "~> 2.3.7", git: 'git@github.com:technicalpickles/jeweler.git'
+  gem "rake"
   gem "rspec"
   gem "webmock"
-  gem "byebug"
 end

data/README.md

@@ -63,3 +63,11 @@ Details
 `CurrencyRate` contains two parts that can work independently: Synchronizer and Fetcher.
 `CurrencyRate::Synchronizer` loads data from selected exchanges using adapters and saves it into FileStorage in normalized format.
 `CurrencyRate::Fetch` reads data from FileStorage and returns rate for requested pair and exchange.
+
+Development
+-----------
+When adapter's output format changes you can replace fixtures by running `bin/rake update_rates['ExchangeName']`.
+For example `bin/rake update_rates['Fixer']` will update fixtures for the FixerAdapter.
+
+Some of adapters require API keys so the task searches for 'api_keys.yml` file in project root.
+You can copy it from `api_keys.yml.sample` and set up your values.

data/Rakefile

@@ -22,3 +22,32 @@ Jeweler::Tasks.new do |gem|
   gem.email = "roman.snitko@gmail.com"
   gem.authors = ["Roman Snitko"]
 end
+
+require 'byebug'
+require 'yaml'
+require_relative "lib/currency_rate"
+
+desc "Update rates for specified adapter"
+task :update_rates, [:exchange] do |t, args|
+  api_keys = YAML.load_file("api_keys.yml")
+
+  CurrencyRate.configure do |config|
+    api_keys.each { |name, key| config.api_keys[name] = key }
+  end
+
+  adapter = CurrencyRate::const_get("#{args.exchange}Adapter").instance
+
+  print "Loading data for #{args.exchange}... "
+  exchange_data = adapter.exchange_data
+  raw_storage = CurrencyRate::FileStorage.new(File.expand_path("spec/fixtures/adapters", __dir__))
+  raw_storage.write(args.exchange, exchange_data)
+  puts "Success!"
+
+  print "Normalizing data for #{args.exchange}..."
+  normalized_data = adapter.normalize exchange_data
+  normalized_storage = CurrencyRate::FileStorage.new(File.expand_path("spec/fixtures/adapters/normalized", __dir__))
+  normalized_storage.write(args.exchange, normalized_data)
+  puts "Success!"
+
+  puts "#{args.exchange} fixtures update finished!"
+end

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.4.1

data/api_keys.yml.sample

@@ -0,0 +1,3 @@
+ForgeAdapter: "<your_key>"
+CurrencyLayerAdapter: "<your_key>"
+FixerAdapter: "<your_key>"

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/currency-rate.gemspec

@@ -2,18 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: currency-rate 1.2.0 ruby lib
+# stub: currency-rate 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "currency-rate".freeze
-  s.version = "1.2.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Roman Snitko".freeze]
-  s.date = "2018-02-12"
+  s.date = "2018-12-12"
   s.description = "Fetches exchange rates from various sources and does the conversion".freeze
   s.email = "roman.snitko@gmail.com".freeze
+  s.executables = ["rake".freeze, "rspec".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -26,6 +27,9 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "api_keys.yml.sample",
+    "bin/rake",
+    "bin/rspec",
     "currency-rate.gemspec",
     "lib/adapter.rb",
     "lib/adapters/crypto/bitfinex_adapter.rb",
@@ -41,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/adapters/fiat/currency_layer_adapter.rb",
     "lib/adapters/fiat/fixer_adapter.rb",
     "lib/adapters/fiat/forge_adapter.rb",
+    "lib/adapters/fiat/free_forex_adapter.rb",
     "lib/adapters/fiat/yahoo_adapter.rb",
     "lib/configuration.rb",
     "lib/currency_rate.rb",
@@ -48,34 +53,36 @@ Gem::Specification.new do |s|
     "lib/storage/file_storage.rb",
     "lib/storage/serializers/yaml_serializer.rb",
     "lib/synchronizer.rb",
-    "spec/fixtures/adapters/bitfinex_adapter.yml",
-    "spec/fixtures/adapters/bitpay_adapter.yml",
-    "spec/fixtures/adapters/bitstamp_adapter.yml",
-    "spec/fixtures/adapters/btc_china_adapter.yml",
-    "spec/fixtures/adapters/btce_adapter.yml",
-    "spec/fixtures/adapters/coinbase_adapter.yml",
-    "spec/fixtures/adapters/currency_layer_adapter.yml",
-    "spec/fixtures/adapters/fixer_adapter.yml",
-    "spec/fixtures/adapters/forge_adapter.yml",
-    "spec/fixtures/adapters/huobi_adapter.yml",
-    "spec/fixtures/adapters/kraken_adapter.yml",
-    "spec/fixtures/adapters/localbitcoins_adapter.yml",
-    "spec/fixtures/adapters/normalized/bitfinex_adapter.yml",
-    "spec/fixtures/adapters/normalized/bitpay_adapter.yml",
-    "spec/fixtures/adapters/normalized/bitstamp_adapter.yml",
-    "spec/fixtures/adapters/normalized/btc_china_adapter.yml",
-    "spec/fixtures/adapters/normalized/btce_adapter.yml",
-    "spec/fixtures/adapters/normalized/coinbase_adapter.yml",
-    "spec/fixtures/adapters/normalized/currency_layer_adapter.yml",
-    "spec/fixtures/adapters/normalized/fixer_adapter.yml",
-    "spec/fixtures/adapters/normalized/forge_adapter.yml",
-    "spec/fixtures/adapters/normalized/huobi_adapter.yml",
-    "spec/fixtures/adapters/normalized/kraken_adapter.yml",
-    "spec/fixtures/adapters/normalized/localbitcoins_adapter.yml",
-    "spec/fixtures/adapters/normalized/okcoin_adapter.yml",
-    "spec/fixtures/adapters/normalized/yahoo_adapter.yml",
-    "spec/fixtures/adapters/okcoin_adapter.yml",
-    "spec/fixtures/adapters/yahoo_adapter.yml",
+    "spec/fixtures/adapters/bitfinex_rates.yml",
+    "spec/fixtures/adapters/bitpay_rates.yml",
+    "spec/fixtures/adapters/bitstamp_rates.yml",
+    "spec/fixtures/adapters/btc_china_rates.yml",
+    "spec/fixtures/adapters/btce_rates.yml",
+    "spec/fixtures/adapters/coinbase_rates.yml",
+    "spec/fixtures/adapters/currency_layer_rates.yml",
+    "spec/fixtures/adapters/fixer_rates.yml",
+    "spec/fixtures/adapters/forge_rates.yml",
+    "spec/fixtures/adapters/free_forex_rates.yml",
+    "spec/fixtures/adapters/huobi_rates.yml",
+    "spec/fixtures/adapters/kraken_rates.yml",
+    "spec/fixtures/adapters/localbitcoins_rates.yml",
+    "spec/fixtures/adapters/normalized/bitfinex_rates.yml",
+    "spec/fixtures/adapters/normalized/bitpay_rates.yml",
+    "spec/fixtures/adapters/normalized/bitstamp_rates.yml",
+    "spec/fixtures/adapters/normalized/btc_china_rates.yml",
+    "spec/fixtures/adapters/normalized/btce_rates.yml",
+    "spec/fixtures/adapters/normalized/coinbase_rates.yml",
+    "spec/fixtures/adapters/normalized/currency_layer_rates.yml",
+    "spec/fixtures/adapters/normalized/fixer_rates.yml",
+    "spec/fixtures/adapters/normalized/forge_rates.yml",
+    "spec/fixtures/adapters/normalized/free_forex_rates.yml",
+    "spec/fixtures/adapters/normalized/huobi_rates.yml",
+    "spec/fixtures/adapters/normalized/kraken_rates.yml",
+    "spec/fixtures/adapters/normalized/localbitcoins_rates.yml",
+    "spec/fixtures/adapters/normalized/okcoin_rates.yml",
+    "spec/fixtures/adapters/normalized/yahoo_rates.yml",
+    "spec/fixtures/adapters/okcoin_rates.yml",
+    "spec/fixtures/adapters/yahoo_rates.yml",
     "spec/lib/adapter_spec.rb",
     "spec/lib/adapters/crypto/bitfinex_adapter_spec.rb",
     "spec/lib/adapters/crypto/bitpay_adapter_spec.rb",
@@ -90,6 +97,7 @@ Gem::Specification.new do |s|
     "spec/lib/adapters/fiat/currency_layer_adapter_spec.rb",
     "spec/lib/adapters/fiat/fixer_adapter_spec.rb",
     "spec/lib/adapters/fiat/forge_adapter_spec.rb",
+    "spec/lib/adapters/fiat/free_forex_adapter_spec.rb",
     "spec/lib/adapters/fiat/yahoo_adapter_spec.rb",
     "spec/lib/currency_rate_spec.rb",
     "spec/lib/fetcher_spec.rb",
@@ -100,7 +108,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/snitko/currency-rate".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.14".freeze
+  s.rubygems_version = "2.7.6".freeze
   s.summary = "Converter for fiat and crypto currencies".freeze
 
   if s.respond_to? :specification_version then
@@ -108,23 +116,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<http>.freeze, [">= 0"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.7"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
-      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
     else
       s.add_dependency(%q<http>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
       s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.7"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<webmock>.freeze, [">= 0"])
-      s.add_dependency(%q<byebug>.freeze, [">= 0"])
     end
   else
     s.add_dependency(%q<http>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.7"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<webmock>.freeze, [">= 0"])
-    s.add_dependency(%q<byebug>.freeze, [">= 0"])
   end
 end
 

data/lib/adapter.rb

@@ -1,7 +1,9 @@
+
 module CurrencyRate
   class Adapter
     include Singleton
 
+    SUPPORTED_CURRENCIES = []
     FETCH_URL = nil
     API_KEY_PARAM = nil
 
@@ -32,9 +34,8 @@ module CurrencyRate
 
       begin
         if self.class::FETCH_URL.kind_of?(Hash)
-          self.class::FETCH_URL.reduce({}) do |result, (name, url)|
+          self.class::FETCH_URL.each_with_object({}) do |(name, url), result|
             result[name] = request url
-            result
           end
         else
           request self.class::FETCH_URL
@@ -57,7 +58,7 @@ module CurrencyRate
         param_symbol = fetch_url.split("/").last.include?("?") ? "&" : "?"
         fetch_url << "#{param_symbol}#{self.class::API_KEY_PARAM}=#{api_key}" if api_key
       end
-      http_client = HTTP.timeout(connect: 4, read: 4)
+      http_client = HTTP.timeout(connect: CurrencyRate.configuration.connect_timeout, read: CurrencyRate.configuration.read_timeout)
       JSON.parse(http_client.get(fetch_url).to_s)
     end
 

data/lib/adapters/crypto/binance_adapter.rb

@@ -0,0 +1,42 @@
+module CurrencyRate
+  class BinanceAdapter < Adapter
+    # No need to use it for fetching, just additional information about supported currencies
+    SUPPORTED_CURRENCIES = %w(
+      ADA ADX AGI AMB ARK ARN AST BAT BCC BCD BCN BLZ BNB BNT BQX
+      BRD BTG BTS CDT CMT CND CVC DCR DGD DLT DNT EDO ELF ENG ENJ
+      EOS ETC ETH EVX FUN GAS GNT GRS GTO GVT GXS HOT HSR ICN ICX
+      INS KEY KMD KNC LRC LSK LTC LUN MCO MDA MFT MOD MTH MTL NAS
+      NAV NEO NXS OAX OMG ONT OST PAX PHX POA POE PPT QKC QLC QSP
+      RCN RDN REN REP REQ RLC RPX RVN SKY SNM SNT SUB SYS TNB TNT
+      TRX USDC USDT VEN VET VIA VIB WAN WPR WTC XEM XLM XMR XRP
+      XVG XZC ZEC ZEN ZIL ZRX
+    )
+
+    ANCHOR_CURRENCY = "BTC"
+
+    FETCH_URL = {
+                  "Binance" => "https://api.binance.com/api/v3/ticker/price",
+                  "Blockchain" => "https://blockchain.info/ticker"
+                }
+
+    def normalize(data)
+      return nil unless super
+      binance_result = data["Binance"].reduce({ "anchor" => ANCHOR_CURRENCY }) do |result, hash|
+        if hash["symbol"].index(ANCHOR_CURRENCY) == 0
+          result[hash["symbol"].sub(ANCHOR_CURRENCY, "")] = BigDecimal.new(hash["price"].to_s)
+        elsif hash["symbol"].index(ANCHOR_CURRENCY) == 3
+          result[hash["symbol"].sub(ANCHOR_CURRENCY, "")] = 1 / BigDecimal.new(hash["price"].to_s)
+        end
+        result
+      end
+
+      blockchain_result = data["Blockchain"].reduce({}) do |result, (key, value)|
+        result[key] = BigDecimal.new(value["last"].to_s)
+        result
+      end
+
+      binance_result.merge(blockchain_result)
+    end
+
+  end
+end

data/lib/adapters/crypto/bitfinex_adapter.rb

@@ -1,14 +1,37 @@
 module CurrencyRate
   class BitfinexAdapter < Adapter
-    FETCH_URL = {
-      "BTC_USD" => "https://api.bitfinex.com/v1/pubticker/btcusd",
-      "LTC_USD" => "https://api.bitfinex.com/v1/pubticker/ltcusd",
-    }
+    # No need to use it for fetching, just additional information about supported currencies
+    SUPPORTED_CURRENCIES = %w(
+      AGI AID AIO ANT ATM AUC AVT BAB BAT BCI BFT BNT BSV BTG CBT CFI CND CTX
+      DAD DAI DAT DGB DASH DTA DTH EDO ELF EOS ESS ETC ETH ETP EUR FSN FUN GBP
+      GNT HOT IOS IOT IQX JPY KNC LRC LTC LYM MIT MKR MNA MTN NCA NEO ODE OMG
+      OMNI ORS PAI POA POY QSH QTM RBT RCN RDN REP REQ RLC RRT SAN SEE SEN SNG
+      SNT SPK STJ TNB TRX USD UTK VEE VET WAX WPR XLM XMR XRP XTZ XVG YYW ZCN
+      ZEC ZIL ZRX
+    )
+
+    ASSET_MAP = {
+                  "DSH" => "DASH",
+                  "OMN" => "OMNI",
+                }
+
+    ANCHOR_CURRENCY = "BTC"
+
+    FETCH_URL = "https://api.bitfinex.com/v2/tickers?symbols=ALL"
 
     def normalize(data)
       return nil unless super
-      data.reduce({}) do |result, (pair, value)|
-        result[pair] = BigDecimal.new(value["last_price"].to_s)
+      data.reduce({ "anchor" => ANCHOR_CURRENCY }) do |result, pair_info|
+        pair_name = pair_info[0].sub("t", "")
+        key = pair_name.sub(ANCHOR_CURRENCY, "")
+        key = ASSET_MAP[key] || key
+
+        if pair_name.index(ANCHOR_CURRENCY) == 0
+          result[key] = BigDecimal.new(pair_info[7].to_s)
+        elsif pair_name.index(ANCHOR_CURRENCY) == 3
+          result[key] = 1 / BigDecimal.new(pair_info[7].to_s)
+        end
+
         result
       end
     end

data/lib/adapters/crypto/bitpay_adapter.rb

@@ -1,11 +1,26 @@
 module CurrencyRate
   class BitpayAdapter < Adapter
+    # No need to use it for fetching, just additional information about supported currencies
+    SUPPORTED_CURRENCIES = %w(
+      AED AFN ALL AMD ANG AOA ARS AUD AWG AZN BAM BBD BCH BDT BGN BHD BIF BMD
+      BND BOB BRL BSD BTN BWP BZD CAD CDF CHF CLF CLP CNY COP CRC CUP CVE CZK
+      DJF DKK DOP DZD EGP ETB EUR FJD FKP GBP GEL GHS GIP GMD GNF GTQ GUSD GYD
+      HKD HNL HRK HTG HUF IDR ILS INR IQD IRR ISK JEP JMD JOD JPY KES KGS KHR
+      KMF KPW KRW KWD KYD KZT LAK LBP LKR LRD LSL LYD MAD MDL MGA MKD MMK MNT
+      MOP MRU MUR MVR MWK MXN MYR MZN NAD NGN NIO NOK NPR NZD OMR PAB PAX PEN
+      PGK PHP PKR PLN PYG QAR RON RSD RUB RWF SAR SBD SCR SDG SEK SGD SHP SLL
+      SOS SRD STN SVC SYP SZL THB TJS TMT TND TOP TRY TTD TWD TZS UAH UGX USD
+      USDC UYU UZS VEF VES VND VUV WST XAF XAG XAU XCD XOF XPF YER ZAR ZMW ZWL
+    )
+
+    ANCHOR_CURRENCY = "BTC"
+
     FETCH_URL = "https://bitpay.com/api/rates"
 
     def normalize(data)
       return nil unless super
-      data.reject { |rate| rate["code"] == "BTC" }.reduce({}) do |result, rate|
-        result["BTC_#{rate['code'].upcase}"] = BigDecimal.new(rate["rate"].to_s)
+      data.reject { |rate| rate["code"] == ANCHOR_CURRENCY }.reduce({ "anchor" => ANCHOR_CURRENCY }) do |result, rate|
+        result["#{rate['code'].upcase}"] = BigDecimal.new(rate["rate"].to_s)
         result
       end
     end

data/lib/adapters/crypto/bitstamp_adapter.rb

@@ -1,16 +1,17 @@
 module CurrencyRate
   class BitstampAdapter < Adapter
-    FETCH_URL = {
-      'BTC_USD' => 'https://www.bitstamp.net/api/v2/ticker/btcusd/',
-      'BTC_EUR' => 'https://www.bitstamp.net/api/v2/ticker/btceur/',
-      'LTC_USD' => 'https://www.bitstamp.net/api/v2/ticker/ltcusd/',
-      'LTC_EUR' => 'https://www.bitstamp.net/api/v2/ticker/ltceur/',
-    }
+    SUPPORTED_CURRENCIES = %w(
+      BCH BTC ETH EUR LTC XRP
+    )
+
+    ANCHOR_CURRENCY = "USD"
+
+    FETCH_URL = Hash[SUPPORTED_CURRENCIES.collect { |currency| [ currency, "https://www.bitstamp.net/api/v2/ticker/#{currency}usd/".downcase ] }]
 
     def normalize(data)
       return nil unless super
-      data.reduce({}) do |result, (pair, value)|
-        result[pair] = BigDecimal.new(value["last"].to_s)
+      data.reduce({ "anchor" => ANCHOR_CURRENCY, ANCHOR_CURRENCY => BigDecimal.new("1") }) do |result, (key, value)|
+        result[key] =  1 / BigDecimal.new(value["last"].to_s)
         result
       end
     end