zold-score 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d91d7f9367ae85f63b248adbf08a23b14c258cd288ade1127496f621ab73f7
-  data.tar.gz: 339c967d7dbaae591e63a173875726e0bb9f51e6c04b91dc1ab3ae94208d4b7d
+  metadata.gz: 633fc21de75740f2a881f83a3316a8c487e4c961869cd1b2fd06914e77672a03
+  data.tar.gz: 83382113630773e7b161fdac29130a6e4a8eaec9621ed5b793a1769e9b2981a2
 SHA512:
-  metadata.gz: e51a0ee045e0f4ea19ffaddec0ca61601b3e341ad584dc84c74189f83525734703ee82f14beb33ff274923ab1feadc654dab76683dd32901d7e630c813869784
-  data.tar.gz: bbe46c4db547135d7e450bd10540df76b2a3e5eac86bcb3c642e4a7769b35b95d129477c2b9d35de2a5ec00c9e573855ec177d6ced1e511835e01a02dc3613ce
+  metadata.gz: 114608fa7b37a278418bb7a0ea3e5a157c21dbca65a992da76c9857c94ec6eb31fe22b2f5c0fdd2e2a3f2762fd46d4274d2f28e6a495cd06543a5f2b82ffc1f4
+  data.tar.gz: e0b5ab868f2a2e9505051a0c2b5aecb082c8ff8372ca491d51b12370b9c5d25a393a486d6230ac4ca6f0c869e0adfeba08d58eac880dc8d110853354fa846c2e

data/.gitignore

@@ -5,3 +5,5 @@ coverage/
 .DS_Store
 rdoc/
 Gemfile.lock
+tmp/
+lib/score_suffix

data/.travis.yml

@@ -9,8 +9,10 @@ branches:
 install:
   - travis_retry bundle update
   - gem install pdd
+  - sudo apt-get install cppcheck
 script:
   - pdd -f /dev/null
+  - cppcheck --enable=all --quiet --suppress=unusedFunction .
   - export RUBYOPT="-W0"
   - rake --quiet
 after_success:

data/Rakefile

@@ -33,7 +33,12 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
-task default: %i[clean test rubocop copyright]
+task default: %i[clean compile test rubocop copyright]
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new 'score_suffix' do |ext|
+  ext.lib_dir = 'lib/score_suffix'
+end
 
 require 'rake/testtask'
 desc 'Run all unit tests'

data/appveyor.yml

@@ -8,13 +8,14 @@ branches:
     - gh-pages
 os: Windows Server 2012
 environment:
+  MAKE: mingw32-make
   matrix:
     - ruby_version: "23-x64"
     - ruby_version: "24-x64"
     - ruby_version: "25-x64"
 install:
   - ps: |
-      $Env:PATH = "C:\Ruby${Env:ruby_version}\bin;${Env:PATH}"
+      $Env:PATH = "C:\Ruby${Env:ruby_version}\bin;C:\msys64\mingw64\bin;${Env:PATH}"
       if ($Env:ruby_version -match "^23" ) {
         # RubyInstaller; download OpenSSL headers from OpenKnapsack Project
         $Env:openssl_dir = "C:\Ruby${Env:ruby_version}"
@@ -33,6 +34,6 @@ build_script:
   - bundle update
   - bundle install
 test_script:
-  - bundle exec rake --quiet
+  - bundle exec rake --trace
 cache:
   - vendor/bundle

data/ext/score_suffix/ScoreSuffix.cpp

@@ -0,0 +1,128 @@
+// Copyright (c) 2018 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
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#include <array>
+#include <random>
+#include <vector>
+#include <openssl/sha.h>
+#include <ruby.h>
+
+using namespace std;
+
+static
+array<uint8_t, SHA256_DIGEST_LENGTH> sha256(const string &string)
+{
+	SHA256_CTX ctx;
+	SHA256_Init(&ctx);
+	SHA256_Update(&ctx, string.data(), string.size());
+	array<uint8_t, SHA256_DIGEST_LENGTH> hash;
+	SHA256_Final(&hash[0], &ctx);
+	return hash;
+}
+
+static
+bool check_hash(const array<uint8_t, SHA256_DIGEST_LENGTH> &hash, int strength)
+{
+	int current_strength = 0;
+	const auto rend = hash.rend();
+	for (auto h = hash.rbegin(); h != rend; ++h) {
+		if ((*h & 0x0f) != 0) {
+			break;
+		}
+		current_strength += (*h == 0) ? 2 : 1;
+		if (*h != 0) {
+			break;
+		}
+	}
+	return current_strength >= strength;
+}
+
+static
+string create_nonce(uint64_t i)
+{
+	const string chars =
+		"0123456789"
+		"abcdefghijklmnopqrstuvwxyz"
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+	string rv;
+	for (int l = 0; l < 6; l++) {  // Cut to 6 sym
+		rv += chars[i % chars.size()];
+		if (i < chars.size()) {
+			break;
+		}
+		i /= chars.size();
+	}
+	return {rv.rbegin(), rv.rend()};
+}
+
+static
+string index(const string &prefix, int strength)
+{
+	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);
+		}
+	}
+}
+
+static
+VALUE ScoreSuffix_initialize(VALUE self, VALUE prefix, VALUE strength)
+{
+	rb_iv_set(self, "@prefix", prefix);
+	rb_iv_set(self, "@strength", strength);
+	return self;
+}
+
+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());
+}
+
+extern "C"
+void Init_score_suffix()
+{
+	VALUE module = rb_define_module("Zold");
+	VALUE score_suffix = rb_define_class_under(
+		module,
+		"ScoreSuffix",
+		rb_cObject
+	);
+	rb_define_method(
+		score_suffix,
+		"initialize",
+		reinterpret_cast<VALUE(*)(...)>(ScoreSuffix_initialize),
+		2
+	);
+	rb_define_method(
+		score_suffix,
+		"value",
+		reinterpret_cast<VALUE(*)(...)>(ScoreSuffix_value),
+		0
+	);
+}

data/ext/score_suffix/extconf.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'mkmf'
+
+# rubocop:disable Style/GlobalVars
+$warnflags = ''
+$CXXFLAGS << ' -std=c++11'
+$CXXFLAGS.gsub!(/-Wimplicit-int/, '')
+$CXXFLAGS.gsub!(/-Wdeclaration-after-statement/, '')
+$CXXFLAGS.gsub!(/-Wimplicit-function-declaration/, '')
+# rubocop:enable Style/GlobalVars
+
+create_makefile 'score_suffix/score_suffix'

data/lib/zold/score.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'openssl'
+require 'score_suffix/score_suffix'
 require 'time'
 
 # Zold score.
@@ -188,23 +189,17 @@ module Zold
     # on the CPU power and the <tt>strength</tt> of the current score.
     def next
       raise 'This score is not valid' unless valid?
-      idx = 0
-      loop do
-        suffix = idx.to_s(16)
-        score = Score.new(
-          time: @time, host: @host, port: @port,
-          invoice: @invoice, suffixes: @suffixes + [suffix],
-          strength: @strength
+      if expired?
+        return Score.new(
+          time: Time.now, host: @host, port: @port, invoice: @invoice,
+          suffixes: [], strength: @strength
         )
-        return score if score.valid?
-        if score.expired?
-          return Score.new(
-            time: Time.now, host: @host, port: @port, invoice: @invoice,
-            suffixes: [], strength: @strength
-          )
-        end
-        idx += 1
       end
+      suffix = ScoreSuffix.new(suffixes.empty? ? prefix : hash, @strength)
+      Score.new(
+        time: @time, host: @host, port: @port, invoice: @invoice,
+        suffixes: @suffixes + [suffix.value], strength: @strength
+      )
     end
 
     # The age of the score in seconds.

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.2.2'
+  s.version = '0.3.0'
   s.license = 'MIT'
   s.summary = 'Zold score'
   s.description = 'Score calculating Ruby Gem for Zold'
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_development_dependency 'codecov', '~>0'
   s.add_development_dependency 'minitest', '~>5'
+  s.add_development_dependency 'rake-compiler', '~>1.0.4'
   s.add_development_dependency 'rdoc', '~>4'
   s.add_development_dependency 'rspec-rails', '~>3'
   s.add_development_dependency 'rubocop', '0.58.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-score
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,8 @@ files:
 - README.md
 - Rakefile
 - appveyor.yml
+- ext/score_suffix/ScoreSuffix.cpp
+- ext/score_suffix/extconf.rb
 - lib/zold/score.rb
 - test/zold/test_score.rb
 - zold-score.gemspec