zold-score 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fea20008b46e776779c40cc80438e7a95446cd3348ed819a447c2dfe9896b2f8
-  data.tar.gz: e077d65ccd21ffc3a331c04d45eed5e18f4af4b11cdec0c26b4ed9b27c6141bf
+  metadata.gz: 9ca76fd64c3274215258b3b3e8f715cc841009a0d799c9e4092c78b63558534e
+  data.tar.gz: 17037451897d26ee9788fa797323778d0172f0fdb4338438b64b8d64fa40fa8a
 SHA512:
-  metadata.gz: beebaa5ce22becb6404f983d4b1214c64dc227da9a6868715c46e5f36c81fc8334c334c5996b5ecec1dc89d63ff257b6300ef1835b8ae5e0fd2f1ce6b2ad4a9e
-  data.tar.gz: a1ee92aee0494c7c6dd74f423ac83d3bc9d5a220340d4340e45bb09c142ef1d948c658a037c81df79eebbd0a156d901276478480e7a2f85a80fe9f183f7cc23c
+  metadata.gz: 1b91291084be1cc34920ac013e427ee2347e327c7c8dd0c1999bbc8987f68807f47bf15d2d5eadf7c956e258d6e573beb02a1afbf7c13a672e9388033c559c36
+  data.tar.gz: a9103c4e4f2530fbd6a0a98baea144a28b02469e17d0e093a0018bc1d764aaa356340e0f80d2bc27a024dda1ff91b1f792ffa87fa287cb595db276190a09fca0

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3.3
+  TargetRubyVersion: 2.5
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false

data/.simplecov

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,4 +21,5 @@
 # SOFTWARE.
 
 source 'https://rubygems.org'
+ruby '2.6.0'
 gemspec

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2018 Yegor Bugayenko
+Copyright (c) 2018-2019 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -68,7 +68,7 @@ RuboCop::RakeTask.new(:rubocop) do |task|
 end
 
 task :copyright do
-  sh "grep -q -r '#{Date.today.strftime('%Y')}' \
+  sh "grep -q -r '2018-#{Date.today.strftime('%Y')}' \
     --include '*.rb' \
     --include '*.txt' \
     --include 'Rakefile' \

data/ext/score_suffix/ScoreSuffix.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Yegor Bugayenko
+// Copyright (c) 2018-2019 Yegor Bugayenko
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the 'Software'), to deal

data/ext/score_suffix/extconf.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/lib/zold/score.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -36,11 +36,14 @@ require 'time'
 # {White Paper}[https://papers.zold.io/wp.pdf].
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2018-2019 Yegor Bugayenko
 # License:: MIT
 module Zold
   # Score
   class Score
+    # When can't parse
+    class CantParse < StandardError; end
+
     # Default strength for the entire system, in production mode. The larger
     # the number, the more difficult it is to find the next score for
     # a node. If the number if too small, the values of the score will be
@@ -63,7 +66,7 @@ module Zold
       end
       @time = time
       raise 'Host can\'t be nil' if host.nil?
-      unless host =~ /^[0-9a-z\.\-]+$/
+      unless /^[0-9a-z\.\-]+$/.match?(host)
         raise "Host \"#{host}\" is in a wrong format"
       end
       @host = host
@@ -79,7 +82,7 @@ module Zold
       end
       @port = port
       raise 'Invoice can\'t be nil' if invoice.nil?
-      unless invoice =~ /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/
+      unless /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/.match?(invoice)
         raise "Invoice \"#{invoice}\" is wrong"
       end
       @invoice = invoice
@@ -106,7 +109,7 @@ module Zold
 
     # Parses it back from the JSON.
     def self.parse_json(json)
-      raise 'JSON can\'t be nil' if json.nil?
+      raise CantParse, 'JSON can\'t be nil' if json.nil?
       Score.new(
         time: Time.parse(json['time']),
         host: json['host'],
@@ -115,6 +118,8 @@ module Zold
         suffixes: json['suffixes'],
         strength: json['strength']
       )
+    rescue StandardError => e
+      raise CantParse, "#{e.message} in \"#{json}\""
     end
 
     # Compare with another Score, by text.
@@ -160,7 +165,7 @@ module Zold
     def self.parse(text)
       raise 'Can\'t parse nil' if text.nil?
       parts = text.split(' ', 7)
-      raise "Invalid score, not enough parts in \"#{text}\"" if parts.length < 6
+      raise 'Invalid score, not enough parts' if parts.length < 6
       Score.new(
         time: Time.at(parts[1].hex),
         host: parts[2],
@@ -169,6 +174,8 @@ module Zold
         suffixes: parts[6] ? parts[6].split(' ') : [],
         strength: parts[0].to_i
       )
+    rescue StandardError => e
+      raise CantParse, "#{e.message} in \"#{text}\""
     end
 
     # Returns its crypto hash. Read the White Paper for more information.

data/test/zold/test_score.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -29,7 +29,7 @@ require_relative '../../lib/zold/score'
 
 # Score test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2018-2019 Yegor Bugayenko
 # License:: MIT
 class TestScore < Minitest::Test
   include Minitest::Hooks
@@ -108,10 +108,11 @@ class TestScore < Minitest::Test
   end
 
   def test_parses_broken_text
-    ex = assert_raises do
-      Zold::Score.parse('some garbage')
+    text = 'some garbage to parse, which can\'t be parsed'
+    ex = assert_raises(Zold::Score::CantParse) do
+      Zold::Score.parse(text)
     end
-    assert(ex.message.include?('Invalid score'), ex)
+    assert(ex.message.include?(text), ex)
   end
 
   def test_prints_and_parses_zero_score

data/zold-score.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 Yegor Bugayenko
+# Copyright (c) 2018-2019 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
     s.required_rubygems_version = Gem::Requirement.new('>= 0')
   end
   s.rubygems_version = '2.2'
-  s.required_ruby_version = '>=2.3'
+  s.required_ruby_version = '>=2.5'
   s.name = 'zold-score'
-  s.version = '0.4.4'
+  s.version = '0.4.5'
   s.license = 'MIT'
   s.summary = 'Zold score'
   s.description = 'Score calculating Ruby Gem for Zold'
@@ -48,6 +48,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '1.0.4'
   s.add_development_dependency 'rdoc', '4.3.0'
   s.add_development_dependency 'rspec-rails', '3.8.1'
-  s.add_development_dependency 'rubocop', '0.60.0'
-  s.add_development_dependency 'rubocop-rspec', '1.30.0'
+  s.add_development_dependency 'rubocop', '0.62.0'
+  s.add_development_dependency 'rubocop-rspec', '1.31.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-score
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: 1.31.0
 description: Score calculating Ruby Gem for Zold
 email: yegor256@gmail.com
 executables: []
@@ -162,15 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 2
 summary: Zold score