cryptoexchange 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176be07e7dffa4e9edfdd3b86e8ab4275c1e85f9
-  data.tar.gz: 247c1c0adf1b7bce1f609f1ac95c466f82e286b8
+  metadata.gz: 90f0d45ac77acb4133cdfba54122f50ecae41a56
+  data.tar.gz: 17f77122553fa33ea2ad4f7e3af4129cf5bbeae4
 SHA512:
-  metadata.gz: a3c58733f6640d090b761b05a87724931945b39ecf37be1a3bb3d1dbcf0fd8ef19c4c9048a8271af1ed6f858dad9fb86ddabad116cd864b85e4744bafb02f4d3
-  data.tar.gz: 3a5b193f456d18adb069af76241289fb9aec3e4ede8b2ad9bf95fb7bbe37d3b9549ce01b1928f4cac6ca1bee1865731205435cb7c3f20c152a11c16953f02617
+  metadata.gz: 6bef5f4149bc6a1c34e5d3802ecde46067969c785f60351eb6cb33bb6bec3e8f0551ceba0f77e91f7269e5b1784b3e7a3c9311e0d2d08fd2c072c7160a030b1e
+  data.tar.gz: 4cefe5227dba98467760fec76b5bb6529929949c743c4693c58154d0f1e2b7d98d8a4f6cb4794f314f206889bfebe955a3262b46f6601600c8c2f8a06d63b0b1

data/lib/cryptoexchange/exchanges/ether_delta/services/market.rb

@@ -10,28 +10,43 @@ module Cryptoexchange::Exchanges
           end
         end
 
-        def fetch(market_pair)
-          output = super(ticker_url(market_pair))
-          adapt(output, market_pair)
+        def fetch
+          output = super ticker_url
+          adapt_all(output)
         end
 
-        def ticker_url(market_pair)
+        def ticker_url
           "#{Cryptoexchange::Exchanges::EtherDelta::Market::API_URL}/returnTicker"
         end
 
+        def adapt_all(output)
+          output.map do |pair, ticker|
+            # format example: ETH_ZRX
+            # ETH is the Target, ZRX is the Base
+            target, base = pair.split('_')
+            # Ignore non-standard BASE
+            next if base =~ /\s/ || base =~ /0x/
+            market_pair = Cryptoexchange::Models::MarketPair.new(
+                            base: base,
+                            target: target,
+                            market: EtherDelta::Market::NAME
+                          )
+            adapt(ticker, market_pair)
+          end
+        end
+
         def adapt(output, market_pair)
           name = "#{market_pair.target}_#{market_pair.base}"
-          market = output[name]
           ticker = Cryptoexchange::Models::Ticker.new
           ticker.base      = market_pair.base
           ticker.target    = market_pair.target
           ticker.market    = EtherDelta::Market::NAME
-          ticker.last      = NumericHelper.to_d(market['last'].to_s)
-          ticker.bid       = NumericHelper.to_d(market['bid'].to_s)
-          ticker.ask       = NumericHelper.to_d(market['ask'].to_s)
-          ticker.volume    = NumericHelper.to_d(market['quoteVolume'].to_s)
+          ticker.last      = NumericHelper.to_d(output['last'].to_s)
+          ticker.bid       = NumericHelper.to_d(output['bid'].to_s)
+          ticker.ask       = NumericHelper.to_d(output['ask'].to_s)
+          ticker.volume    = NumericHelper.to_d(output['quoteVolume'].to_s)
           ticker.timestamp = DateTime.now.to_time.to_i
-          ticker.payload   = market
+          ticker.payload   = output
           ticker
         end
       end

data/lib/cryptoexchange/helpers/numeric_helper.rb

@@ -2,7 +2,8 @@ class NumericHelper
   class << self
     def to_d(number)
       if number
-        number.empty? ? nil : BigDecimal.new(number.to_s)
+        num = number.to_s
+        num.empty? ? nil : BigDecimal.new(num)
       else
         nil
       end

data/lib/cryptoexchange/version.rb

@@ -1,3 +1,3 @@
 module Cryptoexchange
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptoexchange
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - TM Lee