zold-score 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68392cfa1c2e06dd6c73d634175ee5b9be791022bfe1aa1a4a8cbad3162473d2
-  data.tar.gz: f28d302d34fe57cf1aa6012e5e7a3af4f275f383118aa993196b3a5b19e95d81
+  metadata.gz: 3e8e3611ae87c09e55eb4f6ca4d9f2480d8247bae57009ec55cf4d3cdc44f097
+  data.tar.gz: 785e1f097278534c39d6bfad528138f0b16ee84041c27962dfdaebf81ef9b6b7
 SHA512:
-  metadata.gz: dfd692c492b853c62786c0a88a8bbca50cd32e61ed544e877689c5b62ac61a2d3f01f1ce1d0690a32a7ecde3ebcd6f18827db92f6411e55d7e574b4dc485f0bc
-  data.tar.gz: f6cef47b4f15809ee287a9a8097dd2a8999eba7fa13e7187da060f1e1cf610737394c1eb01b8a276625a256cf98abd9590cc99983ef4c1d58ae112a72ab29480
+  metadata.gz: 0b1e6c40f46bdcb1149ebca1b95e30806535d25257410ca6d98ed30d2d8d1ae2a73e079d4c5960f9d3bced6058b4c7d890f80d2297d848afc2865ac44ff082ff
+  data.tar.gz: 12822784b61069fbec36a2258658e4fb5536a67878eeb31b3e555aeac8a8a80b149c94bc275a9df6d6338d4ef3c4efe34711486eb85b6412d3a17ded0565357b

data/.rubocop.yml

@@ -2,12 +2,16 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3.3
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
 Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/LineLength:
   Max: 120
 Metrics/AbcSize:
   Max: 25
+Metrics/BlockLength:
+  Max: 30
 Metrics/MethodLength:
   Max: 25
 Metrics/ClassLength:

data/ext/score_suffix/ScoreSuffix.cpp

@@ -23,9 +23,17 @@
 #include <vector>
 #include <openssl/sha.h>
 #include <ruby.h>
+#include <ruby/thread.h>
 
 using namespace std;
 
+struct index_params {
+	string prefix;
+	int strength;
+	string nonce;
+	bool keep_going;
+};
+
 static
 array<uint8_t, SHA256_DIGEST_LENGTH> sha256(const string &string)
 {
@@ -61,7 +69,6 @@ string create_nonce(uint64_t i)
 		"0123456789"
 		"abcdefghijklmnopqrstuvwxyz"
 		"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
 	string rv;
 	for (int l = 0; l < 6; l++) {  // Cut to 6 sym
 		rv += chars[i % chars.size()];
@@ -74,16 +81,25 @@ string create_nonce(uint64_t i)
 }
 
 static
-string index(const string &prefix, int strength)
+void *index(void *arg)
 {
+	index_params *params = static_cast<index_params *>(arg);
 	mt19937_64 random(uint64_t(time(nullptr)));
-
-	for (uint64_t i = random(); ; i++) {
-		const auto hash = sha256(prefix + " " + create_nonce(i));
-		if (check_hash(hash, strength)) {
-			return create_nonce(i);
+	for (uint64_t i = random(); params->keep_going; i++) {
+		const auto hash = sha256(params->prefix + " " + create_nonce(i));
+		if (check_hash(hash, params->strength)) {
+			params->nonce = create_nonce(i);
+			break;
 		}
 	}
+	return nullptr;
+}
+
+static
+void unblocking_func(void *arg)
+{
+	index_params *params = static_cast<index_params *>(arg);
+	params->keep_going = false;
 }
 
 static
@@ -98,10 +114,14 @@ static
 VALUE ScoreSuffix_value(VALUE self)
 {
 	auto prefix_value = rb_iv_get(self, "@prefix");
-	const string prefix = StringValuePtr(prefix_value);
-	const int strength = NUM2INT(rb_iv_get(self, "@strength"));
-	const auto nonce = index(prefix, strength);
-	return rb_str_new2(nonce.c_str());
+	index_params params = {
+		StringValuePtr(prefix_value),
+		NUM2INT(rb_iv_get(self, "@strength")),
+		"",
+		true
+	};
+	rb_thread_call_without_gvl(index, &params, unblocking_func, &params);
+	return rb_str_new2(params.nonce.c_str());
 }
 
 extern "C"

data/test/zold/test_score.rb

@@ -21,7 +21,9 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
 require 'tmpdir'
+require 'timeout'
 require 'time'
 require_relative '../../lib/zold/score'
 
@@ -30,6 +32,18 @@ require_relative '../../lib/zold/score'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestScore < Minitest::Test
+  include Minitest::Hooks
+
+  # We need this in order to make sure any test is faster than a minute. This
+  # should help spotting tests that hang out sometimes. The number of seconds
+  # to wait can be increased, but try to make it as little as possible,
+  # in order to catch problems ealier.
+  def around
+    Timeout.timeout(10) do
+      super
+    end
+  end
+
   def test_reduces_itself
     score = Zold::Score.new(
       time: Time.parse('2017-07-19T21:24:51Z'),
@@ -164,4 +178,14 @@ class TestScore < Minitest::Test
     )
     assert_equal('e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000', score.hash)
   end
+
+  def test_lets_the_thread_to_die
+    score = Zold::Score.new(host: 'localhost', invoice: 'NOPREFIX@ffffffffffffffff', strength: 30)
+    thread = Thread.start do
+      score.next
+    end
+    sleep(0.1)
+    thread.kill
+    thread.join
+  end
 end

data/zold-score.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2'
   s.required_ruby_version = '>=2.3'
   s.name = 'zold-score'
-  s.version = '0.3.2'
+  s.version = '0.3.3'
   s.license = 'MIT'
   s.summary = 'Zold score'
   s.description = 'Score calculating Ruby Gem for Zold'
@@ -42,9 +42,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_development_dependency 'codecov', '0.1.14'
   s.add_development_dependency 'minitest', '5.11.3'
+  s.add_development_dependency 'minitest-hooks', '1.5.0'
   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.58.1'
+  s.add_development_dependency 'rubocop', '0.60.0'
   s.add_development_dependency 'rubocop-rspec', '1.30.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-score
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.11.3
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement