satoshi-unit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33e2b8e9fff83147605f66272e31bfa2df9bfd8
-  data.tar.gz: 339fe64084bf5733e5ef19f67c1f9d4d949af564
+  metadata.gz: c57f6b19472e8e09b67722d760e8644bf491a39b
+  data.tar.gz: 50848d88f076cc33fd2e9f72112f5ee60ff92546
 SHA512:
-  metadata.gz: 41a899656d58c46fcbe7f619a3db8222bab29faa58629c1a583998d91fd48fbf7364c5f837cf1601d42db35ef63cbe5bf6e3403fddd54c48cec6f52fe1e46c66
-  data.tar.gz: 13250853c7bc52ba439c5b397dab7ef6600a01094dbd46131b8bc962fea15d8f5a12249849e73e9ff58120b9e4258a6ab9aadd84d1a6b097558b02df519113e0
+  metadata.gz: 0ce606fb76a9db9060dbd10c4e5bdd712b825fc6beb033fdeb0d1c894dca2d366f8e831767980fbef20a3c919c95555ccc44c526d735279899ff9b2d359ddd6e
+  data.tar.gz: 5a1eb156e209a8272d8540e2cb54d4ab68f66cfaf0a8946375c5272c9d69bc6f488702ecd72013c9db6908a680ffe0d8e3835bd989110ea0433af0e2582673be

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/satoshi.rb

@@ -76,15 +76,29 @@ class Satoshi
   end
 
   def +(i)
-    self.to_i + i
+    if i.kind_of?(Satoshi)
+      Satoshi.new(self.to_i + i, from_unit: :satoshi)
+    else
+      self.to_i + i
+    end
   end
 
   def -(i)
-    self.to_i - i
+    if i.kind_of?(Satoshi)
+      Satoshi.new(self.to_i - i, from_unit: :satoshi)
+    else
+      self.to_i - i
+    end
   end
 
+  # IMPORTANT: multiplication is done on satoshis, not btc.
+  # 0.01*0.02 BTC will be a larger value.
   def *(i)
-    self.to_i * i
+    if i.kind_of?(Satoshi)
+      Satoshi.new(self.to_i * i, from_unit: :satoshi)
+    else
+      self.to_i * i
+    end
   end
 
   def coerce(other)

data/spec/satoshi_spec.rb

@@ -76,4 +76,15 @@ describe Satoshi do
     expect( -> { Satoshi.new(21_000_000) }).not_to raise_exception
   end
 
+  it "returns satoshi for +,- and * methods if both operands are Satoshi" do
+    s1 = Satoshi.new(0.001, from_unit: :btc)
+    s2 = Satoshi.new(0.002, from_unit: :btc)
+    expect(s1+s2).to be_kind_of(Satoshi)
+    expect((s1+s2).to_unit).to eq(0.003)
+    expect(s2-s1).to be_kind_of(Satoshi)
+    expect((s2-s1).to_unit).to eq(0.001)
+    expect(s2*s1).to be_kind_of(Satoshi)
+    expect((s2*s1).to_unit).to eq(200)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satoshi-unit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler