currency-rate 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7717da50f7013b0f430545b761e05f6fa88ea8
-  data.tar.gz: f0e499bed1863467e640448da5f23eb9219bc53d
+  metadata.gz: f90626ba2850871f4a11109c3325c0fb93eacfa2
+  data.tar.gz: 1bdfde8354857ea4eb18c7bbc82df9cc6d57dacd
 SHA512:
-  metadata.gz: 8cedcc1c71864a83e88ce7ae444b139d469f628897ab411ae4c64b517e57c9af81a35531313beb8b712994d3a8f01a4ff28d9ef26c319264a6f53ac4093bd384
-  data.tar.gz: f8be39baeccb40a9a6ebe0e1de6bfb0403499b1978c201e9bbd87bc98590f5ae1719d09ddd16a3bfea31201920ad73b50f34e032d0a584f51e0d0f99f0dc61cf
+  metadata.gz: b331ad6154585cfb839900aa2be697b6da4636967a2679bdc3cbf4c8062cb094b30300944908a1695681741cbf47a36dc04b746b4d64b59164fab511e82d4281
+  data.tar.gz: a0f0b4a9b4b6281154619dd6e4d7ee10c8d99b9771840b7a21bdecc78c696ccd96bcad0cc3dd342d17d9c07d69f718521020807509e69651512243964c6546ad

data/Gemfile

@@ -4,7 +4,7 @@ gem 'satoshi-unit'
 
 group :development do
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.1.1", git: 'git@github.com:technicalpickles/jeweler.git'
+  gem "jeweler", "~> 2.3.7", git: 'git@github.com:technicalpickles/jeweler.git'
   gem "rspec"
   gem 'webmock'
   gem 'vcr'

data/Gemfile.lock

@@ -1,23 +1,24 @@
 GIT
   remote: git@github.com:technicalpickles/jeweler.git
-  revision: ec91e05d06f2835ee30568fa42b5fa7d451444b6
+  revision: afab16b95fbac811f3ab233e058d39eb4e300284
   specs:
-    jeweler (2.1.1)
+    jeweler (2.3.7)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
+      semver2
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    builder (3.2.2)
+    builder (3.2.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
@@ -26,33 +27,34 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.14.0)
+    github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
     hashdiff (0.3.0)
-    hashie (3.4.4)
+    hashie (3.5.5)
     highline (1.7.8)
-    json (1.8.3)
-    jwt (1.5.1)
-    mini_portile2 (2.0.0)
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.2.0)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    rack (1.6.4)
-    rake (11.1.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.0.0)
+    rdoc (5.1.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -68,8 +70,8 @@ GEM
     rspec-support (3.4.1)
     safe_yaml (1.0.4)
     satoshi-unit (0.1.8)
-    semver (1.0.1)
-    thread_safe (0.3.5)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
     vcr (3.0.3)
     webmock (2.0.3)
       addressable (>= 2.3.6)
@@ -81,11 +83,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  jeweler (~> 2.1.1)!
+  jeweler (~> 2.3.7)!
   rspec
   satoshi-unit
   vcr
   webmock
 
 BUNDLED WITH
-   1.12.0
+   1.15.1

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

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.3.3 ruby lib
+# stub: currency-rate 0.3.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "currency-rate"
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   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-03-29"
+  s.date = "2017-07-26"
   s.description = "Fetches exchange rates from various sources and does the conversion"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
@@ -88,14 +88,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.1.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.3.7"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<vcr>, [">= 0"])
     else
       s.add_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.3.7"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<vcr>, [">= 0"])
@@ -103,7 +103,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<satoshi-unit>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.3.7"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<vcr>, [">= 0"])

data/lib/adapter.rb

@@ -33,7 +33,6 @@ module CurrencyRate
     end
 
     def rate_for(from,to)
-
       begin
         @rates = self.storage.fetch(self.class.to_s) { self.fetch_rates! }
       rescue FetchingFailed => e

data/lib/btc_adapters/kraken_adapter.rb

@@ -3,9 +3,15 @@ module CurrencyRate
 
     FETCH_URL = {
       "usd_btc" => 'https://api.kraken.com/0/public/Ticker?pair=xbtusd',
-      "eur_btc" => 'https://api.kraken.com/0/public/Ticker?pair=xbteur'
+      "eur_btc" => 'https://api.kraken.com/0/public/Ticker?pair=xbteur',
+      "usd_ltc" => 'https://api.kraken.com/0/public/Ticker?pair=ltcusd',
+      "eur_ltc" => 'https://api.kraken.com/0/public/Ticker?pair=ltceur',
     }
     DEFAULT_CURRENCIES = ["USD", "BTC"]
+    CRYPTO_CURRENCIES = ["BTC", "LTC"]
+    ASSET_MAP = {
+      "BTC" => "XBT",
+    }
 
     def rate_for(to,from)
       super
@@ -15,9 +21,9 @@ module CurrencyRate
 
     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
+      raise CurrencyNotSupported unless rate || ([currency1, currency2] & CRYPTO_CURRENCIES).any?
+      fiat, crypto = CRYPTO_CURRENCIES.include?(currency1) ? [currency2, currency1] : [currency1, currency2]
+      rate['result']["X#{ta(crypto)}Z#{ta(fiat)}"]['c'].first
     end
 
     def supported_currency_pairs
@@ -28,5 +34,9 @@ module CurrencyRate
       end
     end
 
+    def translate_asset(asset)
+      ASSET_MAP[asset] || asset
+    end
+    alias_method :ta, :translate_asset
   end
 end

data/lib/currency_rate.rb

@@ -19,7 +19,7 @@ module CurrencyRate
 
     # Setting default values for anchor currency depending on
     # which adapter type is un use.
-    anchor_currency = if a.kind_of?(BtcAdapter)
+    anchor_currency ||= if a.kind_of?(BtcAdapter)
       'BTC' if anchor_currency.nil?
     else
       'USD' if anchor_currency.nil?

data/spec/fixtures/vcr/exchange_rate_adapters/btc_adapters/kraken_adapter.yml

@@ -19,7 +19,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 06 Feb 2017 05:24:58 GMT
+      - Fri, 07 Jul 2017 14:22:20 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
@@ -27,19 +27,23 @@ http_interactions:
       Connection:
       - keep-alive
       Set-Cookie:
-      - __cfduid=deb478f2bbc3b2d0079764973622b4cd51486358697; expires=Tue, 06-Feb-18
-        05:24:57 GMT; path=/; domain=.kraken.com; HttpOnly
+      - __cfduid=dfca5540f20daad70ed370ad0034ba1b71499437339; expires=Sat, 07-Jul-18
+        14:22:19 GMT; path=/; domain=.kraken.com; HttpOnly
+      Cache-Control:
+      - public,max-age=1,smaxage=1
       Vary:
       - Accept-Encoding
+      Cf-Cache-Status:
+      - EXPIRED
       Server:
       - cloudflare-nginx
       Cf-Ray:
-      - 32cc2dc4ee4e1123-SIN
+      - 37ab748addd3235a-FRA
     body:
       encoding: ASCII-8BIT
-      string: '{"error":[],"result":{"XXBTZUSD":{"a":["1018.00000","1","1.000"],"b":["1017.71000","24","24.000"],"c":["1018.00000","0.00139780"],"v":["140.87496222","1186.97757850"],"p":["1019.57961","1017.84325"],"t":[407,2092],"l":["1013.75000","1005.40000"],"h":["1024.00000","1030.00000"],"o":"1017.88600"}}}'
+      string: '{"error":[],"result":{"XXBTZUSD":{"a":["2511.88400","1","1.000"],"b":["1018.00000","5","5.000"],"c":["1018.00000","0.30000000"],"v":["2633.12341463","3864.11048862"],"p":["2561.39405","2572.10762"],"t":[6405,9427],"l":["2500.00000","2500.00000"],"h":["2613.99300","2615.00000"],"o":"2605.64100"}}}'
     http_version: 
-  recorded_at: Mon, 06 Feb 2017 05:24:58 GMT
+  recorded_at: Fri, 07 Jul 2017 14:22:20 GMT
 - request:
     method: get
     uri: https://api.kraken.com/0/public/Ticker?pair=xbteur
@@ -59,7 +63,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 06 Feb 2017 05:25:00 GMT
+      - Fri, 07 Jul 2017 14:22:21 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
@@ -67,17 +71,109 @@ http_interactions:
       Connection:
       - keep-alive
       Set-Cookie:
-      - __cfduid=d28404188131d0b4033e5ad505afba3711486358699; expires=Tue, 06-Feb-18
-        05:24:59 GMT; path=/; domain=.kraken.com; HttpOnly
+      - __cfduid=d0b780324eb697ad65322504814dd480e1499437340; expires=Sat, 07-Jul-18
+        14:22:20 GMT; path=/; domain=.kraken.com; HttpOnly
+      Cache-Control:
+      - public,max-age=1,smaxage=1
       Vary:
       - Accept-Encoding
+      Cf-Cache-Status:
+      - EXPIRED
       Server:
       - cloudflare-nginx
       Cf-Ray:
-      - 32cc2dcdab5030ae-SIN
+      - 37ab74922c9c648d-FRA
     body:
       encoding: ASCII-8BIT
-      string: '{"error":[],"result":{"XXBTZEUR":{"a":["946.99900","1","1.000"],"b":["945.33000","6","6.000"],"c":["945.33000","0.33190000"],"v":["350.90083527","4825.99524551"],"p":["945.36841","944.38709"],"t":[687,6669],"l":["940.00000","935.00000"],"h":["948.00000","959.08900"],"o":"943.60000"}}}'
+      string: '{"error":[],"result":{"XXBTZEUR":{"a":["2209.91100","5","5.000"],"b":["945.33000","1","1.000"],"c":["945.33000","0.02653398"],"v":["5233.29645560","7648.83316547"],"p":["2235.89989","2249.70379"],"t":[13098,20659],"l":["2189.67000","2189.67000"],"h":["2288.25800","2290.77900"],"o":"2284.69200"}}}'
     http_version: 
-  recorded_at: Mon, 06 Feb 2017 05:25:00 GMT
+  recorded_at: Fri, 07 Jul 2017 14:22:21 GMT
+- request:
+    method: get
+    uri: https://api.kraken.com/0/public/Ticker?pair=ltcusd
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 07 Jul 2017 14:22:22 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=dd849ee171f061fcd7e20d8a89f4a99811499437341; expires=Sat, 07-Jul-18
+        14:22:21 GMT; path=/; domain=.kraken.com; HttpOnly
+      Cache-Control:
+      - public,max-age=2,smaxage=2
+      Vary:
+      - Accept-Encoding
+      Cf-Cache-Status:
+      - EXPIRED
+      Server:
+      - cloudflare-nginx
+      Cf-Ray:
+      - 37ab7499cbe90f93-FRA
+    body:
+      encoding: ASCII-8BIT
+      string: '{"error":[],"result":{"XLTCZUSD":{"a":["46.31299","10","10.000"],"b":["46.10008","20","20.000"],"c":["46.10003","1.00000000"],"v":["25860.06146258","41962.36292092"],"p":["48.20874","49.25912"],"t":[2468,3047],"l":["45.78800","45.78800"],"h":["51.59990","52.10031"],"o":"51.01002"}}}'
+    http_version: 
+  recorded_at: Fri, 07 Jul 2017 14:22:22 GMT
+- request:
+    method: get
+    uri: https://api.kraken.com/0/public/Ticker?pair=ltceur
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 07 Jul 2017 14:22:23 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=d089377bfcb6d87fdebdd75f0d910ec541499437342; expires=Sat, 07-Jul-18
+        14:22:22 GMT; path=/; domain=.kraken.com; HttpOnly
+      Cache-Control:
+      - public,max-age=1,smaxage=1
+      Vary:
+      - Accept-Encoding
+      Cf-Cache-Status:
+      - EXPIRED
+      Server:
+      - cloudflare-nginx
+      Cf-Ray:
+      - 37ab74a14cae27b0-FRA
+    body:
+      encoding: ASCII-8BIT
+      string: '{"error":[],"result":{"XLTCZEUR":{"a":["40.74999","86","86.000"],"b":["40.62900","30","30.000"],"c":["40.74999","0.01050000"],"v":["53028.04209664","63233.70263117"],"p":["41.75383","42.21588"],"t":[4052,5246],"l":["40.02000","40.02000"],"h":["45.08076","45.67800"],"o":"45.00925"}}}'
+    http_version: 
+  recorded_at: Fri, 07 Jul 2017 14:22:23 GMT
 recorded_with: VCR 3.0.3

data/spec/lib/btc_adapters/coinbase_adapter_spec.rb

@@ -17,6 +17,8 @@ RSpec.describe CurrencyRate::CoinbaseAdapter do
   it "finds the rate for currency code" do
     expect(@exchange_adapter.rate_for('BTC', 'USD')).to eq(1019.98)
     expect(@exchange_adapter.rate_for('USD', 'BTC')).to eq(0.00098)
+    expect(@exchange_adapter.rate_for('LTC', 'USD')).to eq(3.95)
+    expect(@exchange_adapter.rate_for('USD', 'LTC')).to eq(0.253165)
     expect( -> { @exchange_adapter.rate_for('FEDcoin', 'USD') }).to raise_error(CurrencyRate::Adapter::CurrencyNotSupported)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: currency-rate
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: satoshi-unit
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement