zold-score 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95e6e5b07f648e57d06ddbcb8d93cf32fa4330f621fa67dee4fec4014b74979
-  data.tar.gz: eb9e2ba533897bbbde34dab6873b2c347f1e81cca15eb0380eb55120ee98afe5
+  metadata.gz: 7824cd0db572815711d7dc77b9f820543a6f006c5476af408a78a027d00e8a77
+  data.tar.gz: 1e5ce652f5365135fb299d3e432e7e09fa485e822673bacbadf53418014d2192
 SHA512:
-  metadata.gz: a16f800d385d5d9eb07061e7c0e8d1c2dbfa6e530f7329480fbf65a168f3607fda47bc86384e2f4bba290b258cb2b71c6017e1ebbbedfa253d126867007ca5c9
-  data.tar.gz: '079dae179cb868a1cd8c5a9d6fc4cbf33419371125e0dee215a9f1556bcdcba97efe6c8c585cb1e5de74bb8b399c9941b4a19f11f6fa966465cb0f3a893ba146'
+  metadata.gz: cb927d57fa49f8805563a8664b501b82fd7b2a91a0dd6e43c801d005913b6f95b5a283e4a06d758d7cd7cfaf3e7d0e8413ec7b10781897490b926ee7436b2de1
+  data.tar.gz: 34ec30b7f91f1f61ff106aa4a9e3d266092934571a177d6548329ae5f5c6785f7978567d98f355205d2667e406ec0aa06eec9d8f74965ff96c785cee4061291d

data/lib/zold/score.rb

@@ -79,28 +79,32 @@ module Zold
       )
     end
 
-    # Pattern to match from string
-    PTN = Regexp.new(
-      '^' + [
-        '([0-9]+)/(?<strength>[0-9]+):',
-        ' (?<time>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-        ' (?<host>[0-9a-z\.\-]+)',
-        ' (?<port>[0-9]+)',
-        ' (?<invoice>[a-zA-Z0-9]{8,32}@[a-f0-9]{16})',
-        '(?<suffixes>( [a-zA-Z0-9]+)*)'
-      ].join + '$'
-    )
-    private_constant :PTN
+    # Converts it to a string. You can parse it back
+    # using <tt>parse()</tt>.
+    def to_s
+      pfx, bnf = @invoice.split('@')
+      [
+        @strength,
+        @time.to_i.to_s(16),
+        @host,
+        @port.to_s(16),
+        pfx,
+        bnf,
+        @suffixes.join(' ')
+      ].join(' ')
+    end
 
     # Parses it back from the text generated by <tt>to_s</tt>.
     def self.parse(text)
-      m = PTN.match(text.strip)
-      raise "Invalid score '#{text}', doesn't match: #{PTN}" if m.nil?
+      parts = text.split(' ', 7)
+      raise "Invalid score, not enough parts in \"#{text}\"" if parts.length < 7
       Score.new(
-        time: Time.parse(m[:time]), host: m[:host],
-        port: m[:port].to_i, invoice: m[:invoice],
-        suffixes: m[:suffixes].split(' '),
-        strength: m[:strength].to_i
+        time: Time.at(parts[1].hex),
+        host: parts[2],
+        port: parts[3].hex,
+        invoice: "#{parts[4]}@#{parts[5]}",
+        suffixes: parts[6] ? parts[6].split(' ') : [],
+        strength: parts[0].to_i
       )
     end
 
@@ -117,19 +121,6 @@ module Zold
       "#{value}:#{@time.strftime('%H%M')}"
     end
 
-    # Converts it to a string. You can parse it back
-    # using <tt>parse()</tt>.
-    def to_s
-      [
-        "#{value}/#{@strength}:",
-        @time.utc.iso8601,
-        @host,
-        @port,
-        @invoice,
-        @suffixes.join(' ')
-      ].join(' ').strip
-    end
-
     # Converts the score to a hash, which can be used for JSON presentation
     # of the score.
     def to_h

data/test/zold/test_score.rb

@@ -92,7 +92,7 @@ class TestScore < Minitest::Test
       ).next.next.to_s
     )
     assert_equal(2, score.value)
-    assert_equal(score.time.to_s, time.to_s)
+    assert_equal(score.time.utc.iso8601, time.utc.iso8601)
     assert_equal('localhost', score.host)
     assert_equal(999, score.port)
   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.4.1'
+  s.version = '0.4.2'
   s.license = 'MIT'
   s.summary = 'Zold score'
   s.description = 'Score calculating Ruby Gem for Zold'

metadata

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