onchain 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603a864a335ed6cee0809e270eacc6ac5a26ab83
-  data.tar.gz: a8e588d02f6758232d4389c1de0ac3518af55b13
+  metadata.gz: 2681f7c45e64e34c7421a682eaed14035ae3a4ce
+  data.tar.gz: 36c15aca1879fec82f853ce6347298bda21cb59b
 SHA512:
-  metadata.gz: e394b7451c91446846de1142d3abdbcbd39d9a77e4840380bfd1d26c918000b1359f8576f5cedc5e6711c3dc5fb8b9e29f85a1581b8395d673bfe70a94c973c9
-  data.tar.gz: 4a9726a7633b292079d74535f9f35770cd807089982568627d8a69e0feea2c4bf6c423d29d83618858bcb338a16a1df8729db1cab2cdde70c3b221850f577dc9
+  metadata.gz: 2ff21134f7794c7c776d582c2c470e820a6adeb7c391a70a35f9f92938256fed12887a4632bbf763d81f948cda2929b9b8a20d8da79bc778a689d27623898802
+  data.tar.gz: 3b99ec0e024abcbbbdb744d37beb17e647ca6ee7ae67abb8bfb051aca40cda377052fe8ec975411e21d5f3e422770cc37f1ddc238e72caa61f8f48e4c820a408

data/lib/onchain/block_chain.rb

@@ -49,6 +49,18 @@ class OnChain::BlockChain
       
     end
     
+    # Given a list of addresses, return those
+    # that don't have balances in the cahce.
+    def get_uncached_addresses(addresses)
+      ret = []
+      addresses.each do |address|
+        if cache_read(address) == nil
+          ret << address
+        end
+      end
+      return ret
+    end
+    
     def get_balance_satoshi(address)
       return (get_balance(address).to_f * 100000000).to_i
     end

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -5,7 +5,14 @@ class OnChain::BlockChain
     def blockinfo_get_all_balances(addresses)
       base = "https://blockchain.info/multiaddr?&simple=true&active="
       
-      addresses.each do |address|
+      
+      addr = get_uncached_addresses(addresses)
+      
+      if addr.length == 0
+        return
+      end
+      
+      addr.each do |address|
         base = base + address + '|'
       end
       

data/lib/onchain/providers/blockr_api.rb

@@ -70,9 +70,16 @@ class OnChain::BlockChain
     end
 
     def blockr_get_all_balances(addresses)
+      
+      addr = get_uncached_addresses(addresses)
+      
+      if addr.length == 0
+        return
+      end
+      
       base = "https://blockr.io/api/v1/address/balance/"
       
-      addresses.each do |address|
+      addr.each do |address|
         base = base + address + ','
       end
       

data/lib/onchain/providers/chaincom_api.rb

@@ -63,14 +63,21 @@ class OnChain::BlockChain
 
     def chaincom_get_all_balances(addresses)
       
-      res = Chain.get_addresses(addresses)
+      addr = get_uncached_addresses(addresses)
       
-      res.each do |address|
+      if addr.length == 0
+        return
       end
       
-      json['data'].each do |addr|
-        bal = addr["balance"] / 100000000.0
-        cache_write(address, bal, BALANCE_CACHE_FOR)
+      res = Chain.get_addresses(addr)
+      
+      if ! res.kind_of?(Array)
+        res = [res]
+      end
+      
+      res.each do |address|
+        bal = address["balance"] / 100000000.0
+        cache_write(address["hash"], bal, BALANCE_CACHE_FOR)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake