zold 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca413080aece7a7df0ad64a62f79d05a374b7a1
-  data.tar.gz: 59a587c153a051be1245f8403d85807638afbef9
+  metadata.gz: 8166417b26ad8c5745a7c83ddec0f463bc641d1e
+  data.tar.gz: 8d8747d23ab292070a3fd1d5b86efd3fa27bb4ad
 SHA512:
-  metadata.gz: 5d34fdc3e75b98dc53cd34323278911fc8f7a1c0a49c5a9fe46fb12785f8ca7d65ff7a69023067a185afe1a249a6f9951103c054e6f214150972756b3c9dd528
-  data.tar.gz: a9e5f068362f53f591305c90931dba01842644c6a6b369433fa6c2a44b53887ab24de6d44a2c4c51a4d89badb32506a821ab63246b03f5f325b30e2cf5533407
+  metadata.gz: b86e8bcb2f3f79e072f6c33b769089c1711ce8d4ef6cfb855c88b5a130964146d5a5e5a184d604ead24d2fee82a2cc6c519a0c0ce09e403b3802edc23b15ec8a
+  data.tar.gz: 41bc7348572a88dcf9d7951f9f8f21ad9b54f35cd3430df64587e2e50567b124fae6719e96aaf17608efb29af4a88a8552dd2143fd29a2c99975cb2b87059fbc

data/lib/zold/http.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require 'rainbow'
+require 'uri'
 require 'net/http'
 require_relative 'version'
 require_relative 'score'
@@ -41,7 +42,9 @@ module Zold
     VERSION_HEADER = 'X-Zold-Version'.freeze
 
     def initialize(uri, score = Score::ZERO)
-      @uri = uri
+      raise 'URI can\'t be nil' if uri.nil?
+      @uri = uri.is_a?(String) ? URI(uri) : uri
+      raise 'Score can\'t be nil' if score.nil?
       @score = score
     end
 

data/lib/zold/node/entrance.rb

@@ -128,8 +128,10 @@ and modified nothing (this is most likely a bug!)")
       ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
-      @push_mutex.synchronize { @modified += modified }
-      @pushes.post { push_one } if @pushes.length < 2
+      unless modified.empty?
+        @push_mutex.synchronize { @modified += modified }
+        @pushes.post { push_one } if @pushes.length < 2
+      end
       modified
     end
 

data/lib/zold/node/farm.rb

@@ -115,6 +115,7 @@ module Zold
           .split(/\n/)
           .map { |t| Score.parse(t) }
           .reject(&:expired?)
+          .select(&:valid?)
           .sort_by(&:value)
           .reverse
           .take(max)

data/lib/zold/node/front.rb

@@ -147,12 +147,14 @@ module Zold
       id = Id.new(params[:id])
       wallet = settings.wallets.find(id)
       request.body.rewind
-      body = request.body.read
-      if wallet.exists? && AtomicFile.new(wallet.path).read == body
+      after = request.body.read
+      before = wallet.exists? ? AtomicFile.new(wallet.path).read : ''
+      if before == after
         status 304
         return
       end
-      settings.entrance.push(id, body, sync: !params[:sync].nil?)
+      settings.log.info("Wallet #{id} is new: #{before.length}b != #{after.length}b")
+      settings.entrance.push(id, after, sync: !params[:sync].nil?)
       JSON.pretty_generate(
         version: VERSION,
         score: score.to_h

data/lib/zold/remotes.rb

@@ -61,8 +61,7 @@ module Zold
       end
 
       def http(path = '/')
-        uri = URI("http://#{@host}:#{@port}#{path}")
-        Http.new(uri, @score)
+        Http.new("http://#{@host}:#{@port}#{path}", @score)
       end
 
       def to_s

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -56,7 +56,7 @@ class FakeNode
           )
         end
       end
-      home = URI("http://localhost:#{port}/")
+      home = "http://localhost:#{port}/"
       while Zold::Http.new(home).get.code == '599' && node.alive?
         sleep 1
         @log.debug("Waiting for #{home}...")

data/test/node/test_front.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'json'
 require_relative '../test__helper'
 require_relative 'fake_node'
+require_relative '../fake_home'
 require_relative '../../lib/zold/http'
 require_relative '../../lib/zold/score'
 
@@ -50,14 +51,20 @@ class FrontTest < Minitest::Test
           )
         end
       end
-      score = Zold::Score.new(
-        Time.now, 'localhost', 999,
-        'NOPREFIX@ffffffffffffffff',
-        strength: 1
-      ).next.next.next.next
-      Zold::Http.new(URI("http://localhost:#{port}/"), score).get
-      json = JSON.parse(Zold::Http.new(URI("http://localhost:#{port}/remotes"), score).get.body)
-      assert(json['all'].find { |r| r['host'] == 'localhost' })
+    end
+  end
+
+  def test_pushes_twice
+    FakeNode.new(log: test_log).run do |port|
+      FakeHome.new.run do |home|
+        wallet = home.create_wallet
+        response = Zold::Http.new("http://localhost:#{port}/wallet/#{wallet.id}?sync=true").put(File.read(wallet.path))
+        assert_equal('200', response.code, response.body)
+        3.times do
+          r = Zold::Http.new("http://localhost:#{port}/wallet/#{wallet.id}?sync=true").put(File.read(wallet.path))
+          assert_equal('304', r.code, r.body)
+        end
+      end
     end
   end
 

data/test/test_http.rb

@@ -31,21 +31,21 @@ require_relative '../lib/zold/http'
 class TestHttp < Minitest::Test
   def test_pings_broken_uri
     stub_request(:get, 'http://bad-host/').to_return(status: 500)
-    res = Zold::Http.new(URI('http://bad-host/')).get
+    res = Zold::Http.new('http://bad-host/').get
     assert_equal('500', res.code)
     assert_equal('', res.body)
   end
 
   def test_pings_with_exception
     stub_request(:get, 'http://exception/').to_return { raise 'Intentionally' }
-    res = Zold::Http.new(URI('http://exception/')).get
+    res = Zold::Http.new('http://exception/').get
     assert_equal('599', res.code)
     assert(res.body.include?('Intentionally'))
   end
 
   def test_pings_live_uri
     stub_request(:get, 'http://good-host/').to_return(status: 200)
-    res = Zold::Http.new(URI('http://good-host/')).get
+    res = Zold::Http.new('http://good-host/').get
     assert_equal('200', res.code)
   end
 end

metadata

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