zold-score 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7824cd0db572815711d7dc77b9f820543a6f006c5476af408a78a027d00e8a77
-  data.tar.gz: 1e5ce652f5365135fb299d3e432e7e09fa485e822673bacbadf53418014d2192
+  metadata.gz: f144b35f41f572b478b56aa45dfb771f6df83f9ffbfbe725287a39dd51eb7329
+  data.tar.gz: 8de2e35edc58105204a30479352af5283178b69b006e849b581c7492ac65197c
 SHA512:
-  metadata.gz: cb927d57fa49f8805563a8664b501b82fd7b2a91a0dd6e43c801d005913b6f95b5a283e4a06d758d7cd7cfaf3e7d0e8413ec7b10781897490b926ee7436b2de1
-  data.tar.gz: 34ec30b7f91f1f61ff106aa4a9e3d266092934571a177d6548329ae5f5c6785f7978567d98f355205d2667e406ec0aa06eec9d8f74965ff96c785cee4061291d
+  metadata.gz: 157659238d2e181462a65694ae60801ac49fae88e6656e709b521a6f4df172a33afbdbc759e1a81ac81ee77928cf3d552331c0fced3481d9e9d3d06fb1407f7a
+  data.tar.gz: 202d378faeba0c50d0d357436e3bf844c0770c12173d47a32b331369f835298d79cc759ca5c9f20938ab7929a96678ee42d0e7f570656e80268069740be5c079

data/.rubocop.yml

@@ -6,8 +6,6 @@ Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Layout/EndOfLine:
   EnforcedStyle: lf
-Metrics/LineLength:
-  Max: 120
 Metrics/AbcSize:
   Max: 25
 Metrics/BlockLength:

data/lib/zold/score.rb

@@ -63,18 +63,26 @@ module Zold
     end
 
     # The default no-value score.
-    ZERO = Score.new(time: Time.now, host: 'localhost', invoice: 'NOPREFIX@ffffffffffffffff')
+    ZERO = Score.new(
+      time: Time.now, host: 'localhost',
+      invoice: 'NOPREFIX@ffffffffffffffff'
+    )
 
     # Parses it back from the JSON.
     def self.parse_json(json)
-      raise "Time in JSON is broken: #{json}" unless json['time'] =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/
+      unless json['time'] =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/
+        raise "Time in JSON is broken: #{json}"
+      end
       raise "Host is wrong: #{json}" unless json['host'] =~ /^[0-9a-z\.\-]+$/
       raise "Port is wrong: #{json}" unless json['port'].is_a?(Integer)
-      raise "Invoice is wrong: #{json}" unless json['invoice'] =~ /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/
+      unless json['invoice'] =~ /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/
+        raise "Invoice is wrong: #{json}"
+      end
       raise "Suffixes not array: #{json}" unless json['suffixes'].is_a?(Array)
       Score.new(
         time: Time.parse(json['time']), host: json['host'],
-        port: json['port'], invoice: json['invoice'], suffixes: json['suffixes'],
+        port: json['port'], invoice: json['invoice'],
+        suffixes: json['suffixes'],
         strength: json['strength']
       )
     end
@@ -97,7 +105,7 @@ module Zold
     # Parses it back from the text generated by <tt>to_s</tt>.
     def self.parse(text)
       parts = text.split(' ', 7)
-      raise "Invalid score, not enough parts in \"#{text}\"" if parts.length < 7
+      raise "Invalid score, not enough parts in \"#{text}\"" if parts.length < 6
       Score.new(
         time: Time.at(parts[1].hex),
         host: parts[2],

data/test/zold/test_score.rb

@@ -87,7 +87,8 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse(
       Zold::Score.new(
-        time: time, host: 'localhost', port: 999, invoice: 'NOPREFIX@ffffffffffffffff',
+        time: time, host: 'localhost', port: 999,
+        invoice: 'NOPREFIX@ffffffffffffffff',
         strength: 1
       ).next.next.to_s
     )
@@ -106,13 +107,14 @@ class TestScore < Minitest::Test
 
   def test_prints_and_parses_zero_score
     time = Time.now
-    score = Zold::Score.parse(
-      Zold::Score.new(
-        time: time, host: '192.168.0.1', port: 1, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
-      ).to_s
+    before = Zold::Score.new(
+      time: time, host: '192.168.0.1', port: 1,
+      invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
     )
-    assert_equal(0, score.value)
-    assert(!score.expired?)
+    text = before.to_s.strip
+    after = Zold::Score.parse(text)
+    assert_equal(before.value, after.value)
+    assert(!after.expired?)
   end
 
   def test_finds_next_score
@@ -154,16 +156,25 @@ class TestScore < Minitest::Test
       time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
       invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: ['3a934b']
     )
-    assert_equal('c9c72efbf6beeea13408c5e720ec42aec017c11c3db335e05595c03755000000', score.hash)
+    assert_equal(
+      'c9c72efbf6beeea13408c5e720ec42aec017c11c3db335e05595c03755000000',
+      score.hash
+    )
     score = Zold::Score.new(
       time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
       invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: %w[3a934b 1421217]
     )
-    assert_equal('e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000', score.hash)
+    assert_equal(
+      'e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000',
+      score.hash
+    )
   end
 
   def test_lets_the_thread_to_die
-    score = Zold::Score.new(host: 'localhost', invoice: 'NOPREFIX@ffffffffffffffff', strength: 30)
+    score = Zold::Score.new(
+      host: 'localhost', invoice:
+      'NOPREFIX@ffffffffffffffff', strength: 30
+    )
     thread = Thread.start do
       score.next
     end

data/zold-score.gemspec

@@ -23,11 +23,13 @@
 require 'English'
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  if s.respond_to? :required_rubygems_version=
+    s.required_rubygems_version = Gem::Requirement.new('>= 0')
+  end
   s.rubygems_version = '2.2'
   s.required_ruby_version = '>=2.3'
   s.name = 'zold-score'
-  s.version = '0.4.2'
+  s.version = '0.4.3'
   s.license = 'MIT'
   s.summary = 'Zold score'
   s.description = 'Score calculating Ruby Gem for Zold'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-score
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov