z85 0.9 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8a8f710b44f09a0f49dcd06e762772a7be52afe545c9704c9bfc3b8fb18686
-  data.tar.gz: 0ca0ddb2f4a4acb520be1ff60e5ccb1e2c570db10ec7c1cc2dc94635b68c05ae
+  metadata.gz: 2b160adbdea010f5e0545cd033922819550b2b8f435422ff3ba363000345e2ca
+  data.tar.gz: 1703dd4ddbf8c142be0b6c22fa658814ecbd413127c39fc09e2f6ca75d2fc050
 SHA512:
-  metadata.gz: 288828a461c5de1c20ae44c03b275dfa5c21264517c397be2bb03bf7da5c4bfd59d4d882afe5d3c258f8279836513a1508b712d6225e981813f690fcf8fa76ea
-  data.tar.gz: 782da75afcaeaca47cddc7dfd85893b96ca8ddec4d9f32721e39027803f236d754a80d88c8f3114e9787df70a61f3d12bd6c3cd582a2d7f9bbdb8ceb1f8558df
+  metadata.gz: '0894598b2ce5a09fba76ec6122c2bd57571b73f03947a979b3450595e741875083cbbfebeb3413b5713c07dd65648228c2e4356b501e661a99048e422ce94a5d'
+  data.tar.gz: 4a0d167f327f6c2409a04a0d2cc680da05fece160eeba3d126639e725413c764469c01b032eec9b693a9b3c239b2751f983671d135db4e447142d5e6b4d87c10

data/ext/z85/z85.c

@@ -33,6 +33,8 @@
 
 typedef unsigned char byte;
 
+static VALUE z85_error;
+
 static char encoder[85 + 1] = {
     "0123456789"
     "abcdefghij"
@@ -119,12 +121,39 @@ static VALUE z85_decode(VALUE _mod, VALUE rstring)
     return out;
 }
 
+static VALUE z85_extract_counter(VALUE _mod, VALUE encoded)
+{
+    char* string = StringValuePtr(encoded);
+    char counter = string[RSTRING_LEN(encoded) - 1] - '0';
+    if (0 <= counter && counter <= 3) {
+        return INT2FIX(counter);
+    } else {
+        rb_raise(z85_error, "Invalid counter: %c", counter + '0');
+    }
+}
+
+static VALUE z85_trim_padding(VALUE _mod, VALUE padded_string, VALUE counter)
+{
+    int padding_size = FIX2INT(counter);
+    long trimmed_len = RSTRING_LEN(padded_string) - padding_size;
+
+    if (trimmed_len < 0)
+        rb_raise(z85_error, "String too short for counter %d", padding_size);
+    rb_str_resize(padded_string, trimmed_len);
+
+    return Qnil;
+}
+
 /* This function has a special name and it is invoked by Ruby to initialize the extension. */
 void Init_z85()
 {
     VALUE z85 = rb_define_module("Z85");
     VALUE z85_singleton_class = rb_singleton_class(z85);
 
+    z85_error = rb_define_class_under(z85, "Error", rb_eStandardError);
+
     rb_define_private_method(z85_singleton_class, "_encode", z85_encode, 1);
     rb_define_private_method(z85_singleton_class, "_decode", z85_decode, 1);
+    rb_define_private_method(z85_singleton_class, "extract_counter", z85_extract_counter, 1);
+    rb_define_private_method(z85_singleton_class, "trim_padding", z85_trim_padding, 2);
 }

data/lib/z85.rb

@@ -7,8 +7,6 @@ module Z85
   PADDINGS = ["", "\0", "\0\0", "\0\0\0"].freeze
   private_constant :PADDINGS
 
-  class Error < StandardError; end
-
   class << self
     private def err(message)
       raise Error, message
@@ -24,7 +22,7 @@ module Z85
 
     def encode_with_padding(string)
       n  = 4 - (string.bytesize % 4)
-      n == 4 ? _encode(string) + "0" : _encode(string + PADDINGS[n]) + n.to_s
+      n == 4 ? _encode(string) << "0" : _encode(string + PADDINGS[n]) << n.to_s
     end
 
     def decode(string)
@@ -42,28 +40,9 @@ module Z85
 
       counter = extract_counter(string)
       decoded = _decode(string)
-
-      begin
-        decoded[-counter, counter] = ""
-      rescue IndexError
-        err "String too short for counter #{counter}"
-      end
+      trim_padding(decoded, counter)
 
       decoded
     end
-
-    private def extract_counter(string)
-      begin
-        counter = Integer(string[-1])
-      rescue ArgumentError
-        err "Invalid counter: #{string[-1]}"
-      end
-
-      if counter <= 3
-        counter
-      else
-        err "Invalid counter: #{counter}"
-      end
-    end
   end
 end

data/lib/z85/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Z85
-  VERSION = "0.9"
+  VERSION = "0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z85
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Xavier Noria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: fxn@hashref.com