zold 0.14.49 → 0.14.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a66103ede11237d2ccfcdd1ce46a4e59eedd713a601443440459677c7f665e
-  data.tar.gz: 177d88b0030850e1d6848a7ef92b10873e23342b77f50ff2b2344c29dac4d99a
+  metadata.gz: c93f5cab672e8cda8e44e15b589f97d593486c089f4428487370835207087b00
+  data.tar.gz: 5a14a57fcf20345a21acb27086042dac6cb7df2abfb5b226bae85d6014cc9899
 SHA512:
-  metadata.gz: 7d8ede15f27a062b31ffa705fc3ccf4f387a7884dd5d3b18527cb24b9d3baa1e31715420412a385f41d1f98735b3de7ff017218d5c21fec301fcc0f7e3a31a50
-  data.tar.gz: c9d21059a4093c33677c81b1402b217ff8cbe1aff453f6682fc815681a938b584ae5b52d7b5ca5e7ec21f763aa96ec611fe66bee3c5d69cc360f93ee590ae1af
+  metadata.gz: 8f4ac2585a5eaf88260243cdad9326eaee19a8a5c7db6689a3bd0a1fd9ba69d466aa95a390f4937ec9ae3fa916c5cb72214a9d4d20ae563e9e4c2d65ff41e018
+  data.tar.gz: 992a00ef00711065ee79e191b3a1ac40d96c70e3074331298484a5a90f5f27170925c5420cac43b617aaabdc1a3712c5729a4d2ff452923faeec3e797c2a89bb

data/lib/zold/amount.rb

@@ -111,6 +111,10 @@ module Zold
       @coins.negative?
     end
 
+    def positive?
+      @coins.positive?
+    end
+
     def *(other)
       raise '* may only work with a number' unless other.is_a?(Integer) || other.is_a?(Float)
       c = (@coins * other).to_i

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.49'
+  VERSION = '0.14.50'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -130,7 +130,7 @@ module Zold
 
     def add(txn)
       raise 'The txn has to be of type Txn' unless txn.is_a?(Txn)
-      dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id }
+      dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id && t.amount.negative? && txn.amount.negative? }
       raise "Wallet #{id} can't pay itself: #{txn}" if txn.bnf == id
       raise "The transaction with the same ID and BNF already exists in #{id}: #{dup}" unless dup.nil?
       raise "The tax payment already exists in #{id}: #{txn}" if Tax.new(self).exists?(txn.details)

data/test/test_amount.rb

@@ -47,6 +47,8 @@ class TestAmount < Minitest::Test
   def test_compares_with_zero
     amount = Zold::Amount.new(zld: 0.00001)
     assert(!amount.zero?)
+    assert(amount.positive?)
+    assert(!amount.negative?)
     assert(amount != Zold::Amount::ZERO)
   end
 

data/test/test_wallet.rb

@@ -71,6 +71,18 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_adds_similar_transaction
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 39.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      id = Zold::Id.new
+      wallet.sub(amount, "NOPREFIX@#{id}", key)
+      wallet.add(Zold::Txn.new(1, Time.now, amount, 'NOPREFIX', id, '-'))
+      assert(wallet.balance.zero?)
+    end
+  end
+
   def test_refurbishes_wallet
     FakeHome.new.run do |home|
       wallet = home.create_wallet

data/zold.gemspec

@@ -54,7 +54,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.test_files = s.files.grep(%r{^(test|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'backtrace', '~>0.3'
+  s.add_runtime_dependency 'backtrace', '~>0'
   s.add_runtime_dependency 'cachy', '~>0.4'
   s.add_runtime_dependency 'concurrent-ruby', '~>1.0'
   s.add_runtime_dependency 'cucumber', '~>3.1' # has to stay here for Heroku
@@ -75,10 +75,10 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'slop', '~>4.4'
   s.add_runtime_dependency 'sys-proctable', '~>1.1'
   s.add_runtime_dependency 'usagewatch_ext', '~>0.2'
-  s.add_runtime_dependency 'xcop', '~>0.5'
+  s.add_runtime_dependency 'xcop', '~>0'
   s.add_development_dependency 'codecov', '~>0.1'
   s.add_development_dependency 'minitest', '~>5.11'
-  s.add_development_dependency 'random-port', '~>0.1'
+  s.add_development_dependency 'random-port', '~>0'
   s.add_development_dependency 'rdoc', '~>4.2'
   s.add_development_dependency 'rspec-rails', '~>3.1'
   s.add_development_dependency 'webmock', '~>3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.49
+  version: 0.14.50
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cachy
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement