mycoins 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8928e60128a76148d009d196ef2286ed57d50880
-  data.tar.gz: 85dcc24bcdd9bd1f374403f2c01483adba3822cc
+  metadata.gz: a1efe36d3e0e78d37ba9d8e94ba52cc347ff66dc
+  data.tar.gz: 325e8c74caca5ef03df0870426ac707061028583
 SHA512:
-  metadata.gz: e82115cd34552785b099128be98d1bb6486e03f2cf89cd0b15092006b6bc713ebee09e1f5c336809995901b49ea55e0a816c41c90cb519494600d73d30e63e8c
-  data.tar.gz: ea5d21181fbbe559c1528870ae538c375b0e06f0698d075c13c9fcce7364c679b898472fd45a5082b578f674d16c71a2ae7d9b528faf487a04a787d33e0d74d4
+  metadata.gz: 2b7426d402a069a60d445078870dd384c77315caa383556371372ad49720b533e32381d790ac8bc3b32574151a0365cfc473186dfadf5ad487dfb065b054f547
+  data.tar.gz: a60262e526a64cc3e76defbb1911ba0a94cfa5b0d0a05c3bb27f042cd7cc5a109a2d290fc935fa15d1d50a72e63834309d56e26f87729c8af91e712bbbbb3c36

data/lib/mycoins.rb

@@ -24,6 +24,8 @@ class MyCoins
 
       @dx = Dynarex.new
       @dx.import s
+      
+      puts @dx.to_xml pretty: true
 
     end
 
@@ -36,7 +38,7 @@ class MyCoins
 
     mycoins = @dx.all.inject([]) do |r, mycoin|
       
-      found = c.find mycoin.title
+      found = c.find mycoin.title.gsub(/\s+\[[^\]]+\]/,'')
       found ? r << found.symbol : r
 
     end
@@ -63,7 +65,7 @@ class MyCoins
   #
   def price(coin_name, qty, btc: nil, date: nil)
     coin = @ccf.find(coin_name)
-    "%.2f %s" % [(coin.price_usd.to_f * qty) * @jer.rate(@mycurrency), 
+    "%.2f %s" % [(coin.price_usd.to_f * qty.to_f) * @jer.rate(@mycurrency), 
                  @mycurrency]
   end
   
@@ -78,7 +80,8 @@ class MyCoins
     
     r = build_portfolio(@dx.title)
     dx = Dynarex.new    
-    dx.import r.records
+    puts 'r.records: ' + r.records.inspect
+    dx.import r.records    
     
     h = r.to_h
     h.delete :records
@@ -110,7 +113,7 @@ class MyCoins
       records: a,
       datetime: Time.now.strftime("%d/%m/%Y at %H:%M%p"),
       invested: invested,
-      revenue: sum(a, ('value_' + @mycurrency.downcase).to_sym),      
+      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),
@@ -127,7 +130,7 @@ class MyCoins
     @dx.all.inject([]) do |r, x|
 
       puts 'x: ' + x.inspect if @debug
-      coin = @ccf.find(x.title)
+      coin = @ccf.find(x.title.gsub(/\s+\[[^\]]+\]/,''))
       usd_rate = coin.price_usd.to_f      
 
       paid = ((x.qty.to_f * x.btc_price.to_f) * \
@@ -139,8 +142,8 @@ class MyCoins
       h = {
         title: x.title,         
         rank: coin.rank.to_i,
-        qty: x.qty,
-        btc_price: x.btc_price,
+        qty: "%.2f" % x.qty,
+        btc_price:  "%.4f" % x.btc_price,
         paid: "%.2f" % paid,
         value_usd: "%.2f" % value_usd
       }
@@ -178,7 +181,7 @@ class MyCoins
     coins = r.records.sort_by {|x| -x[order_by].to_f}.map {|x| x.values}
     coins.reverse! if order_by == :rank
     
-    labels = %w(Rank Name Qty btc_price) \
+    labels = %w(Name Rank Qty btc_price) \
         + ["paid(#{@mycurrency}):", 'value(USD):']
     labels << "value(#{@mycurrency}):" if @mycurrency    
     labels += ['Profit:', 'Profit (%):']
@@ -191,11 +194,11 @@ class MyCoins
     out << tf.display
     
     out << "\n\nInvested: %.2f %s" % [r.invested, @mycurrency]
-    out << "\nRevenue: %.2f %s" % [r.revenue, @mycurrency]    
     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 << "\nCurrent value: %.2f %s" % [r.value, @mycurrency]        
     out
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   sCz5KsiHA9vj8OfrxhYrEb+ML4+J28Umdki7V1vgnQWmnI+Ok2SWlkScgzcmGXF6
   TJ4=
   -----END CERTIFICATE-----
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex