mycoins 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81094f6de11121c276fa8bd1039820aec9783736
-  data.tar.gz: 2396fe1349594814d82360abe4ba713820dbb93f
+  metadata.gz: bd59d18937ce9fc62449408978b57aa3d7a099f2
+  data.tar.gz: 7f180dd3ed3f2a909abfacf039e56c17957d954a
 SHA512:
-  metadata.gz: 6c616ce1a054d8cf5bab8b38af96bfb715e19555ffc0daefbb2877ff3d3ceb174584b258d75b88dde2b5c4a0e1a0f6350f82a7e514dda9bbf3c2cf62db1d15ef
-  data.tar.gz: bf1a81b0e3c4f1d8e1637062e40a5405478209e655da423f0ea09e6dc9e01781498f60ee182d57609d3cd372de49efa13defeea82d92ff9c81c53f90568ec648
+  metadata.gz: 396925dc7f5288544eb79dc0ec5f964322624f7c82e77e4ded10ca5b20086c8343805468c404c614d674e8a33fe9730f2e94efc77f4da4691f12735c91936957
+  data.tar.gz: c45831af7f6479299ba68a5709a8c35cc1405937d0e171bfc0865cc894d0c07d548c6718abe18e66168be6bc477f534d45bd44a103dccc2e24bc5a4f7d590b9e

data/lib/mycoins.rb

@@ -14,7 +14,7 @@ class MyCoins
   def initialize(source, date: nil, debug: false, 
                  mycurrency: 'USD', filepath: 'mycoins', colored: true)
 
-    @debug, @filepath, @color = debug, filepath, colored
+    @debug, @filepath, @colored = debug, filepath, colored
     
     @jer = JustExchangeRates.new(base: 'USD')
 
@@ -69,6 +69,45 @@ class MyCoins
     File.write filepath, to_xml
     
   end
+  
+  def to_dx()
+    
+    r = build_portfolio(@dx.title)
+    dx = Dynarex.new    
+    dx.import r.records    
+    
+    h = r.to_h
+    h.delete :records
+    dx.summary.merge!(h)
+    
+    dx
+    
+  end
+  
+  def to_openstruct()
+    build_portfolio(@dx.title)
+  end
+  
+  def to_percentages()
+    
+    all = self.to_dx.to_a
+    val = ('value_' + @mycurrency.downcase).to_sym
+    
+    a = all.map {|x| x[val].to_f }
+    sum = a.inject(&:+)
+    
+    a2 = all.map do |x| 
+      [x[:title].sub(/\s+\[[^\]]\]+/,''), (x[val].to_f).round(2)]
+    end.group_by(&:first).to_a
+    
+    a3 = a2.map do |x| 
+      [x.first, ((x[1].inject(0) {|r,y| r + y[1].to_f} / sum.to_f) * 100)\
+       .round(2)]
+    end
+    
+    a3.sort_by(&:last).reverse.to_h
+
+  end
 
   def to_s()
     @ccf.to_s
@@ -99,15 +138,7 @@ class MyCoins
   
   def to_xml()
     
-    r = build_portfolio(@dx.title)
-    dx = Dynarex.new    
-    dx.import r.records    
-    
-    h = r.to_h
-    h.delete :records
-    dx.summary.merge!(h)
-    
-    dx.to_xml pretty: true
+    self.to_dx().to_xml pretty: true
     
   end
   
@@ -153,7 +184,7 @@ class MyCoins
       pct_gross_profit: pct_gross_profit,
       pct_losses: pct_losses,
       net_profit: sum(a, :roi).round(2),
-      pct_net_profit: pct_gross_profit + pct_losses
+      pct_net_profit: (pct_gross_profit + pct_losses).round(2)
     }
     
     @portfolio = OpenStruct.new(h)
@@ -284,7 +315,7 @@ class MyCoins
         [c(r.gross_profit), @mycurrency, c(r.pct_gross_profit.to_s + "%")]
     out << "\nLosses: %.2f %s (%.2f%%)" % [r.losses, @mycurrency, r.pct_losses]
     out << "\n\nNet profit: %s %s (%s)" % [c(r.net_profit), @mycurrency, 
-                                                 c(r.pct_net_profit.to_s + "%")]
+                                                c(r.pct_net_profit.to_s + "%")]
     out << "\nCurrent value: %.2f %s (%s BTC)" % [r.value, @mycurrency, 
                                                   r.btc_value]
     out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   sCz5KsiHA9vj8OfrxhYrEb+ML4+J28Umdki7V1vgnQWmnI+Ok2SWlkScgzcmGXF6
   TJ4=
   -----END CERTIFICATE-----
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex