mycoins 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1efe36d3e0e78d37ba9d8e94ba52cc347ff66dc
-  data.tar.gz: 325e8c74caca5ef03df0870426ac707061028583
+  metadata.gz: ae93a879c55d95f55070ebb8731bcf73c135498b
+  data.tar.gz: f0bd6d46cc903407cb577effedbac04971f99981
 SHA512:
-  metadata.gz: 2b7426d402a069a60d445078870dd384c77315caa383556371372ad49720b533e32381d790ac8bc3b32574151a0365cfc473186dfadf5ad487dfb065b054f547
-  data.tar.gz: a60262e526a64cc3e76defbb1911ba0a94cfa5b0d0a05c3bb27f042cd7cc5a109a2d290fc935fa15d1d50a72e63834309d56e26f87729c8af91e712bbbbb3c36
+  metadata.gz: f4ed3d309508b0d7f2cb85072762639f646a85d8523d8f9e70081a217bfbac362aa0567f9f1f3b10ab3976bf3319d2847585fdfe8284155c8b71e9a2c342c427
+  data.tar.gz: 90ebeec8177ccd9dc552bfe5dc2e51ece56f465bef2335c8db3ef2778e2b5e4690f03ce2a416334f10a0ee27c387bd2b1f9a1403940596e65ac988cec62a2a7e

data/lib/mycoins.rb

@@ -23,9 +23,7 @@ class MyCoins
     if s =~ /<\?dynarex / then
 
       @dx = Dynarex.new
-      @dx.import s
-      
-      puts @dx.to_xml pretty: true
+      @dx.import s     
 
     end
 
@@ -64,8 +62,15 @@ class MyCoins
   # return the value of a coin given either the qty or purchase amount in BTC
   #
   def price(coin_name, qty, btc: nil, date: nil)
-    coin = @ccf.find(coin_name)
-    "%.2f %s" % [(coin.price_usd.to_f * qty.to_f) * @jer.rate(@mycurrency), 
+    
+    price_usd = if date then
+      @ccf.price coin_name, date
+    else
+      coin = @ccf.find(coin_name)      
+      coin.price_usd.to_f      
+    end
+  
+    "%.2f %s" % [(price_usd * qty.to_f) * @jer.rate(@mycurrency), 
                  @mycurrency]
   end
   
@@ -80,7 +85,6 @@ class MyCoins
     
     r = build_portfolio(@dx.title)
     dx = Dynarex.new    
-    puts 'r.records: ' + r.records.inspect
     dx.import r.records    
     
     h = r.to_h
@@ -106,6 +110,8 @@ class MyCoins
     gross_profit_list, losses_list = a.partition {|x| x[:profit].to_f > 0}
     gross_profit, losses = [gross_profit_list, losses_list]\
         .map{|x| sum(x, :profit)}
+    pct_gross_profit = (100 / (invested / gross_profit)).round(2)
+    pct_losses = (100 / (invested / losses)).round(2)
 
     h = {
       title: title,
@@ -115,9 +121,10 @@ class MyCoins
       invested: invested,
       value: sum(a, ('value_' + @mycurrency.downcase).to_sym),      
       gross_profit: gross_profit.round(2), losses: losses.round(2),
-      pct_gross_profit: (100 / (invested / gross_profit)).round(2),
-      pct_losses: (100 / (invested / losses)).round(2),
-      net_profit: sum(a, :profit).round(2)
+      pct_gross_profit: pct_gross_profit,
+      pct_losses: pct_losses,
+      net_profit: sum(a, :profit).round(2),
+      pct_net_profit: pct_gross_profit + pct_losses
     }
     
     @portfolio = OpenStruct.new(h)
@@ -143,9 +150,9 @@ class MyCoins
         title: x.title,         
         rank: coin.rank.to_i,
         qty: "%.2f" % x.qty,
-        btc_price:  "%.4f" % x.btc_price,
-        paid: "%.2f" % paid,
-        value_usd: "%.2f" % value_usd
+        btc_price:  "%.5f" % x.btc_price,
+        paid: "%.0f" % paid,
+        value_usd: "%.0f" % value_usd
       }
       
       mycurrency = if @mycurrency and @mycurrency != 'USD' then
@@ -163,6 +170,7 @@ class MyCoins
         
       end
       
+      puts 'local_value: ' + local_value.inspect if @debug
       value = (local_value || value_usd)
       
       h2 = {
@@ -194,10 +202,10 @@ class MyCoins
     out << tf.display
     
     out << "\n\nInvested: %.2f %s" % [r.invested, @mycurrency]
-    out << "\n\nGross profit: %.2f %s (%%%.2f)" % \
+    out << "\n\nGross profit: %.2f %s (%.2f%%)" % \
         [r.gross_profit, @mycurrency, r.pct_gross_profit]
-    out << "\nLosses: %.2f %s (%%%.2f)" % [r.losses, @mycurrency, r.pct_losses]
-    out << "\n\nNet profit: %.2f %s" % [r.net_profit, @mycurrency]
+    out << "\nLosses: %.2f %s (%.2f%%)" % [r.losses, @mycurrency, r.pct_losses]
+    out << "\n\nNet profit: %.2f %s (%.2f%%)" % [r.net_profit, @mycurrency, r.pct_net_profit]
     out << "\nCurrent value: %.2f %s" % [r.value, @mycurrency]        
     out
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson