zold 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6811821f5b8eed50d2d11c0e972ee9a91ba1a7e
-  data.tar.gz: f4cfbe65254ee35788815494b7529d9cae6447e7
+  metadata.gz: f0b9d4b798dc11ecf4b3b470b46f7ef8036f5468
+  data.tar.gz: 7870c6ccbc732c981849fd5efb49c517dfb3cc18
 SHA512:
-  metadata.gz: 370fbc1d1a3b8df9369f9cfcd190849dd418e1af8f1d9a81c4257887cefac1b6427ba3072763793d29ec30864101f9268bdad7a6cedf7d55bca70441d897b3e0
-  data.tar.gz: 0d719f61975a5f6d7dadfe6a79b0fe40d05f98d71db97a6566b5d4c6fecc5e498f830a08f95748be5ac1332baec03b9df622f3d6b852350a7714fe18f6af0b0f
+  metadata.gz: 1812d627031af500210ebdfb18094ca91a90031e7dc587555d9c519fd823ed5eba7e7d58695f0fdc74dc4a7bef612f4b0ea569532a60f20916e149cb34822a70
+  data.tar.gz: f5425fa8b4b6d36c4b903c047c8093edde27bd6f71ee59616adef18fe9533c2133401c24d865ea7b52d6f5159e9c9f3b7ccc213256d4fad32dc00127b7094372

data/lib/zold/copies.rb

@@ -42,7 +42,7 @@ module Zold
 
     def clean
       list = load
-      list.reject! { |s| s[:time] < Time.now - 24 * 60 }
+      list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
       save(list)
       Dir.new(@dir).select { |f| f =~ /[0-9]+/ }.each do |f|
         File.delete(File.join(@dir, f)) if list.find { |s| s[:name] == f }.nil?

data/lib/zold/score.rb

@@ -168,7 +168,7 @@ module Zold
     end
 
     def expired?
-      @time < Time.now - 24 * 60
+      @time < Time.now - 24 * 60 * 60
     end
 
     def prefix

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.4'.freeze
 end

data/test/commands/test_clean.rb

@@ -34,8 +34,8 @@ class TestClean < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       id = Zold::Id.new
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
-      copies.add('a1', 'host-1', 80, 1, Time.now - 26 * 60)
-      copies.add('a2', 'host-2', 80, 2, Time.now - 26 * 60)
+      copies.add('a1', 'host-1', 80, 1, Time.now - 26 * 60 * 60)
+      copies.add('a2', 'host-2', 80, 2, Time.now - 26 * 60 * 60)
       Zold::Clean.new(copies: copies.root, log: $log).run(['clean', id.to_s])
       assert(copies.all.empty?)
     end

data/test/commands/test_taxes.rb

@@ -43,7 +43,7 @@ class TestTaxes < Minitest::Test
       wallet.add(
         Zold::Txn.new(
           1,
-          Time.now - 24 * 60 * 365 * 20,
+          Time.now - 24 * 60 * 60 * 365 * 20,
           Zold::Amount.new(zld: 19.99),
           'NOPREFIX', Zold::Id.new, '-'
         )

data/test/test_score.rb

@@ -96,6 +96,22 @@ class TestScore < Minitest::Test
     assert(!score.expired?)
   end
 
+  def test_expires_correctly
+    score = Zold::Score.new(
+      Time.now - 100 * 60 * 60, 'localhost', 443,
+      'NOPREFIX@ffffffffffffffff', strength: 2
+    ).next.next.next
+    assert(score.expired?)
+  end
+
+  def test_dont_expire_correctly
+    score = Zold::Score.new(
+      Time.now - 10 * 60 * 60, 'localhost', 443,
+      'NOPREFIX@ffffffffffffffff', strength: 2
+    ).next.next.next
+    assert(!score.expired?)
+  end
+
   def test_correct_number_of_zeroes
     score = Zold::Score.new(
       Time.now, 'localhost', 443,

data/test/test_tax.rb

@@ -41,14 +41,14 @@ class TestTax < Minitest::Test
       wallet.add(
         Zold::Txn.new(
           1,
-          Time.now - 24 * 60 * 365,
+          Time.now - 24 * 60 * 60 * 365,
           Zold::Amount.new(zld: 19.99),
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
       tax = Zold::Tax.new(wallet)
-      assert(tax.debt > Zold::Amount.new(coins: 16_775_000))
-      assert(tax.debt < Zold::Amount.new(coins: 16_775_999))
+      assert(tax.debt > Zold::Amount.new(coins: 1_006_524_000))
+      assert(tax.debt < Zold::Amount.new(coins: 1_006_524_999))
     end
   end
 
@@ -58,7 +58,7 @@ class TestTax < Minitest::Test
       wallet.add(
         Zold::Txn.new(
           1,
-          Time.now - 24 * 60 * 365,
+          Time.now - 24 * 60 * 60 * 365,
           Zold::Amount.new(zld: 19.99),
           'NOPREFIX', Zold::Id.new, '-'
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Yegor Bugayenko